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.3 by pcg, Wed Apr 2 05:15:00 2003 UTC vs.
Revision 1.66 by pcg, Thu Dec 6 00:35:29 2007 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
37#include "netcompat.h"
38
40#if !HAVE_RAND_PSEUDO_BYTES 39#if !HAVE_RAND_PSEUDO_BYTES
41# define RAND_pseudo_bytes RAND_bytes 40# define RAND_pseudo_bytes RAND_bytes
42#endif 41#endif
43 42
44#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
45 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
46struct crypto_ctx 51struct crypto_ctx
47{ 52{
48 EVP_CIPHER_CTX cctx; 53 EVP_CIPHER_CTX cctx;
49 HMAC_CTX hctx; 54 HMAC_CTX hctx;
50 55
… …
53}; 58};
54 59
55crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 60crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
56{ 61{
57 EVP_CIPHER_CTX_init (&cctx); 62 EVP_CIPHER_CTX_init (&cctx);
58 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));
59 HMAC_CTX_init (&hctx); 64 HMAC_CTX_init (&hctx);
60 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);
61} 66}
62 67
63crypto_ctx::~crypto_ctx () 68crypto_ctx::~crypto_ctx ()
64{ 69{
65 EVP_CIPHER_CTX_cleanup (&cctx); 70 require (EVP_CIPHER_CTX_cleanup (&cctx));
66 HMAC_CTX_cleanup (&hctx); 71 HMAC_CTX_cleanup (&hctx);
67} 72}
68 73
69static void 74static void
70rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
71{ 76{
72 EVP_MD_CTX ctx; 77 EVP_MD_CTX ctx;
73 78
74 EVP_MD_CTX_init (&ctx); 79 EVP_MD_CTX_init (&ctx);
75 EVP_DigestInit (&ctx, RSA_HASH); 80 require (EVP_DigestInit (&ctx, RSA_HASH));
76 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
77 EVP_DigestUpdate(&ctx, &id, sizeof id); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
78 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
79 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
80} 85}
81 86
82struct rsa_entry { 87struct rsa_entry
88{
83 tstamp expire; 89 tstamp expire;
84 rsaid id; 90 rsaid id;
85 rsachallenge chg; 91 rsachallenge chg;
86}; 92};
87 93
88struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
89{ 95{
90 void cleaner_cb (tstamp &ts); time_watcher cleaner; 96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
91 97
92 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
93 { 99 {
94 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
95 { 101 {
96 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
97 { 103 {
98 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
99 105
100 erase (i); 106 erase (i);
101 return true; 107 return true;
102 } 108 }
103 } 109 }
104 110
105 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
106 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
107 113
108 return false; 114 return false;
109 } 115 }
110 116
111 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
112 { 118 {
113 rsa_entry e; 119 rsa_entry e;
114 120
115 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
116 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
117 123
118 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
119 e.id = id; 125 e.id = id;
120 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
121 127
122 push_back (e); 128 push_back (e);
123 129
124 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
125 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
126 } 132 }
127 133
128 rsa_cache () 134 rsa_cache ()
129 : cleaner (this, &rsa_cache::cleaner_cb) 135 {
130 { } 136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
131 139
132} rsa_cache; 140} rsa_cache;
133 141
134void rsa_cache::cleaner_cb (tstamp &ts) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
135{ 143{
136 if (empty ()) 144 if (empty ())
137 ts = TSTAMP_CANCEL; 145 w.stop ();
138 else 146 else
139 { 147 {
140 ts = NOW + RSA_TTL;
141
142 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
143 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
144 i = erase (i); 150 i = erase (i);
145 else 151 else
146 ++i; 152 ++i;
147 } 153 }
148} 154}
149 155
150////////////////////////////////////////////////////////////////////////////// 156//////////////////////////////////////////////////////////////////////////////
151 157
152void pkt_queue::put (tap_packet *p) 158void pkt_queue::put (net_packet *p)
153{ 159{
154 if (queue[i]) 160 if (queue[i])
155 { 161 {
156 delete queue[i]; 162 delete queue[i];
157 j = (j + 1) % QUEUEDEPTH; 163 j = (j + 1) % QUEUEDEPTH;
… …
160 queue[i] = p; 166 queue[i] = p;
161 167
162 i = (i + 1) % QUEUEDEPTH; 168 i = (i + 1) % QUEUEDEPTH;
163} 169}
164 170
165tap_packet *pkt_queue::get () 171net_packet *pkt_queue::get ()
166{ 172{
167 tap_packet *p = queue[j]; 173 net_packet *p = queue[j];
168 174
169 if (p) 175 if (p)
170 { 176 {
171 queue[j] = 0; 177 queue[j] = 0;
172 j = (j + 1) % QUEUEDEPTH; 178 j = (j + 1) % QUEUEDEPTH;
… …
186{ 192{
187 for (i = QUEUEDEPTH; --i > 0; ) 193 for (i = QUEUEDEPTH; --i > 0; )
188 delete queue[i]; 194 delete queue[i];
189} 195}
190 196
191struct net_rateinfo { 197struct net_rateinfo
198{
192 u32 host; 199 u32 host;
193 double pcnt, diff; 200 double pcnt, diff;
194 tstamp last; 201 tstamp last;
195}; 202};
196 203
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 < ev_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 = ev_now ();
232 240
233 push_front (ri); 241 push_front (ri);
234 242
235 return true; 243 return true;
236 } 244 }
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 + (ev_now () - ri.last);
244 252
245 ri.last = NOW; 253 ri.last = ev_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#if ENABLE_BRIDGING
474 f |= FEATURE_BRIDGING;
475#endif
476 return f;
477 }
451}; 478};
452 479
453void config_packet::setup (ptype type, int dst) 480void config_packet::setup (ptype type, int dst)
454{ 481{
455 prot_major = PROTOCOL_MAJOR; 482 prot_major = PROTOCOL_MAJOR;
456 prot_minor = PROTOCOL_MINOR; 483 prot_minor = PROTOCOL_MINOR;
457 randsize = RAND_SIZE; 484 randsize = RAND_SIZE;
458 hmaclen = HMACLENGTH; 485 hmaclen = HMACLENGTH;
459 flags = curflags (); 486 flags = 0;
460 challengelen = sizeof (rsachallenge); 487 challengelen = sizeof (rsachallenge);
488 features = get_features ();
461 489
462 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 490 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
463 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 491 digest_nid = htonl (EVP_MD_type (RSA_HASH));
464 hmac_nid = htonl (EVP_MD_type (DIGEST)); 492 hmac_nid = htonl (EVP_MD_type (DIGEST));
465 493
… …
467 set_hdr (type, dst); 495 set_hdr (type, dst);
468} 496}
469 497
470bool config_packet::chk_config () const 498bool config_packet::chk_config () const
471{ 499{
472 return prot_major == PROTOCOL_MAJOR 500 if (prot_major != PROTOCOL_MAJOR)
473 && randsize == RAND_SIZE 501 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
474 && hmaclen == HMACLENGTH 502 else if (randsize != RAND_SIZE)
475 && flags == curflags () 503 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
504 else if (hmaclen != HMACLENGTH)
505 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
476 && challengelen == sizeof (rsachallenge) 506 else if (challengelen != sizeof (rsachallenge))
507 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
477 && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) 508 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
509 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)) 510 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
511 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)); 512 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
513 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
514 else
515 return true;
516
517 return false;
480} 518}
481 519
482struct auth_req_packet : config_packet 520struct auth_req_packet : config_packet
483{ 521{
484 char magic[8]; 522 char magic[8];
485 u8 initiate; // false if this is just an automatic reply 523 u8 initiate; // false if this is just an automatic reply
486 u8 protocols; // supported protocols (will get patches on forward) 524 u8 protocols; // supported protocols (will be patched on forward)
487 u8 pad2, pad3; 525 u8 pad2, pad3;
488 rsaid id; 526 rsaid id;
489 rsaencrdata encr; 527 rsaencrdata encr;
490 528
491 auth_req_packet (int dst, bool initiate_, u8 protocols_) 529 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
546}; 584};
547 585
548///////////////////////////////////////////////////////////////////////////// 586/////////////////////////////////////////////////////////////////////////////
549 587
550void 588void
589connection::connection_established ()
590{
591 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
592
593 if (ictx && octx)
594 {
595 connectmode = conf->connectmode;
596
597 // make sure rekeying timeouts are slightly asymmetric
598 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
599 rekey.start (rekey_interval, rekey_interval);
600 keepalive.start (::conf.keepalive);
601
602 // send queued packets
603 if (ictx && octx)
604 {
605 while (tap_packet *p = (tap_packet *)data_queue.get ())
606 {
607 send_data_packet (p);
608 delete p;
609 }
610
611 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
612 {
613 send_vpn_packet (p, si, IPTOS_RELIABILITY);
614 delete p;
615 }
616 }
617 }
618 else
619 {
620 retry_cnt = 0;
621 establish_connection.start (5);
622 keepalive.stop ();
623 rekey.stop ();
624 }
625}
626
627void
551connection::reset_dstaddr () 628connection::reset_si ()
552{ 629{
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); 630 protocol = best_protocol (THISNODE->protocols & conf->protocols);
587 631
588 // mask out protocols we cannot establish 632 // mask out protocols we cannot establish
589 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
590 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
591 636
592 if (protocol) 637 if (protocol
638 && (!conf->can_direct (THISNODE)
639 || !THISNODE->can_direct (conf)))
640 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
642 protocol = 0;
593 { 643 }
594 rsachallenge chg;
595 644
596 rsa_cache.gen (pkt->id, chg); 645 si.set (conf, protocol);
646}
597 647
598 if (0 > RSA_public_encrypt (sizeof chg, 648// ensure sockinfo is valid, forward if necessary
599 (unsigned char *)&chg, (unsigned char *)&pkt->encr, 649const sockinfo &
600 conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) 650connection::forward_si (const sockinfo &si) const
601 fatal ("RSA_public_encrypt error"); 651{
652 if (!si.valid ())
653 {
654 connection *r = vpn->find_router ();
602 655
603 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 656 if (r)
657 {
658 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
659 conf->nodename, r->conf->nodename, (const char *)r->si);
660 return r->si;
661 }
662 else
663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
664 conf->nodename);
665 }
604 666
605 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 667 return si;
668}
669
670void
671connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
672{
673 if (!vpn->send_vpn_packet (pkt, si, tos))
674 reset_connection ();
675}
676
677void
678connection::send_ping (const sockinfo &si, u8 pong)
679{
680 ping_packet *pkt = new ping_packet;
681
682 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
683 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
684
685 delete pkt;
686}
687
688void
689connection::send_reset (const sockinfo &si)
690{
691 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
692 {
693 config_packet *pkt = new config_packet;
694
695 pkt->setup (vpn_packet::PT_RESET, conf->id);
696 send_vpn_packet (pkt, si, IPTOS_MINCOST);
606 697
607 delete pkt; 698 delete pkt;
608 } 699 }
609 else 700}
610 ; // silently fail 701
702void
703connection::send_auth_request (const sockinfo &si, bool initiate)
704{
705 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
706
707 rsachallenge chg;
708 rsa_cache.gen (pkt->id, chg);
709 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
710
711 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
712
713 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
714
715 delete pkt;
611} 716}
612 717
613void 718void
614connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 719connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)
615{ 720{
… …
629} 734}
630 735
631void 736void
632connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
633{ 738{
634 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
635 conf->id, rid, (const char *)rsi); 740 conf->id, rid, (const char *)rsi);
636 741
637 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 742 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
638 743
639 r->hmac_set (octx); 744 r->hmac_set (octx);
640 send_vpn_packet (r, si); 745 send_vpn_packet (r, si);
641 746
642 delete r; 747 delete r;
643} 748}
644 749
645void 750inline void
646connection::establish_connection_cb (tstamp &ts) 751connection::establish_connection_cb (ev::timer &w, int revents)
647{ 752{
648 if (ictx || conf == THISNODE 753 if (!ictx
754 && conf != THISNODE
649 || connectmode == conf_node::C_NEVER 755 && connectmode != conf_node::C_NEVER
650 || connectmode == conf_node::C_DISABLED) 756 && connectmode != conf_node::C_DISABLED
651 ts = TSTAMP_CANCEL; 757 && !w.is_active ())
652 else if (ts <= NOW)
653 { 758 {
654 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
760 ? (retry_cnt & 3) + 1
761 : 1 << (retry_cnt >> 2));
655 762
656 if (retry_int < 3600 * 8) 763 reset_si ();
657 retry_cnt++;
658 764
659 ts = NOW + retry_int; 765 bool slow = si.prot & PROT_SLOW;
660 766
661 if (conf->hostname) 767 if (si.prot && !si.host)
662 { 768 {
663 reset_dstaddr (); 769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
664 if (si.host && auth_rate_limiter.can (si)) 770 /*TODO*/ /* start the timer so we don't recurse endlessly */
665 { 771 w.start (1);
666 if (retry_cnt < 4) 772 vpn->send_connect_request (conf->id);
667 send_auth_request (si, true);
668 else
669 send_ping (si, 0);
670 }
671 } 773 }
672 else 774 else
673 vpn->connect_request (conf->id); 775 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
777
778 const sockinfo &dsi = forward_si (si);
779
780 slow = slow || (dsi.prot & PROT_SLOW);
781
782 if (dsi.valid () && auth_rate_limiter.can (dsi))
783 {
784 if (retry_cnt < 4)
785 send_auth_request (dsi, true);
786 else
787 send_ping (dsi, 0);
788 }
789 }
790
791 retry_int *= slow ? 8. : 0.7;
792
793 if (retry_int < conf->max_retry)
794 retry_cnt++;
795 else
796 retry_int = conf->max_retry;
797
798 w.start (retry_int);
674 } 799 }
675} 800}
676 801
677void 802void
678connection::reset_connection () 803connection::reset_connection ()
… …
681 { 806 {
682 slog (L_INFO, _("%s(%s): connection lost"), 807 slog (L_INFO, _("%s(%s): connection lost"),
683 conf->nodename, (const char *)si); 808 conf->nodename, (const char *)si);
684 809
685 if (::conf.script_node_down) 810 if (::conf.script_node_down)
686 run_script (run_script_cb (this, &connection::script_node_down), false); 811 {
812 run_script_cb cb;
813 cb.set<connection, &connection::script_node_down> (this);
814 if (!run_script (cb, false))
815 slog (L_WARN, _("node-down command execution failed, continuing."));
816 }
687 } 817 }
688 818
689 delete ictx; ictx = 0; 819 delete ictx; ictx = 0;
690 delete octx; octx = 0; 820 delete octx; octx = 0;
821#if ENABLE_DNS
822 dnsv4_reset_connection ();
823#endif
691 824
692 si.host= 0; 825 si.host = 0;
693 826
694 last_activity = 0; 827 last_activity = 0;
695 retry_cnt = 0; 828 retry_cnt = 0;
696 829
697 rekey.reset (); 830 rekey.stop ();
698 keepalive.reset (); 831 keepalive.stop ();
699 establish_connection.reset (); 832 establish_connection.stop ();
700} 833}
701 834
702void 835void
703connection::shutdown () 836connection::shutdown ()
704{ 837{
… …
706 send_reset (si); 839 send_reset (si);
707 840
708 reset_connection (); 841 reset_connection ();
709} 842}
710 843
711void 844inline void
712connection::rekey_cb (tstamp &ts) 845connection::rekey_cb (ev::timer &w, int revents)
713{ 846{
714 ts = TSTAMP_CANCEL;
715
716 reset_connection (); 847 reset_connection ();
717 establish_connection (); 848 establish_connection ();
718} 849}
719 850
720void 851void
721connection::send_data_packet (tap_packet *pkt, bool broadcast) 852connection::send_data_packet (tap_packet *pkt)
722{ 853{
723 vpndata_packet *p = new vpndata_packet; 854 vpndata_packet *p = new vpndata_packet;
724 int tos = 0; 855 int tos = 0;
725 856
726 if (conf->inherit_tos 857 // I am not hilarious about peeking into packets, but so be it.
727 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 858 if (conf->inherit_tos && pkt->is_ipv4 ())
728 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
729 tos = (*pkt)[15] & IPTOS_TOS_MASK; 859 tos = (*pkt)[15] & IPTOS_TOS_MASK;
730 860
731 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 861 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
732 send_vpn_packet (p, si, tos); 862 send_vpn_packet (p, si, tos);
733 863
734 delete p; 864 delete p;
735 865
736 if (oseqno > MAX_SEQNO) 866 if (oseqno > MAX_SEQNO)
737 rekey (); 867 rekey ();
738} 868}
739 869
740void 870void
741connection::inject_data_packet (tap_packet *pkt, bool broadcast) 871connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
742{ 872{
743 if (ictx && octx) 873 if (ictx && octx)
744 send_data_packet (pkt, broadcast); 874 send_data_packet (pkt);
745 else 875 else
746 { 876 {
747 if (!broadcast)//DDDD 877 if (!broadcast)
748 queue.put (new tap_packet (*pkt)); 878 data_queue.put (new tap_packet (*pkt));
749 879
750 establish_connection (); 880 establish_connection ();
751 } 881 }
752} 882}
753 883
884void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
885{
886 if (ictx && octx)
887 send_vpn_packet (pkt, si, tos);
888 else
889 {
890 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
891
892 establish_connection ();
893 }
894}
895
754void 896void
755connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
756{ 898{
757 last_activity = NOW; 899 last_activity = ev_now ();
758 900
759 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 901 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
760 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 902 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
903
904 if (connectmode == conf_node::C_DISABLED)
905 return;
761 906
762 switch (pkt->typ ()) 907 switch (pkt->typ ())
763 { 908 {
764 case vpn_packet::PT_PING: 909 case vpn_packet::PT_PING:
765 // we send pings instead of auth packets after some retries, 910 // we send pings instead of auth packets after some retries,
… …
812 if (p->initiate) 957 if (p->initiate)
813 send_auth_request (rsi, false); 958 send_auth_request (rsi, false);
814 959
815 rsachallenge k; 960 rsachallenge k;
816 961
817 if (0 > RSA_private_decrypt (sizeof (p->encr), 962 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
818 (unsigned char *)&p->encr, (unsigned char *)&k, 963 {
819 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
820 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 964 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
821 conf->nodename, (const char *)rsi); 965 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
966 break;
967 }
822 else 968 else
823 { 969 {
824 retry_cnt = 0;
825 establish_connection.set (NOW + 8); //? ;)
826 keepalive.reset ();
827 rekey.reset ();
828
829 delete ictx;
830 ictx = 0;
831
832 delete octx; 970 delete octx;
833 971
834 octx = new crypto_ctx (k, 1); 972 octx = new crypto_ctx (k, 1);
835 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 973 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
836 974
837 conf->protocols = p->protocols; 975 conf->protocols = p->protocols;
976 features = p->features & config_packet::get_features ();
977
838 send_auth_response (rsi, p->id, k); 978 send_auth_response (rsi, p->id, k);
979
980 connection_established ();
839 981
840 break; 982 break;
841 } 983 }
842 } 984 }
985 else
986 slog (L_WARN, _("%s(%s): protocol mismatch"),
987 conf->nodename, (const char *)rsi);
843 988
844 send_reset (rsi); 989 send_reset (rsi);
845 } 990 }
846 991
847 break; 992 break;
… …
860 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1005 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
861 1006
862 rsachallenge chg; 1007 rsachallenge chg;
863 1008
864 if (!rsa_cache.find (p->id, chg)) 1009 if (!rsa_cache.find (p->id, chg))
1010 {
865 slog (L_ERR, _("%s(%s): unrequested auth response"), 1011 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
866 conf->nodename, (const char *)rsi); 1012 conf->nodename, (const char *)rsi);
1013 break;
1014 }
867 else 1015 else
868 { 1016 {
869 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1017 crypto_ctx *cctx = new crypto_ctx (chg, 0);
870 1018
871 if (!p->hmac_chk (cctx)) 1019 if (!p->hmac_chk (cctx))
1020 {
872 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1021 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"), 1022 "could be an attack, or just corruption or a synchronization error"),
874 conf->nodename, (const char *)rsi); 1023 conf->nodename, (const char *)rsi);
1024 break;
1025 }
875 else 1026 else
876 { 1027 {
877 rsaresponse h; 1028 rsaresponse h;
878 1029
879 rsa_hash (p->id, chg, h); 1030 rsa_hash (p->id, chg, h);
… …
885 delete ictx; ictx = cctx; 1036 delete ictx; ictx = cctx;
886 1037
887 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1038 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
888 1039
889 si = rsi; 1040 si = rsi;
1041 protocol = rsi.prot;
890 1042
891 rekey.set (NOW + ::conf.rekey); 1043 connection_established ();
892 keepalive.set (NOW + ::conf.keepalive);
893 1044
894 // send queued packets 1045 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
895 while (tap_packet *p = queue.get ()) 1046 conf->nodename, (const char *)rsi,
1047 p->prot_major, p->prot_minor);
1048
1049 if (::conf.script_node_up)
896 { 1050 {
897 send_data_packet (p); 1051 run_script_cb cb;
898 delete p; 1052 cb.set<connection, &connection::script_node_up> (this);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing."));
899 } 1055 }
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,
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 1056
911 break; 1057 break;
912 } 1058 }
913 else 1059 else
914 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1060 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
933 1079
934 if (ictx && octx) 1080 if (ictx && octx)
935 { 1081 {
936 vpndata_packet *p = (vpndata_packet *)pkt; 1082 vpndata_packet *p = (vpndata_packet *)pkt;
937 1083
938 if (rsi == si) 1084 if (!p->hmac_chk (ictx))
1085 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1086 "could be an attack, or just corruption or a synchronization error"),
1087 conf->nodename, (const char *)rsi);
1088 else
939 { 1089 {
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 1090 u32 seqno;
1091 tap_packet *d = p->unpack (this, seqno);
1092
1093 if (iseqno.recv_ok (seqno))
945 { 1094 {
946 u32 seqno; 1095 vpn->tap->send (d);
947 tap_packet *d = p->unpack (this, seqno);
948 1096
949 if (iseqno.recv_ok (seqno)) 1097 if (si != rsi)
950 { 1098 {
951 vpn->tap->send (d); 1099 // fast re-sync on source address changes, useful especially for tcp/ip
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; 1100 si = rsi;
1101
1102 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1103 conf->nodename, (const char *)si, (const char *)rsi);
965 } 1104 }
966 } 1105 }
1106
1107 delete d;
1108 break;
967 } 1109 }
968 else
969 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
970 } 1110 }
971 1111
972 send_reset (rsi); 1112 send_reset (rsi);
973 break; 1113 break;
974 1114
975 case vpn_packet::PT_CONNECT_REQ: 1115 case vpn_packet::PT_CONNECT_REQ:
976 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1116 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
977 { 1117 {
978 connect_req_packet *p = (connect_req_packet *) pkt; 1118 connect_req_packet *p = (connect_req_packet *) pkt;
979 1119
980 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1120 if (p->id > 0 && p->id <= vpn->conns.size ())
981 conf->protocols = p->protocols;
982 connection *c = vpn->conns[p->id - 1];
983
984 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
985 conf->id, p->id, c->ictx && c->octx);
986
987 if (c->ictx && c->octx)
988 { 1121 {
1122 connection *c = vpn->conns[p->id - 1];
1123 conf->protocols = p->protocols;
1124
1125 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1126 conf->id, p->id, c->ictx && c->octx);
1127
1128 if (c->ictx && c->octx)
1129 {
989 // send connect_info packets to both sides, in case one is 1130 // send connect_info packets to both sides, in case one is
990 // behind a nat firewall (or both ;) 1131 // behind a nat firewall (or both ;)
991 c->send_connect_info (conf->id, si, conf->protocols); 1132 c->send_connect_info (conf->id, si, conf->protocols);
992 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1133 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1134 }
1135 else
1136 c->establish_connection ();
993 } 1137 }
1138 else
1139 slog (L_WARN,
1140 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1141 p->id);
994 } 1142 }
995 1143
996 break; 1144 break;
997 1145
998 case vpn_packet::PT_CONNECT_INFO: 1146 case vpn_packet::PT_CONNECT_INFO:
999 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1147 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1000 { 1148 {
1001 connect_info_packet *p = (connect_info_packet *) pkt; 1149 connect_info_packet *p = (connect_info_packet *)pkt;
1002 1150
1003 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1151 if (p->id > 0 && p->id <= vpn->conns.size ())
1004 conf->protocols = p->protocols; 1152 {
1005 connection *c = vpn->conns[p->id - 1]; 1153 connection *c = vpn->conns[p->id - 1];
1006 1154
1155 c->conf->protocols = p->protocols;
1156 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1157 p->si.upgrade_protocol (protocol, c->conf);
1158
1007 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1159 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1008 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1160 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1009 1161
1162 const sockinfo &dsi = forward_si (p->si);
1163
1164 if (dsi.valid ())
1010 c->send_auth_request (p->si, true); 1165 c->send_auth_request (dsi, true);
1166 }
1167 else
1168 slog (L_WARN,
1169 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1170 p->id);
1011 } 1171 }
1012 1172
1013 break; 1173 break;
1014 1174
1015 default: 1175 default:
1016 send_reset (rsi); 1176 send_reset (rsi);
1017 break; 1177 break;
1018 } 1178 }
1019} 1179}
1020 1180
1021void connection::keepalive_cb (tstamp &ts) 1181inline void
1182connection::keepalive_cb (ev::timer &w, int revents)
1022{ 1183{
1023 if (NOW >= last_activity + ::conf.keepalive + 30) 1184 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1024 { 1185 {
1025 reset_connection (); 1186 reset_connection ();
1026 establish_connection (); 1187 establish_connection ();
1027 } 1188 }
1028 else if (NOW < last_activity + ::conf.keepalive) 1189 else if (ev_now () < last_activity + ::conf.keepalive)
1029 ts = last_activity + ::conf.keepalive; 1190 w.start (last_activity + ::conf.keepalive - ev::now ());
1030 else if (conf->connectmode != conf_node::C_ONDEMAND 1191 else if (conf->connectmode != conf_node::C_ONDEMAND
1031 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1192 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1032 { 1193 {
1033 send_ping (si); 1194 send_ping (si);
1034 ts = NOW + 5; 1195 w.start (5);
1035 } 1196 }
1197 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1198 // hold ondemand connections implicitly a few seconds longer
1199 // should delete octx, though, or something like that ;)
1200 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1036 else 1201 else
1037 reset_connection (); 1202 reset_connection ();
1038} 1203}
1039 1204
1040void connection::connect_request (int id) 1205void connection::send_connect_request (int id)
1041{ 1206{
1042 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1207 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1043 1208
1044 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1209 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1045 p->hmac_set (octx); 1210 p->hmac_set (octx);
1046 send_vpn_packet (p, si); 1211 send_vpn_packet (p, si);
1047 1212
1048 delete p; 1213 delete p;
1049} 1214}
1050 1215
1216void connection::script_init_env (const char *ext)
1217{
1218 char *env;
1219 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1220 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1221 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1222 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1223 conf->id & 0xff); putenv (env);
1224}
1225
1051void connection::script_node () 1226void connection::script_init_connect_env ()
1052{ 1227{
1053 vpn->script_if_up (); 1228 vpn->script_init_env ();
1054 1229
1055 char *env; 1230 char *env;
1056 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1231 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1057 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1232 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1058 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1233 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1059 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1234 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1060} 1235}
1061 1236
1237inline const char *
1062const char *connection::script_node_up () 1238connection::script_node_up ()
1063{ 1239{
1064 script_node (); 1240 script_init_connect_env ();
1065 1241
1066 putenv ("STATE=up"); 1242 putenv ((char *)"STATE=up");
1067 1243
1244 char *filename;
1245 asprintf (&filename,
1246 "%s/%s",
1247 confbase,
1068 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1248 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1069}
1070 1249
1250 return filename;
1251}
1252
1253inline const char *
1071const char *connection::script_node_down () 1254connection::script_node_down ()
1072{ 1255{
1073 script_node (); 1256 script_init_connect_env ();
1074 1257
1075 putenv ("STATE=down"); 1258 putenv ((char *)"STATE=down");
1076 1259
1077 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1260 char *filename;
1078} 1261 asprintf (&filename,
1262 "%s/%s",
1263 confbase,
1264 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1079 1265
1080// send a vpn packet out to other hosts 1266 return filename;
1081void
1082connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1083{
1084 switch (protocol)
1085 {
1086 case PROT_IPv4:
1087 vpn->send_ipv4_packet (pkt, si, tos);
1088 break;
1089
1090 case PROT_UDPv4:
1091 vpn->send_udpv4_packet (pkt, si, tos);
1092 break;
1093
1094 case PROT_TCPv4:
1095 vpn->send_tcpv4_packet (pkt, si, tos);
1096 break;
1097 }
1098} 1267}
1099 1268
1100connection::connection(struct vpn *vpn_) 1269connection::connection (struct vpn *vpn, conf_node *conf)
1101: vpn(vpn_) 1270: vpn(vpn), conf(conf)
1102, rekey (this, &connection::rekey_cb) 1271#if ENABLE_DNS
1103, keepalive (this, &connection::keepalive_cb) 1272, dns (0)
1273#endif
1274{
1275 rekey .set<connection, &connection::rekey_cb > (this);
1276 keepalive .set<connection, &connection::keepalive_cb > (this);
1104, establish_connection (this, &connection::establish_connection_cb) 1277 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1105{ 1278
1106 octx = ictx = 0; 1279 octx = ictx = 0;
1107 retry_cnt = 0; 1280 retry_cnt = 0;
1108 1281
1282 if (!conf->protocols) // make sure some protocol is enabled
1283 conf->protocols = PROT_UDPv4;
1284
1109 connectmode = conf_node::C_ALWAYS; // initial setting 1285 connectmode = conf_node::C_ALWAYS; // initial setting
1110 reset_connection (); 1286 reset_connection ();
1111} 1287}
1112 1288
1113connection::~connection () 1289connection::~connection ()

Diff Legend

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