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.19 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.67 by pcg, Thu Aug 7 16:34:21 2008 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. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17*/ 20*/
18 21
19#include "config.h" 22#include "config.h"
20
21extern "C" {
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>
29#include <openssl/rsa.h> 28#include <openssl/rsa.h>
30#include <openssl/err.h> 29#include <openssl/err.h>
31
32#include "gettext.h"
33 30
34#include "conf.h" 31#include "conf.h"
35#include "slog.h" 32#include "slog.h"
36#include "device.h" 33#include "device.h"
37#include "vpn.h" 34#include "vpn.h"
38#include "connection.h" 35#include "connection.h"
39 36
40#include <sys/socket.h> 37#include "netcompat.h"
41#ifdef HAVE_NETINET_IN_H
42# include <netinet/in.h>
43#endif
44#include <arpa/inet.h>
45#include <net/if.h>
46#ifdef HAVE_NETINET_IN_SYSTM_H
47# include <netinet/in_systm.h>
48#endif
49#ifdef HAVE_NETINET_IP_H
50# include <netinet/ip.h>
51#endif
52
53#ifndef IPTOS_TOS_MASK
54# define IPTOS_TOS_MASK (IPTOS_LOWDELAY | IPTOS_THROUGHPUT | IPTOS_RELIABILITY | IPTOS_MINCOST)
55#endif
56 38
57#if !HAVE_RAND_PSEUDO_BYTES 39#if !HAVE_RAND_PSEUDO_BYTES
58# define RAND_pseudo_bytes RAND_bytes 40# define RAND_pseudo_bytes RAND_bytes
59#endif 41#endif
60 42
61#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
62 44
45#define ULTRA_FAST 1
46#define HLOG 15
47#include "lzf/lzf.h"
48#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c"
50
63struct crypto_ctx 51struct crypto_ctx
64{ 52{
65 EVP_CIPHER_CTX cctx; 53 EVP_CIPHER_CTX cctx;
66 HMAC_CTX hctx; 54 HMAC_CTX hctx;
67 55
… …
70}; 58};
71 59
72crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 60crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
73{ 61{
74 EVP_CIPHER_CTX_init (&cctx); 62 EVP_CIPHER_CTX_init (&cctx);
75 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 63 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
76 HMAC_CTX_init (&hctx); 64 HMAC_CTX_init (&hctx);
77 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 65 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
78} 66}
79 67
80crypto_ctx::~crypto_ctx () 68crypto_ctx::~crypto_ctx ()
81{ 69{
82 EVP_CIPHER_CTX_cleanup (&cctx); 70 require (EVP_CIPHER_CTX_cleanup (&cctx));
83 HMAC_CTX_cleanup (&hctx); 71 HMAC_CTX_cleanup (&hctx);
84} 72}
85 73
86static void 74static void
87rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
88{ 76{
89 EVP_MD_CTX ctx; 77 EVP_MD_CTX ctx;
90 78
91 EVP_MD_CTX_init (&ctx); 79 EVP_MD_CTX_init (&ctx);
92 EVP_DigestInit (&ctx, RSA_HASH); 80 require (EVP_DigestInit (&ctx, RSA_HASH));
93 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
94 EVP_DigestUpdate(&ctx, &id, sizeof id); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
95 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
96 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
97} 85}
98 86
99struct rsa_entry { 87struct rsa_entry
88{
100 tstamp expire; 89 tstamp expire;
101 rsaid id; 90 rsaid id;
102 rsachallenge chg; 91 rsachallenge chg;
103}; 92};
104 93
105struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
106{ 95{
107 void cleaner_cb (time_watcher &w); time_watcher cleaner; 96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
108 97
109 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
110 { 99 {
111 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
112 { 101 {
113 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
114 { 103 {
115 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
116 105
117 erase (i); 106 erase (i);
118 return true; 107 return true;
119 } 108 }
120 } 109 }
121 110
122 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
123 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
124 113
125 return false; 114 return false;
126 } 115 }
127 116
128 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
129 { 118 {
130 rsa_entry e; 119 rsa_entry e;
131 120
132 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
133 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
134 123
135 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
136 e.id = id; 125 e.id = id;
137 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
138 127
139 push_back (e); 128 push_back (e);
140 129
141 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
142 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
143 } 132 }
144 133
145 rsa_cache () 134 rsa_cache ()
146 : cleaner (this, &rsa_cache::cleaner_cb) 135 {
147 { } 136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
148 139
149} rsa_cache; 140} rsa_cache;
150 141
151void rsa_cache::cleaner_cb (time_watcher &w) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
152{ 143{
153 if (empty ()) 144 if (empty ())
154 w.at = TSTAMP_CANCEL; 145 w.stop ();
155 else 146 else
156 { 147 {
157 w.at = NOW + RSA_TTL;
158
159 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
160 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
161 i = erase (i); 150 i = erase (i);
162 else 151 else
163 ++i; 152 ++i;
164 } 153 }
165} 154}
166 155
167////////////////////////////////////////////////////////////////////////////// 156//////////////////////////////////////////////////////////////////////////////
168 157
169void pkt_queue::put (net_packet *p) 158pkt_queue::pkt_queue (double max_ttl, int max_queue)
159: max_ttl (max_ttl), max_queue (max_queue)
170{ 160{
171 if (queue[i]) 161 queue = new pkt [max_queue];
172 {
173 delete queue[i];
174 j = (j + 1) % QUEUEDEPTH;
175 }
176 162
177 queue[i] = p;
178
179 i = (i + 1) % QUEUEDEPTH;
180}
181
182net_packet *pkt_queue::get ()
183{
184 net_packet *p = queue[j];
185
186 if (p)
187 {
188 queue[j] = 0;
189 j = (j + 1) % QUEUEDEPTH;
190 }
191
192 return p;
193}
194
195pkt_queue::pkt_queue ()
196{
197 memset (queue, 0, sizeof (queue));
198 i = 0; 163 i = 0;
199 j = 0; 164 j = 0;
165
166 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
200} 167}
201 168
202pkt_queue::~pkt_queue () 169pkt_queue::~pkt_queue ()
203{ 170{
204 for (i = QUEUEDEPTH; --i > 0; ) 171 while (net_packet *p = get ())
172 delete p;
173
205 delete queue[i]; 174 delete [] queue;
206} 175}
207 176
177void pkt_queue::expire_cb (ev::timer &w, int revents)
178{
179 ev_tstamp expire = ev_now () - max_ttl;
180
181 for (;;)
182 {
183 if (empty ())
184 break;
185
186 double diff = queue[j].tstamp - expire;
187
188 if (diff >= 0.)
189 {
190 w.start (diff > 0.5 ? diff : 0.5);
191 break;
192 }
193
194 delete get ();
195 }
196}
197
198void pkt_queue::put (net_packet *p)
199{
200 ev_tstamp now = ev_now ();
201
202 // start expiry timer
203 if (empty ())
204 expire.start (max_ttl);
205
206 int ni = i + 1 == max_queue ? 0 : i + 1;
207
208 if (ni == j)
209 delete get ();
210
211 queue[i].pkt = p;
212 queue[i].tstamp = now;
213
214 i = ni;
215}
216
217net_packet *pkt_queue::get ()
218{
219 if (empty ())
220 return 0;
221
222 net_packet *p = queue[j].pkt;
223 queue[j].pkt = 0;
224
225 j = j + 1 == max_queue ? 0 : j + 1;
226
227 return p;
228}
229
208struct net_rateinfo { 230struct net_rateinfo
231{
209 u32 host; 232 u32 host;
210 double pcnt, diff; 233 double pcnt, diff;
211 tstamp last; 234 tstamp last;
212}; 235};
213 236
214// only do action once every x seconds per host whole allowing bursts. 237// only do action once every x seconds per host whole allowing bursts.
215// this implementation ("splay list" ;) is inefficient, 238// this implementation ("splay list" ;) is inefficient,
216// but low on resources. 239// but low on resources.
217struct net_rate_limiter : list<net_rateinfo> 240struct net_rate_limiter : list<net_rateinfo>
218{ 241{
219 static const double ALPHA = 1. - 1. / 600.; // allow bursts 242# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
220 static const double CUTOFF = 10.; // one event every CUTOFF seconds 243# define NRL_CUTOFF 10. // one event every CUTOFF seconds
221 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 244# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
222 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 245# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
223 246
224 bool can (const sockinfo &si) { return can((u32)si.host); } 247 bool can (const sockinfo &si) { return can((u32)si.host); }
225 bool can (u32 host); 248 bool can (u32 host);
226}; 249};
227 250
… …
232 iterator i; 255 iterator i;
233 256
234 for (i = begin (); i != end (); ) 257 for (i = begin (); i != end (); )
235 if (i->host == host) 258 if (i->host == host)
236 break; 259 break;
237 else if (i->last < NOW - EXPIRE) 260 else if (i->last < ev_now () - NRL_EXPIRE)
238 i = erase (i); 261 i = erase (i);
239 else 262 else
240 i++; 263 i++;
241 264
242 if (i == end ()) 265 if (i == end ())
243 { 266 {
244 net_rateinfo ri; 267 net_rateinfo ri;
245 268
246 ri.host = host; 269 ri.host = host;
247 ri.pcnt = 1.; 270 ri.pcnt = 1.;
248 ri.diff = MAXDIF; 271 ri.diff = NRL_MAXDIF;
249 ri.last = NOW; 272 ri.last = ev_now ();
250 273
251 push_front (ri); 274 push_front (ri);
252 275
253 return true; 276 return true;
254 } 277 }
255 else 278 else
256 { 279 {
257 net_rateinfo ri (*i); 280 net_rateinfo ri (*i);
258 erase (i); 281 erase (i);
259 282
260 ri.pcnt = ri.pcnt * ALPHA; 283 ri.pcnt = ri.pcnt * NRL_ALPHA;
261 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 284 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
262 285
263 ri.last = NOW; 286 ri.last = ev_now ();
264 287
265 double dif = ri.diff / ri.pcnt; 288 double dif = ri.diff / ri.pcnt;
266 289
267 bool send = dif > CUTOFF; 290 bool send = dif > NRL_CUTOFF;
268 291
269 if (dif > MAXDIF) 292 if (dif > NRL_MAXDIF)
270 { 293 {
271 ri.pcnt = 1.; 294 ri.pcnt = 1.;
272 ri.diff = MAXDIF; 295 ri.diff = NRL_MAXDIF;
273 } 296 }
274 else if (send) 297 else if (send)
275 ri.pcnt++; 298 ri.pcnt++;
276 299
277 push_front (ri); 300 push_front (ri);
… …
324} 347}
325 348
326#define MAXVPNDATA (MAX_MTU - 6 - 6) 349#define MAXVPNDATA (MAX_MTU - 6 - 6)
327#define DATAHDR (sizeof (u32) + RAND_SIZE) 350#define DATAHDR (sizeof (u32) + RAND_SIZE)
328 351
329struct vpndata_packet:vpn_packet 352struct vpndata_packet : vpn_packet
330 { 353 {
331 u8 data[MAXVPNDATA + DATAHDR]; // seqno 354 u8 data[MAXVPNDATA + DATAHDR]; // seqno
332 355
333 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 356 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
334 tap_packet *unpack (connection *conn, u32 &seqno); 357 tap_packet *unpack (connection *conn, u32 &seqno);
… …
347 int outl = 0, outl2; 370 int outl = 0, outl2;
348 ptype type = PT_DATA_UNCOMPRESSED; 371 ptype type = PT_DATA_UNCOMPRESSED;
349 372
350#if ENABLE_COMPRESSION 373#if ENABLE_COMPRESSION
351 u8 cdata[MAX_MTU]; 374 u8 cdata[MAX_MTU];
352 u32 cl;
353 375
376 if (conn->features & ENABLE_COMPRESSION)
377 {
354 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 378 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
379
355 if (cl) 380 if (cl)
356 { 381 {
357 type = PT_DATA_COMPRESSED; 382 type = PT_DATA_COMPRESSED;
358 d = cdata; 383 d = cdata;
359 l = cl + 2; 384 l = cl + 2;
360 385
361 d[0] = cl >> 8; 386 d[0] = cl >> 8;
362 d[1] = cl; 387 d[1] = cl;
388 }
363 } 389 }
364#endif 390#endif
365 391
366 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 392 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
367 393
368 struct { 394 struct {
369#if RAND_SIZE 395#if RAND_SIZE
370 u8 rnd[RAND_SIZE]; 396 u8 rnd[RAND_SIZE];
371#endif 397#endif
… …
375 datahdr.seqno = ntohl (seqno); 401 datahdr.seqno = ntohl (seqno);
376#if RAND_SIZE 402#if RAND_SIZE
377 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 403 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
378#endif 404#endif
379 405
380 EVP_EncryptUpdate (cctx, 406 require (EVP_EncryptUpdate (cctx,
381 (unsigned char *) data + outl, &outl2, 407 (unsigned char *) data + outl, &outl2,
382 (unsigned char *) &datahdr, DATAHDR); 408 (unsigned char *) &datahdr, DATAHDR));
383 outl += outl2; 409 outl += outl2;
384 410
385 EVP_EncryptUpdate (cctx, 411 require (EVP_EncryptUpdate (cctx,
386 (unsigned char *) data + outl, &outl2, 412 (unsigned char *) data + outl, &outl2,
387 (unsigned char *) d, l); 413 (unsigned char *) d, l));
388 outl += outl2; 414 outl += outl2;
389 415
390 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 416 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
391 outl += outl2; 417 outl += outl2;
392 418
393 len = outl + data_hdr_size (); 419 len = outl + data_hdr_size ();
394 420
395 set_hdr (type, dst); 421 set_hdr (type, dst);
… …
404 int outl = 0, outl2; 430 int outl = 0, outl2;
405 tap_packet *p = new tap_packet; 431 tap_packet *p = new tap_packet;
406 u8 *d; 432 u8 *d;
407 u32 l = len - data_hdr_size (); 433 u32 l = len - data_hdr_size ();
408 434
409 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 435 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
410 436
411#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
412 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
413 439
414 if (type == PT_DATA_COMPRESSED) 440 if (type == PT_DATA_COMPRESSED)
… …
416 else 442 else
417#endif 443#endif
418 d = &(*p)[6 + 6 - DATAHDR]; 444 d = &(*p)[6 + 6 - DATAHDR];
419 445
420 /* this overwrites part of the src mac, but we fix that later */ 446 /* this overwrites part of the src mac, but we fix that later */
421 EVP_DecryptUpdate (cctx, 447 require (EVP_DecryptUpdate (cctx,
422 d, &outl2, 448 d, &outl2,
423 (unsigned char *)&data, len - data_hdr_size ()); 449 (unsigned char *)&data, len - data_hdr_size ()));
424 outl += outl2; 450 outl += outl2;
425 451
426 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 452 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
427 outl += outl2; 453 outl += outl2;
428 454
429 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 455 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
430 456
431 id2mac (dst () ? dst() : THISNODE->id, p->dst); 457 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
460{ 486{
461 // actually, hmaclen cannot be checked because the hmac 487 // actually, hmaclen cannot be checked because the hmac
462 // field comes before this data, so peers with other 488 // field comes before this data, so peers with other
463 // hmacs simply will not work. 489 // hmacs simply will not work.
464 u8 prot_major, prot_minor, randsize, hmaclen; 490 u8 prot_major, prot_minor, randsize, hmaclen;
465 u8 flags, challengelen, pad2, pad3; 491 u8 flags, challengelen, features, pad3;
466 u32 cipher_nid, digest_nid, hmac_nid; 492 u32 cipher_nid, digest_nid, hmac_nid;
467
468 const u8 curflags () const
469 {
470 return 0x80
471 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
472 }
473 493
474 void setup (ptype type, int dst); 494 void setup (ptype type, int dst);
475 bool chk_config () const; 495 bool chk_config () const;
496
497 static u8 get_features ()
498 {
499 u8 f = 0;
500#if ENABLE_COMPRESSION
501 f |= FEATURE_COMPRESSION;
502#endif
503#if ENABLE_ROHC
504 f |= FEATURE_ROHC;
505#endif
506#if ENABLE_BRIDGING
507 f |= FEATURE_BRIDGING;
508#endif
509 return f;
510 }
476}; 511};
477 512
478void config_packet::setup (ptype type, int dst) 513void config_packet::setup (ptype type, int dst)
479{ 514{
480 prot_major = PROTOCOL_MAJOR; 515 prot_major = PROTOCOL_MAJOR;
481 prot_minor = PROTOCOL_MINOR; 516 prot_minor = PROTOCOL_MINOR;
482 randsize = RAND_SIZE; 517 randsize = RAND_SIZE;
483 hmaclen = HMACLENGTH; 518 hmaclen = HMACLENGTH;
484 flags = curflags (); 519 flags = 0;
485 challengelen = sizeof (rsachallenge); 520 challengelen = sizeof (rsachallenge);
521 features = get_features ();
486 522
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 523 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 524 digest_nid = htonl (EVP_MD_type (RSA_HASH));
489 hmac_nid = htonl (EVP_MD_type (DIGEST)); 525 hmac_nid = htonl (EVP_MD_type (DIGEST));
490 526
… …
493} 529}
494 530
495bool config_packet::chk_config () const 531bool config_packet::chk_config () const
496{ 532{
497 if (prot_major != PROTOCOL_MAJOR) 533 if (prot_major != PROTOCOL_MAJOR)
498 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 534 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
499 else if (randsize != RAND_SIZE) 535 else if (randsize != RAND_SIZE)
500 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 536 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
501 else if (hmaclen != HMACLENGTH) 537 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 538 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
503 else if (flags != curflags ())
504 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
505 else if (challengelen != sizeof (rsachallenge)) 539 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 540 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 541 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 542 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 543 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
510 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 544 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 545 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
512 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 546 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
513 else 547 else
514 return true; 548 return true;
515 549
516 return false; 550 return false;
517} 551}
518 552
519struct auth_req_packet : config_packet 553struct auth_req_packet : config_packet
520{ 554{
521 char magic[8]; 555 char magic[8];
522 u8 initiate; // false if this is just an automatic reply 556 u8 initiate; // false if this is just an automatic reply
523 u8 protocols; // supported protocols (will get patches on forward) 557 u8 protocols; // supported protocols (will be patched on forward)
524 u8 pad2, pad3; 558 u8 pad2, pad3;
525 rsaid id; 559 rsaid id;
526 rsaencrdata encr; 560 rsaencrdata encr;
527 561
528 auth_req_packet (int dst, bool initiate_, u8 protocols_) 562 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
585///////////////////////////////////////////////////////////////////////////// 619/////////////////////////////////////////////////////////////////////////////
586 620
587void 621void
588connection::connection_established () 622connection::connection_established ()
589{ 623{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
625
590 if (ictx && octx) 626 if (ictx && octx)
591 { 627 {
592 connectmode = conf->connectmode; 628 // make sure rekeying timeouts are slightly asymmetric
593 629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
594 rekey.start (NOW + ::conf.rekey); 630 rekey.start (rekey_interval, rekey_interval);
595 keepalive.start (NOW + ::conf.keepalive); 631 keepalive.start (::conf.keepalive);
596 632
597 // send queued packets 633 // send queued packets
598 if (ictx && octx) 634 if (ictx && octx)
599 { 635 {
600 while (tap_packet *p = (tap_packet *)data_queue.get ()) 636 while (tap_packet *p = (tap_packet *)data_queue.get ())
601 { 637 {
602 send_data_packet (p); 638 if (p->len) send_data_packet (p);
603 delete p; 639 delete p;
604 } 640 }
605 641
606 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 642 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
607 { 643 {
608 send_vpn_packet (p, si, IPTOS_RELIABILITY); 644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
609 delete p; 645 delete p;
610 } 646 }
611 } 647 }
612 } 648 }
613 else 649 else
614 { 650 {
615 retry_cnt = 0; 651 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 652 establish_connection.start (5);
617 keepalive.reset (); 653 keepalive.stop ();
618 rekey.reset (); 654 rekey.stop ();
619 } 655 }
620} 656}
621 657
622void 658void
623connection::reset_si () 659connection::reset_si ()
… …
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 661 protocol = best_protocol (THISNODE->protocols & conf->protocols);
626 662
627 // mask out protocols we cannot establish 663 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 664 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 665 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
666 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
667
668 if (protocol
669 && (!conf->can_direct (THISNODE)
670 || !THISNODE->can_direct (conf)))
671 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
673 protocol = 0;
674 }
630 675
631 si.set (conf, protocol); 676 si.set (conf, protocol);
632} 677}
633 678
634// ensure sockinfo is valid, forward if necessary 679// ensure sockinfo is valid, forward if necessary
… …
639 { 684 {
640 connection *r = vpn->find_router (); 685 connection *r = vpn->find_router ();
641 686
642 if (r) 687 if (r)
643 { 688 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
645 conf->nodename, r->conf->nodename); 690 conf->nodename, r->conf->nodename, (const char *)r->si);
646 return r->si; 691 return r->si;
647 } 692 }
648 else 693 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
650 conf->nodename); 695 conf->nodename);
… …
689connection::send_auth_request (const sockinfo &si, bool initiate) 734connection::send_auth_request (const sockinfo &si, bool initiate)
690{ 735{
691 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 736 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
692 737
693 rsachallenge chg; 738 rsachallenge chg;
694
695 rsa_cache.gen (pkt->id, chg); 739 rsa_cache.gen (pkt->id, chg);
696 740 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
697 if (0 > RSA_public_encrypt (sizeof chg,
698 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
699 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
700 fatal ("RSA_public_encrypt error");
701 741
702 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 742 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
703 743
704 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 744 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
705 745
… …
725} 765}
726 766
727void 767void
728connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
729{ 769{
730 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
731 conf->id, rid, (const char *)rsi); 771 conf->id, rid, (const char *)rsi);
732 772
733 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 773 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
734 774
735 r->hmac_set (octx); 775 r->hmac_set (octx);
736 send_vpn_packet (r, si); 776 send_vpn_packet (r, si);
737 777
738 delete r; 778 delete r;
739} 779}
740 780
741void 781inline void
742connection::establish_connection_cb (time_watcher &w) 782connection::establish_connection_cb (ev::timer &w, int revents)
743{ 783{
744 if (ictx || conf == THISNODE 784 if (!ictx
785 && conf != THISNODE
745 || connectmode == conf_node::C_NEVER 786 && connectmode != conf_node::C_NEVER
746 || connectmode == conf_node::C_DISABLED) 787 && connectmode != conf_node::C_DISABLED
747 w.at = TSTAMP_CANCEL; 788 && !w.is_active ())
748 else if (w.at <= NOW)
749 { 789 {
750 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 790 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
751 791 // and stop trying. should probably be handled by a per-connection expire handler.
752 if (retry_int < 3600 * 8) 792 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
793 {
794 reset_connection ();
753 retry_cnt++; 795 return;
796 }
754 797
755 w.at = NOW + retry_int; 798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
799 ? (retry_cnt & 3) + 1
800 : 1 << (retry_cnt >> 2));
756 801
757 reset_si (); 802 reset_si ();
758 803
804 bool slow = si.prot & PROT_SLOW;
805
759 if (si.prot && !si.host) 806 if (si.prot && !si.host)
807 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
809 /*TODO*/ /* start the timer so we don't recurse endlessly */
810 w.start (1);
760 vpn->send_connect_request (conf->id); 811 vpn->send_connect_request (conf->id);
812 }
761 else 813 else
762 { 814 {
815 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
816
763 const sockinfo &dsi = forward_si (si); 817 const sockinfo &dsi = forward_si (si);
818
819 slow = slow || (dsi.prot & PROT_SLOW);
764 820
765 if (dsi.valid () && auth_rate_limiter.can (dsi)) 821 if (dsi.valid () && auth_rate_limiter.can (dsi))
766 { 822 {
767 if (retry_cnt < 4) 823 if (retry_cnt < 4)
768 send_auth_request (dsi, true); 824 send_auth_request (dsi, true);
769 else 825 else
770 send_ping (dsi, 0); 826 send_ping (dsi, 0);
771 } 827 }
772 } 828 }
829
830 retry_int *= slow ? 8. : 0.7;
831
832 if (retry_int < conf->max_retry)
833 retry_cnt++;
834 else
835 retry_int = conf->max_retry;
836
837 w.start (retry_int);
773 } 838 }
774} 839}
775 840
776void 841void
777connection::reset_connection () 842connection::reset_connection ()
… …
780 { 845 {
781 slog (L_INFO, _("%s(%s): connection lost"), 846 slog (L_INFO, _("%s(%s): connection lost"),
782 conf->nodename, (const char *)si); 847 conf->nodename, (const char *)si);
783 848
784 if (::conf.script_node_down) 849 if (::conf.script_node_down)
785 run_script (run_script_cb (this, &connection::script_node_down), false); 850 {
851 run_script_cb cb;
852 cb.set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
854 slog (L_WARN, _("node-down command execution failed, continuing."));
855 }
786 } 856 }
787 857
788 delete ictx; ictx = 0; 858 delete ictx; ictx = 0;
789 delete octx; octx = 0; 859 delete octx; octx = 0;
860#if ENABLE_DNS
861 dnsv4_reset_connection ();
862#endif
790 863
791 si.host= 0; 864 si.host = 0;
792 865
793 last_activity = 0; 866 last_activity = 0;
794 retry_cnt = 0; 867 retry_cnt = 0;
795 868
796 rekey.reset (); 869 rekey.stop ();
797 keepalive.reset (); 870 keepalive.stop ();
798 establish_connection.reset (); 871 establish_connection.stop ();
799} 872}
800 873
801void 874void
802connection::shutdown () 875connection::shutdown ()
803{ 876{
… …
805 send_reset (si); 878 send_reset (si);
806 879
807 reset_connection (); 880 reset_connection ();
808} 881}
809 882
810void 883inline void
811connection::rekey_cb (time_watcher &w) 884connection::rekey_cb (ev::timer &w, int revents)
812{ 885{
813 w.at = TSTAMP_CANCEL;
814
815 reset_connection (); 886 reset_connection ();
816 establish_connection (); 887 establish_connection ();
817} 888}
818 889
819void 890void
820connection::send_data_packet (tap_packet *pkt, bool broadcast) 891connection::send_data_packet (tap_packet *pkt)
821{ 892{
822 vpndata_packet *p = new vpndata_packet; 893 vpndata_packet *p = new vpndata_packet;
823 int tos = 0; 894 int tos = 0;
824 895
825 // I am not hilarious about peeking into packets, but so be it. 896 // I am not hilarious about peeking into packets, but so be it.
826 if (conf->inherit_tos 897 if (conf->inherit_tos && pkt->is_ipv4 ())
827 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
828 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
829 tos = (*pkt)[15] & IPTOS_TOS_MASK; 898 tos = (*pkt)[15] & IPTOS_TOS_MASK;
830 899
831 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 900 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
832 send_vpn_packet (p, si, tos); 901 send_vpn_packet (p, si, tos);
833 902
834 delete p; 903 delete p;
835 904
836 if (oseqno > MAX_SEQNO) 905 if (oseqno > MAX_SEQNO)
837 rekey (); 906 rekey ();
838} 907}
839 908
840void 909void
841connection::inject_data_packet (tap_packet *pkt, bool broadcast) 910connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
842{ 911{
843 if (ictx && octx) 912 if (ictx && octx)
844 send_data_packet (pkt, broadcast); 913 send_data_packet (pkt);
845 else 914 else
846 { 915 {
847 if (!broadcast)//DDDD 916 if (!broadcast)
848 data_queue.put (new tap_packet (*pkt)); 917 data_queue.put (new tap_packet (*pkt));
849 918
850 establish_connection (); 919 establish_connection ();
851 } 920 }
852} 921}
… …
855{ 924{
856 if (ictx && octx) 925 if (ictx && octx)
857 send_vpn_packet (pkt, si, tos); 926 send_vpn_packet (pkt, si, tos);
858 else 927 else
859 { 928 {
860 vpn_queue.put (new vpn_packet (*pkt)); 929 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
861 930
862 establish_connection (); 931 establish_connection ();
863 } 932 }
864} 933}
865 934
866void 935void
867connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
868{ 937{
869 last_activity = NOW; 938 last_activity = ev_now ();
870 939
871 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 940 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
872 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 941 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
942
943 if (connectmode == conf_node::C_DISABLED)
944 return;
873 945
874 switch (pkt->typ ()) 946 switch (pkt->typ ())
875 { 947 {
876 case vpn_packet::PT_PING: 948 case vpn_packet::PT_PING:
877 // we send pings instead of auth packets after some retries, 949 // we send pings instead of auth packets after some retries,
… …
924 if (p->initiate) 996 if (p->initiate)
925 send_auth_request (rsi, false); 997 send_auth_request (rsi, false);
926 998
927 rsachallenge k; 999 rsachallenge k;
928 1000
929 if (0 > RSA_private_decrypt (sizeof (p->encr), 1001 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
930 (unsigned char *)&p->encr, (unsigned char *)&k, 1002 {
931 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
932 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1003 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)); 1004 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1005 break;
1006 }
934 else 1007 else
935 { 1008 {
936 delete octx; 1009 delete octx;
937 1010
938 octx = new crypto_ctx (k, 1); 1011 octx = new crypto_ctx (k, 1);
939 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1012 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
940 1013
941 conf->protocols = p->protocols; 1014 conf->protocols = p->protocols;
1015 features = p->features & config_packet::get_features ();
942 1016
943 send_auth_response (rsi, p->id, k); 1017 send_auth_response (rsi, p->id, k);
944 1018
945 connection_established (); 1019 connection_established ();
946 1020
… …
982 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1056 crypto_ctx *cctx = new crypto_ctx (chg, 0);
983 1057
984 if (!p->hmac_chk (cctx)) 1058 if (!p->hmac_chk (cctx))
985 { 1059 {
986 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1060 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
987 "could be an attack, or just corruption or an synchronization error"), 1061 "could be an attack, or just corruption or a synchronization error"),
988 conf->nodename, (const char *)rsi); 1062 conf->nodename, (const char *)rsi);
989 break; 1063 break;
990 } 1064 }
991 else 1065 else
992 { 1066 {
… …
1010 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1084 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1011 conf->nodename, (const char *)rsi, 1085 conf->nodename, (const char *)rsi,
1012 p->prot_major, p->prot_minor); 1086 p->prot_major, p->prot_minor);
1013 1087
1014 if (::conf.script_node_up) 1088 if (::conf.script_node_up)
1015 run_script (run_script_cb (this, &connection::script_node_up), false); 1089 {
1090 run_script_cb cb;
1091 cb.set<connection, &connection::script_node_up> (this);
1092 if (!run_script (cb, false))
1093 slog (L_WARN, _("node-up command execution failed, continuing."));
1094 }
1016 1095
1017 break; 1096 break;
1018 } 1097 }
1019 else 1098 else
1020 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1099 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1041 { 1120 {
1042 vpndata_packet *p = (vpndata_packet *)pkt; 1121 vpndata_packet *p = (vpndata_packet *)pkt;
1043 1122
1044 if (!p->hmac_chk (ictx)) 1123 if (!p->hmac_chk (ictx))
1045 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1124 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1046 "could be an attack, or just corruption or an synchronization error"), 1125 "could be an attack, or just corruption or a synchronization error"),
1047 conf->nodename, (const char *)rsi); 1126 conf->nodename, (const char *)rsi);
1048 else 1127 else
1049 { 1128 {
1050 u32 seqno; 1129 u32 seqno;
1051 tap_packet *d = p->unpack (this, seqno); 1130 tap_packet *d = p->unpack (this, seqno);
1052 1131
1053 if (iseqno.recv_ok (seqno)) 1132 if (iseqno.recv_ok (seqno))
1054 { 1133 {
1055 vpn->tap->send (d); 1134 vpn->tap->send (d);
1056 1135
1057 if (p->dst () == 0) // re-broadcast
1058 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1059 {
1060 connection *c = *i;
1061
1062 if (c->conf != THISNODE && c->conf != conf)
1063 c->inject_data_packet (d);
1064 }
1065
1066 if (si != rsi) 1136 if (si != rsi)
1067 { 1137 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1138 // fast re-sync on source address changes, useful especially for tcp/ip
1069 si = rsi; 1139 si = rsi;
1070 1140
1071 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1141 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1072 conf->nodename, (const char *)si, (const char *)rsi); 1142 conf->nodename, (const char *)si, (const char *)rsi);
1073 } 1143 }
1074
1075 delete d;
1076
1077 break;
1078 } 1144 }
1145
1146 delete d;
1147 break;
1079 } 1148 }
1080 } 1149 }
1081 1150
1082 send_reset (rsi); 1151 send_reset (rsi);
1083 break; 1152 break;
… …
1085 case vpn_packet::PT_CONNECT_REQ: 1154 case vpn_packet::PT_CONNECT_REQ:
1086 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1155 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1087 { 1156 {
1088 connect_req_packet *p = (connect_req_packet *) pkt; 1157 connect_req_packet *p = (connect_req_packet *) pkt;
1089 1158
1090 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1159 if (p->id > 0 && p->id <= vpn->conns.size ())
1091 connection *c = vpn->conns[p->id - 1];
1092 conf->protocols = p->protocols;
1093
1094 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1095 conf->id, p->id, c->ictx && c->octx);
1096
1097 if (c->ictx && c->octx)
1098 { 1160 {
1161 connection *c = vpn->conns[p->id - 1];
1162 conf->protocols = p->protocols;
1163
1164 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1165 conf->id, p->id, c->ictx && c->octx);
1166
1167 if (c->ictx && c->octx)
1168 {
1099 // send connect_info packets to both sides, in case one is 1169 // send connect_info packets to both sides, in case one is
1100 // behind a nat firewall (or both ;) 1170 // behind a nat firewall (or both ;)
1101 c->send_connect_info (conf->id, si, conf->protocols); 1171 c->send_connect_info (conf->id, si, conf->protocols);
1102 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1172 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1173 }
1174 else
1175 c->establish_connection ();
1103 } 1176 }
1104 else 1177 else
1105 c->establish_connection (); 1178 slog (L_WARN,
1179 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1180 p->id);
1106 } 1181 }
1107 1182
1108 break; 1183 break;
1109 1184
1110 case vpn_packet::PT_CONNECT_INFO: 1185 case vpn_packet::PT_CONNECT_INFO:
1111 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1186 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1112 { 1187 {
1113 connect_info_packet *p = (connect_info_packet *) pkt; 1188 connect_info_packet *p = (connect_info_packet *)pkt;
1114 1189
1115 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1190 if (p->id > 0 && p->id <= vpn->conns.size ())
1116 1191 {
1117 connection *c = vpn->conns[p->id - 1]; 1192 connection *c = vpn->conns[p->id - 1];
1118 1193
1119 c->conf->protocols = p->protocols; 1194 c->conf->protocols = p->protocols;
1120 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1195 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1121 p->si.upgrade_protocol (protocol, c->conf); 1196 p->si.upgrade_protocol (protocol, c->conf);
1122 1197
1123 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1198 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1124 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1199 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1125 1200
1126 const sockinfo &dsi = forward_si (p->si); 1201 const sockinfo &dsi = forward_si (p->si);
1127 1202
1128 if (dsi.valid ()) 1203 if (dsi.valid ())
1129 c->send_auth_request (dsi, true); 1204 c->send_auth_request (dsi, true);
1205 }
1206 else
1207 slog (L_WARN,
1208 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1209 p->id);
1130 } 1210 }
1131 1211
1132 break; 1212 break;
1133 1213
1134 default: 1214 default:
1135 send_reset (rsi); 1215 send_reset (rsi);
1136 break; 1216 break;
1137 } 1217 }
1138} 1218}
1139 1219
1140void connection::keepalive_cb (time_watcher &w) 1220inline void
1221connection::keepalive_cb (ev::timer &w, int revents)
1141{ 1222{
1142 if (NOW >= last_activity + ::conf.keepalive + 30) 1223 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1143 { 1224 {
1144 reset_connection (); 1225 reset_connection ();
1145 establish_connection (); 1226 establish_connection ();
1146 } 1227 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1228 else if (ev_now () < last_activity + ::conf.keepalive)
1148 w.at = last_activity + ::conf.keepalive; 1229 w.start (last_activity + ::conf.keepalive - ev::now ());
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1230 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1231 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1232 {
1152 send_ping (si); 1233 send_ping (si);
1153 w.at = NOW + 5; 1234 w.start (5);
1154 } 1235 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1236 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1237 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1238 // should delete octx, though, or something like that ;)
1158 w.at = last_activity + ::conf.keepalive + 10; 1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1159 else 1240 else
1160 reset_connection (); 1241 reset_connection ();
1161} 1242}
1162 1243
1163void connection::send_connect_request (int id) 1244void connection::send_connect_request (int id)
… …
1169 send_vpn_packet (p, si); 1250 send_vpn_packet (p, si);
1170 1251
1171 delete p; 1252 delete p;
1172} 1253}
1173 1254
1255void connection::script_init_env (const char *ext)
1256{
1257 char *env;
1258 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1259 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1260 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1261 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1262 conf->id & 0xff); putenv (env);
1263}
1264
1174void connection::script_node () 1265void connection::script_init_connect_env ()
1175{ 1266{
1176 vpn->script_if_up (); 1267 vpn->script_init_env ();
1177 1268
1178 char *env; 1269 char *env;
1179 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1270 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1180 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1181 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1182 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1183} 1274}
1184 1275
1276inline const char *
1185const char *connection::script_node_up () 1277connection::script_node_up ()
1186{ 1278{
1187 script_node (); 1279 script_init_connect_env ();
1188 1280
1189 putenv ("STATE=up"); 1281 putenv ((char *)"STATE=up");
1190 1282
1283 char *filename;
1284 asprintf (&filename,
1285 "%s/%s",
1286 confbase,
1191 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1287 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1192}
1193 1288
1289 return filename;
1290}
1291
1292inline const char *
1194const char *connection::script_node_down () 1293connection::script_node_down ()
1195{ 1294{
1196 script_node (); 1295 script_init_connect_env ();
1197 1296
1198 putenv ("STATE=down"); 1297 putenv ((char *)"STATE=down");
1199 1298
1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1299 char *filename;
1201} 1300 asprintf (&filename,
1301 "%s/%s",
1302 confbase,
1303 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1202 1304
1305 return filename;
1306}
1307
1203connection::connection(struct vpn *vpn_) 1308connection::connection (struct vpn *vpn, conf_node *conf)
1204: vpn(vpn_) 1309: vpn(vpn), conf(conf),
1205, rekey (this, &connection::rekey_cb) 1310#if ENABLE_DNS
1206, keepalive (this, &connection::keepalive_cb) 1311 dns (0),
1312#endif
1313 data_queue(conf->max_ttl, conf->max_queue),
1314 vpn_queue(conf->max_ttl, conf->max_queue)
1315{
1316 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this);
1207, establish_connection (this, &connection::establish_connection_cb) 1318 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1208{ 1319
1209 octx = ictx = 0; 1320 octx = ictx = 0;
1210 retry_cnt = 0; 1321 retry_cnt = 0;
1211 1322
1212 connectmode = conf_node::C_ALWAYS; // initial setting 1323 if (!conf->protocols) // make sure some protocol is enabled
1324 conf->protocols = PROT_UDPv4;
1325
1326 connectmode = conf->connectmode;
1327
1328 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 {
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335
1213 reset_connection (); 1336 reset_connection ();
1214} 1337}
1215 1338
1216connection::~connection () 1339connection::~connection ()
1217{ 1340{

Diff Legend

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