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.24 by pcg, Wed Oct 22 01:05:23 2003 UTC vs.
Revision 1.68 by pcg, Thu Aug 7 17:30:27 2008 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your option) any later version.
9 11
10 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,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 GNU General Public License for more details. 15 GNU General Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 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
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21
22extern "C" {
23# include "lzf/lzf.h"
24}
25 23
26#include <list> 24#include <list>
27 25
28#include <openssl/rand.h> 26#include <openssl/rand.h>
29#include <openssl/evp.h> 27#include <openssl/evp.h>
30#include <openssl/rsa.h> 28#include <openssl/rsa.h>
31#include <openssl/err.h> 29#include <openssl/err.h>
32
33#include "gettext.h"
34 30
35#include "conf.h" 31#include "conf.h"
36#include "slog.h" 32#include "slog.h"
37#include "device.h" 33#include "device.h"
38#include "vpn.h" 34#include "vpn.h"
… …
44# define RAND_pseudo_bytes RAND_bytes 40# define RAND_pseudo_bytes RAND_bytes
45#endif 41#endif
46 42
47#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
48 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
49struct crypto_ctx 51struct crypto_ctx
50{ 52{
51 EVP_CIPHER_CTX cctx; 53 EVP_CIPHER_CTX cctx;
52 HMAC_CTX hctx; 54 HMAC_CTX hctx;
53 55
… …
56}; 58};
57 59
58crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 60crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
59{ 61{
60 EVP_CIPHER_CTX_init (&cctx); 62 EVP_CIPHER_CTX_init (&cctx);
61 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));
62 HMAC_CTX_init (&hctx); 64 HMAC_CTX_init (&hctx);
63 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);
64} 66}
65 67
66crypto_ctx::~crypto_ctx () 68crypto_ctx::~crypto_ctx ()
67{ 69{
68 EVP_CIPHER_CTX_cleanup (&cctx); 70 require (EVP_CIPHER_CTX_cleanup (&cctx));
69 HMAC_CTX_cleanup (&hctx); 71 HMAC_CTX_cleanup (&hctx);
70} 72}
71 73
72static void 74static void
73rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
74{ 76{
75 EVP_MD_CTX ctx; 77 EVP_MD_CTX ctx;
76 78
77 EVP_MD_CTX_init (&ctx); 79 EVP_MD_CTX_init (&ctx);
78 EVP_DigestInit (&ctx, RSA_HASH); 80 require (EVP_DigestInit (&ctx, RSA_HASH));
79 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
80 EVP_DigestUpdate(&ctx, &id, sizeof id); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
81 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
82 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
83} 85}
84 86
85struct rsa_entry { 87struct rsa_entry
88{
86 tstamp expire; 89 tstamp expire;
87 rsaid id; 90 rsaid id;
88 rsachallenge chg; 91 rsachallenge chg;
89}; 92};
90 93
91struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
92{ 95{
93 void cleaner_cb (time_watcher &w); time_watcher cleaner; 96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
94 97
95 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
96 { 99 {
97 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
98 { 101 {
99 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
100 { 103 {
101 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
102 105
103 erase (i); 106 erase (i);
104 return true; 107 return true;
105 } 108 }
106 } 109 }
107 110
108 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
109 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
110 113
111 return false; 114 return false;
112 } 115 }
113 116
114 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
115 { 118 {
116 rsa_entry e; 119 rsa_entry e;
117 120
118 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
119 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
120 123
121 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
122 e.id = id; 125 e.id = id;
123 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
124 127
125 push_back (e); 128 push_back (e);
126 129
127 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
128 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
129 } 132 }
130 133
131 rsa_cache () 134 rsa_cache ()
132 : cleaner (this, &rsa_cache::cleaner_cb) 135 {
133 { } 136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
134 139
135} rsa_cache; 140} rsa_cache;
136 141
137void rsa_cache::cleaner_cb (time_watcher &w) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
138{ 143{
139 if (empty ()) 144 if (empty ())
140 w.at = TSTAMP_CANCEL; 145 w.stop ();
141 else 146 else
142 { 147 {
143 w.at = NOW + RSA_TTL;
144
145 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
146 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
147 i = erase (i); 150 i = erase (i);
148 else 151 else
149 ++i; 152 ++i;
150 } 153 }
151} 154}
152 155
153////////////////////////////////////////////////////////////////////////////// 156//////////////////////////////////////////////////////////////////////////////
154 157
155void 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)
156{ 160{
157 if (queue[i]) 161 queue = new pkt [max_queue];
158 {
159 delete queue[i];
160 j = (j + 1) % QUEUEDEPTH;
161 }
162 162
163 queue[i] = p;
164
165 i = (i + 1) % QUEUEDEPTH;
166}
167
168net_packet *pkt_queue::get ()
169{
170 net_packet *p = queue[j];
171
172 if (p)
173 {
174 queue[j] = 0;
175 j = (j + 1) % QUEUEDEPTH;
176 }
177
178 return p;
179}
180
181pkt_queue::pkt_queue ()
182{
183 memset (queue, 0, sizeof (queue));
184 i = 0; 163 i = 0;
185 j = 0; 164 j = 0;
165
166 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
186} 167}
187 168
188pkt_queue::~pkt_queue () 169pkt_queue::~pkt_queue ()
189{ 170{
190 for (i = QUEUEDEPTH; --i > 0; ) 171 while (net_packet *p = get ())
172 delete p;
173
191 delete queue[i]; 174 delete [] queue;
192} 175}
193 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
194struct net_rateinfo { 230struct net_rateinfo
231{
195 u32 host; 232 u32 host;
196 double pcnt, diff; 233 double pcnt, diff;
197 tstamp last; 234 tstamp last;
198}; 235};
199 236
200// 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.
201// this implementation ("splay list" ;) is inefficient, 238// this implementation ("splay list" ;) is inefficient,
202// but low on resources. 239// but low on resources.
203struct net_rate_limiter : list<net_rateinfo> 240struct net_rate_limiter : list<net_rateinfo>
204{ 241{
205 static const double ALPHA = 1. - 1. / 600.; // allow bursts 242# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
206 static const double CUTOFF = 10.; // one event every CUTOFF seconds 243# define NRL_CUTOFF 10. // one event every CUTOFF seconds
207 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 244# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
208 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
209 246
210 bool can (const sockinfo &si) { return can((u32)si.host); } 247 bool can (const sockinfo &si) { return can((u32)si.host); }
211 bool can (u32 host); 248 bool can (u32 host);
212}; 249};
213 250
… …
218 iterator i; 255 iterator i;
219 256
220 for (i = begin (); i != end (); ) 257 for (i = begin (); i != end (); )
221 if (i->host == host) 258 if (i->host == host)
222 break; 259 break;
223 else if (i->last < NOW - EXPIRE) 260 else if (i->last < ev_now () - NRL_EXPIRE)
224 i = erase (i); 261 i = erase (i);
225 else 262 else
226 i++; 263 i++;
227 264
228 if (i == end ()) 265 if (i == end ())
229 { 266 {
230 net_rateinfo ri; 267 net_rateinfo ri;
231 268
232 ri.host = host; 269 ri.host = host;
233 ri.pcnt = 1.; 270 ri.pcnt = 1.;
234 ri.diff = MAXDIF; 271 ri.diff = NRL_MAXDIF;
235 ri.last = NOW; 272 ri.last = ev_now ();
236 273
237 push_front (ri); 274 push_front (ri);
238 275
239 return true; 276 return true;
240 } 277 }
241 else 278 else
242 { 279 {
243 net_rateinfo ri (*i); 280 net_rateinfo ri (*i);
244 erase (i); 281 erase (i);
245 282
246 ri.pcnt = ri.pcnt * ALPHA; 283 ri.pcnt = ri.pcnt * NRL_ALPHA;
247 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 284 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
248 285
249 ri.last = NOW; 286 ri.last = ev_now ();
250 287
251 double dif = ri.diff / ri.pcnt; 288 double dif = ri.diff / ri.pcnt;
252 289
253 bool send = dif > CUTOFF; 290 bool send = dif > NRL_CUTOFF;
254 291
255 if (dif > MAXDIF) 292 if (dif > NRL_MAXDIF)
256 { 293 {
257 ri.pcnt = 1.; 294 ri.pcnt = 1.;
258 ri.diff = MAXDIF; 295 ri.diff = NRL_MAXDIF;
259 } 296 }
260 else if (send) 297 else if (send)
261 ri.pcnt++; 298 ri.pcnt++;
262 299
263 push_front (ri); 300 push_front (ri);
… …
310} 347}
311 348
312#define MAXVPNDATA (MAX_MTU - 6 - 6) 349#define MAXVPNDATA (MAX_MTU - 6 - 6)
313#define DATAHDR (sizeof (u32) + RAND_SIZE) 350#define DATAHDR (sizeof (u32) + RAND_SIZE)
314 351
315struct vpndata_packet:vpn_packet 352struct vpndata_packet : vpn_packet
316 { 353 {
317 u8 data[MAXVPNDATA + DATAHDR]; // seqno 354 u8 data[MAXVPNDATA + DATAHDR]; // seqno
318 355
319 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);
320 tap_packet *unpack (connection *conn, u32 &seqno); 357 tap_packet *unpack (connection *conn, u32 &seqno);
… …
333 int outl = 0, outl2; 370 int outl = 0, outl2;
334 ptype type = PT_DATA_UNCOMPRESSED; 371 ptype type = PT_DATA_UNCOMPRESSED;
335 372
336#if ENABLE_COMPRESSION 373#if ENABLE_COMPRESSION
337 u8 cdata[MAX_MTU]; 374 u8 cdata[MAX_MTU];
338 u32 cl;
339 375
376 if (conn->features & ENABLE_COMPRESSION)
377 {
340 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 378 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
379
341 if (cl) 380 if (cl)
342 { 381 {
343 type = PT_DATA_COMPRESSED; 382 type = PT_DATA_COMPRESSED;
344 d = cdata; 383 d = cdata;
345 l = cl + 2; 384 l = cl + 2;
346 385
347 d[0] = cl >> 8; 386 d[0] = cl >> 8;
348 d[1] = cl; 387 d[1] = cl;
388 }
349 } 389 }
350#endif 390#endif
351 391
352 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 392 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353 393
354 struct { 394 struct {
355#if RAND_SIZE 395#if RAND_SIZE
356 u8 rnd[RAND_SIZE]; 396 u8 rnd[RAND_SIZE];
357#endif 397#endif
… …
361 datahdr.seqno = ntohl (seqno); 401 datahdr.seqno = ntohl (seqno);
362#if RAND_SIZE 402#if RAND_SIZE
363 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 403 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
364#endif 404#endif
365 405
366 EVP_EncryptUpdate (cctx, 406 require (EVP_EncryptUpdate (cctx,
367 (unsigned char *) data + outl, &outl2, 407 (unsigned char *) data + outl, &outl2,
368 (unsigned char *) &datahdr, DATAHDR); 408 (unsigned char *) &datahdr, DATAHDR));
369 outl += outl2; 409 outl += outl2;
370 410
371 EVP_EncryptUpdate (cctx, 411 require (EVP_EncryptUpdate (cctx,
372 (unsigned char *) data + outl, &outl2, 412 (unsigned char *) data + outl, &outl2,
373 (unsigned char *) d, l); 413 (unsigned char *) d, l));
374 outl += outl2; 414 outl += outl2;
375 415
376 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 416 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
377 outl += outl2; 417 outl += outl2;
378 418
379 len = outl + data_hdr_size (); 419 len = outl + data_hdr_size ();
380 420
381 set_hdr (type, dst); 421 set_hdr (type, dst);
… …
390 int outl = 0, outl2; 430 int outl = 0, outl2;
391 tap_packet *p = new tap_packet; 431 tap_packet *p = new tap_packet;
392 u8 *d; 432 u8 *d;
393 u32 l = len - data_hdr_size (); 433 u32 l = len - data_hdr_size ();
394 434
395 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 435 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
396 436
397#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
398 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
399 439
400 if (type == PT_DATA_COMPRESSED) 440 if (type == PT_DATA_COMPRESSED)
… …
402 else 442 else
403#endif 443#endif
404 d = &(*p)[6 + 6 - DATAHDR]; 444 d = &(*p)[6 + 6 - DATAHDR];
405 445
406 /* 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 */
407 EVP_DecryptUpdate (cctx, 447 require (EVP_DecryptUpdate (cctx,
408 d, &outl2, 448 d, &outl2,
409 (unsigned char *)&data, len - data_hdr_size ()); 449 (unsigned char *)&data, len - data_hdr_size ()));
410 outl += outl2; 450 outl += outl2;
411 451
412 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 452 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
413 outl += outl2; 453 outl += outl2;
414 454
415 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 455 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
416 456
417 id2mac (dst () ? dst() : THISNODE->id, p->dst); 457 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
446{ 486{
447 // actually, hmaclen cannot be checked because the hmac 487 // actually, hmaclen cannot be checked because the hmac
448 // field comes before this data, so peers with other 488 // field comes before this data, so peers with other
449 // hmacs simply will not work. 489 // hmacs simply will not work.
450 u8 prot_major, prot_minor, randsize, hmaclen; 490 u8 prot_major, prot_minor, randsize, hmaclen;
451 u8 flags, challengelen, pad2, pad3; 491 u8 flags, challengelen, features, pad3;
452 u32 cipher_nid, digest_nid, hmac_nid; 492 u32 cipher_nid, digest_nid, hmac_nid;
453
454 const u8 curflags () const
455 {
456 return 0x80
457 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
458 }
459 493
460 void setup (ptype type, int dst); 494 void setup (ptype type, int dst);
461 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 }
462}; 511};
463 512
464void config_packet::setup (ptype type, int dst) 513void config_packet::setup (ptype type, int dst)
465{ 514{
466 prot_major = PROTOCOL_MAJOR; 515 prot_major = PROTOCOL_MAJOR;
467 prot_minor = PROTOCOL_MINOR; 516 prot_minor = PROTOCOL_MINOR;
468 randsize = RAND_SIZE; 517 randsize = RAND_SIZE;
469 hmaclen = HMACLENGTH; 518 hmaclen = HMACLENGTH;
470 flags = curflags (); 519 flags = 0;
471 challengelen = sizeof (rsachallenge); 520 challengelen = sizeof (rsachallenge);
521 features = get_features ();
472 522
473 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 523 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
474 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 524 digest_nid = htonl (EVP_MD_type (RSA_HASH));
475 hmac_nid = htonl (EVP_MD_type (DIGEST)); 525 hmac_nid = htonl (EVP_MD_type (DIGEST));
476 526
… …
484 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 534 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485 else if (randsize != RAND_SIZE) 535 else if (randsize != RAND_SIZE)
486 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 536 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487 else if (hmaclen != HMACLENGTH) 537 else if (hmaclen != HMACLENGTH)
488 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 538 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
489 else if (flags != curflags ())
490 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
491 else if (challengelen != sizeof (rsachallenge)) 539 else if (challengelen != sizeof (rsachallenge))
492 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 540 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 541 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494 slog (L_WARN, _("cipher mismatch (remote %x <=> local %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));
495 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 543 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
504 552
505struct auth_req_packet : config_packet 553struct auth_req_packet : config_packet
506{ 554{
507 char magic[8]; 555 char magic[8];
508 u8 initiate; // false if this is just an automatic reply 556 u8 initiate; // false if this is just an automatic reply
509 u8 protocols; // supported protocols (will get patches on forward) 557 u8 protocols; // supported protocols (will be patched on forward)
510 u8 pad2, pad3; 558 u8 pad2, pad3;
511 rsaid id; 559 rsaid id;
512 rsaencrdata encr; 560 rsaencrdata encr;
513 561
514 auth_req_packet (int dst, bool initiate_, u8 protocols_) 562 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
571///////////////////////////////////////////////////////////////////////////// 619/////////////////////////////////////////////////////////////////////////////
572 620
573void 621void
574connection::connection_established () 622connection::connection_established ()
575{ 623{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
625
576 if (ictx && octx) 626 if (ictx && octx)
577 { 627 {
578 connectmode = conf->connectmode; 628 // make sure rekeying timeouts are slightly asymmetric
579 629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
580 rekey.start (NOW + ::conf.rekey); 630 rekey.start (rekey_interval, rekey_interval);
581 keepalive.start (NOW + ::conf.keepalive); 631 keepalive.start (::conf.keepalive);
582 632
583 // send queued packets 633 // send queued packets
584 if (ictx && octx) 634 if (ictx && octx)
585 { 635 {
586 while (tap_packet *p = (tap_packet *)data_queue.get ()) 636 while (tap_packet *p = (tap_packet *)data_queue.get ())
587 { 637 {
588 send_data_packet (p); 638 if (p->len) send_data_packet (p);
589 delete p; 639 delete p;
590 } 640 }
591 641
592 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 642 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
593 { 643 {
594 send_vpn_packet (p, si, IPTOS_RELIABILITY); 644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
595 delete p; 645 delete p;
596 } 646 }
597 } 647 }
598 } 648 }
599 else 649 else
600 { 650 {
601 retry_cnt = 0; 651 retry_cnt = 0;
602 establish_connection.start (NOW + 5); 652 establish_connection.start (5);
603 keepalive.reset (); 653 keepalive.stop ();
604 rekey.reset (); 654 rekey.stop ();
605 } 655 }
606} 656}
607 657
608void 658void
609connection::reset_si () 659connection::reset_si ()
… …
611 protocol = best_protocol (THISNODE->protocols & conf->protocols); 661 protocol = best_protocol (THISNODE->protocols & conf->protocols);
612 662
613 // mask out protocols we cannot establish 663 // mask out protocols we cannot establish
614 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 664 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
615 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 }
616 675
617 si.set (conf, protocol); 676 si.set (conf, protocol);
618} 677}
619 678
620// ensure sockinfo is valid, forward if necessary 679// ensure sockinfo is valid, forward if necessary
… …
625 { 684 {
626 connection *r = vpn->find_router (); 685 connection *r = vpn->find_router ();
627 686
628 if (r) 687 if (r)
629 { 688 {
630 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
631 conf->nodename, r->conf->nodename); 690 conf->nodename, r->conf->nodename, (const char *)r->si);
632 return r->si; 691 return r->si;
633 } 692 }
634 else 693 else
635 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
636 conf->nodename); 695 conf->nodename);
… …
706} 765}
707 766
708void 767void
709connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
710{ 769{
711 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
712 conf->id, rid, (const char *)rsi); 771 conf->id, rid, (const char *)rsi);
713 772
714 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);
715 774
716 r->hmac_set (octx); 775 r->hmac_set (octx);
717 send_vpn_packet (r, si); 776 send_vpn_packet (r, si);
718 777
719 delete r; 778 delete r;
720} 779}
721 780
722void 781inline void
723connection::establish_connection_cb (time_watcher &w) 782connection::establish_connection_cb (ev::timer &w, int revents)
724{ 783{
725 if (ictx || conf == THISNODE 784 if (!ictx
785 && conf != THISNODE
726 || connectmode == conf_node::C_NEVER 786 && connectmode != conf_node::C_NEVER
727 || connectmode == conf_node::C_DISABLED) 787 && connectmode != conf_node::C_DISABLED
728 w.at = TSTAMP_CANCEL; 788 && !w.is_active ())
729 else if (w.at <= NOW)
730 { 789 {
731 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
732 791 // and stop trying. should probably be handled by a per-connection expire handler.
733 if (retry_int < 3600 * 8) 792 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
793 {
794 reset_connection ();
734 retry_cnt++; 795 return;
796 }
735 797
736 w.at = NOW + retry_int; 798 last_establish_attempt = ev_now ();
799
800 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
801 ? (retry_cnt & 3) + 1
802 : 1 << (retry_cnt >> 2));
737 803
738 reset_si (); 804 reset_si ();
739 805
806 bool slow = si.prot & PROT_SLOW;
807
740 if (si.prot && !si.host) 808 if (si.prot && !si.host)
809 {
810 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
811 /*TODO*/ /* start the timer so we don't recurse endlessly */
812 w.start (1);
741 vpn->send_connect_request (conf->id); 813 vpn->send_connect_request (conf->id);
814 }
742 else 815 else
743 { 816 {
817 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
818
744 const sockinfo &dsi = forward_si (si); 819 const sockinfo &dsi = forward_si (si);
820
821 slow = slow || (dsi.prot & PROT_SLOW);
745 822
746 if (dsi.valid () && auth_rate_limiter.can (dsi)) 823 if (dsi.valid () && auth_rate_limiter.can (dsi))
747 { 824 {
748 if (retry_cnt < 4) 825 if (retry_cnt < 4)
749 send_auth_request (dsi, true); 826 send_auth_request (dsi, true);
750 else 827 else
751 send_ping (dsi, 0); 828 send_ping (dsi, 0);
752 } 829 }
753 } 830 }
831
832 retry_int *= slow ? 8. : 0.9;
833
834 if (retry_int < conf->max_retry)
835 retry_cnt++;
836 else
837 retry_int = conf->max_retry;
838
839 w.start (retry_int);
754 } 840 }
755} 841}
756 842
757void 843void
758connection::reset_connection () 844connection::reset_connection ()
… …
761 { 847 {
762 slog (L_INFO, _("%s(%s): connection lost"), 848 slog (L_INFO, _("%s(%s): connection lost"),
763 conf->nodename, (const char *)si); 849 conf->nodename, (const char *)si);
764 850
765 if (::conf.script_node_down) 851 if (::conf.script_node_down)
766 run_script (run_script_cb (this, &connection::script_node_down), false); 852 {
853 run_script_cb cb;
854 cb.set<connection, &connection::script_node_down> (this);
855 if (!run_script (cb, false))
856 slog (L_WARN, _("node-down command execution failed, continuing."));
857 }
767 } 858 }
768 859
769 delete ictx; ictx = 0; 860 delete ictx; ictx = 0;
770 delete octx; octx = 0; 861 delete octx; octx = 0;
862#if ENABLE_DNS
863 dnsv4_reset_connection ();
864#endif
771 865
772 si.host= 0; 866 si.host = 0;
773 867
774 last_activity = 0; 868 last_activity = 0;
775 retry_cnt = 0; 869 retry_cnt = 0;
776 870
777 rekey.reset (); 871 rekey.stop ();
778 keepalive.reset (); 872 keepalive.stop ();
779 establish_connection.reset (); 873 establish_connection.stop ();
780} 874}
781 875
782void 876void
783connection::shutdown () 877connection::shutdown ()
784{ 878{
… …
786 send_reset (si); 880 send_reset (si);
787 881
788 reset_connection (); 882 reset_connection ();
789} 883}
790 884
791void 885inline void
792connection::rekey_cb (time_watcher &w) 886connection::rekey_cb (ev::timer &w, int revents)
793{ 887{
794 w.at = TSTAMP_CANCEL;
795
796 reset_connection (); 888 reset_connection ();
797 establish_connection (); 889 establish_connection ();
798} 890}
799 891
800void 892void
… …
815 if (oseqno > MAX_SEQNO) 907 if (oseqno > MAX_SEQNO)
816 rekey (); 908 rekey ();
817} 909}
818 910
819void 911void
912connection::post_inject_queue ()
913{
914 // force a connection every now and when when packets are sent (max 1/s)
915 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
916 establish_connection.stop ();
917
918 establish_connection ();
919}
920
921void
820connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 922connection::inject_data_packet (tap_packet *pkt)
821{ 923{
822 if (ictx && octx) 924 if (ictx && octx)
823 send_data_packet (pkt); 925 send_data_packet (pkt);
824 else 926 else
825 { 927 {
826 if (!broadcast)//DDDD
827 data_queue.put (new tap_packet (*pkt)); 928 data_queue.put (new tap_packet (*pkt));
828 929 post_inject_queue ();
829 establish_connection ();
830 } 930 }
831} 931}
832 932
833void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 933void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
834{ 934{
835 if (ictx && octx) 935 if (ictx && octx)
836 send_vpn_packet (pkt, si, tos); 936 send_vpn_packet (pkt, si, tos);
837 else 937 else
838 { 938 {
839 vpn_queue.put (new vpn_packet (*pkt)); 939 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
840 940 post_inject_queue ();
841 establish_connection ();
842 } 941 }
843} 942}
844 943
845void 944void
846connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 945connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
847{ 946{
848 last_activity = NOW; 947 last_activity = ev_now ();
849 948
850 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 949 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
851 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 950 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
951
952 if (connectmode == conf_node::C_DISABLED)
953 return;
852 954
853 switch (pkt->typ ()) 955 switch (pkt->typ ())
854 { 956 {
855 case vpn_packet::PT_PING: 957 case vpn_packet::PT_PING:
856 // we send pings instead of auth packets after some retries, 958 // we send pings instead of auth packets after some retries,
… …
917 1019
918 octx = new crypto_ctx (k, 1); 1020 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1021 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 1022
921 conf->protocols = p->protocols; 1023 conf->protocols = p->protocols;
1024 features = p->features & config_packet::get_features ();
922 1025
923 send_auth_response (rsi, p->id, k); 1026 send_auth_response (rsi, p->id, k);
924 1027
925 connection_established (); 1028 connection_established ();
926 1029
… …
962 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1065 crypto_ctx *cctx = new crypto_ctx (chg, 0);
963 1066
964 if (!p->hmac_chk (cctx)) 1067 if (!p->hmac_chk (cctx))
965 { 1068 {
966 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1069 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
967 "could be an attack, or just corruption or an synchronization error"), 1070 "could be an attack, or just corruption or a synchronization error"),
968 conf->nodename, (const char *)rsi); 1071 conf->nodename, (const char *)rsi);
969 break; 1072 break;
970 } 1073 }
971 else 1074 else
972 { 1075 {
… …
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1093 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
991 conf->nodename, (const char *)rsi, 1094 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor); 1095 p->prot_major, p->prot_minor);
993 1096
994 if (::conf.script_node_up) 1097 if (::conf.script_node_up)
995 run_script (run_script_cb (this, &connection::script_node_up), false); 1098 {
1099 run_script_cb cb;
1100 cb.set<connection, &connection::script_node_up> (this);
1101 if (!run_script (cb, false))
1102 slog (L_WARN, _("node-up command execution failed, continuing."));
1103 }
996 1104
997 break; 1105 break;
998 } 1106 }
999 else 1107 else
1000 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1108 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1021 { 1129 {
1022 vpndata_packet *p = (vpndata_packet *)pkt; 1130 vpndata_packet *p = (vpndata_packet *)pkt;
1023 1131
1024 if (!p->hmac_chk (ictx)) 1132 if (!p->hmac_chk (ictx))
1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1133 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1026 "could be an attack, or just corruption or an synchronization error"), 1134 "could be an attack, or just corruption or a synchronization error"),
1027 conf->nodename, (const char *)rsi); 1135 conf->nodename, (const char *)rsi);
1028 else 1136 else
1029 { 1137 {
1030 u32 seqno; 1138 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno); 1139 tap_packet *d = p->unpack (this, seqno);
… …
1034 { 1142 {
1035 vpn->tap->send (d); 1143 vpn->tap->send (d);
1036 1144
1037 if (si != rsi) 1145 if (si != rsi)
1038 { 1146 {
1039 // fast re-sync on connection changes, useful especially for tcp/ip 1147 // fast re-sync on source address changes, useful especially for tcp/ip
1040 si = rsi; 1148 si = rsi;
1041 1149
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1150 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1151 conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1152 }
1045
1046 delete d;
1047
1048 break;
1049 } 1153 }
1154
1155 delete d;
1156 break;
1050 } 1157 }
1051 } 1158 }
1052 1159
1053 send_reset (rsi); 1160 send_reset (rsi);
1054 break; 1161 break;
… …
1056 case vpn_packet::PT_CONNECT_REQ: 1163 case vpn_packet::PT_CONNECT_REQ:
1057 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1164 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1058 { 1165 {
1059 connect_req_packet *p = (connect_req_packet *) pkt; 1166 connect_req_packet *p = (connect_req_packet *) pkt;
1060 1167
1061 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1168 if (p->id > 0 && p->id <= vpn->conns.size ())
1062 connection *c = vpn->conns[p->id - 1];
1063 conf->protocols = p->protocols;
1064
1065 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1066 conf->id, p->id, c->ictx && c->octx);
1067
1068 if (c->ictx && c->octx)
1069 { 1169 {
1170 connection *c = vpn->conns[p->id - 1];
1171 conf->protocols = p->protocols;
1172
1173 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1174 conf->id, p->id, c->ictx && c->octx);
1175
1176 if (c->ictx && c->octx)
1177 {
1070 // send connect_info packets to both sides, in case one is 1178 // send connect_info packets to both sides, in case one is
1071 // behind a nat firewall (or both ;) 1179 // behind a nat firewall (or both ;)
1072 c->send_connect_info (conf->id, si, conf->protocols); 1180 c->send_connect_info (conf->id, si, conf->protocols);
1073 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1181 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1182 }
1183 else
1184 c->establish_connection ();
1074 } 1185 }
1075 else 1186 else
1076 c->establish_connection (); 1187 slog (L_WARN,
1188 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1189 p->id);
1077 } 1190 }
1078 1191
1079 break; 1192 break;
1080 1193
1081 case vpn_packet::PT_CONNECT_INFO: 1194 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1195 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1196 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1197 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1198
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1199 if (p->id > 0 && p->id <= vpn->conns.size ())
1087 1200 {
1088 connection *c = vpn->conns[p->id - 1]; 1201 connection *c = vpn->conns[p->id - 1];
1089 1202
1090 c->conf->protocols = p->protocols; 1203 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1204 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1205 p->si.upgrade_protocol (protocol, c->conf);
1093 1206
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1207 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1208 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1096 1209
1097 const sockinfo &dsi = forward_si (p->si); 1210 const sockinfo &dsi = forward_si (p->si);
1098 1211
1099 if (dsi.valid ()) 1212 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1213 c->send_auth_request (dsi, true);
1214 }
1215 else
1216 slog (L_WARN,
1217 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1218 p->id);
1101 } 1219 }
1102 1220
1103 break; 1221 break;
1104 1222
1105 default: 1223 default:
1106 send_reset (rsi); 1224 send_reset (rsi);
1107 break; 1225 break;
1108 } 1226 }
1109} 1227}
1110 1228
1111void connection::keepalive_cb (time_watcher &w) 1229inline void
1230connection::keepalive_cb (ev::timer &w, int revents)
1112{ 1231{
1113 if (NOW >= last_activity + ::conf.keepalive + 30) 1232 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1114 { 1233 {
1115 reset_connection (); 1234 reset_connection ();
1116 establish_connection (); 1235 establish_connection ();
1117 } 1236 }
1118 else if (NOW < last_activity + ::conf.keepalive) 1237 else if (ev_now () < last_activity + ::conf.keepalive)
1119 w.at = last_activity + ::conf.keepalive; 1238 w.start (last_activity + ::conf.keepalive - ev::now ());
1120 else if (conf->connectmode != conf_node::C_ONDEMAND 1239 else if (conf->connectmode != conf_node::C_ONDEMAND
1121 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1240 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1122 { 1241 {
1123 send_ping (si); 1242 send_ping (si);
1124 w.at = NOW + 5; 1243 w.start (5);
1125 } 1244 }
1126 else if (NOW < last_activity + ::conf.keepalive + 10) 1245 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1127 // hold ondemand connections implicitly a few seconds longer 1246 // hold ondemand connections implicitly a few seconds longer
1128 // should delete octx, though, or something like that ;) 1247 // should delete octx, though, or something like that ;)
1129 w.at = last_activity + ::conf.keepalive + 10; 1248 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1130 else 1249 else
1131 reset_connection (); 1250 reset_connection ();
1132} 1251}
1133 1252
1134void connection::send_connect_request (int id) 1253void connection::send_connect_request (int id)
… …
1140 send_vpn_packet (p, si); 1259 send_vpn_packet (p, si);
1141 1260
1142 delete p; 1261 delete p;
1143} 1262}
1144 1263
1264void connection::script_init_env (const char *ext)
1265{
1266 char *env;
1267 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1268 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1269 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1270 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1271 conf->id & 0xff); putenv (env);
1272}
1273
1145void connection::script_node () 1274void connection::script_init_connect_env ()
1146{ 1275{
1147 vpn->script_if_up (); 1276 vpn->script_init_env ();
1148 1277
1149 char *env; 1278 char *env;
1150 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1279 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1151 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1280 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1152 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1281 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1153 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1282 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1154} 1283}
1155 1284
1285inline const char *
1156const char *connection::script_node_up () 1286connection::script_node_up ()
1157{ 1287{
1158 script_node (); 1288 script_init_connect_env ();
1159 1289
1160 putenv ("STATE=up"); 1290 putenv ((char *)"STATE=up");
1161 1291
1292 char *filename;
1293 asprintf (&filename,
1294 "%s/%s",
1295 confbase,
1162 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1296 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1163}
1164 1297
1298 return filename;
1299}
1300
1301inline const char *
1165const char *connection::script_node_down () 1302connection::script_node_down ()
1166{ 1303{
1167 script_node (); 1304 script_init_connect_env ();
1168 1305
1169 putenv ("STATE=down"); 1306 putenv ((char *)"STATE=down");
1170 1307
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1308 char *filename;
1172} 1309 asprintf (&filename,
1310 "%s/%s",
1311 confbase,
1312 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1173 1313
1314 return filename;
1315}
1316
1174connection::connection(struct vpn *vpn_) 1317connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1318: vpn(vpn), conf(conf),
1176, rekey (this, &connection::rekey_cb) 1319#if ENABLE_DNS
1177, keepalive (this, &connection::keepalive_cb) 1320 dns (0),
1321#endif
1322 data_queue(conf->max_ttl, conf->max_queue),
1323 vpn_queue(conf->max_ttl, conf->max_queue)
1324{
1325 rekey .set<connection, &connection::rekey_cb > (this);
1326 keepalive .set<connection, &connection::keepalive_cb > (this);
1178, establish_connection (this, &connection::establish_connection_cb) 1327 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1179{ 1328
1329 last_establish_attempt = 0.;
1180 octx = ictx = 0; 1330 octx = ictx = 0;
1181 retry_cnt = 0;
1182 1331
1183 connectmode = conf_node::C_ALWAYS; // initial setting 1332 if (!conf->protocols) // make sure some protocol is enabled
1333 conf->protocols = PROT_UDPv4;
1334
1335 connectmode = conf->connectmode;
1336
1337 // queue a dummy packet to force an initial connection attempt
1338 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1339 vpn_queue.put (new net_packet);
1340
1184 reset_connection (); 1341 reset_connection ();
1185} 1342}
1186 1343
1187connection::~connection () 1344connection::~connection ()
1188{ 1345{

Diff Legend

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