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.2 by pcg, Wed Apr 2 03:25:17 2003 UTC vs.
Revision 1.46 by pcg, Sat Mar 5 19:13:15 2005 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines