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.45 by pcg, Fri Mar 4 09:36:45 2005 UTC vs.
Revision 1.68 by pcg, Thu Aug 7 17:30:27 2008 UTC

… …
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 15 GNU General Public License for more details.
16 16
17 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
18 along with gvpe; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
19 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
20*/ 20*/
21 21
22#include "config.h" 22#include "config.h"
23
24#include <cassert>
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"
… …
86 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
87 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
88 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
89} 85}
90 86
91struct rsa_entry { 87struct rsa_entry
88{
92 tstamp expire; 89 tstamp expire;
93 rsaid id; 90 rsaid id;
94 rsachallenge chg; 91 rsachallenge chg;
95}; 92};
96 93
97struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
98{ 95{
99 void cleaner_cb (time_watcher &w); time_watcher cleaner; 96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
100 97
101 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
102 { 99 {
103 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
104 { 101 {
105 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
106 { 103 {
107 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
108 105
109 erase (i); 106 erase (i);
110 return true; 107 return true;
111 } 108 }
112 } 109 }
113 110
114 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
115 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
116 113
117 return false; 114 return false;
118 } 115 }
119 116
120 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
121 { 118 {
122 rsa_entry e; 119 rsa_entry e;
123 120
124 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
125 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
126 123
127 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
128 e.id = id; 125 e.id = id;
129 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
130 127
131 push_back (e); 128 push_back (e);
132 129
133 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
134 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
135 } 132 }
136 133
137 rsa_cache () 134 rsa_cache ()
138 : cleaner (this, &rsa_cache::cleaner_cb) 135 {
139 { } 136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
140 139
141} rsa_cache; 140} rsa_cache;
142 141
143void rsa_cache::cleaner_cb (time_watcher &w) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
144{ 143{
145 if (!empty ()) 144 if (empty ())
145 w.stop ();
146 else
146 { 147 {
147 w.start (NOW + RSA_TTL);
148
149 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
150 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
151 i = erase (i); 150 i = erase (i);
152 else 151 else
153 ++i; 152 ++i;
154 } 153 }
155} 154}
156 155
157////////////////////////////////////////////////////////////////////////////// 156//////////////////////////////////////////////////////////////////////////////
158 157
159void 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)
160{ 160{
161 if (queue[i]) 161 queue = new pkt [max_queue];
162 {
163 delete queue[i];
164 j = (j + 1) % QUEUEDEPTH;
165 }
166 162
167 queue[i] = p;
168
169 i = (i + 1) % QUEUEDEPTH;
170}
171
172net_packet *pkt_queue::get ()
173{
174 net_packet *p = queue[j];
175
176 if (p)
177 {
178 queue[j] = 0;
179 j = (j + 1) % QUEUEDEPTH;
180 }
181
182 return p;
183}
184
185pkt_queue::pkt_queue ()
186{
187 memset (queue, 0, sizeof (queue));
188 i = 0; 163 i = 0;
189 j = 0; 164 j = 0;
165
166 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
190} 167}
191 168
192pkt_queue::~pkt_queue () 169pkt_queue::~pkt_queue ()
193{ 170{
194 for (i = QUEUEDEPTH; --i > 0; ) 171 while (net_packet *p = get ())
172 delete p;
173
195 delete queue[i]; 174 delete [] queue;
196} 175}
197 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
198struct net_rateinfo { 230struct net_rateinfo
231{
199 u32 host; 232 u32 host;
200 double pcnt, diff; 233 double pcnt, diff;
201 tstamp last; 234 tstamp last;
202}; 235};
203 236
… …
222 iterator i; 255 iterator i;
223 256
224 for (i = begin (); i != end (); ) 257 for (i = begin (); i != end (); )
225 if (i->host == host) 258 if (i->host == host)
226 break; 259 break;
227 else if (i->last < NOW - NRL_EXPIRE) 260 else if (i->last < ev_now () - NRL_EXPIRE)
228 i = erase (i); 261 i = erase (i);
229 else 262 else
230 i++; 263 i++;
231 264
232 if (i == end ()) 265 if (i == end ())
… …
234 net_rateinfo ri; 267 net_rateinfo ri;
235 268
236 ri.host = host; 269 ri.host = host;
237 ri.pcnt = 1.; 270 ri.pcnt = 1.;
238 ri.diff = NRL_MAXDIF; 271 ri.diff = NRL_MAXDIF;
239 ri.last = NOW; 272 ri.last = ev_now ();
240 273
241 push_front (ri); 274 push_front (ri);
242 275
243 return true; 276 return true;
244 } 277 }
… …
246 { 279 {
247 net_rateinfo ri (*i); 280 net_rateinfo ri (*i);
248 erase (i); 281 erase (i);
249 282
250 ri.pcnt = ri.pcnt * NRL_ALPHA; 283 ri.pcnt = ri.pcnt * NRL_ALPHA;
251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 284 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
252 285
253 ri.last = NOW; 286 ri.last = ev_now ();
254 287
255 double dif = ri.diff / ri.pcnt; 288 double dif = ri.diff / ri.pcnt;
256 289
257 bool send = dif > NRL_CUTOFF; 290 bool send = dif > NRL_CUTOFF;
258 291
… …
468 f |= FEATURE_COMPRESSION; 501 f |= FEATURE_COMPRESSION;
469#endif 502#endif
470#if ENABLE_ROHC 503#if ENABLE_ROHC
471 f |= FEATURE_ROHC; 504 f |= FEATURE_ROHC;
472#endif 505#endif
506#if ENABLE_BRIDGING
507 f |= FEATURE_BRIDGING;
508#endif
473 return f; 509 return f;
474 } 510 }
475}; 511};
476 512
477void config_packet::setup (ptype type, int dst) 513void config_packet::setup (ptype type, int dst)
478{ 514{
479 prot_major = PROTOCOL_MAJOR; 515 prot_major = PROTOCOL_MAJOR;
480 prot_minor = PROTOCOL_MINOR; 516 prot_minor = PROTOCOL_MINOR;
481 randsize = RAND_SIZE; 517 randsize = RAND_SIZE;
482 hmaclen = HMACLENGTH; 518 hmaclen = HMACLENGTH;
483 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 519 flags = 0;
484 challengelen = sizeof (rsachallenge); 520 challengelen = sizeof (rsachallenge);
485 features = get_features (); 521 features = get_features ();
486 522
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 523 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 524 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
498 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);
499 else if (randsize != RAND_SIZE) 535 else if (randsize != RAND_SIZE)
500 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);
501 else if (hmaclen != HMACLENGTH) 537 else if (hmaclen != HMACLENGTH)
502 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);
503#if 0 // this implementation should handle all flag settings
504 else if (flags != curflags ())
505 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
506#endif
507 else if (challengelen != sizeof (rsachallenge)) 539 else if (challengelen != sizeof (rsachallenge))
508 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));
509 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 541 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
510 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 542 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
511 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 543 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
587///////////////////////////////////////////////////////////////////////////// 619/////////////////////////////////////////////////////////////////////////////
588 620
589void 621void
590connection::connection_established () 622connection::connection_established ()
591{ 623{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
625
592 if (ictx && octx) 626 if (ictx && octx)
593 { 627 {
594 connectmode = conf->connectmode;
595
596 // make sure rekeying timeouts are slightly asymmetric 628 // make sure rekeying timeouts are slightly asymmetric
597 rekey.start (NOW + ::conf.rekey 629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
598 + (conf->id > THISNODE->id ? 10 : 0)); 630 rekey.start (rekey_interval, rekey_interval);
599 keepalive.start (NOW + ::conf.keepalive); 631 keepalive.start (::conf.keepalive);
600 632
601 // send queued packets 633 // send queued packets
602 if (ictx && octx) 634 if (ictx && octx)
603 { 635 {
604 while (tap_packet *p = (tap_packet *)data_queue.get ()) 636 while (tap_packet *p = (tap_packet *)data_queue.get ())
605 { 637 {
606 send_data_packet (p); 638 if (p->len) send_data_packet (p);
607 delete p; 639 delete p;
608 } 640 }
609 641
610 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 642 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
611 { 643 {
612 send_vpn_packet (p, si, IPTOS_RELIABILITY); 644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
613 delete p; 645 delete p;
614 } 646 }
615 } 647 }
616 } 648 }
617 else 649 else
618 { 650 {
619 retry_cnt = 0; 651 retry_cnt = 0;
620 establish_connection.start (NOW + 5); 652 establish_connection.start (5);
621 keepalive.stop (); 653 keepalive.stop ();
622 rekey.stop (); 654 rekey.stop ();
623 } 655 }
624} 656}
625 657
… …
631 // mask out protocols we cannot establish 663 // mask out protocols we cannot establish
632 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 664 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 665 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 666 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
635 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 }
675
636 si.set (conf, protocol); 676 si.set (conf, protocol);
637} 677}
638 678
639// ensure sockinfo is valid, forward if necessary 679// ensure sockinfo is valid, forward if necessary
640const sockinfo & 680const sockinfo &
… …
644 { 684 {
645 connection *r = vpn->find_router (); 685 connection *r = vpn->find_router ();
646 686
647 if (r) 687 if (r)
648 { 688 {
649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
650 conf->nodename, r->conf->nodename); 690 conf->nodename, r->conf->nodename, (const char *)r->si);
651 return r->si; 691 return r->si;
652 } 692 }
653 else 693 else
654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
655 conf->nodename); 695 conf->nodename);
… …
659} 699}
660 700
661void 701void
662connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 702connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
663{ 703{
664 bool ok; 704 if (!vpn->send_vpn_packet (pkt, si, tos))
665
666 switch (si.prot)
667 {
668 case PROT_IPv4:
669 ok = vpn->send_ipv4_packet (pkt, si, tos); break;
670 case PROT_UDPv4:
671 ok = vpn->send_udpv4_packet (pkt, si, tos); break;
672#if ENABLE_TCP
673 case PROT_TCPv4:
674 ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
675#endif
676#if ENABLE_ICMP
677 case PROT_ICMPv4:
678 ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
679#endif
680#if ENABLE_DNS
681 case PROT_DNSv4:
682 ok = send_dnsv4_packet (pkt, si, tos); break;
683#endif
684
685 default:
686 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
687 ok = false;
688 }
689
690 if (!ok)
691 reset_connection (); 705 reset_connection ();
692} 706}
693 707
694void 708void
695connection::send_ping (const sockinfo &si, u8 pong) 709connection::send_ping (const sockinfo &si, u8 pong)
… …
751} 765}
752 766
753void 767void
754connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
755{ 769{
756 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
757 conf->id, rid, (const char *)rsi); 771 conf->id, rid, (const char *)rsi);
758 772
759 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);
760 774
761 r->hmac_set (octx); 775 r->hmac_set (octx);
762 send_vpn_packet (r, si); 776 send_vpn_packet (r, si);
763 777
764 delete r; 778 delete r;
765} 779}
766 780
767void 781inline void
768connection::establish_connection_cb (time_watcher &w) 782connection::establish_connection_cb (ev::timer &w, int revents)
769{ 783{
770 if (!ictx 784 if (!ictx
771 && conf != THISNODE 785 && conf != THISNODE
772 && connectmode != conf_node::C_NEVER 786 && connectmode != conf_node::C_NEVER
773 && connectmode != conf_node::C_DISABLED 787 && connectmode != conf_node::C_DISABLED
774 && NOW > w.at) 788 && !w.is_active ())
775 { 789 {
776 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
777 791 // and stop trying. should probably be handled by a per-connection expire handler.
778 if (retry_int < conf->max_retry) 792 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
793 {
794 reset_connection ();
779 retry_cnt++; 795 return;
780 else 796 }
781 retry_int = conf->max_retry;
782 797
783 w.start (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));
784 803
785 reset_si (); 804 reset_si ();
786 805
806 bool slow = si.prot & PROT_SLOW;
807
787 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);
788 vpn->send_connect_request (conf->id); 813 vpn->send_connect_request (conf->id);
814 }
789 else 815 else
790 { 816 {
817 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
818
791 const sockinfo &dsi = forward_si (si); 819 const sockinfo &dsi = forward_si (si);
820
821 slow = slow || (dsi.prot & PROT_SLOW);
792 822
793 if (dsi.valid () && auth_rate_limiter.can (dsi)) 823 if (dsi.valid () && auth_rate_limiter.can (dsi))
794 { 824 {
795 if (retry_cnt < 4) 825 if (retry_cnt < 4)
796 send_auth_request (dsi, true); 826 send_auth_request (dsi, true);
797 else 827 else
798 send_ping (dsi, 0); 828 send_ping (dsi, 0);
799 } 829 }
800 } 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);
801 } 840 }
802} 841}
803 842
804void 843void
805connection::reset_connection () 844connection::reset_connection ()
… …
808 { 847 {
809 slog (L_INFO, _("%s(%s): connection lost"), 848 slog (L_INFO, _("%s(%s): connection lost"),
810 conf->nodename, (const char *)si); 849 conf->nodename, (const char *)si);
811 850
812 if (::conf.script_node_down) 851 if (::conf.script_node_down)
813 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 }
814 } 858 }
815 859
816 delete ictx; ictx = 0; 860 delete ictx; ictx = 0;
817 delete octx; octx = 0; 861 delete octx; octx = 0;
818#if ENABLE_DNS 862#if ENABLE_DNS
… …
836 send_reset (si); 880 send_reset (si);
837 881
838 reset_connection (); 882 reset_connection ();
839} 883}
840 884
841void 885inline void
842connection::rekey_cb (time_watcher &w) 886connection::rekey_cb (ev::timer &w, int revents)
843{ 887{
844 reset_connection (); 888 reset_connection ();
845 establish_connection (); 889 establish_connection ();
846} 890}
847 891
… …
863 if (oseqno > MAX_SEQNO) 907 if (oseqno > MAX_SEQNO)
864 rekey (); 908 rekey ();
865} 909}
866 910
867void 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
868connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 922connection::inject_data_packet (tap_packet *pkt)
869{ 923{
870 if (ictx && octx) 924 if (ictx && octx)
871 send_data_packet (pkt); 925 send_data_packet (pkt);
872 else 926 else
873 { 927 {
874 if (!broadcast)//DDDD
875 data_queue.put (new tap_packet (*pkt)); 928 data_queue.put (new tap_packet (*pkt));
876 929 post_inject_queue ();
877 establish_connection ();
878 } 930 }
879} 931}
880 932
881void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 933void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
882{ 934{
883 if (ictx && octx) 935 if (ictx && octx)
884 send_vpn_packet (pkt, si, tos); 936 send_vpn_packet (pkt, si, tos);
885 else 937 else
886 { 938 {
887 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 939 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
888 940 post_inject_queue ();
889 establish_connection ();
890 } 941 }
891} 942}
892 943
893void 944void
894connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 945connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
895{ 946{
896 last_activity = NOW; 947 last_activity = ev_now ();
897 948
898 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",
899 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;
900 954
901 switch (pkt->typ ()) 955 switch (pkt->typ ())
902 { 956 {
903 case vpn_packet::PT_PING: 957 case vpn_packet::PT_PING:
904 // we send pings instead of auth packets after some retries, 958 // we send pings instead of auth packets after some retries,
… …
964 delete octx; 1018 delete octx;
965 1019
966 octx = new crypto_ctx (k, 1); 1020 octx = new crypto_ctx (k, 1);
967 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1021 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
968 1022
969 // compatibility code, remove when no longer required
970 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
971
972 conf->protocols = p->protocols; 1023 conf->protocols = p->protocols;
973 features = p->features & config_packet::get_features (); 1024 features = p->features & config_packet::get_features ();
974 1025
975 send_auth_response (rsi, p->id, k); 1026 send_auth_response (rsi, p->id, k);
976 1027
… …
1042 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1093 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1043 conf->nodename, (const char *)rsi, 1094 conf->nodename, (const char *)rsi,
1044 p->prot_major, p->prot_minor); 1095 p->prot_major, p->prot_minor);
1045 1096
1046 if (::conf.script_node_up) 1097 if (::conf.script_node_up)
1047 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 }
1048 1104
1049 break; 1105 break;
1050 } 1106 }
1051 else 1107 else
1052 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"),
… …
1086 { 1142 {
1087 vpn->tap->send (d); 1143 vpn->tap->send (d);
1088 1144
1089 if (si != rsi) 1145 if (si != rsi)
1090 { 1146 {
1091 // fast re-sync on connection changes, useful especially for tcp/ip 1147 // fast re-sync on source address changes, useful especially for tcp/ip
1092 si = rsi; 1148 si = rsi;
1093 1149
1094 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1150 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1095 conf->nodename, (const char *)si, (const char *)rsi); 1151 conf->nodename, (const char *)si, (const char *)rsi);
1096 } 1152 }
… …
1107 case vpn_packet::PT_CONNECT_REQ: 1163 case vpn_packet::PT_CONNECT_REQ:
1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1164 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1109 { 1165 {
1110 connect_req_packet *p = (connect_req_packet *) pkt; 1166 connect_req_packet *p = (connect_req_packet *) pkt;
1111 1167
1112 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 ())
1113 connection *c = vpn->conns[p->id - 1];
1114 conf->protocols = p->protocols;
1115
1116 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1117 conf->id, p->id, c->ictx && c->octx);
1118
1119 if (c->ictx && c->octx)
1120 { 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 {
1121 // send connect_info packets to both sides, in case one is 1178 // send connect_info packets to both sides, in case one is
1122 // behind a nat firewall (or both ;) 1179 // behind a nat firewall (or both ;)
1123 c->send_connect_info (conf->id, si, conf->protocols); 1180 c->send_connect_info (conf->id, si, conf->protocols);
1124 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 ();
1125 } 1185 }
1126 else 1186 else
1127 c->establish_connection (); 1187 slog (L_WARN,
1188 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1189 p->id);
1128 } 1190 }
1129 1191
1130 break; 1192 break;
1131 1193
1132 case vpn_packet::PT_CONNECT_INFO: 1194 case vpn_packet::PT_CONNECT_INFO:
1133 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1195 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1134 { 1196 {
1135 connect_info_packet *p = (connect_info_packet *)pkt; 1197 connect_info_packet *p = (connect_info_packet *)pkt;
1136 1198
1137 if (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 ())
1138 { 1200 {
1139 connection *c = vpn->conns[p->id - 1]; 1201 connection *c = vpn->conns[p->id - 1];
1140 1202
1141 c->conf->protocols = p->protocols; 1203 c->conf->protocols = p->protocols;
1142 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));
… …
1148 const sockinfo &dsi = forward_si (p->si); 1210 const sockinfo &dsi = forward_si (p->si);
1149 1211
1150 if (dsi.valid ()) 1212 if (dsi.valid ())
1151 c->send_auth_request (dsi, true); 1213 c->send_auth_request (dsi, true);
1152 } 1214 }
1215 else
1216 slog (L_WARN,
1217 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1218 p->id);
1153 } 1219 }
1154 1220
1155 break; 1221 break;
1156 1222
1157 default: 1223 default:
1158 send_reset (rsi); 1224 send_reset (rsi);
1159 break; 1225 break;
1160 } 1226 }
1161} 1227}
1162 1228
1163void connection::keepalive_cb (time_watcher &w) 1229inline void
1230connection::keepalive_cb (ev::timer &w, int revents)
1164{ 1231{
1165 if (NOW >= last_activity + ::conf.keepalive + 30) 1232 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1166 { 1233 {
1167 reset_connection (); 1234 reset_connection ();
1168 establish_connection (); 1235 establish_connection ();
1169 } 1236 }
1170 else if (NOW < last_activity + ::conf.keepalive) 1237 else if (ev_now () < last_activity + ::conf.keepalive)
1171 w.start (last_activity + ::conf.keepalive); 1238 w.start (last_activity + ::conf.keepalive - ev::now ());
1172 else if (conf->connectmode != conf_node::C_ONDEMAND 1239 else if (conf->connectmode != conf_node::C_ONDEMAND
1173 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1240 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1174 { 1241 {
1175 send_ping (si); 1242 send_ping (si);
1176 w.start (NOW + 5); 1243 w.start (5);
1177 } 1244 }
1178 else if (NOW < last_activity + ::conf.keepalive + 10) 1245 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1179 // hold ondemand connections implicitly a few seconds longer 1246 // hold ondemand connections implicitly a few seconds longer
1180 // should delete octx, though, or something like that ;) 1247 // should delete octx, though, or something like that ;)
1181 w.start (last_activity + ::conf.keepalive + 10); 1248 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1182 else 1249 else
1183 reset_connection (); 1250 reset_connection ();
1184} 1251}
1185 1252
1186void connection::send_connect_request (int id) 1253void connection::send_connect_request (int id)
… …
1192 send_vpn_packet (p, si); 1259 send_vpn_packet (p, si);
1193 1260
1194 delete p; 1261 delete p;
1195} 1262}
1196 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
1197void connection::script_node () 1274void connection::script_init_connect_env ()
1198{ 1275{
1199 vpn->script_if_up (); 1276 vpn->script_init_env ();
1200 1277
1201 char *env; 1278 char *env;
1202 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1279 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1203 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1280 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1204 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1281 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1205 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1282 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1206} 1283}
1207 1284
1285inline const char *
1208const char *connection::script_node_up () 1286connection::script_node_up ()
1209{ 1287{
1210 script_node (); 1288 script_init_connect_env ();
1211 1289
1212 putenv ("STATE=up"); 1290 putenv ((char *)"STATE=up");
1213 1291
1292 char *filename;
1293 asprintf (&filename,
1294 "%s/%s",
1295 confbase,
1214 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1296 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1215}
1216 1297
1298 return filename;
1299}
1300
1301inline const char *
1217const char *connection::script_node_down () 1302connection::script_node_down ()
1218{ 1303{
1219 script_node (); 1304 script_init_connect_env ();
1220 1305
1221 putenv ("STATE=down"); 1306 putenv ((char *)"STATE=down");
1222 1307
1223 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1308 char *filename;
1309 asprintf (&filename,
1310 "%s/%s",
1311 confbase,
1312 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1313
1314 return filename;
1224} 1315}
1225 1316
1226connection::connection (struct vpn *vpn, conf_node *conf) 1317connection::connection (struct vpn *vpn, conf_node *conf)
1227: vpn(vpn), conf(conf) 1318: vpn(vpn), conf(conf),
1228, rekey (this, &connection::rekey_cb)
1229, keepalive (this, &connection::keepalive_cb)
1230, establish_connection (this, &connection::establish_connection_cb)
1231#if ENABLE_DNS 1319#if ENABLE_DNS
1232, dns (0) 1320 dns (0),
1233#endif 1321#endif
1322 data_queue(conf->max_ttl, conf->max_queue),
1323 vpn_queue(conf->max_ttl, conf->max_queue)
1234{ 1324{
1325 rekey .set<connection, &connection::rekey_cb > (this);
1326 keepalive .set<connection, &connection::keepalive_cb > (this);
1327 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1328
1329 last_establish_attempt = 0.;
1235 octx = ictx = 0; 1330 octx = ictx = 0;
1236 retry_cnt = 0;
1237 1331
1238 if (!conf->protocols) // make sure some protocol is enabled 1332 if (!conf->protocols) // make sure some protocol is enabled
1239 conf->protocols = PROT_UDPv4; 1333 conf->protocols = PROT_UDPv4;
1240 1334
1241 connectmode = conf_node::C_ALWAYS; // initial setting 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
1242 reset_connection (); 1341 reset_connection ();
1243} 1342}
1244 1343
1245connection::~connection () 1344connection::~connection ()
1246{ 1345{

Diff Legend

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