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

Comparing gvpe/src/connection.C (file contents):
Revision 1.1 by pcg, Wed Apr 2 03:06:22 2003 UTC vs.
Revision 1.34 by pcg, Mon May 10 18:57:07 2004 UTC

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
21extern "C" { 22#include <cassert>
22# include "lzf/lzf.h"
23}
24 23
25#include <list> 24#include <list>
25
26#include <openssl/rand.h>
27#include <openssl/evp.h>
28#include <openssl/rsa.h>
29#include <openssl/err.h>
26 30
27#include "gettext.h" 31#include "gettext.h"
28 32
29#include "conf.h" 33#include "conf.h"
30#include "slog.h" 34#include "slog.h"
31#include "device.h" 35#include "device.h"
32#include "protocol.h" 36#include "vpn.h"
33#include "connection.h" 37#include "connection.h"
38
39#include "netcompat.h"
34 40
35#if !HAVE_RAND_PSEUDO_BYTES 41#if !HAVE_RAND_PSEUDO_BYTES
36# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
37#endif 43#endif
38 44
39#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
40 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
41struct crypto_ctx 53struct crypto_ctx
42{ 54{
43 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
44 HMAC_CTX hctx; 56 HMAC_CTX hctx;
45 57
48}; 60};
49 61
50crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 62crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
51{ 63{
52 EVP_CIPHER_CTX_init (&cctx); 64 EVP_CIPHER_CTX_init (&cctx);
53 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));
54 HMAC_CTX_init (&hctx); 66 HMAC_CTX_init (&hctx);
55 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);
56} 68}
57 69
58crypto_ctx::~crypto_ctx () 70crypto_ctx::~crypto_ctx ()
59{ 71{
60 EVP_CIPHER_CTX_cleanup (&cctx); 72 require (EVP_CIPHER_CTX_cleanup (&cctx));
61 HMAC_CTX_cleanup (&hctx); 73 HMAC_CTX_cleanup (&hctx);
62} 74}
63 75
64static void 76static void
65rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
66{ 78{
67 EVP_MD_CTX ctx; 79 EVP_MD_CTX ctx;
68 80
69 EVP_MD_CTX_init (&ctx); 81 EVP_MD_CTX_init (&ctx);
70 EVP_DigestInit (&ctx, RSA_HASH); 82 require (EVP_DigestInit (&ctx, RSA_HASH));
71 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
72 EVP_DigestUpdate(&ctx, &id, sizeof id); 84 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
73 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
74 EVP_MD_CTX_cleanup (&ctx); 86 EVP_MD_CTX_cleanup (&ctx);
75} 87}
76 88
77struct rsa_entry { 89struct rsa_entry {
78 tstamp expire; 90 tstamp expire;
80 rsachallenge chg; 92 rsachallenge chg;
81}; 93};
82 94
83struct rsa_cache : list<rsa_entry> 95struct rsa_cache : list<rsa_entry>
84{ 96{
85 void cleaner_cb (tstamp &ts); time_watcher cleaner; 97 void cleaner_cb (time_watcher &w); time_watcher cleaner;
86 98
87 bool find (const rsaid &id, rsachallenge &chg) 99 bool find (const rsaid &id, rsachallenge &chg)
88 { 100 {
89 for (iterator i = begin (); i != end (); ++i) 101 for (iterator i = begin (); i != end (); ++i)
90 { 102 {
124 : cleaner (this, &rsa_cache::cleaner_cb) 136 : cleaner (this, &rsa_cache::cleaner_cb)
125 { } 137 { }
126 138
127} rsa_cache; 139} rsa_cache;
128 140
129void rsa_cache::cleaner_cb (tstamp &ts) 141void rsa_cache::cleaner_cb (time_watcher &w)
130{ 142{
131 if (empty ()) 143 if (!empty ())
132 ts = TSTAMP_CANCEL;
133 else
134 { 144 {
135 ts = NOW + RSA_TTL; 145 w.start (NOW + RSA_TTL);
136 146
137 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
138 if (i->expire <= NOW) 148 if (i->expire <= NOW)
139 i = erase (i); 149 i = erase (i);
140 else 150 else
142 } 152 }
143} 153}
144 154
145////////////////////////////////////////////////////////////////////////////// 155//////////////////////////////////////////////////////////////////////////////
146 156
147void pkt_queue::put (tap_packet *p) 157void pkt_queue::put (net_packet *p)
148{ 158{
149 if (queue[i]) 159 if (queue[i])
150 { 160 {
151 delete queue[i]; 161 delete queue[i];
152 j = (j + 1) % QUEUEDEPTH; 162 j = (j + 1) % QUEUEDEPTH;
155 queue[i] = p; 165 queue[i] = p;
156 166
157 i = (i + 1) % QUEUEDEPTH; 167 i = (i + 1) % QUEUEDEPTH;
158} 168}
159 169
160tap_packet *pkt_queue::get () 170net_packet *pkt_queue::get ()
161{ 171{
162 tap_packet *p = queue[j]; 172 net_packet *p = queue[j];
163 173
164 if (p) 174 if (p)
165 { 175 {
166 queue[j] = 0; 176 queue[j] = 0;
167 j = (j + 1) % QUEUEDEPTH; 177 j = (j + 1) % QUEUEDEPTH;
192// 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.
193// this implementation ("splay list" ;) is inefficient, 203// this implementation ("splay list" ;) is inefficient,
194// but low on resources. 204// but low on resources.
195struct net_rate_limiter : list<net_rateinfo> 205struct net_rate_limiter : list<net_rateinfo>
196{ 206{
197 static const double ALPHA = 1. - 1. / 90.; // allow bursts 207# define NRL_ALPHA 1. - 1. / 600. // allow bursts
198 static const double CUTOFF = 20.; // one event every CUTOFF seconds 208# define NRL_CUTOFF 10. // one event every CUTOFF seconds
199 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209# define NRL_EXPIRE NRL_CUTOFF * 30. // expire entries after this time
210# define NRL_MAXDIF NRL_CUTOFF * (1. / (1. - NRL_ALPHA)) // maximum diff /count value
200 211
201 bool can (const sockinfo &si) { return can((u32)si.host); } 212 bool can (const sockinfo &si) { return can((u32)si.host); }
202 bool can (u32 host); 213 bool can (u32 host);
203}; 214};
204 215
205net_rate_limiter auth_rate_limiter, reset_rate_limiter; 216net_rate_limiter auth_rate_limiter, reset_rate_limiter;
206 217
209 iterator i; 220 iterator i;
210 221
211 for (i = begin (); i != end (); ) 222 for (i = begin (); i != end (); )
212 if (i->host == host) 223 if (i->host == host)
213 break; 224 break;
214 else if (i->last < NOW - EXPIRE) 225 else if (i->last < NOW - NRL_EXPIRE)
215 i = erase (i); 226 i = erase (i);
216 else 227 else
217 i++; 228 i++;
218 229
219 if (i == end ()) 230 if (i == end ())
220 { 231 {
221 net_rateinfo ri; 232 net_rateinfo ri;
222 233
223 ri.host = host; 234 ri.host = host;
224 ri.pcnt = 1.; 235 ri.pcnt = 1.;
225 ri.diff = CUTOFF * (1. / (1. - ALPHA)); 236 ri.diff = NRL_MAXDIF;
226 ri.last = NOW; 237 ri.last = NOW;
227 238
228 push_front (ri); 239 push_front (ri);
229 240
230 return true; 241 return true;
232 else 243 else
233 { 244 {
234 net_rateinfo ri (*i); 245 net_rateinfo ri (*i);
235 erase (i); 246 erase (i);
236 247
237 ri.pcnt = ri.pcnt * ALPHA; 248 ri.pcnt = ri.pcnt * NRL_ALPHA;
238 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
239 250
240 ri.last = NOW; 251 ri.last = NOW;
241 252
253 double dif = ri.diff / ri.pcnt;
254
242 bool send = ri.diff / ri.pcnt > CUTOFF; 255 bool send = dif > NRL_CUTOFF;
243 256
257 if (dif > NRL_MAXDIF)
258 {
259 ri.pcnt = 1.;
260 ri.diff = NRL_MAXDIF;
261 }
244 if (send) 262 else if (send)
245 ri.pcnt++; 263 ri.pcnt++;
246 264
247 push_front (ri); 265 push_front (ri);
248 266
249 return send; 267 return send;
280 hmac_gen (ctx); 298 hmac_gen (ctx);
281 299
282 return !memcmp (hmac, hmac_digest, HMACLENGTH); 300 return !memcmp (hmac, hmac_digest, HMACLENGTH);
283} 301}
284 302
285void vpn_packet::set_hdr (ptype type, unsigned int dst) 303void vpn_packet::set_hdr (ptype type_, unsigned int dst)
286{ 304{
287 this->type = type; 305 type = type_;
288 306
289 int src = THISNODE->id; 307 int src = THISNODE->id;
290 308
291 src1 = src; 309 src1 = src;
292 srcdst = ((src >> 8) << 4) | (dst >> 8); 310 srcdst = ((src >> 8) << 4) | (dst >> 8);
294} 312}
295 313
296#define MAXVPNDATA (MAX_MTU - 6 - 6) 314#define MAXVPNDATA (MAX_MTU - 6 - 6)
297#define DATAHDR (sizeof (u32) + RAND_SIZE) 315#define DATAHDR (sizeof (u32) + RAND_SIZE)
298 316
299struct vpndata_packet:vpn_packet 317struct vpndata_packet : vpn_packet
300 { 318 {
301 u8 data[MAXVPNDATA + DATAHDR]; // seqno 319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
302 320
303 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);
304 tap_packet *unpack (connection *conn, u32 &seqno); 322 tap_packet *unpack (connection *conn, u32 &seqno);
317 int outl = 0, outl2; 335 int outl = 0, outl2;
318 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
319 337
320#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
321 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
322 u32 cl;
323 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
324 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
325 if (cl) 345 if (cl)
326 { 346 {
327 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
328 d = cdata; 348 d = cdata;
329 l = cl + 2; 349 l = cl + 2;
330 350
331 d[0] = cl >> 8; 351 d[0] = cl >> 8;
332 d[1] = cl; 352 d[1] = cl;
353 }
333 } 354 }
334#endif 355#endif
335 356
336 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
337 358
338 struct { 359 struct {
339#if RAND_SIZE 360#if RAND_SIZE
340 u8 rnd[RAND_SIZE]; 361 u8 rnd[RAND_SIZE];
341#endif 362#endif
345 datahdr.seqno = ntohl (seqno); 366 datahdr.seqno = ntohl (seqno);
346#if RAND_SIZE 367#if RAND_SIZE
347 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 368 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
348#endif 369#endif
349 370
350 EVP_EncryptUpdate (cctx, 371 require (EVP_EncryptUpdate (cctx,
351 (unsigned char *) data + outl, &outl2, 372 (unsigned char *) data + outl, &outl2,
352 (unsigned char *) &datahdr, DATAHDR); 373 (unsigned char *) &datahdr, DATAHDR));
353 outl += outl2; 374 outl += outl2;
354 375
355 EVP_EncryptUpdate (cctx, 376 require (EVP_EncryptUpdate (cctx,
356 (unsigned char *) data + outl, &outl2, 377 (unsigned char *) data + outl, &outl2,
357 (unsigned char *) d, l); 378 (unsigned char *) d, l));
358 outl += outl2; 379 outl += outl2;
359 380
360 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 381 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
361 outl += outl2; 382 outl += outl2;
362 383
363 len = outl + data_hdr_size (); 384 len = outl + data_hdr_size ();
364 385
365 set_hdr (type, dst); 386 set_hdr (type, dst);
374 int outl = 0, outl2; 395 int outl = 0, outl2;
375 tap_packet *p = new tap_packet; 396 tap_packet *p = new tap_packet;
376 u8 *d; 397 u8 *d;
377 u32 l = len - data_hdr_size (); 398 u32 l = len - data_hdr_size ();
378 399
379 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 400 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
380 401
381#if ENABLE_COMPRESSION 402#if ENABLE_COMPRESSION
382 u8 cdata[MAX_MTU]; 403 u8 cdata[MAX_MTU];
383 404
384 if (type == PT_DATA_COMPRESSED) 405 if (type == PT_DATA_COMPRESSED)
386 else 407 else
387#endif 408#endif
388 d = &(*p)[6 + 6 - DATAHDR]; 409 d = &(*p)[6 + 6 - DATAHDR];
389 410
390 /* 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 */
391 EVP_DecryptUpdate (cctx, 412 require (EVP_DecryptUpdate (cctx,
392 d, &outl2, 413 d, &outl2,
393 (unsigned char *)&data, len - data_hdr_size ()); 414 (unsigned char *)&data, len - data_hdr_size ()));
394 outl += outl2; 415 outl += outl2;
395 416
396 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 417 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
397 outl += outl2; 418 outl += outl2;
398 419
399 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 420 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
400 421
401 id2mac (dst () ? dst() : THISNODE->id, p->dst); 422 id2mac (dst () ? dst() : THISNODE->id, p->dst);
430{ 451{
431 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
432 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
433 // hmacs simply will not work. 454 // hmacs simply will not work.
434 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
435 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
436 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
437
438 const u8 curflags () const
439 {
440 return 0x80
441 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
442 }
443 458
444 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
445 bool chk_config () const; 460 bool chk_config () const;
461
462 static u8 get_features ()
463 {
464 u8 f = 0;
465#if ENABLE_COMPRESSION
466 f |= FEATURE_COMPRESSION;
467#endif
468#if ENABLE_ROHC
469 f |= FEATURE_ROHC;
470#endif
471 return f;
472 }
446}; 473};
447 474
448void config_packet::setup (ptype type, int dst) 475void config_packet::setup (ptype type, int dst)
449{ 476{
450 prot_major = PROTOCOL_MAJOR; 477 prot_major = PROTOCOL_MAJOR;
451 prot_minor = PROTOCOL_MINOR; 478 prot_minor = PROTOCOL_MINOR;
452 randsize = RAND_SIZE; 479 randsize = RAND_SIZE;
453 hmaclen = HMACLENGTH; 480 hmaclen = HMACLENGTH;
454 flags = curflags (); 481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
455 challengelen = sizeof (rsachallenge); 482 challengelen = sizeof (rsachallenge);
483 features = get_features ();
456 484
457 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
458 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
459 hmac_nid = htonl (EVP_MD_type (DIGEST)); 487 hmac_nid = htonl (EVP_MD_type (DIGEST));
460 488
462 set_hdr (type, dst); 490 set_hdr (type, dst);
463} 491}
464 492
465bool config_packet::chk_config () const 493bool config_packet::chk_config () const
466{ 494{
467 return prot_major == PROTOCOL_MAJOR 495 if (prot_major != PROTOCOL_MAJOR)
468 && randsize == RAND_SIZE 496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
469 && hmaclen == HMACLENGTH 497 else if (randsize != RAND_SIZE)
470 && flags == curflags () 498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
499 else if (hmaclen != HMACLENGTH)
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
501#if 0 // this implementation should handle all flag settings
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
471 && challengelen == sizeof (rsachallenge) 505 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
472 && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) 507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
473 && digest_nid == htonl (EVP_MD_type (RSA_HASH)) 509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
510 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
474 && hmac_nid == htonl (EVP_MD_type (DIGEST)); 511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
512 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
513 else
514 return true;
515
516 return false;
475} 517}
476 518
477struct auth_req_packet : config_packet 519struct auth_req_packet : config_packet
478{ 520{
479 char magic[8]; 521 char magic[8];
480 u8 initiate; // false if this is just an automatic reply 522 u8 initiate; // false if this is just an automatic reply
481 u8 protocols; // supported protocols (will get patches on forward) 523 u8 protocols; // supported protocols (will be patched on forward)
482 u8 pad2, pad3; 524 u8 pad2, pad3;
483 rsaid id; 525 rsaid id;
484 rsaencrdata encr; 526 rsaencrdata encr;
485 527
486 auth_req_packet (int dst, bool initiate_, u8 protocols_) 528 auth_req_packet (int dst, bool initiate_, u8 protocols_)
541}; 583};
542 584
543///////////////////////////////////////////////////////////////////////////// 585/////////////////////////////////////////////////////////////////////////////
544 586
545void 587void
588connection::connection_established ()
589{
590 if (ictx && octx)
591 {
592 connectmode = conf->connectmode;
593
594 rekey.start (NOW + ::conf.rekey);
595 keepalive.start (NOW + ::conf.keepalive);
596
597 // send queued packets
598 if (ictx && octx)
599 {
600 while (tap_packet *p = (tap_packet *)data_queue.get ())
601 {
602 send_data_packet (p);
603 delete p;
604 }
605
606 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
607 {
608 send_vpn_packet (p, si, IPTOS_RELIABILITY);
609 delete p;
610 }
611 }
612 }
613 else
614 {
615 retry_cnt = 0;
616 establish_connection.start (NOW + 5);
617 keepalive.stop ();
618 rekey.stop ();
619 }
620}
621
622void
546connection::reset_dstaddr () 623connection::reset_si ()
547{ 624{
625 protocol = best_protocol (THISNODE->protocols & conf->protocols);
626
627 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
630
548 si.set (conf); 631 si.set (conf, protocol);
632}
633
634// ensure sockinfo is valid, forward if necessary
635const sockinfo &
636connection::forward_si (const sockinfo &si) const
637{
638 if (!si.valid ())
639 {
640 connection *r = vpn->find_router ();
641
642 if (r)
643 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),
645 conf->nodename, r->conf->nodename);
646 return r->si;
647 }
648 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
650 conf->nodename);
651 }
652
653 return si;
654}
655
656void
657connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
658{
659 if (!vpn->send_vpn_packet (pkt, si, tos))
660 reset_connection ();
549} 661}
550 662
551void 663void
552connection::send_ping (const sockinfo &si, u8 pong) 664connection::send_ping (const sockinfo &si, u8 pong)
553{ 665{
576void 688void
577connection::send_auth_request (const sockinfo &si, bool initiate) 689connection::send_auth_request (const sockinfo &si, bool initiate)
578{ 690{
579 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 691 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
580 692
581 protocol = best_protocol (THISNODE->protocols & conf->protocols);
582
583 rsachallenge chg; 693 rsachallenge chg;
584
585 rsa_cache.gen (pkt->id, chg); 694 rsa_cache.gen (pkt->id, chg);
586 695 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
587 if (0 > RSA_public_encrypt (sizeof chg,
588 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
589 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
590 fatal ("RSA_public_encrypt error");
591 696
592 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 697 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
593 698
594 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 699 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
595 700
596 delete pkt; 701 delete pkt;
597} 702}
598 703
599void 704void
627 732
628 delete r; 733 delete r;
629} 734}
630 735
631void 736void
632connection::establish_connection_cb (tstamp &ts) 737connection::establish_connection_cb (time_watcher &w)
633{ 738{
634 if (ictx || conf == THISNODE 739 if (!ictx
740 && conf != THISNODE
635 || connectmode == conf_node::C_NEVER 741 && connectmode != conf_node::C_NEVER
636 || connectmode == conf_node::C_DISABLED) 742 && connectmode != conf_node::C_DISABLED
637 ts = TSTAMP_CANCEL; 743 && NOW > w.at)
638 else if (ts <= NOW)
639 { 744 {
640 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 745 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
641 746
642 if (retry_int < 3600 * 8) 747 if (retry_int < 3600 * 8)
643 retry_cnt++; 748 retry_cnt++;
644 749
645 ts = NOW + retry_int; 750 w.start (NOW + retry_int);
646 751
647 if (conf->hostname) 752 reset_si ();
753
754 if (si.prot && !si.host)
755 vpn->send_connect_request (conf->id);
756 else
648 { 757 {
649 reset_dstaddr (); 758 const sockinfo &dsi = forward_si (si);
759
650 if (si.host && auth_rate_limiter.can (si)) 760 if (dsi.valid () && auth_rate_limiter.can (dsi))
651 { 761 {
652 if (retry_cnt < 4) 762 if (retry_cnt < 4)
653 send_auth_request (si, true); 763 send_auth_request (dsi, true);
654 else 764 else
655 send_ping (si, 0); 765 send_ping (dsi, 0);
656 } 766 }
657 } 767 }
658 else
659 vpn->connect_request (conf->id);
660 } 768 }
661} 769}
662 770
663void 771void
664connection::reset_connection () 772connection::reset_connection ()
678 si.host= 0; 786 si.host= 0;
679 787
680 last_activity = 0; 788 last_activity = 0;
681 retry_cnt = 0; 789 retry_cnt = 0;
682 790
683 rekey.reset (); 791 rekey.stop ();
684 keepalive.reset (); 792 keepalive.stop ();
685 establish_connection.reset (); 793 establish_connection.stop ();
686} 794}
687 795
688void 796void
689connection::shutdown () 797connection::shutdown ()
690{ 798{
693 801
694 reset_connection (); 802 reset_connection ();
695} 803}
696 804
697void 805void
698connection::rekey_cb (tstamp &ts) 806connection::rekey_cb (time_watcher &w)
699{ 807{
700 ts = TSTAMP_CANCEL;
701
702 reset_connection (); 808 reset_connection ();
703 establish_connection (); 809 establish_connection ();
704} 810}
705 811
706void 812void
707connection::send_data_packet (tap_packet *pkt, bool broadcast) 813connection::send_data_packet (tap_packet *pkt)
708{ 814{
709 vpndata_packet *p = new vpndata_packet; 815 vpndata_packet *p = new vpndata_packet;
710 int tos = 0; 816 int tos = 0;
711 817
712 if (conf->inherit_tos 818 // I am not hilarious about peeking into packets, but so be it.
713 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 819 if (conf->inherit_tos && pkt->is_ipv4 ())
714 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
715 tos = (*pkt)[15] & IPTOS_TOS_MASK; 820 tos = (*pkt)[15] & IPTOS_TOS_MASK;
716 821
717 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 822 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
718 send_vpn_packet (p, si, tos); 823 send_vpn_packet (p, si, tos);
719 824
720 delete p; 825 delete p;
721 826
722 if (oseqno > MAX_SEQNO) 827 if (oseqno > MAX_SEQNO)
723 rekey (); 828 rekey ();
724} 829}
725 830
726void 831void
727connection::inject_data_packet (tap_packet *pkt, bool broadcast) 832connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
728{ 833{
729 if (ictx && octx) 834 if (ictx && octx)
730 send_data_packet (pkt, broadcast); 835 send_data_packet (pkt);
731 else 836 else
732 { 837 {
733 if (!broadcast)//DDDD 838 if (!broadcast)//DDDD
734 queue.put (new tap_packet (*pkt)); 839 data_queue.put (new tap_packet (*pkt));
840
841 establish_connection ();
842 }
843}
844
845void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
846{
847 if (ictx && octx)
848 send_vpn_packet (pkt, si, tos);
849 else
850 {
851 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
735 852
736 establish_connection (); 853 establish_connection ();
737 } 854 }
738} 855}
739 856
745 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 862 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
746 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 863 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
747 864
748 switch (pkt->typ ()) 865 switch (pkt->typ ())
749 { 866 {
750 case vpn_packet::PT_PING: 867 case vpn_packet::PT_PING:
751 // we send pings instead of auth packets after some retries, 868 // we send pings instead of auth packets after some retries,
752 // so reset the retry counter and establish a connection 869 // so reset the retry counter and establish a connection
753 // when we receive a ping. 870 // when we receive a ping.
754 if (!ictx) 871 if (!ictx)
872 {
873 if (auth_rate_limiter.can (rsi))
874 send_auth_request (rsi, true);
875 }
876 else
877 send_ping (rsi, 1); // pong
878
879 break;
880
881 case vpn_packet::PT_PONG:
882 break;
883
884 case vpn_packet::PT_RESET:
755 { 885 {
756 if (auth_rate_limiter.can (rsi)) 886 reset_connection ();
757 send_auth_request (rsi, true); 887
888 config_packet *p = (config_packet *) pkt;
889
890 if (!p->chk_config ())
891 {
892 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
893 conf->nodename, (const char *)rsi);
894 connectmode = conf_node::C_DISABLED;
895 }
896 else if (connectmode == conf_node::C_ALWAYS)
897 establish_connection ();
758 } 898 }
759 else
760 send_ping (rsi, 1); // pong
761
762 break; 899 break;
763 900
764 case vpn_packet::PT_PONG:
765 break;
766
767 case vpn_packet::PT_RESET: 901 case vpn_packet::PT_AUTH_REQ:
768 { 902 if (auth_rate_limiter.can (rsi))
769 reset_connection ();
770
771 config_packet *p = (config_packet *) pkt;
772
773 if (!p->chk_config ())
774 { 903 {
904 auth_req_packet *p = (auth_req_packet *) pkt;
905
906 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate);
907
908 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))
909 {
910 if (p->prot_minor != PROTOCOL_MINOR)
911 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
912 conf->nodename, (const char *)rsi,
913 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
914
915 if (p->initiate)
916 send_auth_request (rsi, false);
917
918 rsachallenge k;
919
920 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
921 {
922 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
923 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
924 break;
925 }
926 else
927 {
928 delete octx;
929
930 octx = new crypto_ctx (k, 1);
931 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
932
933 // compatibility code, remove when no longer required
934 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
935
936 conf->protocols = p->protocols;
937 features = p->features & config_packet::get_features ();
938
939 send_auth_response (rsi, p->id, k);
940
941 connection_established ();
942
943 break;
944 }
945 }
946 else
775 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 947 slog (L_WARN, _("%s(%s): protocol mismatch"),
776 conf->nodename, (const char *)rsi); 948 conf->nodename, (const char *)rsi);
777 connectmode = conf_node::C_DISABLED; 949
950 send_reset (rsi);
778 } 951 }
779 else if (connectmode == conf_node::C_ALWAYS) 952
780 establish_connection ();
781 }
782 break; 953 break;
783 954
784 case vpn_packet::PT_AUTH_REQ: 955 case vpn_packet::PT_AUTH_RES:
785 if (auth_rate_limiter.can (rsi))
786 { 956 {
787 auth_req_packet *p = (auth_req_packet *) pkt; 957 auth_res_packet *p = (auth_res_packet *) pkt;
788 958
789 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 959 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id);
790 960
791 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 961 if (p->chk_config ())
792 { 962 {
793 if (p->prot_minor != PROTOCOL_MINOR) 963 if (p->prot_minor != PROTOCOL_MINOR)
794 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 964 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
795 conf->nodename, (const char *)rsi, 965 conf->nodename, (const char *)rsi,
796 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 966 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
797 967
798 if (p->initiate)
799 send_auth_request (rsi, false);
800
801 rsachallenge k; 968 rsachallenge chg;
802 969
803 if (0 > RSA_private_decrypt (sizeof (p->encr), 970 if (!rsa_cache.find (p->id, chg))
804 (unsigned char *)&p->encr, (unsigned char *)&k, 971 {
805 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) 972 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
806 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),
807 conf->nodename, (const char *)rsi); 973 conf->nodename, (const char *)rsi);
974 break;
975 }
808 else 976 else
809 { 977 {
810 retry_cnt = 0; 978 crypto_ctx *cctx = new crypto_ctx (chg, 0);
811 establish_connection.set (NOW + 8); //? ;) 979
812 keepalive.reset (); 980 if (!p->hmac_chk (cctx))
981 {
982 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
983 "could be an attack, or just corruption or a synchronization error"),
984 conf->nodename, (const char *)rsi);
985 break;
986 }
813 rekey.reset (); 987 else
988 {
989 rsaresponse h;
814 990
991 rsa_hash (p->id, chg, h);
992
993 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
994 {
995 prot_minor = p->prot_minor;
996
997 delete ictx; ictx = cctx;
998
999 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1000
1001 si = rsi;
1002 protocol = rsi.prot;
1003
1004 connection_established ();
1005
1006 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1007 conf->nodename, (const char *)rsi,
1008 p->prot_major, p->prot_minor);
1009
1010 if (::conf.script_node_up)
1011 run_script (run_script_cb (this, &connection::script_node_up), false);
1012
1013 break;
1014 }
1015 else
1016 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1017 conf->nodename, (const char *)rsi);
1018 }
1019
815 delete ictx; 1020 delete cctx;
816 ictx = 0;
817
818 delete octx;
819
820 octx = new crypto_ctx (k, 1);
821 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
822
823 conf->protocols = p->protocols;
824 send_auth_response (rsi, p->id, k);
825
826 break;
827 } 1021 }
828 } 1022 }
829
830 send_reset (rsi);
831 } 1023 }
832 1024
1025 send_reset (rsi);
833 break; 1026 break;
834 1027
835 case vpn_packet::PT_AUTH_RES: 1028 case vpn_packet::PT_DATA_COMPRESSED:
836 { 1029#if !ENABLE_COMPRESSION
837 auth_res_packet *p = (auth_res_packet *) pkt; 1030 send_reset (rsi);
1031 break;
1032#endif
838 1033
839 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1034 case vpn_packet::PT_DATA_UNCOMPRESSED:
840 1035
841 if (p->chk_config ()) 1036 if (ictx && octx)
842 { 1037 {
843 if (p->prot_minor != PROTOCOL_MINOR) 1038 vpndata_packet *p = (vpndata_packet *)pkt;
844 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
845 conf->nodename, (const char *)rsi,
846 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
847 1039
848 rsachallenge chg; 1040 if (!p->hmac_chk (ictx))
849 1041 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
850 if (!rsa_cache.find (p->id, chg)) 1042 "could be an attack, or just corruption or a synchronization error"),
851 slog (L_ERR, _("%s(%s): unrequested auth response"),
852 conf->nodename, (const char *)rsi); 1043 conf->nodename, (const char *)rsi);
853 else 1044 else
854 { 1045 {
855 crypto_ctx *cctx = new crypto_ctx (chg, 0);
856
857 if (!p->hmac_chk (cctx))
858 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
859 "could be an attack, or just corruption or an synchronization error"),
860 conf->nodename, (const char *)rsi);
861 else 1046 u32 seqno;
1047 tap_packet *d = p->unpack (this, seqno);
1048
1049 if (iseqno.recv_ok (seqno))
862 { 1050 {
863 rsaresponse h; 1051 vpn->tap->send (d);
864 1052
865 rsa_hash (p->id, chg, h); 1053 if (si != rsi)
866
867 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
868 { 1054 {
869 prot_minor = p->prot_minor; 1055 // fast re-sync on connection changes, useful especially for tcp/ip
870
871 delete ictx; ictx = cctx;
872
873 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
874
875 si = rsi; 1056 si = rsi;
876 1057
877 rekey.set (NOW + ::conf.rekey); 1058 slog (L_INFO, _("%s(%s): socket address changed to %s"),
878 keepalive.set (NOW + ::conf.keepalive);
879
880 // send queued packets
881 while (tap_packet *p = queue.get ())
882 {
883 send_data_packet (p);
884 delete p;
885 }
886
887 connectmode = conf->connectmode;
888
889 slog (L_INFO, _("%s(%s): %s connection established, protocol version %d.%d"),
890 conf->nodename, (const char *)rsi, 1059 conf->nodename, (const char *)si, (const char *)rsi);
891 strprotocol (protocol),
892 p->prot_major, p->prot_minor);
893
894 if (::conf.script_node_up)
895 run_script (run_script_cb (this, &connection::script_node_up), false);
896
897 break;
898 } 1060 }
899 else
900 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
901 conf->nodename, (const char *)rsi);
902 } 1061 }
903 1062
904 delete cctx; 1063 delete d;
1064 break;
905 } 1065 }
906 } 1066 }
907 }
908 1067
909 send_reset (rsi); 1068 send_reset (rsi);
910 break; 1069 break;
911 1070
912 case vpn_packet::PT_DATA_COMPRESSED:
913#if !ENABLE_COMPRESSION
914 send_reset (rsi);
915 break;
916#endif
917
918 case vpn_packet::PT_DATA_UNCOMPRESSED:
919
920 if (ictx && octx)
921 {
922 vpndata_packet *p = (vpndata_packet *)pkt;
923
924 if (rsi == si)
925 {
926 if (!p->hmac_chk (ictx))
927 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
928 "could be an attack, or just corruption or an synchronization error"),
929 conf->nodename, (const char *)rsi);
930 else
931 {
932 u32 seqno;
933 tap_packet *d = p->unpack (this, seqno);
934
935 if (iseqno.recv_ok (seqno))
936 {
937 vpn->tap->send (d);
938
939 if (p->dst () == 0) // re-broadcast
940 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
941 {
942 connection *c = *i;
943
944 if (c->conf != THISNODE && c->conf != conf)
945 c->inject_data_packet (d);
946 }
947
948 delete d;
949
950 break;
951 }
952 }
953 }
954 else
955 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
956 }
957
958 send_reset (rsi);
959 break;
960
961 case vpn_packet::PT_CONNECT_REQ: 1071 case vpn_packet::PT_CONNECT_REQ:
962 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1072 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
963 { 1073 {
964 connect_req_packet *p = (connect_req_packet *) pkt; 1074 connect_req_packet *p = (connect_req_packet *) pkt;
965 1075
966 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1076 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything
967 conf->protocols = p->protocols;
968 connection *c = vpn->conns[p->id - 1]; 1077 connection *c = vpn->conns[p->id - 1];
1078 conf->protocols = p->protocols;
969 1079
970 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", 1080 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
971 conf->id, p->id, c->ictx && c->octx); 1081 conf->id, p->id, c->ictx && c->octx);
972 1082
973 if (c->ictx && c->octx) 1083 if (c->ictx && c->octx)
974 { 1084 {
975 // send connect_info packets to both sides, in case one is 1085 // send connect_info packets to both sides, in case one is
976 // behind a nat firewall (or both ;) 1086 // behind a nat firewall (or both ;)
977 c->send_connect_info (conf->id, si, conf->protocols); 1087 c->send_connect_info (conf->id, si, conf->protocols);
978 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1088 send_connect_info (c->conf->id, c->si, c->conf->protocols);
979 } 1089 }
1090 else
1091 c->establish_connection ();
980 } 1092 }
981 1093
982 break; 1094 break;
983 1095
984 case vpn_packet::PT_CONNECT_INFO: 1096 case vpn_packet::PT_CONNECT_INFO:
985 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1097 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
986 { 1098 {
987 connect_info_packet *p = (connect_info_packet *) pkt; 1099 connect_info_packet *p = (connect_info_packet *) pkt;
988 1100
989 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1101 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything
990 conf->protocols = p->protocols; 1102
991 connection *c = vpn->conns[p->id - 1]; 1103 connection *c = vpn->conns[p->id - 1];
992 1104
1105 c->conf->protocols = p->protocols;
1106 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1107 p->si.upgrade_protocol (protocol, c->conf);
1108
993 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1109 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
994 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1110 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
995 1111
1112 const sockinfo &dsi = forward_si (p->si);
1113
1114 if (dsi.valid ())
996 c->send_auth_request (p->si, true); 1115 c->send_auth_request (dsi, true);
997 } 1116 }
998 1117
999 break; 1118 break;
1000 1119
1001 default: 1120 default:
1002 send_reset (rsi); 1121 send_reset (rsi);
1003 break; 1122 break;
1004
1005 } 1123 }
1006} 1124}
1007 1125
1008void connection::keepalive_cb (tstamp &ts) 1126void connection::keepalive_cb (time_watcher &w)
1009{ 1127{
1010 if (NOW >= last_activity + ::conf.keepalive + 30) 1128 if (NOW >= last_activity + ::conf.keepalive + 30)
1011 { 1129 {
1012 reset_connection (); 1130 reset_connection ();
1013 establish_connection (); 1131 establish_connection ();
1014 } 1132 }
1015 else if (NOW < last_activity + ::conf.keepalive) 1133 else if (NOW < last_activity + ::conf.keepalive)
1016 ts = last_activity + ::conf.keepalive; 1134 w.start (last_activity + ::conf.keepalive);
1017 else if (conf->connectmode != conf_node::C_ONDEMAND 1135 else if (conf->connectmode != conf_node::C_ONDEMAND
1018 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1136 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1019 { 1137 {
1020 send_ping (si); 1138 send_ping (si);
1021 ts = NOW + 5; 1139 w.start (NOW + 5);
1022 } 1140 }
1141 else if (NOW < last_activity + ::conf.keepalive + 10)
1142 // hold ondemand connections implicitly a few seconds longer
1143 // should delete octx, though, or something like that ;)
1144 w.start (last_activity + ::conf.keepalive + 10);
1023 else 1145 else
1024 reset_connection (); 1146 reset_connection ();
1025} 1147}
1026 1148
1027void connection::connect_request (int id) 1149void connection::send_connect_request (int id)
1028{ 1150{
1029 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1151 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1030 1152
1031 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1153 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1032 p->hmac_set (octx); 1154 p->hmac_set (octx);
1035 delete p; 1157 delete p;
1036} 1158}
1037 1159
1038void connection::script_node () 1160void connection::script_node ()
1039{ 1161{
1040 vpn->script_if_up (0); 1162 vpn->script_if_up ();
1041 1163
1042 char *env; 1164 char *env;
1043 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1165 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1044 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1166 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1045 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1167 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1046 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1168 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1047} 1169}
1048 1170
1049const char *connection::script_node_up (int) 1171const char *connection::script_node_up ()
1050{ 1172{
1051 script_node (); 1173 script_node ();
1052 1174
1053 putenv ("STATE=up"); 1175 putenv ("STATE=up");
1054 1176
1055 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1177 return ::conf.script_node_up ? ::conf.script_node_up : "node-up";
1056} 1178}
1057 1179
1058const char *connection::script_node_down (int) 1180const char *connection::script_node_down ()
1059{ 1181{
1060 script_node (); 1182 script_node ();
1061 1183
1062 putenv ("STATE=down"); 1184 putenv ("STATE=down");
1063 1185
1064 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1186 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1065}
1066
1067// send a vpn packet out to other hosts
1068void
1069connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1070{
1071 if (protocol & PROT_IPv4)
1072 vpn->send_ipv4_packet (pkt, si, tos);
1073 else
1074 vpn->send_udpv4_packet (pkt, si, tos);
1075} 1187}
1076 1188
1077connection::connection(struct vpn *vpn_) 1189connection::connection(struct vpn *vpn_)
1078: vpn(vpn_) 1190: vpn(vpn_)
1079, rekey (this, &connection::rekey_cb) 1191, rekey (this, &connection::rekey_cb)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines