1 | /* |
1 | /* |
2 | connection.C -- manage a single connection |
2 | connection.C -- manage a single connection |
|
|
3 | Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> |
3 | |
4 | |
4 | This program is free software; you can redistribute it and/or modify |
5 | This program is free software; you can redistribute it and/or modify |
5 | it under the terms of the GNU General Public License as published by |
6 | it under the terms of the GNU General Public License as published by |
6 | the Free Software Foundation; either version 2 of the License, or |
7 | the Free Software Foundation; either version 2 of the License, or |
7 | (at your option) any later version. |
8 | (at your option) any later version. |
… | |
… | |
16 | Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
17 | */ |
18 | */ |
18 | |
19 | |
19 | #include "config.h" |
20 | #include "config.h" |
20 | |
21 | |
21 | extern "C" { |
22 | #include <cassert> |
22 | # include "lzf/lzf.h" |
|
|
23 | } |
|
|
24 | |
23 | |
25 | #include <list> |
24 | #include <list> |
26 | |
25 | |
27 | #include <openssl/rand.h> |
26 | #include <openssl/rand.h> |
28 | #include <openssl/evp.h> |
27 | #include <openssl/evp.h> |
… | |
… | |
35 | #include "slog.h" |
34 | #include "slog.h" |
36 | #include "device.h" |
35 | #include "device.h" |
37 | #include "vpn.h" |
36 | #include "vpn.h" |
38 | #include "connection.h" |
37 | #include "connection.h" |
39 | |
38 | |
|
|
39 | #include "netcompat.h" |
|
|
40 | |
40 | #if !HAVE_RAND_PSEUDO_BYTES |
41 | #if !HAVE_RAND_PSEUDO_BYTES |
41 | # define RAND_pseudo_bytes RAND_bytes |
42 | # define RAND_pseudo_bytes RAND_bytes |
42 | #endif |
43 | #endif |
43 | |
44 | |
44 | #define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic |
45 | #define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic |
45 | |
46 | |
|
|
47 | #define ULTRA_FAST 1 |
|
|
48 | #define HLOG 15 |
|
|
49 | #include "lzf/lzf.h" |
|
|
50 | #include "lzf/lzf_c.c" |
|
|
51 | #include "lzf/lzf_d.c" |
|
|
52 | |
46 | struct crypto_ctx |
53 | struct crypto_ctx |
47 | { |
54 | { |
48 | EVP_CIPHER_CTX cctx; |
55 | EVP_CIPHER_CTX cctx; |
49 | HMAC_CTX hctx; |
56 | HMAC_CTX hctx; |
50 | |
57 | |
… | |
… | |
53 | }; |
60 | }; |
54 | |
61 | |
55 | crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) |
62 | crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) |
56 | { |
63 | { |
57 | EVP_CIPHER_CTX_init (&cctx); |
64 | EVP_CIPHER_CTX_init (&cctx); |
58 | EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); |
65 | require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc)); |
59 | HMAC_CTX_init (&hctx); |
66 | HMAC_CTX_init (&hctx); |
60 | HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); |
67 | HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); |
61 | } |
68 | } |
62 | |
69 | |
63 | crypto_ctx::~crypto_ctx () |
70 | crypto_ctx::~crypto_ctx () |
64 | { |
71 | { |
65 | EVP_CIPHER_CTX_cleanup (&cctx); |
72 | require (EVP_CIPHER_CTX_cleanup (&cctx)); |
66 | HMAC_CTX_cleanup (&hctx); |
73 | HMAC_CTX_cleanup (&hctx); |
67 | } |
74 | } |
68 | |
75 | |
69 | static void |
76 | static void |
70 | rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) |
77 | rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) |
71 | { |
78 | { |
72 | EVP_MD_CTX ctx; |
79 | EVP_MD_CTX ctx; |
73 | |
80 | |
74 | EVP_MD_CTX_init (&ctx); |
81 | EVP_MD_CTX_init (&ctx); |
75 | EVP_DigestInit (&ctx, RSA_HASH); |
82 | require (EVP_DigestInit (&ctx, RSA_HASH)); |
76 | EVP_DigestUpdate(&ctx, &chg, sizeof chg); |
83 | require (EVP_DigestUpdate(&ctx, &chg, sizeof chg)); |
77 | EVP_DigestUpdate(&ctx, &id, sizeof id); |
84 | require (EVP_DigestUpdate(&ctx, &id, sizeof id)); |
78 | EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); |
85 | require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); |
79 | EVP_MD_CTX_cleanup (&ctx); |
86 | EVP_MD_CTX_cleanup (&ctx); |
80 | } |
87 | } |
81 | |
88 | |
82 | struct rsa_entry { |
89 | struct rsa_entry { |
83 | tstamp expire; |
90 | tstamp expire; |
… | |
… | |
131 | |
138 | |
132 | } rsa_cache; |
139 | } rsa_cache; |
133 | |
140 | |
134 | void rsa_cache::cleaner_cb (time_watcher &w) |
141 | void rsa_cache::cleaner_cb (time_watcher &w) |
135 | { |
142 | { |
136 | if (empty ()) |
143 | if (!empty ()) |
137 | w.at = TSTAMP_CANCEL; |
|
|
138 | else |
|
|
139 | { |
144 | { |
140 | w.at = NOW + RSA_TTL; |
145 | w.start (NOW + RSA_TTL); |
141 | |
146 | |
142 | for (iterator i = begin (); i != end (); ) |
147 | for (iterator i = begin (); i != end (); ) |
143 | if (i->expire <= NOW) |
148 | if (i->expire <= NOW) |
144 | i = erase (i); |
149 | i = erase (i); |
145 | else |
150 | else |
… | |
… | |
147 | } |
152 | } |
148 | } |
153 | } |
149 | |
154 | |
150 | ////////////////////////////////////////////////////////////////////////////// |
155 | ////////////////////////////////////////////////////////////////////////////// |
151 | |
156 | |
152 | void pkt_queue::put (tap_packet *p) |
157 | void pkt_queue::put (net_packet *p) |
153 | { |
158 | { |
154 | if (queue[i]) |
159 | if (queue[i]) |
155 | { |
160 | { |
156 | delete queue[i]; |
161 | delete queue[i]; |
157 | j = (j + 1) % QUEUEDEPTH; |
162 | j = (j + 1) % QUEUEDEPTH; |
… | |
… | |
160 | queue[i] = p; |
165 | queue[i] = p; |
161 | |
166 | |
162 | i = (i + 1) % QUEUEDEPTH; |
167 | i = (i + 1) % QUEUEDEPTH; |
163 | } |
168 | } |
164 | |
169 | |
165 | tap_packet *pkt_queue::get () |
170 | net_packet *pkt_queue::get () |
166 | { |
171 | { |
167 | tap_packet *p = queue[j]; |
172 | net_packet *p = queue[j]; |
168 | |
173 | |
169 | if (p) |
174 | if (p) |
170 | { |
175 | { |
171 | queue[j] = 0; |
176 | queue[j] = 0; |
172 | j = (j + 1) % QUEUEDEPTH; |
177 | j = (j + 1) % QUEUEDEPTH; |
… | |
… | |
197 | // only do action once every x seconds per host whole allowing bursts. |
202 | // only do action once every x seconds per host whole allowing bursts. |
198 | // this implementation ("splay list" ;) is inefficient, |
203 | // this implementation ("splay list" ;) is inefficient, |
199 | // but low on resources. |
204 | // but low on resources. |
200 | struct net_rate_limiter : list<net_rateinfo> |
205 | struct net_rate_limiter : list<net_rateinfo> |
201 | { |
206 | { |
202 | static const double ALPHA = 1. - 1. / 180.; // allow bursts |
207 | static const double ALPHA = 1. - 1. / 600.; // allow bursts |
203 | static const double CUTOFF = 10.; // one event every CUTOFF seconds |
208 | static const double CUTOFF = 10.; // one event every CUTOFF seconds |
204 | static const double EXPIRE = CUTOFF * 30.; // expire entries after this time |
209 | static const double EXPIRE = CUTOFF * 30.; // expire entries after this time |
|
|
210 | static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value |
205 | |
211 | |
206 | bool can (const sockinfo &si) { return can((u32)si.host); } |
212 | bool can (const sockinfo &si) { return can((u32)si.host); } |
207 | bool can (u32 host); |
213 | bool can (u32 host); |
208 | }; |
214 | }; |
209 | |
215 | |
210 | net_rate_limiter auth_rate_limiter, reset_rate_limiter; |
216 | net_rate_limiter auth_rate_limiter, reset_rate_limiter; |
211 | |
217 | |
… | |
… | |
225 | { |
231 | { |
226 | net_rateinfo ri; |
232 | net_rateinfo ri; |
227 | |
233 | |
228 | ri.host = host; |
234 | ri.host = host; |
229 | ri.pcnt = 1.; |
235 | ri.pcnt = 1.; |
230 | ri.diff = CUTOFF * (1. / (1. - ALPHA)); |
236 | ri.diff = MAXDIF; |
231 | ri.last = NOW; |
237 | ri.last = NOW; |
232 | |
238 | |
233 | push_front (ri); |
239 | push_front (ri); |
234 | |
240 | |
235 | return true; |
241 | return true; |
… | |
… | |
242 | ri.pcnt = ri.pcnt * ALPHA; |
248 | ri.pcnt = ri.pcnt * ALPHA; |
243 | ri.diff = ri.diff * ALPHA + (NOW - ri.last); |
249 | ri.diff = ri.diff * ALPHA + (NOW - ri.last); |
244 | |
250 | |
245 | ri.last = NOW; |
251 | ri.last = NOW; |
246 | |
252 | |
|
|
253 | double dif = ri.diff / ri.pcnt; |
|
|
254 | |
247 | bool send = ri.diff / ri.pcnt > CUTOFF; |
255 | bool send = dif > CUTOFF; |
248 | |
256 | |
|
|
257 | if (dif > MAXDIF) |
|
|
258 | { |
|
|
259 | ri.pcnt = 1.; |
|
|
260 | ri.diff = MAXDIF; |
|
|
261 | } |
249 | if (send) |
262 | else if (send) |
250 | ri.pcnt++; |
263 | ri.pcnt++; |
251 | |
264 | |
252 | push_front (ri); |
265 | push_front (ri); |
253 | |
266 | |
254 | return send; |
267 | return send; |
… | |
… | |
299 | } |
312 | } |
300 | |
313 | |
301 | #define MAXVPNDATA (MAX_MTU - 6 - 6) |
314 | #define MAXVPNDATA (MAX_MTU - 6 - 6) |
302 | #define DATAHDR (sizeof (u32) + RAND_SIZE) |
315 | #define DATAHDR (sizeof (u32) + RAND_SIZE) |
303 | |
316 | |
304 | struct vpndata_packet:vpn_packet |
317 | struct vpndata_packet : vpn_packet |
305 | { |
318 | { |
306 | u8 data[MAXVPNDATA + DATAHDR]; // seqno |
319 | u8 data[MAXVPNDATA + DATAHDR]; // seqno |
307 | |
320 | |
308 | void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); |
321 | void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); |
309 | tap_packet *unpack (connection *conn, u32 &seqno); |
322 | tap_packet *unpack (connection *conn, u32 &seqno); |
… | |
… | |
322 | int outl = 0, outl2; |
335 | int outl = 0, outl2; |
323 | ptype type = PT_DATA_UNCOMPRESSED; |
336 | ptype type = PT_DATA_UNCOMPRESSED; |
324 | |
337 | |
325 | #if ENABLE_COMPRESSION |
338 | #if ENABLE_COMPRESSION |
326 | u8 cdata[MAX_MTU]; |
339 | u8 cdata[MAX_MTU]; |
327 | u32 cl; |
|
|
328 | |
340 | |
|
|
341 | if (conn->features & ENABLE_COMPRESSION) |
|
|
342 | { |
329 | cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); |
343 | u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); |
|
|
344 | |
330 | if (cl) |
345 | if (cl) |
331 | { |
346 | { |
332 | type = PT_DATA_COMPRESSED; |
347 | type = PT_DATA_COMPRESSED; |
333 | d = cdata; |
348 | d = cdata; |
334 | l = cl + 2; |
349 | l = cl + 2; |
335 | |
350 | |
336 | d[0] = cl >> 8; |
351 | d[0] = cl >> 8; |
337 | d[1] = cl; |
352 | d[1] = cl; |
|
|
353 | } |
338 | } |
354 | } |
339 | #endif |
355 | #endif |
340 | |
356 | |
341 | EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); |
357 | require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); |
342 | |
358 | |
343 | struct { |
359 | struct { |
344 | #if RAND_SIZE |
360 | #if RAND_SIZE |
345 | u8 rnd[RAND_SIZE]; |
361 | u8 rnd[RAND_SIZE]; |
346 | #endif |
362 | #endif |
… | |
… | |
350 | datahdr.seqno = ntohl (seqno); |
366 | datahdr.seqno = ntohl (seqno); |
351 | #if RAND_SIZE |
367 | #if RAND_SIZE |
352 | RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); |
368 | RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); |
353 | #endif |
369 | #endif |
354 | |
370 | |
355 | EVP_EncryptUpdate (cctx, |
371 | require (EVP_EncryptUpdate (cctx, |
356 | (unsigned char *) data + outl, &outl2, |
372 | (unsigned char *) data + outl, &outl2, |
357 | (unsigned char *) &datahdr, DATAHDR); |
373 | (unsigned char *) &datahdr, DATAHDR)); |
358 | outl += outl2; |
374 | outl += outl2; |
359 | |
375 | |
360 | EVP_EncryptUpdate (cctx, |
376 | require (EVP_EncryptUpdate (cctx, |
361 | (unsigned char *) data + outl, &outl2, |
377 | (unsigned char *) data + outl, &outl2, |
362 | (unsigned char *) d, l); |
378 | (unsigned char *) d, l)); |
363 | outl += outl2; |
379 | outl += outl2; |
364 | |
380 | |
365 | EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); |
381 | require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2)); |
366 | outl += outl2; |
382 | outl += outl2; |
367 | |
383 | |
368 | len = outl + data_hdr_size (); |
384 | len = outl + data_hdr_size (); |
369 | |
385 | |
370 | set_hdr (type, dst); |
386 | set_hdr (type, dst); |
… | |
… | |
379 | int outl = 0, outl2; |
395 | int outl = 0, outl2; |
380 | tap_packet *p = new tap_packet; |
396 | tap_packet *p = new tap_packet; |
381 | u8 *d; |
397 | u8 *d; |
382 | u32 l = len - data_hdr_size (); |
398 | u32 l = len - data_hdr_size (); |
383 | |
399 | |
384 | EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); |
400 | require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); |
385 | |
401 | |
386 | #if ENABLE_COMPRESSION |
402 | #if ENABLE_COMPRESSION |
387 | u8 cdata[MAX_MTU]; |
403 | u8 cdata[MAX_MTU]; |
388 | |
404 | |
389 | if (type == PT_DATA_COMPRESSED) |
405 | if (type == PT_DATA_COMPRESSED) |
… | |
… | |
391 | else |
407 | else |
392 | #endif |
408 | #endif |
393 | d = &(*p)[6 + 6 - DATAHDR]; |
409 | d = &(*p)[6 + 6 - DATAHDR]; |
394 | |
410 | |
395 | /* this overwrites part of the src mac, but we fix that later */ |
411 | /* this overwrites part of the src mac, but we fix that later */ |
396 | EVP_DecryptUpdate (cctx, |
412 | require (EVP_DecryptUpdate (cctx, |
397 | d, &outl2, |
413 | d, &outl2, |
398 | (unsigned char *)&data, len - data_hdr_size ()); |
414 | (unsigned char *)&data, len - data_hdr_size ())); |
399 | outl += outl2; |
415 | outl += outl2; |
400 | |
416 | |
401 | EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); |
417 | require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2)); |
402 | outl += outl2; |
418 | outl += outl2; |
403 | |
419 | |
404 | seqno = ntohl (*(u32 *)(d + RAND_SIZE)); |
420 | seqno = ntohl (*(u32 *)(d + RAND_SIZE)); |
405 | |
421 | |
406 | id2mac (dst () ? dst() : THISNODE->id, p->dst); |
422 | id2mac (dst () ? dst() : THISNODE->id, p->dst); |
… | |
… | |
435 | { |
451 | { |
436 | // actually, hmaclen cannot be checked because the hmac |
452 | // actually, hmaclen cannot be checked because the hmac |
437 | // field comes before this data, so peers with other |
453 | // field comes before this data, so peers with other |
438 | // hmacs simply will not work. |
454 | // hmacs simply will not work. |
439 | u8 prot_major, prot_minor, randsize, hmaclen; |
455 | u8 prot_major, prot_minor, randsize, hmaclen; |
440 | u8 flags, challengelen, pad2, pad3; |
456 | u8 flags, challengelen, features, pad3; |
441 | u32 cipher_nid, digest_nid, hmac_nid; |
457 | u32 cipher_nid, digest_nid, hmac_nid; |
442 | |
|
|
443 | const u8 curflags () const |
|
|
444 | { |
|
|
445 | return 0x80 |
|
|
446 | | (ENABLE_COMPRESSION ? 0x01 : 0x00); |
|
|
447 | } |
|
|
448 | |
458 | |
449 | void setup (ptype type, int dst); |
459 | void setup (ptype type, int dst); |
450 | bool chk_config () const; |
460 | bool chk_config () const; |
451 | }; |
461 | }; |
|
|
462 | |
|
|
463 | #define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \ |
|
|
464 | | (ENABLE_ROHC ? FEATURE_ROHC : 0)) |
452 | |
465 | |
453 | void config_packet::setup (ptype type, int dst) |
466 | void config_packet::setup (ptype type, int dst) |
454 | { |
467 | { |
455 | prot_major = PROTOCOL_MAJOR; |
468 | prot_major = PROTOCOL_MAJOR; |
456 | prot_minor = PROTOCOL_MINOR; |
469 | prot_minor = PROTOCOL_MINOR; |
457 | randsize = RAND_SIZE; |
470 | randsize = RAND_SIZE; |
458 | hmaclen = HMACLENGTH; |
471 | hmaclen = HMACLENGTH; |
459 | flags = curflags (); |
472 | flags = ENABLE_COMPRESSION ? 0x81 : 0x80; |
460 | challengelen = sizeof (rsachallenge); |
473 | challengelen = sizeof (rsachallenge); |
|
|
474 | features = FEATURES; |
461 | |
475 | |
462 | cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); |
476 | cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); |
463 | digest_nid = htonl (EVP_MD_type (RSA_HASH)); |
477 | digest_nid = htonl (EVP_MD_type (RSA_HASH)); |
464 | hmac_nid = htonl (EVP_MD_type (DIGEST)); |
478 | hmac_nid = htonl (EVP_MD_type (DIGEST)); |
465 | |
479 | |
… | |
… | |
467 | set_hdr (type, dst); |
481 | set_hdr (type, dst); |
468 | } |
482 | } |
469 | |
483 | |
470 | bool config_packet::chk_config () const |
484 | bool config_packet::chk_config () const |
471 | { |
485 | { |
472 | return prot_major == PROTOCOL_MAJOR |
486 | if (prot_major != PROTOCOL_MAJOR) |
473 | && randsize == RAND_SIZE |
487 | slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); |
474 | && hmaclen == HMACLENGTH |
488 | else if (randsize != RAND_SIZE) |
475 | && flags == curflags () |
489 | slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); |
|
|
490 | else if (hmaclen != HMACLENGTH) |
|
|
491 | slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); |
|
|
492 | #if 0 // this implementation should handle all flag settings |
|
|
493 | else if (flags != curflags ()) |
|
|
494 | slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ()); |
|
|
495 | #endif |
476 | && challengelen == sizeof (rsachallenge) |
496 | else if (challengelen != sizeof (rsachallenge)) |
|
|
497 | slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); |
477 | && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) |
498 | else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) |
|
|
499 | slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); |
478 | && digest_nid == htonl (EVP_MD_type (RSA_HASH)) |
500 | else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) |
|
|
501 | slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); |
479 | && hmac_nid == htonl (EVP_MD_type (DIGEST)); |
502 | else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) |
|
|
503 | slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); |
|
|
504 | else |
|
|
505 | return true; |
|
|
506 | |
|
|
507 | return false; |
480 | } |
508 | } |
481 | |
509 | |
482 | struct auth_req_packet : config_packet |
510 | struct auth_req_packet : config_packet |
483 | { |
511 | { |
484 | char magic[8]; |
512 | char magic[8]; |
485 | u8 initiate; // false if this is just an automatic reply |
513 | u8 initiate; // false if this is just an automatic reply |
486 | u8 protocols; // supported protocols (will get patches on forward) |
514 | u8 protocols; // supported protocols (will be patched on forward) |
487 | u8 pad2, pad3; |
515 | u8 pad2, pad3; |
488 | rsaid id; |
516 | rsaid id; |
489 | rsaencrdata encr; |
517 | rsaencrdata encr; |
490 | |
518 | |
491 | auth_req_packet (int dst, bool initiate_, u8 protocols_) |
519 | auth_req_packet (int dst, bool initiate_, u8 protocols_) |
… | |
… | |
544 | len = sizeof (*this) - sizeof (net_packet); |
572 | len = sizeof (*this) - sizeof (net_packet); |
545 | } |
573 | } |
546 | }; |
574 | }; |
547 | |
575 | |
548 | ///////////////////////////////////////////////////////////////////////////// |
576 | ///////////////////////////////////////////////////////////////////////////// |
|
|
577 | |
|
|
578 | void |
|
|
579 | connection::connection_established () |
|
|
580 | { |
|
|
581 | if (ictx && octx) |
|
|
582 | { |
|
|
583 | connectmode = conf->connectmode; |
|
|
584 | |
|
|
585 | rekey.start (NOW + ::conf.rekey); |
|
|
586 | keepalive.start (NOW + ::conf.keepalive); |
|
|
587 | |
|
|
588 | // send queued packets |
|
|
589 | if (ictx && octx) |
|
|
590 | { |
|
|
591 | while (tap_packet *p = (tap_packet *)data_queue.get ()) |
|
|
592 | { |
|
|
593 | send_data_packet (p); |
|
|
594 | delete p; |
|
|
595 | } |
|
|
596 | |
|
|
597 | while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) |
|
|
598 | { |
|
|
599 | send_vpn_packet (p, si, IPTOS_RELIABILITY); |
|
|
600 | delete p; |
|
|
601 | } |
|
|
602 | } |
|
|
603 | } |
|
|
604 | else |
|
|
605 | { |
|
|
606 | retry_cnt = 0; |
|
|
607 | establish_connection.start (NOW + 5); |
|
|
608 | keepalive.stop (); |
|
|
609 | rekey.stop (); |
|
|
610 | } |
|
|
611 | } |
549 | |
612 | |
550 | void |
613 | void |
551 | connection::reset_si () |
614 | connection::reset_si () |
552 | { |
615 | { |
553 | protocol = best_protocol (THISNODE->protocols & conf->protocols); |
616 | protocol = best_protocol (THISNODE->protocols & conf->protocols); |
… | |
… | |
580 | |
643 | |
581 | return si; |
644 | return si; |
582 | } |
645 | } |
583 | |
646 | |
584 | void |
647 | void |
|
|
648 | connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) |
|
|
649 | { |
|
|
650 | if (!vpn->send_vpn_packet (pkt, si, tos)) |
|
|
651 | reset_connection (); |
|
|
652 | } |
|
|
653 | |
|
|
654 | void |
585 | connection::send_ping (const sockinfo &si, u8 pong) |
655 | connection::send_ping (const sockinfo &si, u8 pong) |
586 | { |
656 | { |
587 | ping_packet *pkt = new ping_packet; |
657 | ping_packet *pkt = new ping_packet; |
588 | |
658 | |
589 | pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); |
659 | pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); |
590 | vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY); |
660 | send_vpn_packet (pkt, si, IPTOS_LOWDELAY); |
591 | |
661 | |
592 | delete pkt; |
662 | delete pkt; |
593 | } |
663 | } |
594 | |
664 | |
595 | void |
665 | void |
… | |
… | |
598 | if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) |
668 | if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) |
599 | { |
669 | { |
600 | config_packet *pkt = new config_packet; |
670 | config_packet *pkt = new config_packet; |
601 | |
671 | |
602 | pkt->setup (vpn_packet::PT_RESET, conf->id); |
672 | pkt->setup (vpn_packet::PT_RESET, conf->id); |
603 | vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST); |
673 | send_vpn_packet (pkt, si, IPTOS_MINCOST); |
604 | |
674 | |
605 | delete pkt; |
675 | delete pkt; |
606 | } |
676 | } |
607 | } |
677 | } |
608 | |
678 | |
… | |
… | |
610 | connection::send_auth_request (const sockinfo &si, bool initiate) |
680 | connection::send_auth_request (const sockinfo &si, bool initiate) |
611 | { |
681 | { |
612 | auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); |
682 | auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); |
613 | |
683 | |
614 | rsachallenge chg; |
684 | rsachallenge chg; |
615 | |
|
|
616 | rsa_cache.gen (pkt->id, chg); |
685 | rsa_cache.gen (pkt->id, chg); |
617 | |
686 | rsa_encrypt (conf->rsa_key, chg, pkt->encr); |
618 | if (0 > RSA_public_encrypt (sizeof chg, |
|
|
619 | (unsigned char *)&chg, (unsigned char *)&pkt->encr, |
|
|
620 | conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) |
|
|
621 | fatal ("RSA_public_encrypt error"); |
|
|
622 | |
687 | |
623 | slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); |
688 | slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); |
624 | |
689 | |
625 | vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly |
690 | send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly |
626 | |
691 | |
627 | delete pkt; |
692 | delete pkt; |
628 | } |
693 | } |
629 | |
694 | |
630 | void |
695 | void |
… | |
… | |
638 | |
703 | |
639 | pkt->hmac_set (octx); |
704 | pkt->hmac_set (octx); |
640 | |
705 | |
641 | slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); |
706 | slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); |
642 | |
707 | |
643 | vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly |
708 | send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly |
644 | |
709 | |
645 | delete pkt; |
710 | delete pkt; |
646 | } |
711 | } |
647 | |
712 | |
648 | void |
713 | void |
… | |
… | |
652 | conf->id, rid, (const char *)rsi); |
717 | conf->id, rid, (const char *)rsi); |
653 | |
718 | |
654 | connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); |
719 | connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); |
655 | |
720 | |
656 | r->hmac_set (octx); |
721 | r->hmac_set (octx); |
657 | vpn->send_vpn_packet (r, si); |
722 | send_vpn_packet (r, si); |
658 | |
723 | |
659 | delete r; |
724 | delete r; |
660 | } |
725 | } |
661 | |
726 | |
662 | void |
727 | void |
663 | connection::establish_connection_cb (time_watcher &w) |
728 | connection::establish_connection_cb (time_watcher &w) |
664 | { |
729 | { |
665 | if (ictx || conf == THISNODE |
730 | if (!ictx |
|
|
731 | && conf != THISNODE |
666 | || connectmode == conf_node::C_NEVER |
732 | && connectmode != conf_node::C_NEVER |
667 | || connectmode == conf_node::C_DISABLED) |
733 | && connectmode != conf_node::C_DISABLED |
668 | w.at = TSTAMP_CANCEL; |
734 | && NOW > w.at) |
669 | else if (w.at <= NOW) |
|
|
670 | { |
735 | { |
671 | double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; |
736 | double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; |
672 | |
737 | |
673 | if (retry_int < 3600 * 8) |
738 | if (retry_int < 3600 * 8) |
674 | retry_cnt++; |
739 | retry_cnt++; |
675 | |
740 | |
676 | w.at = NOW + retry_int; |
741 | w.start (NOW + retry_int); |
677 | |
742 | |
678 | reset_si (); |
743 | reset_si (); |
679 | |
744 | |
680 | if (si.prot && !si.host) |
745 | if (si.prot && !si.host) |
681 | vpn->connect_request (conf->id); |
746 | vpn->send_connect_request (conf->id); |
682 | else |
747 | else |
683 | { |
748 | { |
684 | const sockinfo &dsi = forward_si (si); |
749 | const sockinfo &dsi = forward_si (si); |
685 | |
750 | |
686 | if (dsi.valid () && auth_rate_limiter.can (dsi)) |
751 | if (dsi.valid () && auth_rate_limiter.can (dsi)) |
… | |
… | |
712 | si.host= 0; |
777 | si.host= 0; |
713 | |
778 | |
714 | last_activity = 0; |
779 | last_activity = 0; |
715 | retry_cnt = 0; |
780 | retry_cnt = 0; |
716 | |
781 | |
717 | rekey.reset (); |
782 | rekey.stop (); |
718 | keepalive.reset (); |
783 | keepalive.stop (); |
719 | establish_connection.reset (); |
784 | establish_connection.stop (); |
720 | } |
785 | } |
721 | |
786 | |
722 | void |
787 | void |
723 | connection::shutdown () |
788 | connection::shutdown () |
724 | { |
789 | { |
… | |
… | |
729 | } |
794 | } |
730 | |
795 | |
731 | void |
796 | void |
732 | connection::rekey_cb (time_watcher &w) |
797 | connection::rekey_cb (time_watcher &w) |
733 | { |
798 | { |
734 | w.at = TSTAMP_CANCEL; |
|
|
735 | |
|
|
736 | reset_connection (); |
799 | reset_connection (); |
737 | establish_connection (); |
800 | establish_connection (); |
738 | } |
801 | } |
739 | |
802 | |
740 | void |
803 | void |
741 | connection::send_data_packet (tap_packet *pkt, bool broadcast) |
804 | connection::send_data_packet (tap_packet *pkt) |
742 | { |
805 | { |
743 | vpndata_packet *p = new vpndata_packet; |
806 | vpndata_packet *p = new vpndata_packet; |
744 | int tos = 0; |
807 | int tos = 0; |
745 | |
808 | |
746 | if (conf->inherit_tos |
809 | // I am not hilarious about peeking into packets, but so be it. |
747 | && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP |
810 | if (conf->inherit_tos && pkt->is_ipv4 ()) |
748 | && ((*pkt)[14] & 0xf0) == 0x40) // IPv4 |
|
|
749 | tos = (*pkt)[15] & IPTOS_TOS_MASK; |
811 | tos = (*pkt)[15] & IPTOS_TOS_MASK; |
750 | |
812 | |
751 | p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs |
813 | p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs |
752 | vpn->send_vpn_packet (p, si, tos); |
814 | send_vpn_packet (p, si, tos); |
753 | |
815 | |
754 | delete p; |
816 | delete p; |
755 | |
817 | |
756 | if (oseqno > MAX_SEQNO) |
818 | if (oseqno > MAX_SEQNO) |
757 | rekey (); |
819 | rekey (); |
758 | } |
820 | } |
759 | |
821 | |
760 | void |
822 | void |
761 | connection::inject_data_packet (tap_packet *pkt, bool broadcast) |
823 | connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) |
762 | { |
824 | { |
763 | if (ictx && octx) |
825 | if (ictx && octx) |
764 | send_data_packet (pkt, broadcast); |
826 | send_data_packet (pkt); |
765 | else |
827 | else |
766 | { |
828 | { |
767 | if (!broadcast)//DDDD |
829 | if (!broadcast)//DDDD |
768 | queue.put (new tap_packet (*pkt)); |
830 | data_queue.put (new tap_packet (*pkt)); |
769 | |
831 | |
770 | establish_connection (); |
832 | establish_connection (); |
771 | } |
833 | } |
772 | } |
834 | } |
773 | |
835 | |
774 | void connection::inject_vpn_packet (vpn_packet *pkt, int tos) |
836 | void connection::inject_vpn_packet (vpn_packet *pkt, int tos) |
775 | { |
837 | { |
776 | if (ictx && octx) |
838 | if (ictx && octx) |
777 | vpn->send_vpn_packet (pkt, si, tos); |
839 | send_vpn_packet (pkt, si, tos); |
778 | else |
840 | else |
|
|
841 | { |
|
|
842 | vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); |
|
|
843 | |
779 | establish_connection (); |
844 | establish_connection (); |
|
|
845 | } |
780 | } |
846 | } |
781 | |
847 | |
782 | void |
848 | void |
783 | connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) |
849 | connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) |
784 | { |
850 | { |
… | |
… | |
840 | if (p->initiate) |
906 | if (p->initiate) |
841 | send_auth_request (rsi, false); |
907 | send_auth_request (rsi, false); |
842 | |
908 | |
843 | rsachallenge k; |
909 | rsachallenge k; |
844 | |
910 | |
845 | if (0 > RSA_private_decrypt (sizeof (p->encr), |
911 | if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) |
846 | (unsigned char *)&p->encr, (unsigned char *)&k, |
912 | { |
847 | ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) |
|
|
848 | slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), |
913 | slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), |
849 | conf->nodename, (const char *)rsi); |
914 | conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); |
|
|
915 | break; |
|
|
916 | } |
850 | else |
917 | else |
851 | { |
918 | { |
852 | retry_cnt = 0; |
|
|
853 | establish_connection.start (NOW + 8); //? ;) |
|
|
854 | keepalive.reset (); |
|
|
855 | rekey.reset (); |
|
|
856 | |
|
|
857 | delete ictx; |
|
|
858 | ictx = 0; |
|
|
859 | |
|
|
860 | delete octx; |
919 | delete octx; |
861 | |
920 | |
862 | octx = new crypto_ctx (k, 1); |
921 | octx = new crypto_ctx (k, 1); |
863 | oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; |
922 | oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; |
864 | |
923 | |
|
|
924 | // compatibility code, remove when no longer required |
|
|
925 | if (p->flags & 1) p->features |= FEATURE_COMPRESSION; |
|
|
926 | |
865 | conf->protocols = p->protocols; |
927 | conf->protocols = p->protocols; |
|
|
928 | features = p->features & FEATURES; |
|
|
929 | |
866 | send_auth_response (rsi, p->id, k); |
930 | send_auth_response (rsi, p->id, k); |
|
|
931 | |
|
|
932 | connection_established (); |
867 | |
933 | |
868 | break; |
934 | break; |
869 | } |
935 | } |
870 | } |
936 | } |
|
|
937 | else |
|
|
938 | slog (L_WARN, _("%s(%s): protocol mismatch"), |
|
|
939 | conf->nodename, (const char *)rsi); |
871 | |
940 | |
872 | send_reset (rsi); |
941 | send_reset (rsi); |
873 | } |
942 | } |
874 | |
943 | |
875 | break; |
944 | break; |
… | |
… | |
888 | PROTOCOL_MINOR, conf->nodename, p->prot_minor); |
957 | PROTOCOL_MINOR, conf->nodename, p->prot_minor); |
889 | |
958 | |
890 | rsachallenge chg; |
959 | rsachallenge chg; |
891 | |
960 | |
892 | if (!rsa_cache.find (p->id, chg)) |
961 | if (!rsa_cache.find (p->id, chg)) |
|
|
962 | { |
893 | slog (L_ERR, _("%s(%s): unrequested auth response"), |
963 | slog (L_ERR, _("%s(%s): unrequested auth response ignored"), |
894 | conf->nodename, (const char *)rsi); |
964 | conf->nodename, (const char *)rsi); |
|
|
965 | break; |
|
|
966 | } |
895 | else |
967 | else |
896 | { |
968 | { |
897 | crypto_ctx *cctx = new crypto_ctx (chg, 0); |
969 | crypto_ctx *cctx = new crypto_ctx (chg, 0); |
898 | |
970 | |
899 | if (!p->hmac_chk (cctx)) |
971 | if (!p->hmac_chk (cctx)) |
|
|
972 | { |
900 | slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" |
973 | slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" |
901 | "could be an attack, or just corruption or an synchronization error"), |
974 | "could be an attack, or just corruption or a synchronization error"), |
902 | conf->nodename, (const char *)rsi); |
975 | conf->nodename, (const char *)rsi); |
|
|
976 | break; |
|
|
977 | } |
903 | else |
978 | else |
904 | { |
979 | { |
905 | rsaresponse h; |
980 | rsaresponse h; |
906 | |
981 | |
907 | rsa_hash (p->id, chg, h); |
982 | rsa_hash (p->id, chg, h); |
… | |
… | |
915 | iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid |
990 | iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid |
916 | |
991 | |
917 | si = rsi; |
992 | si = rsi; |
918 | protocol = rsi.prot; |
993 | protocol = rsi.prot; |
919 | |
994 | |
920 | rekey.start (NOW + ::conf.rekey); |
995 | connection_established (); |
921 | keepalive.start (NOW + ::conf.keepalive); |
|
|
922 | |
|
|
923 | // send queued packets |
|
|
924 | while (tap_packet *p = queue.get ()) |
|
|
925 | { |
|
|
926 | send_data_packet (p); |
|
|
927 | delete p; |
|
|
928 | } |
|
|
929 | |
|
|
930 | connectmode = conf->connectmode; |
|
|
931 | |
996 | |
932 | slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), |
997 | slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), |
933 | conf->nodename, (const char *)rsi, |
998 | conf->nodename, (const char *)rsi, |
934 | p->prot_major, p->prot_minor); |
999 | p->prot_major, p->prot_minor); |
935 | |
1000 | |
… | |
… | |
961 | |
1026 | |
962 | if (ictx && octx) |
1027 | if (ictx && octx) |
963 | { |
1028 | { |
964 | vpndata_packet *p = (vpndata_packet *)pkt; |
1029 | vpndata_packet *p = (vpndata_packet *)pkt; |
965 | |
1030 | |
966 | if (rsi == si) |
1031 | if (!p->hmac_chk (ictx)) |
|
|
1032 | slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" |
|
|
1033 | "could be an attack, or just corruption or a synchronization error"), |
|
|
1034 | conf->nodename, (const char *)rsi); |
|
|
1035 | else |
967 | { |
1036 | { |
968 | if (!p->hmac_chk (ictx)) |
|
|
969 | slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" |
|
|
970 | "could be an attack, or just corruption or an synchronization error"), |
|
|
971 | conf->nodename, (const char *)rsi); |
|
|
972 | else |
1037 | u32 seqno; |
|
|
1038 | tap_packet *d = p->unpack (this, seqno); |
|
|
1039 | |
|
|
1040 | if (iseqno.recv_ok (seqno)) |
973 | { |
1041 | { |
974 | u32 seqno; |
1042 | vpn->tap->send (d); |
975 | tap_packet *d = p->unpack (this, seqno); |
|
|
976 | |
1043 | |
977 | if (iseqno.recv_ok (seqno)) |
1044 | if (si != rsi) |
978 | { |
1045 | { |
979 | vpn->tap->send (d); |
1046 | // fast re-sync on connection changes, useful especially for tcp/ip |
980 | |
|
|
981 | if (p->dst () == 0) // re-broadcast |
|
|
982 | for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i) |
|
|
983 | { |
|
|
984 | connection *c = *i; |
|
|
985 | |
|
|
986 | if (c->conf != THISNODE && c->conf != conf) |
|
|
987 | c->inject_data_packet (d); |
|
|
988 | } |
|
|
989 | |
|
|
990 | delete d; |
|
|
991 | |
|
|
992 | break; |
1047 | si = rsi; |
|
|
1048 | |
|
|
1049 | slog (L_INFO, _("%s(%s): socket address changed to %s"), |
|
|
1050 | conf->nodename, (const char *)si, (const char *)rsi); |
993 | } |
1051 | } |
|
|
1052 | |
|
|
1053 | delete d; |
|
|
1054 | |
|
|
1055 | break; |
994 | } |
1056 | } |
995 | } |
1057 | } |
996 | else |
|
|
997 | slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi); |
|
|
998 | } |
1058 | } |
999 | |
1059 | |
1000 | send_reset (rsi); |
1060 | send_reset (rsi); |
1001 | break; |
1061 | break; |
1002 | |
1062 | |
… | |
… | |
1017 | // send connect_info packets to both sides, in case one is |
1077 | // send connect_info packets to both sides, in case one is |
1018 | // behind a nat firewall (or both ;) |
1078 | // behind a nat firewall (or both ;) |
1019 | c->send_connect_info (conf->id, si, conf->protocols); |
1079 | c->send_connect_info (conf->id, si, conf->protocols); |
1020 | send_connect_info (c->conf->id, c->si, c->conf->protocols); |
1080 | send_connect_info (c->conf->id, c->si, c->conf->protocols); |
1021 | } |
1081 | } |
|
|
1082 | else |
|
|
1083 | c->establish_connection (); |
1022 | } |
1084 | } |
1023 | |
1085 | |
1024 | break; |
1086 | break; |
1025 | |
1087 | |
1026 | case vpn_packet::PT_CONNECT_INFO: |
1088 | case vpn_packet::PT_CONNECT_INFO: |
… | |
… | |
1059 | { |
1121 | { |
1060 | reset_connection (); |
1122 | reset_connection (); |
1061 | establish_connection (); |
1123 | establish_connection (); |
1062 | } |
1124 | } |
1063 | else if (NOW < last_activity + ::conf.keepalive) |
1125 | else if (NOW < last_activity + ::conf.keepalive) |
1064 | w.at = last_activity + ::conf.keepalive; |
1126 | w.start (last_activity + ::conf.keepalive); |
1065 | else if (conf->connectmode != conf_node::C_ONDEMAND |
1127 | else if (conf->connectmode != conf_node::C_ONDEMAND |
1066 | || THISNODE->connectmode != conf_node::C_ONDEMAND) |
1128 | || THISNODE->connectmode != conf_node::C_ONDEMAND) |
1067 | { |
1129 | { |
1068 | send_ping (si); |
1130 | send_ping (si); |
1069 | w.at = NOW + 5; |
1131 | w.start (NOW + 5); |
1070 | } |
1132 | } |
|
|
1133 | else if (NOW < last_activity + ::conf.keepalive + 10) |
|
|
1134 | // hold ondemand connections implicitly a few seconds longer |
|
|
1135 | // should delete octx, though, or something like that ;) |
|
|
1136 | w.start (last_activity + ::conf.keepalive + 10); |
1071 | else |
1137 | else |
1072 | reset_connection (); |
1138 | reset_connection (); |
1073 | } |
1139 | } |
1074 | |
1140 | |
1075 | void connection::connect_request (int id) |
1141 | void connection::send_connect_request (int id) |
1076 | { |
1142 | { |
1077 | connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); |
1143 | connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); |
1078 | |
1144 | |
1079 | slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); |
1145 | slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); |
1080 | p->hmac_set (octx); |
1146 | p->hmac_set (octx); |
1081 | vpn->send_vpn_packet (p, si); |
1147 | send_vpn_packet (p, si); |
1082 | |
1148 | |
1083 | delete p; |
1149 | delete p; |
1084 | } |
1150 | } |
1085 | |
1151 | |
1086 | void connection::script_node () |
1152 | void connection::script_node () |