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

Comparing gvpe/src/protocol.C (file contents):
Revision 1.7 by pcg, Sun Mar 9 12:48:22 2003 UTC vs.
Revision 1.13 by pcg, Sat Mar 22 22:34:36 2003 UTC

16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17*/ 17*/
18 18
19#include "config.h" 19#include "config.h"
20 20
21#include <list>
22
21#include <cstdlib> 23#include <cstdlib>
22#include <cstring> 24#include <cstring>
23#include <cstdio> 25#include <cstdio>
24 26
25#include <sys/types.h> 27#include <sys/types.h>
60 62
61static const rsachallenge & 63static const rsachallenge &
62challenge_bytes () 64challenge_bytes ()
63{ 65{
64 static rsachallenge challenge; 66 static rsachallenge challenge;
65 static time_t challenge_ttl; // time this challenge needs to be recreated 67 static double challenge_ttl; // time this challenge needs to be recreated
66 68
67 if (now > challenge_ttl) 69 if (NOW > challenge_ttl)
68 { 70 {
69 RAND_bytes ((unsigned char *)&challenge, sizeof (challenge)); 71 RAND_bytes ((unsigned char *)&challenge, sizeof (challenge));
70 challenge_ttl = now + CHALLENGE_TTL; 72 challenge_ttl = NOW + CHALLENGE_TTL;
71 } 73 }
72 74
73 return challenge; 75 return challenge;
76}
77
78// caching of rsa operations really helps slow computers
79struct rsa_entry {
80 tstamp expire;
81 rsachallenge chg;
82 RSA *key; // which key
83 rsaencrdata encr;
84
85 rsa_entry ()
86 {
87 expire = NOW + CHALLENGE_TTL;
88 }
89};
90
91struct rsa_cache : list<rsa_entry>
92{
93 void cleaner_cb (tstamp &ts); time_watcher cleaner;
94
95 const rsaencrdata *public_encrypt (RSA *key, const rsachallenge &chg)
96 {
97 for (iterator i = begin (); i != end (); ++i)
98 {
99 if (i->key == key && !memcmp (&chg, &i->chg, sizeof chg))
100 return &i->encr;
101 }
102
103 if (cleaner.at < NOW)
104 cleaner.start (NOW + CHALLENGE_TTL);
105
106 resize (size () + 1);
107 rsa_entry *e = &(*rbegin ());
108
109 e->key = key;
110 memcpy (&e->chg, &chg, sizeof chg);
111
112 if (0 > RSA_public_encrypt (sizeof chg,
113 (unsigned char *)&chg, (unsigned char *)&e->encr,
114 key, RSA_PKCS1_OAEP_PADDING))
115 fatal ("RSA_public_encrypt error");
116
117 return &e->encr;
118 }
119
120 const rsachallenge *private_decrypt (RSA *key, const rsaencrdata &encr)
121 {
122 for (iterator i = begin (); i != end (); ++i)
123 if (i->key == key && !memcmp (&encr, &i->encr, sizeof encr))
124 return &i->chg;
125
126 if (cleaner.at < NOW)
127 cleaner.start (NOW + CHALLENGE_TTL);
128
129 resize (size () + 1);
130 rsa_entry *e = &(*rbegin ());
131
132 e->key = key;
133 memcpy (&e->encr, &encr, sizeof encr);
134
135 if (0 > RSA_private_decrypt (sizeof encr,
136 (unsigned char *)&encr, (unsigned char *)&e->chg,
137 key, RSA_PKCS1_OAEP_PADDING))
138 {
139 pop_back ();
140 return 0;
141 }
142
143 return &e->chg;
144 }
145
146 rsa_cache ()
147 : cleaner (this, &rsa_cache::cleaner_cb)
148 { }
149
150} rsa_cache;
151
152void rsa_cache::cleaner_cb (tstamp &ts)
153{
154 if (empty ())
155 ts = TSTAMP_CANCEL;
156 else
157 {
158 ts = NOW + 3;
159 for (iterator i = begin (); i != end (); )
160 {
161 if (i->expire >= NOW)
162 i = erase (i);
163 else
164 ++i;
165 }
166 }
74} 167}
75 168
76// run a script. yes, it's a template function. yes, c++ 169// run a script. yes, it's a template function. yes, c++
77// is not a functional language. yes, this suxx. 170// is not a functional language. yes, this suxx.
78template<class owner> 171template<class owner>
112struct crypto_ctx 205struct crypto_ctx
113 { 206 {
114 EVP_CIPHER_CTX cctx; 207 EVP_CIPHER_CTX cctx;
115 HMAC_CTX hctx; 208 HMAC_CTX hctx;
116 209
117 crypto_ctx (rsachallenge &challenge, int enc); 210 crypto_ctx (const rsachallenge &challenge, int enc);
118 ~crypto_ctx (); 211 ~crypto_ctx ();
119 }; 212 };
120 213
121crypto_ctx::crypto_ctx (rsachallenge &challenge, int enc) 214crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
122{ 215{
123 EVP_CIPHER_CTX_init (&cctx); 216 EVP_CIPHER_CTX_init (&cctx);
124 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 217 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc);
125 HMAC_CTX_init (&hctx); 218 HMAC_CTX_init (&hctx);
126 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 219 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
128 221
129crypto_ctx::~crypto_ctx () 222crypto_ctx::~crypto_ctx ()
130{ 223{
131 EVP_CIPHER_CTX_cleanup (&cctx); 224 EVP_CIPHER_CTX_cleanup (&cctx);
132 HMAC_CTX_cleanup (&hctx); 225 HMAC_CTX_cleanup (&hctx);
226}
227
228//////////////////////////////////////////////////////////////////////////////
229
230void pkt_queue::put (tap_packet *p)
231{
232 if (queue[i])
233 {
234 delete queue[i];
235 j = (j + 1) % QUEUEDEPTH;
236 }
237
238 queue[i] = p;
239
240 i = (i + 1) % QUEUEDEPTH;
241}
242
243tap_packet *pkt_queue::get ()
244{
245 tap_packet *p = queue[j];
246
247 if (p)
248 {
249 queue[j] = 0;
250 j = (j + 1) % QUEUEDEPTH;
251 }
252
253 return p;
254}
255
256pkt_queue::pkt_queue ()
257{
258 memset (queue, 0, sizeof (queue));
259 i = 0;
260 j = 0;
261}
262
263pkt_queue::~pkt_queue ()
264{
265 for (i = QUEUEDEPTH; --i > 0; )
266 delete queue[i];
267}
268
269// only do action once every x seconds per host.
270// currently this is quite a slow implementation,
271// but suffices for normal operation.
272struct u32_rate_limiter : private map<u32, tstamp>
273 {
274 tstamp every;
275
276 bool can (u32 host);
277
278 u32_rate_limiter (tstamp every = 1)
279 {
280 this->every = every;
281 }
282 };
283
284struct net_rate_limiter : u32_rate_limiter
285 {
286 bool can (SOCKADDR *sa) { return u32_rate_limiter::can((u32)sa->sin_addr.s_addr); }
287 bool can (sockinfo &si) { return u32_rate_limiter::can((u32)si.host); }
288
289 net_rate_limiter (tstamp every) : u32_rate_limiter (every) {}
290 };
291
292bool u32_rate_limiter::can (u32 host)
293{
294 iterator i;
295
296 for (i = begin (); i != end (); )
297 if (i->second <= NOW)
298 {
299 erase (i);
300 i = begin ();
301 }
302 else
303 ++i;
304
305 i = find (host);
306
307 if (i != end ())
308 return false;
309
310 insert (value_type (host, NOW + every));
311
312 return true;
133} 313}
134 314
135///////////////////////////////////////////////////////////////////////////// 315/////////////////////////////////////////////////////////////////////////////
136 316
137static void next_wakeup (time_t next) 317static void next_wakeup (time_t next)
200 380
201 unsigned int src () 381 unsigned int src ()
202 { 382 {
203 return src1 | ((srcdst >> 4) << 8); 383 return src1 | ((srcdst >> 4) << 8);
204 } 384 }
385
205 unsigned int dst () 386 unsigned int dst ()
206 { 387 {
207 return dst1 | ((srcdst & 0xf) << 8); 388 return dst1 | ((srcdst & 0xf) << 8);
208 } 389 }
390
209 ptype typ () 391 ptype typ ()
210 { 392 {
211 return (ptype) type; 393 return (ptype) type;
212 } 394 }
213 }; 395 };
252 u32 cl; 434 u32 cl;
253 435
254 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 436 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
255 if (cl) 437 if (cl)
256 { 438 {
257 //printf ("compressed packet, %d => %d\n", l, cl);//D
258 type = PT_DATA_COMPRESSED; 439 type = PT_DATA_COMPRESSED;
259 d = cdata; 440 d = cdata;
260 l = cl + 2; 441 l = cl + 2;
261 442
262 d[0] = cl >> 8; 443 d[0] = cl >> 8;
264 } 445 }
265#endif 446#endif
266 447
267 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 448 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0);
268 449
450 struct {
269#if RAND_SIZE 451#if RAND_SIZE
270 struct {
271 u8 rnd[RAND_SIZE]; 452 u8 rnd[RAND_SIZE];
453#endif
272 u32 seqno; 454 u32 seqno;
273 } datahdr; 455 } datahdr;
274 456
275 datahdr.seqno = seqno; 457 datahdr.seqno = ntohl (seqno);
458#if RAND_SIZE
276 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 459 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
460#endif
277 461
278 EVP_EncryptUpdate (cctx, 462 EVP_EncryptUpdate (cctx,
279 (unsigned char *) data + outl, &outl2, 463 (unsigned char *) data + outl, &outl2,
280 (unsigned char *) &datahdr, DATAHDR); 464 (unsigned char *) &datahdr, DATAHDR);
281 outl += outl2; 465 outl += outl2;
282#else
283 EVP_EncryptUpdate (cctx,
284 (unsigned char *) data + outl, &outl2,
285 (unsigned char *) &seqno, DATAHDR);
286 outl += outl2;
287#endif
288 466
289 EVP_EncryptUpdate (cctx, 467 EVP_EncryptUpdate (cctx,
290 (unsigned char *) data + outl, &outl2, 468 (unsigned char *) data + outl, &outl2,
291 (unsigned char *) d, l); 469 (unsigned char *) d, l);
292 outl += outl2; 470 outl += outl2;
328 outl += outl2; 506 outl += outl2;
329 507
330 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 508 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2);
331 outl += outl2; 509 outl += outl2;
332 510
333 seqno = *(u32 *)(d + RAND_SIZE); 511 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
334 512
335 id2mac (dst () ? dst() : THISNODE->id, p->dst); 513 id2mac (dst () ? dst() : THISNODE->id, p->dst);
336 id2mac (src (), p->src); 514 id2mac (src (), p->src);
337 515
338#if ENABLE_COMPRESSION 516#if ENABLE_COMPRESSION
339 if (type == PT_DATA_COMPRESSED) 517 if (type == PT_DATA_COMPRESSED)
340 { 518 {
341 u32 cl = (d[DATAHDR] << 8) | d[DATAHDR + 1]; 519 u32 cl = (d[DATAHDR] << 8) | d[DATAHDR + 1];
342 p->len = lzf_decompress (d + DATAHDR + 2, cl, &(*p)[6 + 6], MAX_MTU) + 6 + 6; 520 p->len = lzf_decompress (d + DATAHDR + 2, cl, &(*p)[6 + 6], MAX_MTU) + 6 + 6;
343 //printf ("decompressxed %d(%d) => %d\n", cl, len - data_hdr_size (), p->len);//D
344 } 521 }
345 else 522 else
346 p->len = outl + (6 + 6 - DATAHDR); 523 p->len = outl + (6 + 6 - DATAHDR);
347#endif 524#endif
348 525
369 u32 digest_nid; 546 u32 digest_nid;
370 547
371 const u8 curflags () const 548 const u8 curflags () const
372 { 549 {
373 return 0x80 550 return 0x80
551 | 0x02
552#if PROTOCOL_MAJOR != 2
553#error hi
554#endif
374 | (ENABLE_COMPRESSION ? 0x01 : 0x00) 555 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
375 | (ENABLE_TRUST ? 0x02 : 0x00);
376 } 556 }
377 557
378 void setup (ptype type, int dst) 558 void setup (ptype type, int dst)
379 { 559 {
380 prot_major = PROTOCOL_MAJOR; 560 prot_major = PROTOCOL_MAJOR;
491void 671void
492connection::send_reset (SOCKADDR *dsa) 672connection::send_reset (SOCKADDR *dsa)
493{ 673{
494 static net_rate_limiter limiter(1); 674 static net_rate_limiter limiter(1);
495 675
496 if (limiter.can (dsa)) 676 if (limiter.can (dsa) && connectmode != conf_node::C_DISABLED)
497 { 677 {
498 config_packet *pkt = new config_packet; 678 config_packet *pkt = new config_packet;
499 679
500 pkt->setup (vpn_packet::PT_RESET, conf->id); 680 pkt->setup (vpn_packet::PT_RESET, conf->id);
501 vpn->send_vpn_packet (pkt, dsa, IPTOS_MINCOST); 681 vpn->send_vpn_packet (pkt, dsa, IPTOS_MINCOST);
503 delete pkt; 683 delete pkt;
504 } 684 }
505} 685}
506 686
507static rsachallenge * 687static rsachallenge *
508gen_challenge (SOCKADDR *sa) 688gen_challenge (u32 seqrand, SOCKADDR *sa)
509{ 689{
510 static rsachallenge k; 690 static rsachallenge k;
511 691
512 memcpy (&k, &challenge_bytes (), sizeof (k)); 692 memcpy (&k, &challenge_bytes (), sizeof (k));
513 RAND_bytes ((unsigned char *)&k[CHG_SEQNO], sizeof (u32)); 693 *(u32 *)&k[CHG_SEQNO] ^= seqrand;
514 xor_sa (k, sa); 694 xor_sa (k, sa);
515 695
516 return &k; 696 return &k;
517} 697}
518 698
519void 699void
520connection::send_auth (auth_subtype subtype, SOCKADDR *sa, rsachallenge *k) 700connection::send_auth (auth_subtype subtype, SOCKADDR *sa, const rsachallenge *k)
521{ 701{
522 static net_rate_limiter limiter(2); 702 static net_rate_limiter limiter(0.2);
523 703
524 if (subtype != AUTH_INIT || limiter.can (sa)) 704 if (subtype != AUTH_INIT || limiter.can (sa))
525 { 705 {
706 if (!k)
707 k = gen_challenge (seqrand, sa);
708
526 auth_packet *pkt = new auth_packet (conf->id, subtype); 709 auth_packet *pkt = new auth_packet (conf->id, subtype);
527 710
528 //printf ("send auth_packet subtype %d\n", subtype);//D 711 memcpy (pkt->challenge, rsa_cache.public_encrypt (conf->rsa_key, *k), sizeof (rsaencrdata));
529
530 if (!k)
531 k = gen_challenge (sa);
532
533#if ENABLE_TRUST
534 if (0 > RSA_public_encrypt (sizeof (*k),
535 (unsigned char *)k, (unsigned char *)&pkt->challenge,
536 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
537 fatal ("RSA_public_encrypt error");
538#else
539# error untrusted mode not yet implemented: programemr does not know how to
540 rsaencrdata enc;
541
542 if (0 > RSA_private_encrypt (sizeof (*k),
543 (unsigned char *)k, (unsigned char *)&enc,
544 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
545 fatal ("RSA_private_encrypt error");
546
547 if (0 > RSA_public_encrypt (sizeof (enc),
548 (unsigned char *)enc, (unsigned char *)&pkt->challenge,
549 conf->rsa_key, RSA_NO_PADDING))
550 fatal ("RSA_public_encrypt error");
551#endif
552 712
553 slog (L_TRACE, ">>%d PT_AUTH(%d) [%s]", conf->id, subtype, (const char *)sockinfo (sa)); 713 slog (L_TRACE, ">>%d PT_AUTH(%d) [%s]", conf->id, subtype, (const char *)sockinfo (sa));
554 714
555 vpn->send_vpn_packet (pkt, sa, IPTOS_RELIABILITY); 715 vpn->send_vpn_packet (pkt, sa, IPTOS_RELIABILITY);
556 716
557 delete pkt; 717 delete pkt;
558 } 718 }
559} 719}
560 720
561void 721void
562connection::establish_connection () 722connection::establish_connection_cb (tstamp &ts)
563{ 723{
564 if (!ictx && conf != THISNODE && connectmode != conf_node::C_NEVER) 724 if (ictx || conf == THISNODE || connectmode == conf_node::C_NEVER)
725 ts = TSTAMP_CANCEL;
726 else if (ts <= NOW)
565 { 727 {
566 if (now >= next_retry) 728 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.25;
567 {
568 int retry_int = retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2);
569 729
570 if (retry_cnt < (17 << 2) | 3) 730 if (retry_int < 3600 * 8)
571 retry_cnt++; 731 retry_cnt++;
572 732
573 if (connectmode == conf_node::C_ONDEMAND 733 if (connectmode == conf_node::C_ONDEMAND
574 && retry_int > ::conf.keepalive) 734 && retry_int > ::conf.keepalive)
575 retry_int = ::conf.keepalive; 735 retry_int = ::conf.keepalive;
576 736
577 next_retry = now + retry_int; 737 ts = NOW + retry_int;
578 next_wakeup (next_retry);
579 738
580 if (conf->hostname) 739 if (conf->hostname)
581 { 740 {
582 reset_dstaddr (); 741 reset_dstaddr ();
583 if (sa.sin_addr.s_addr) 742 if (sa.sin_addr.s_addr)
584 if (retry_cnt < 4) 743 if (retry_cnt < 4)
585 send_auth (AUTH_INIT, &sa); 744 send_auth (AUTH_INIT, &sa);
586 else 745 else
587 send_ping (&sa, 0); 746 send_ping (&sa, 0);
588 } 747 }
589 else 748 else
590 vpn->connect_request (conf->id); 749 vpn->connect_request (conf->id);
591 }
592 } 750 }
593} 751}
594 752
595void 753void
596connection::reset_connection () 754connection::reset_connection ()
601 759
602 if (::conf.script_node_down) 760 if (::conf.script_node_down)
603 run_script (this, &connection::script_node_down, false); 761 run_script (this, &connection::script_node_down, false);
604 } 762 }
605 763
606 delete ictx; 764 delete ictx; ictx = 0;
607 ictx = 0; 765 delete octx; octx = 0;
608 766
609 delete octx; 767 RAND_bytes ((unsigned char *)&seqrand, sizeof (u32));
610 octx = 0;
611 768
612 sa.sin_port = 0; 769 sa.sin_port = 0;
613 sa.sin_addr.s_addr = 0; 770 sa.sin_addr.s_addr = 0;
614 771
615 next_retry = 0;
616 next_rekey = 0;
617 last_activity = 0; 772 last_activity = 0;
773
774 rekey.reset ();
775 keepalive.reset ();
776 establish_connection.reset ();
618} 777}
619 778
620void 779void
621connection::shutdown () 780connection::shutdown ()
622{ 781{
625 784
626 reset_connection (); 785 reset_connection ();
627} 786}
628 787
629void 788void
630connection::rekey () 789connection::rekey_cb (tstamp &ts)
631{ 790{
791 ts = TSTAMP_CANCEL;
792
632 reset_connection (); 793 reset_connection ();
633 establish_connection (); 794 establish_connection ();
634} 795}
635 796
636void 797void
668} 829}
669 830
670void 831void
671connection::recv_vpn_packet (vpn_packet *pkt, SOCKADDR *ssa) 832connection::recv_vpn_packet (vpn_packet *pkt, SOCKADDR *ssa)
672{ 833{
673 last_activity = now; 834 last_activity = NOW;
674 835
675 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 836 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
676 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 837 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
677 838
678 switch (pkt->typ ()) 839 switch (pkt->typ ())
686 // so reset the retry counter and establish a conenction 847 // so reset the retry counter and establish a conenction
687 // when we receive a pong. 848 // when we receive a pong.
688 if (!ictx && !octx) 849 if (!ictx && !octx)
689 { 850 {
690 retry_cnt = 0; 851 retry_cnt = 0;
691 next_retry = 0; 852 establish_connection.at = 0;
692 establish_connection (); 853 establish_connection ();
693 } 854 }
694 855
695 break; 856 break;
696 857
697 case vpn_packet::PT_RESET: 858 case vpn_packet::PT_RESET:
698 { 859 {
699 reset_connection (); 860 reset_connection ();
700 861
701 config_packet *p = (config_packet *) pkt; 862 config_packet *p = (config_packet *) pkt;
702 if (p->chk_config ()) 863 if (!p->chk_config ())
864 {
865 slog (L_WARN, _("protocol mismatch, disabling node '%s'"), conf->nodename);
866 connectmode = conf_node::C_DISABLED;
867 }
703 if (connectmode == conf_node::C_ALWAYS) 868 else if (connectmode == conf_node::C_ALWAYS)
704 establish_connection (); 869 establish_connection ();
705
706 //D slog the protocol mismatch?
707 } 870 }
708 break; 871 break;
709 872
710 case vpn_packet::PT_AUTH: 873 case vpn_packet::PT_AUTH:
711 { 874 {
721 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 884 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
722 885
723 if (p->subtype == AUTH_INIT) 886 if (p->subtype == AUTH_INIT)
724 send_auth (AUTH_INITREPLY, ssa); 887 send_auth (AUTH_INITREPLY, ssa);
725 888
726 rsachallenge k; 889 const rsachallenge *k = rsa_cache.private_decrypt (::conf.rsa_key, p->challenge);
727 890
728#if ENABLE_TRUST
729 if (0 > RSA_private_decrypt (sizeof (rsaencrdata),
730 (unsigned char *)&p->challenge, (unsigned char *)&k,
731 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
732 // continued below
733#else
734 rsaencrdata j;
735 891 if (!k)
736 if (0 > RSA_private_decrypt (sizeof (rsaencrdata),
737 (unsigned char *)&p->challenge, (unsigned char *)&j,
738 ::conf.rsa_key, RSA_NO_PADDING))
739 fatal ("RSA_private_decrypt error");
740
741 if (0 > RSA_public_decrypt (sizeof (k),
742 (unsigned char *)&j, (unsigned char *)&k,
743 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
744 // continued below
745#endif
746 { 892 {
747 slog (L_ERR, _("challenge from %s (%s) illegal or corrupted"), 893 slog (L_ERR, _("challenge from %s (%s) illegal or corrupted"),
748 conf->nodename, (const char *)sockinfo (ssa)); 894 conf->nodename, (const char *)sockinfo (ssa));
749 break; 895 break;
750 } 896 }
751 897
752 retry_cnt = 0; 898 retry_cnt = 0;
753 next_retry = now + 8; 899 establish_connection.set (NOW + 8); //? ;)
900 keepalive.reset ();
901 rekey.reset ();
754 902
755 switch (p->subtype) 903 switch (p->subtype)
756 { 904 {
757 case AUTH_INIT: 905 case AUTH_INIT:
758 case AUTH_INITREPLY: 906 case AUTH_INITREPLY:
759 delete ictx; 907 delete ictx;
760 ictx = 0; 908 ictx = 0;
761 909
762 delete octx; 910 delete octx;
763 911
764 octx = new crypto_ctx (k, 1); 912 octx = new crypto_ctx (*k, 1);
765 oseqno = *(u32 *)&k[CHG_SEQNO] & 0x7fffffff; 913 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
766 914
767 send_auth (AUTH_REPLY, ssa, &k); 915 send_auth (AUTH_REPLY, ssa, k);
768 break; 916 break;
769 917
770 case AUTH_REPLY: 918 case AUTH_REPLY:
771 919
772 if (!memcmp ((u8 *)gen_challenge (ssa) + sizeof (u32), (u8 *)&k + sizeof (u32), 920 if (!memcmp ((u8 *)gen_challenge (seqrand, ssa), (u8 *)k, sizeof (rsachallenge)))
773 sizeof (rsachallenge) - sizeof (u32)))
774 { 921 {
775 delete ictx; 922 delete ictx;
776 923
777 ictx = new crypto_ctx (k, 0); 924 ictx = new crypto_ctx (*k, 0);
778 iseqno = *(u32 *)&k[CHG_SEQNO] & 0x7fffffff; // at least 2**31 sequence numbers are valid 925 iseqno.reset (ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
779 ismask = 0xffffffff; // initially, all lower sequence numbers are invalid
780 926
781 sa = *ssa; 927 sa = *ssa;
782 928
783 next_rekey = now + ::conf.rekey; 929 rekey.set (NOW + ::conf.rekey);
784 next_wakeup (next_rekey); 930 keepalive.set (NOW + ::conf.keepalive);
785 931
786 // send queued packets 932 // send queued packets
787 while (tap_packet *p = queue.get ()) 933 while (tap_packet *p = queue.get ())
788 { 934 {
789 send_data_packet (p); 935 send_data_packet (p);
834 else 980 else
835 { 981 {
836 u32 seqno; 982 u32 seqno;
837 tap_packet *d = p->unpack (this, seqno); 983 tap_packet *d = p->unpack (this, seqno);
838 984
839 if (seqno <= iseqno - 32) 985 if (iseqno.recv_ok (seqno))
840 slog (L_ERR, _("received duplicate or outdated packet (received %08lx, expected %08lx)\n"
841 "possible replay attack, or just massive packet reordering"), seqno, iseqno + 1);//D
842 else if (seqno > iseqno + 32)
843 slog (L_ERR, _("received duplicate or out-of-sync packet (received %08lx, expected %08lx)\n"
844 "possible replay attack, or just massive packet loss"), seqno, iseqno + 1);//D
845 else
846 { 986 {
847 if (seqno > iseqno)
848 {
849 ismask <<= seqno - iseqno;
850 iseqno = seqno;
851 }
852
853 u32 mask = 1 << (iseqno - seqno);
854
855 //printf ("received seqno %08lx, iseqno %08lx, mask %08lx is %08lx\n", seqno, iseqno, mask, ismask);
856 if (ismask & mask)
857 slog (L_ERR, _("received duplicate packet (received %08lx, expected %08lx)\n"
858 "possible replay attack, or just packet duplication"), seqno, iseqno + 1);//D
859 else
860 {
861 ismask |= mask;
862
863 vpn->tap->send (d); 987 vpn->tap->send (d);
864 988
865 if (p->dst () == 0) // re-broadcast 989 if (p->dst () == 0) // re-broadcast
866 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i) 990 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
867 { 991 {
868 connection *c = *i; 992 connection *c = *i;
869 993
870 if (c->conf != THISNODE && c->conf != conf) 994 if (c->conf != THISNODE && c->conf != conf)
871 c->inject_data_packet (d); 995 c->inject_data_packet (d);
872 }
873
874 delete d;
875
876 break;
877 } 996 }
997
998 delete d;
999
1000 break;
878 } 1001 }
879 } 1002 }
880 } 1003 }
881 else 1004 else
882 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)sockinfo (ssa));//D 1005 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)sockinfo (ssa));//D
953 send_reset (ssa); 1076 send_reset (ssa);
954 break; 1077 break;
955 } 1078 }
956} 1079}
957 1080
958void connection::timer () 1081void connection::keepalive_cb (tstamp &ts)
959{ 1082{
960 if (conf != THISNODE) 1083 if (NOW >= last_activity + ::conf.keepalive + 30)
961 { 1084 {
962 if (now >= next_retry && connectmode == conf_node::C_ALWAYS) 1085 reset_connection ();
963 establish_connection (); 1086 establish_connection ();
964 1087 }
965 if (ictx && octx)
966 {
967 if (now >= next_rekey)
968 rekey ();
969 else if (now >= last_activity + ::conf.keepalive + 30)
970 {
971 reset_connection ();
972 establish_connection ();
973 }
974 else if (now >= last_activity + ::conf.keepalive) 1088 else if (NOW < last_activity + ::conf.keepalive)
1089 ts = last_activity + ::conf.keepalive;
975 if (conf->connectmode != conf_node::C_ONDEMAND 1090 else if (conf->connectmode != conf_node::C_ONDEMAND
976 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1091 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1092 {
977 send_ping (&sa); 1093 send_ping (&sa);
978 else 1094 ts = NOW + 5;
1095 }
1096 else
979 reset_connection (); 1097 reset_connection ();
980 1098
981 }
982 }
983} 1099}
984 1100
985void connection::connect_request (int id) 1101void connection::connect_request (int id)
986{ 1102{
987 connect_req_packet *p = new connect_req_packet (conf->id, id); 1103 connect_req_packet *p = new connect_req_packet (conf->id, id);
1024 putenv ("STATE=down"); 1140 putenv ("STATE=down");
1025 1141
1026 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1142 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1027} 1143}
1028 1144
1145connection::connection(struct vpn *vpn_)
1146: vpn(vpn_)
1147, rekey (this, &connection::rekey_cb)
1148, keepalive (this, &connection::keepalive_cb)
1149, establish_connection (this, &connection::establish_connection_cb)
1150{
1151 octx = ictx = 0;
1152 retry_cnt = 0;
1153
1154 connectmode = conf_node::C_ALWAYS; // initial setting
1155 reset_connection ();
1156}
1157
1158connection::~connection ()
1159{
1160 shutdown ();
1161}
1162
1029///////////////////////////////////////////////////////////////////////////// 1163/////////////////////////////////////////////////////////////////////////////
1030
1031vpn::vpn (void)
1032{}
1033 1164
1034const char *vpn::script_if_up () 1165const char *vpn::script_if_up ()
1035{ 1166{
1036 // the tunnel device mtu should be the physical mtu - overhead 1167 // the tunnel device mtu should be the physical mtu - overhead
1037 // the tricky part is rounding to the cipher key blocksize 1168 // the tricky part is rounding to the cipher key blocksize
1088 { 1219 {
1089 int oval = 1; 1220 int oval = 1;
1090 setsockopt (socket_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 1221 setsockopt (socket_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
1091 } 1222 }
1092 1223
1224 udp_ev_watcher.start (socket_fd, POLLIN);
1225
1093 tap = new tap_device (); 1226 tap = new tap_device ();
1094 if (!tap) //D this, of course, never catches 1227 if (!tap) //D this, of course, never catches
1095 { 1228 {
1096 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 1229 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
1097 exit (1); 1230 exit (1);
1098 } 1231 }
1099 1232
1100 run_script (this, &vpn::script_if_up, true); 1233 run_script (this, &vpn::script_if_up, true);
1234
1235 vpn_ev_watcher.start (tap->fd, POLLIN);
1236
1237 reconnect_all ();
1101 1238
1102 return 0; 1239 return 0;
1103} 1240}
1104 1241
1105void 1242void
1170 // if ((*i)->conf->routerprio) 1307 // if ((*i)->conf->routerprio)
1171 // (*i)->establish_connection (); 1308 // (*i)->establish_connection ();
1172} 1309}
1173 1310
1174void 1311void
1175vpn::main_loop () 1312vpn::udp_ev (short revents)
1176{ 1313{
1177 struct pollfd pollfd[2]; 1314 if (revents & (POLLIN | POLLERR))
1178
1179 pollfd[0].fd = tap->fd;
1180 pollfd[0].events = POLLIN;
1181 pollfd[1].fd = socket_fd;
1182 pollfd[1].events = POLLIN;
1183
1184 events = 0;
1185 now = time (0);
1186 next_timecheck = now + 1;
1187
1188 reconnect_all ();
1189
1190 for (;;)
1191 { 1315 {
1192 int npoll = poll (pollfd, 2, (next_timecheck - now) * 1000); 1316 vpn_packet *pkt = new vpn_packet;
1193 1317 struct sockaddr_in sa;
1194 now = time (0); 1318 socklen_t sa_len = sizeof (sa);
1319 int len;
1195 1320
1321 len = recvfrom (socket_fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
1322
1196 if (npoll > 0) 1323 if (len > 0)
1324 {
1325 pkt->len = len;
1326
1327 unsigned int src = pkt->src ();
1328 unsigned int dst = pkt->dst ();
1329
1330 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"),
1331 (const char *)sockinfo (sa), pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
1332
1333 if (dst > conns.size () || pkt->typ () >= vpn_packet::PT_MAX)
1334 slog (L_WARN, _("<<? received CORRUPTED packet type %d from %d to %d"),
1335 pkt->typ (), pkt->src (), pkt->dst ());
1336 else if (dst == 0 && !THISNODE->routerprio)
1337 slog (L_WARN, _("<<%d received broadcast, but we are no router"), dst);
1338 else if (dst != 0 && dst != THISNODE->id)
1339 slog (L_WARN,
1340 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"),
1341 dst, conns[dst - 1]->conf->nodename,
1342 (const char *)sockinfo (sa),
1343 THISNODE->id, THISNODE->nodename);
1344 else if (src == 0 || src > conns.size ())
1345 slog (L_WARN, _("received frame from unknown node %d (%s)"), src, (const char *)sockinfo (sa));
1346 else
1347 conns[src - 1]->recv_vpn_packet (pkt, &sa);
1197 { 1348 }
1198 if (pollfd[1].revents) 1349 else
1350 {
1351 // probably ECONNRESET or somesuch
1352 slog (L_DEBUG, _("%s: %s"), (const char *)sockinfo(sa), strerror (errno));
1353 }
1354
1355 delete pkt;
1356 }
1357 else if (revents & POLLHUP)
1358 {
1359 // this cannot ;) happen on udp sockets
1360 slog (L_ERR, _("FATAL: POLLHUP on socket fd, terminating."));
1361 exit (1);
1362 }
1363 else
1364 {
1365 slog (L_ERR,
1366 _("FATAL: unknown revents %08x in socket, terminating\n"),
1367 revents);
1368 exit (1);
1369 }
1370}
1371
1372void
1373vpn::vpn_ev (short revents)
1374{
1375 if (revents & POLLIN)
1376 {
1377 /* process data */
1378 tap_packet *pkt;
1379
1380 pkt = tap->recv ();
1381
1382 int dst = mac2id (pkt->dst);
1383 int src = mac2id (pkt->src);
1384
1385 if (src != THISNODE->id)
1386 {
1387 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
1388 exit (1);
1389 }
1390
1391 if (dst == THISNODE->id)
1392 {
1393 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
1394 exit (1);
1395 }
1396
1397 if (dst > conns.size ())
1398 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
1399 else
1400 {
1401 if (dst)
1199 { 1402 {
1200 if (pollfd[1].revents & (POLLIN | POLLERR)) 1403 // unicast
1201 {
1202 vpn_packet *pkt = new vpn_packet;
1203 struct sockaddr_in sa;
1204 socklen_t sa_len = sizeof (sa);
1205 int len;
1206
1207 len = recvfrom (socket_fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
1208
1209 if (len > 0)
1210 {
1211 pkt->len = len;
1212
1213 unsigned int src = pkt->src ();
1214 unsigned int dst = pkt->dst ();
1215
1216 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"),
1217 (const char *)sockinfo (sa), pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
1218
1219 if (dst > conns.size () || pkt->typ () >= vpn_packet::PT_MAX)
1220 slog (L_WARN, _("<<? received CORRUPTED packet type %d from %d to %d"),
1221 pkt->typ (), pkt->src (), pkt->dst ());
1222 else if (dst == 0 && !THISNODE->routerprio)
1223 slog (L_WARN, _("<<%d received broadcast, but we are no router"), dst);
1224 else if (dst != 0 && dst != THISNODE->id) 1404 if (dst != THISNODE->id)
1225 slog (L_WARN,
1226 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"),
1227 dst, conns[dst - 1]->conf->nodename,
1228 (const char *)sockinfo (sa),
1229 THISNODE->id, THISNODE->nodename);
1230 else if (src == 0 || src > conns.size ())
1231 slog (L_WARN, _("received frame from unknown node %d (%s)"), src, (const char *)sockinfo (sa));
1232 else
1233 conns[src - 1]->recv_vpn_packet (pkt, &sa); 1405 conns[dst - 1]->inject_data_packet (pkt);
1234 }
1235 else
1236 {
1237 // probably ECONNRESET or somesuch
1238 slog (L_DEBUG, _("%s: %s"), (const char *)sockinfo(sa), strerror (errno));
1239 }
1240
1241 delete pkt;
1242 } 1406 }
1243 else if (pollfd[1].revents & POLLHUP) 1407 else
1244 { 1408 {
1245 // this cannot ;) happen on udp sockets 1409 // broadcast, first check router, then self, then english
1246 slog (L_ERR, _("FATAL: POLLHUP on socket fd, terminating.")); 1410 connection *router = find_router ();
1247 exit (1); 1411
1248 } 1412 if (router)
1413 router->inject_data_packet (pkt, true);
1249 else 1414 else
1250 { 1415 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
1251 slog (L_ERR, 1416 if ((*c)->conf != THISNODE)
1252 _("FATAL: unknown revents %08x in socket, terminating\n"), 1417 (*c)->inject_data_packet (pkt);
1253 pollfd[1].revents);
1254 exit (1);
1255 }
1256 } 1418 }
1419 }
1257 1420
1258 // I use else here to give vpn_packets absolute priority 1421 delete pkt;
1259 else if (pollfd[0].revents) 1422 }
1260 {
1261 if (pollfd[0].revents & POLLIN)
1262 {
1263 /* process data */
1264 tap_packet *pkt;
1265
1266 pkt = tap->recv ();
1267
1268 int dst = mac2id (pkt->dst);
1269 int src = mac2id (pkt->src);
1270
1271 if (src != THISNODE->id)
1272 {
1273 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
1274 exit (1);
1275 }
1276
1277 if (dst == THISNODE->id)
1278 {
1279 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
1280 exit (1);
1281 }
1282
1283 if (dst > conns.size ())
1284 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
1285 else
1286 {
1287 if (dst)
1288 {
1289 // unicast
1290 if (dst != THISNODE->id)
1291 conns[dst - 1]->inject_data_packet (pkt);
1292 }
1293 else
1294 {
1295 // broadcast, first check router, then self, then english
1296 connection *router = find_router ();
1297
1298 if (router)
1299 router->inject_data_packet (pkt, true);
1300 else
1301 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
1302 if ((*c)->conf != THISNODE)
1303 (*c)->inject_data_packet (pkt);
1304 }
1305 }
1306
1307 delete pkt;
1308 }
1309 else if (pollfd[0].revents & (POLLHUP | POLLERR)) 1423 else if (revents & (POLLHUP | POLLERR))
1310 { 1424 {
1311 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating.")); 1425 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
1312 exit (1); 1426 exit (1);
1313 } 1427 }
1314 else 1428 else
1315 abort (); 1429 abort ();
1316 } 1430}
1317 }
1318 1431
1432void
1433vpn::event_cb (tstamp &ts)
1434{
1319 if (events) 1435 if (events)
1320 { 1436 {
1321 if (events & EVENT_SHUTDOWN) 1437 if (events & EVENT_SHUTDOWN)
1322 { 1438 {
1323 shutdown_all (); 1439 shutdown_all ();
1324 1440
1325 remove_pid (pidfilename); 1441 remove_pid (pidfilename);
1326 1442
1327 slog (L_INFO, _("vped terminating")); 1443 slog (L_INFO, _("vped terminating"));
1328 1444
1329 exit (0); 1445 exit (0);
1330 } 1446 }
1331 1447
1332 if (events & EVENT_RECONNECT) 1448 if (events & EVENT_RECONNECT)
1333 reconnect_all (); 1449 reconnect_all ();
1334 1450
1335 events = 0; 1451 events = 0;
1336 }
1337
1338 // very very very dumb and crude and inefficient timer handling, or maybe not?
1339 if (now >= next_timecheck)
1340 {
1341 next_timecheck = now + TIMER_GRANULARITY;
1342
1343 for (conns_vector::iterator c = conns.begin ();
1344 c != conns.end (); ++c)
1345 (*c)->timer ();
1346 }
1347 } 1452 }
1453
1454 ts = TSTAMP_CANCEL;
1455}
1456
1457vpn::vpn (void)
1458: udp_ev_watcher (this, &vpn::udp_ev)
1459, vpn_ev_watcher (this, &vpn::vpn_ev)
1460, event (this, &vpn::event_cb)
1461{
1348} 1462}
1349 1463
1350vpn::~vpn () 1464vpn::~vpn ()
1351{} 1465{
1466}
1352 1467

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines