ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.h
(Generate patch)

Comparing gvpe/src/connection.h (file contents):
Revision 1.33 by pcg, Sun Aug 10 01:34:36 2008 UTC vs.
Revision 1.38 by root, Thu Jul 18 13:35:16 2013 UTC

1/* 1/*
2 connection.h -- header for connection.C 2 connection.h -- header for connection.C
3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2013 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify it 7 GVPE is free software; you can redistribute it and/or modify it
8 under the terms of the GNU General Public License as published by the 8 under the terms of the GNU General Public License as published by the
… …
37#include "global.h" 37#include "global.h"
38#include "conf.h" 38#include "conf.h"
39#include "sockinfo.h" 39#include "sockinfo.h"
40#include "util.h" 40#include "util.h"
41#include "device.h" 41#include "device.h"
42#include "curve25519.h"
43#include "iv_gen.h"
42 44
43struct vpn; 45struct vpn;
44 46
45// called after HUP etc. to (re-)initialize global data structures 47// called after HUP etc. to (re-)initialize global data structures
46void connection_init (); 48void connection_init ();
47 49
50typedef curve25519_key ecdh_key;
51
48struct rsaid 52struct rsa_data
49{ 53{
50 u8 id[RSA_IDLEN]; // the challenge id 54 u32 seqno;
55 u8 auth_key[AUTH_SIZE];
56 u8 mac_key[MAC_KEYSIZE]; // used to generate hmac key
57 u8 cipher_key[CIPHER_KEYSIZE]; // used to generate cipher key
58 u8 hkdf_salt[HKDF_SALT]; // used as hkdf salt
59 u8 pad[
60 (RSABITS >> 3)
61 - 41 // OAEP
62 - sizeof (u32) // seqno
63 - AUTH_SIZE
64 - MAC_KEYSIZE
65 - CIPHER_KEYSIZE
66 - HKDF_SALT
67 - 3 // struct alignment...
68 ];
51}; 69};
52 70
53typedef rsaclear rsachallenge; // challenge data; 71struct auth_data
54typedef rsacrypt rsaencrdata; // encrypted challenge 72{
55typedef u8 rsaresponse[RSA_RESLEN]; // the encrypted ripemd160 hash 73 rsa_data rsa;
74 ecdh_key ecdh;
75};
76
77typedef u8 rsa_crypt[RSA_KEYLEN]; // encrypted challenge
78
79struct auth_encr
80{
81 rsa_crypt rsa;
82 ecdh_key ecdh;
83};
84
85typedef u8 auth_mac[AUTH_SIZE];
86
87struct auth_response
88{
89 auth_mac mac;
90 ecdh_key ecdh;
91};
56 92
57//////////////////////////////////////////////////////////////////////////////////////// 93////////////////////////////////////////////////////////////////////////////////////////
58 94
59struct crypto_ctx; 95struct crypto_ctx;
60 96
… …
152 188
153 sockinfo si; // the current(!) destination ip to send packets to 189 sockinfo si; // the current(!) destination ip to send packets to
154 int retry_cnt; 190 int retry_cnt;
155 191
156 tstamp last_activity; // time of last packet received 192 tstamp last_activity; // time of last packet received
157 tstamp last_establish_attempt; 193 tstamp last_establish_attempt;
158 //tstamp last_si_change; // time we last changed the socket address 194 //tstamp last_si_change; // time we last changed the socket address
159 195
160 u32 oseqno; 196 u32 oseqno;
161 sliding_window iseqno; 197 sliding_window iseqno;
162 198
… …
165 bool is_direct; // current connection (si) is direct? 201 bool is_direct; // current connection (si) is direct?
166 202
167 pkt_queue data_queue, vpn_queue; 203 pkt_queue data_queue, vpn_queue;
168 204
169 crypto_ctx *octx, *ictx; 205 crypto_ctx *octx, *ictx;
206 iv_gen oiv; // generator for random byte prefix
207
208 void generate_auth_data ();
209
210 ev_tstamp auth_expire; // when the snd_* and *_ecdh values expire
211
212 // send auth data - used for octx
213 auth_data snd_auth;
214 auth_mac snd_auth_mac; // expected response mac
215 ecdh_key snd_ecdh_a; // the secret ecdh key we used for our request
216 ecdh_key snd_ecdh_b; // the public ecdh key we received in the response
217 bool have_snd_auth; // received response for our req
218
219 // receive auth data - used for ictx
220 auth_data rcv_auth;
221 ecdh_key rcv_ecdh_a; // the secret ecdh key we used for our response
222 ecdh_key rcv_ecdh_b; // the public ecdh key we sent in our response
223 bool have_rcv_auth; // received auth from other side
170 224
171#if ENABLE_DNS 225#if ENABLE_DNS
172 struct dns_connection *dns; 226 struct dns_connection *dns;
173
174 void dnsv4_reset_connection ();
175#endif 227#endif
176 228
177 enum conf_node::connectmode connectmode; 229 enum conf_node::connectmode connectmode;
178 u8 prot_minor; // minor number of other side 230 u8 prot_minor; // minor number of other side
179 231
180 void reset_si (); 232 void reset_si ();
181 const sockinfo &forward_si (const sockinfo &si) const; 233 const sockinfo &forward_si (const sockinfo &si) const;
182 234
183 void shutdown (); 235 void shutdown ();
184 void connection_established (); 236 void connection_established (const sockinfo &rsi);
185 void reset_connection (); 237 void reset_connection ();
186 238
187 void establish_connection_cb (ev::timer &w, int revents); ev::timer establish_connection; 239 void establish_connection_cb (ev::timer &w, int revents); ev::timer establish_connection;
188 void rekey_cb (ev::timer &w, int revents); ev::timer rekey; // next rekying (actually current reset + reestablishing) 240 void rekey_cb (ev::timer &w, int revents); ev::timer rekey; // next rekying (actually current reset + reestablishing)
189 void keepalive_cb (ev::timer &w, int revents); ev::timer keepalive; // next keepalive probe 241 void keepalive_cb (ev::timer &w, int revents); ev::timer keepalive; // next keepalive probe
190 242
191 void send_connect_request (int id); 243 void send_connect_request (int id);
192 void send_auth_request (const sockinfo &si, bool initiate); 244 void send_auth_request (const sockinfo &si, bool initiate);
193 void send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg); 245 void send_auth_response (const sockinfo &si);
194 void send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols); 246 void send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols);
195 void send_reset (const sockinfo &dsi); 247 void send_reset (const sockinfo &dsi);
196 void send_ping (const sockinfo &dsi, u8 pong = 0); 248 void send_ping (const sockinfo &dsi, u8 pong = 0);
197 void send_data_packet (tap_packet *pkt); 249 void send_data_packet (tap_packet *pkt);
198 250
… …
204 void send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0); 256 void send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos = 0);
205 257
206 void script_init_env (const char *ext); 258 void script_init_env (const char *ext);
207 void script_init_connect_env (); 259 void script_init_connect_env ();
208 const char *script_node_up (); 260 const char *script_node_up ();
261 const char *script_node_change ();
209 const char *script_node_down (); 262 const char *script_node_down ();
210 263
211 void dump_status (); 264 void dump_status ();
212 265
213 connection (struct vpn *vpn, conf_node *conf); 266 connection (struct vpn *vpn, conf_node *conf);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines