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.55 by pcg, Tue Apr 26 00:55:56 2005 UTC vs.
Revision 1.61 by pcg, Sat Nov 10 19:43:37 2007 UTC

… …
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 23
24#include <cassert>
25
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>
… …
92 rsachallenge chg; 90 rsachallenge chg;
93}; 91};
94 92
95struct rsa_cache : list<rsa_entry> 93struct rsa_cache : list<rsa_entry>
96{ 94{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 95 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 96
99 bool find (const rsaid &id, rsachallenge &chg) 97 bool find (const rsaid &id, rsachallenge &chg)
100 { 98 {
101 for (iterator i = begin (); i != end (); ++i) 99 for (iterator i = begin (); i != end (); ++i)
102 { 100 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 101 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev::ev_now ())
104 { 102 {
105 memcpy (&chg, &i->chg, sizeof chg); 103 memcpy (&chg, &i->chg, sizeof chg);
106 104
107 erase (i); 105 erase (i);
108 return true; 106 return true;
109 } 107 }
110 } 108 }
111 109
112 if (cleaner.at < NOW) 110 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 111 cleaner.again ();
114 112
115 return false; 113 return false;
116 } 114 }
117 115
118 void gen (rsaid &id, rsachallenge &chg) 116 void gen (rsaid &id, rsachallenge &chg)
… …
120 rsa_entry e; 118 rsa_entry e;
121 119
122 RAND_bytes ((unsigned char *)&id, sizeof id); 120 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 121 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 122
125 e.expire = NOW + RSA_TTL; 123 e.expire = ev::ev_now () + RSA_TTL;
126 e.id = id; 124 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 125 memcpy (&e.chg, &chg, sizeof chg);
128 126
129 push_back (e); 127 push_back (e);
130 128
131 if (cleaner.at < NOW) 129 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 130 cleaner.again ();
133 } 131 }
134 132
135 rsa_cache () 133 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 134 : cleaner (this, &rsa_cache::cleaner_cb)
137 { } 135 {
136 cleaner.set (RSA_TTL, RSA_TTL);
137 }
138 138
139} rsa_cache; 139} rsa_cache;
140 140
141void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 142{
143 if (!empty ()) 143 if (empty ())
144 w.stop ();
145 else
144 { 146 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
148 if (i->expire <= NOW) 148 if (i->expire <= ev::ev_now ())
149 i = erase (i); 149 i = erase (i);
150 else 150 else
151 ++i; 151 ++i;
152 } 152 }
153} 153}
… …
220 iterator i; 220 iterator i;
221 221
222 for (i = begin (); i != end (); ) 222 for (i = begin (); i != end (); )
223 if (i->host == host) 223 if (i->host == host)
224 break; 224 break;
225 else if (i->last < NOW - NRL_EXPIRE) 225 else if (i->last < ev::ev_now () - NRL_EXPIRE)
226 i = erase (i); 226 i = erase (i);
227 else 227 else
228 i++; 228 i++;
229 229
230 if (i == end ()) 230 if (i == end ())
… …
232 net_rateinfo ri; 232 net_rateinfo ri;
233 233
234 ri.host = host; 234 ri.host = host;
235 ri.pcnt = 1.; 235 ri.pcnt = 1.;
236 ri.diff = NRL_MAXDIF; 236 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 237 ri.last = ev::ev_now ();
238 238
239 push_front (ri); 239 push_front (ri);
240 240
241 return true; 241 return true;
242 } 242 }
… …
244 { 244 {
245 net_rateinfo ri (*i); 245 net_rateinfo ri (*i);
246 erase (i); 246 erase (i);
247 247
248 ri.pcnt = ri.pcnt * NRL_ALPHA; 248 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last);
250 250
251 ri.last = NOW; 251 ri.last = ev::ev_now ();
252 252
253 double dif = ri.diff / ri.pcnt; 253 double dif = ri.diff / ri.pcnt;
254 254
255 bool send = dif > NRL_CUTOFF; 255 bool send = dif > NRL_CUTOFF;
256 256
… …
465#if ENABLE_COMPRESSION 465#if ENABLE_COMPRESSION
466 f |= FEATURE_COMPRESSION; 466 f |= FEATURE_COMPRESSION;
467#endif 467#endif
468#if ENABLE_ROHC 468#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 469 f |= FEATURE_ROHC;
470#endif
471#if ENABLE_BRIDGING
472 f |= FEATURE_BRIDGING;
470#endif 473#endif
471 return f; 474 return f;
472 } 475 }
473}; 476};
474 477
… …
581///////////////////////////////////////////////////////////////////////////// 584/////////////////////////////////////////////////////////////////////////////
582 585
583void 586void
584connection::connection_established () 587connection::connection_established ()
585{ 588{
589 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
590
586 if (ictx && octx) 591 if (ictx && octx)
587 { 592 {
588 connectmode = conf->connectmode; 593 connectmode = conf->connectmode;
589 594
590 // make sure rekeying timeouts are slightly asymmetric 595 // make sure rekeying timeouts are slightly asymmetric
591 rekey.start (NOW + ::conf.rekey 596 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
592 + (conf->id > THISNODE->id ? 10 : 0)); 597 rekey.start (rekey_interval, rekey_interval);
593 keepalive.start (NOW + ::conf.keepalive); 598 keepalive.start (::conf.keepalive);
594 599
595 // send queued packets 600 // send queued packets
596 if (ictx && octx) 601 if (ictx && octx)
597 { 602 {
598 while (tap_packet *p = (tap_packet *)data_queue.get ()) 603 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
609 } 614 }
610 } 615 }
611 else 616 else
612 { 617 {
613 retry_cnt = 0; 618 retry_cnt = 0;
614 establish_connection.start (NOW + 5); 619 establish_connection.start (5);
615 keepalive.stop (); 620 keepalive.stop ();
616 rekey.stop (); 621 rekey.stop ();
617 } 622 }
618} 623}
619 624
… …
624 629
625 // mask out protocols we cannot establish 630 // mask out protocols we cannot establish
626 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 631 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
627 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 632 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
628 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 633 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
634
635 if (protocol
636 && (!conf->can_direct (THISNODE)
637 || !THISNODE->can_direct (conf)))
638 {
639 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
640 protocol = 0;
641 }
629 642
630 si.set (conf, protocol); 643 si.set (conf, protocol);
631} 644}
632 645
633// ensure sockinfo is valid, forward if necessary 646// ensure sockinfo is valid, forward if necessary
… …
719} 732}
720 733
721void 734void
722connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 735connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
723{ 736{
724 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 737 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
725 conf->id, rid, (const char *)rsi); 738 conf->id, rid, (const char *)rsi);
726 739
727 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 740 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
728 741
729 r->hmac_set (octx); 742 r->hmac_set (octx);
… …
731 744
732 delete r; 745 delete r;
733} 746}
734 747
735void 748void
736connection::establish_connection_cb (time_watcher &w) 749connection::establish_connection_cb (ev::timer &w, int revents)
737{ 750{
738 if (!ictx 751 if (!ictx
739 && conf != THISNODE 752 && conf != THISNODE
740 && connectmode != conf_node::C_NEVER 753 && connectmode != conf_node::C_NEVER
741 && connectmode != conf_node::C_DISABLED 754 && connectmode != conf_node::C_DISABLED
742 && NOW > w.at) 755 && !w.is_active ())
743 { 756 {
744 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion 757 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
745
746 double retry_int = double (retry_cnt & 3
747 ? (retry_cnt & 3) + 1 758 ? (retry_cnt & 3) + 1
748 : 1 << (retry_cnt >> 2)); 759 : 1 << (retry_cnt >> 2));
749 760
750 reset_si (); 761 reset_si ();
751 762
752 bool slow = si.prot & PROT_SLOW; 763 bool slow = si.prot & PROT_SLOW;
753 764
754 if (si.prot && !si.host) 765 if (si.prot && !si.host)
766 {
767 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
768 /*TODO*/ /* start the timer so we don't recurse endlessly */
769 w.start (1);
755 vpn->send_connect_request (conf->id); 770 vpn->send_connect_request (conf->id);
771 }
756 else 772 else
757 { 773 {
774 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
775
758 const sockinfo &dsi = forward_si (si); 776 const sockinfo &dsi = forward_si (si);
759 777
760 slow = slow || (dsi.prot & PROT_SLOW); 778 slow = slow || (dsi.prot & PROT_SLOW);
761 779
762 if (dsi.valid () && auth_rate_limiter.can (dsi)) 780 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
773 if (retry_int < conf->max_retry) 791 if (retry_int < conf->max_retry)
774 retry_cnt++; 792 retry_cnt++;
775 else 793 else
776 retry_int = conf->max_retry; 794 retry_int = conf->max_retry;
777 795
778 w.start (NOW + retry_int); 796 w.start (retry_int);
779 } 797 }
780} 798}
781 799
782void 800void
783connection::reset_connection () 801connection::reset_connection ()
… …
816 834
817 reset_connection (); 835 reset_connection ();
818} 836}
819 837
820void 838void
821connection::rekey_cb (time_watcher &w) 839connection::rekey_cb (ev::timer &w, int revents)
822{ 840{
823 reset_connection (); 841 reset_connection ();
824 establish_connection (); 842 establish_connection ();
825} 843}
826 844
… …
848{ 866{
849 if (ictx && octx) 867 if (ictx && octx)
850 send_data_packet (pkt); 868 send_data_packet (pkt);
851 else 869 else
852 { 870 {
853 if (!broadcast)//DDDD 871 if (!broadcast)
854 data_queue.put (new tap_packet (*pkt)); 872 data_queue.put (new tap_packet (*pkt));
855 873
856 establish_connection (); 874 establish_connection ();
857 } 875 }
858} 876}
… …
870} 888}
871 889
872void 890void
873connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 891connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
874{ 892{
875 last_activity = NOW; 893 last_activity = ev::ev_now ();
876 894
877 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 895 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
878 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 896 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
897
898 if (connectmode == conf_node::C_DISABLED)
899 return;
879 900
880 switch (pkt->typ ()) 901 switch (pkt->typ ())
881 { 902 {
882 case vpn_packet::PT_PING: 903 case vpn_packet::PT_PING:
883 // we send pings instead of auth packets after some retries, 904 // we send pings instead of auth packets after some retries,
… …
1063 { 1084 {
1064 vpn->tap->send (d); 1085 vpn->tap->send (d);
1065 1086
1066 if (si != rsi) 1087 if (si != rsi)
1067 { 1088 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1089 // fast re-sync on source address changes, useful especially for tcp/ip
1069 si = rsi; 1090 si = rsi;
1070 1091
1071 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1092 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1072 conf->nodename, (const char *)si, (const char *)rsi); 1093 conf->nodename, (const char *)si, (const char *)rsi);
1073 } 1094 }
… …
1084 case vpn_packet::PT_CONNECT_REQ: 1105 case vpn_packet::PT_CONNECT_REQ:
1085 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1106 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1086 { 1107 {
1087 connect_req_packet *p = (connect_req_packet *) pkt; 1108 connect_req_packet *p = (connect_req_packet *) pkt;
1088 1109
1089 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1110 if (p->id > 0 && p->id <= vpn->conns.size ())
1090 connection *c = vpn->conns[p->id - 1];
1091 conf->protocols = p->protocols;
1092
1093 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1094 conf->id, p->id, c->ictx && c->octx);
1095
1096 if (c->ictx && c->octx)
1097 { 1111 {
1112 connection *c = vpn->conns[p->id - 1];
1113 conf->protocols = p->protocols;
1114
1115 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1116 conf->id, p->id, c->ictx && c->octx);
1117
1118 if (c->ictx && c->octx)
1119 {
1098 // send connect_info packets to both sides, in case one is 1120 // send connect_info packets to both sides, in case one is
1099 // behind a nat firewall (or both ;) 1121 // behind a nat firewall (or both ;)
1100 c->send_connect_info (conf->id, si, conf->protocols); 1122 c->send_connect_info (conf->id, si, conf->protocols);
1101 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1123 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1124 }
1125 else
1126 c->establish_connection ();
1102 } 1127 }
1103 else 1128 else
1104 c->establish_connection (); 1129 slog (L_WARN,
1130 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1131 p->id);
1105 } 1132 }
1106 1133
1107 break; 1134 break;
1108 1135
1109 case vpn_packet::PT_CONNECT_INFO: 1136 case vpn_packet::PT_CONNECT_INFO:
1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1137 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1111 { 1138 {
1112 connect_info_packet *p = (connect_info_packet *)pkt; 1139 connect_info_packet *p = (connect_info_packet *)pkt;
1113 1140
1114 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1141 if (p->id > 0 && p->id <= vpn->conns.size ())
1115 { 1142 {
1116 connection *c = vpn->conns[p->id - 1]; 1143 connection *c = vpn->conns[p->id - 1];
1117 1144
1118 c->conf->protocols = p->protocols; 1145 c->conf->protocols = p->protocols;
1119 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1146 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
… …
1125 const sockinfo &dsi = forward_si (p->si); 1152 const sockinfo &dsi = forward_si (p->si);
1126 1153
1127 if (dsi.valid ()) 1154 if (dsi.valid ())
1128 c->send_auth_request (dsi, true); 1155 c->send_auth_request (dsi, true);
1129 } 1156 }
1157 else
1158 slog (L_WARN,
1159 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1160 p->id);
1130 } 1161 }
1131 1162
1132 break; 1163 break;
1133 1164
1134 default: 1165 default:
1135 send_reset (rsi); 1166 send_reset (rsi);
1136 break; 1167 break;
1137 } 1168 }
1138} 1169}
1139 1170
1140void connection::keepalive_cb (time_watcher &w) 1171void connection::keepalive_cb (ev::timer &w, int revents)
1141{ 1172{
1142 if (NOW >= last_activity + ::conf.keepalive + 30) 1173 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30)
1143 { 1174 {
1144 reset_connection (); 1175 reset_connection ();
1145 establish_connection (); 1176 establish_connection ();
1146 } 1177 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1178 else if (ev::ev_now () < last_activity + ::conf.keepalive)
1148 w.start (last_activity + ::conf.keepalive); 1179 w.start (last_activity + ::conf.keepalive - ev::now ());
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1180 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1181 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1182 {
1152 send_ping (si); 1183 send_ping (si);
1153 w.start (NOW + 5); 1184 w.start (5);
1154 } 1185 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1186 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1187 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1188 // should delete octx, though, or something like that ;)
1158 w.start (last_activity + ::conf.keepalive + 10); 1189 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1159 else 1190 else
1160 reset_connection (); 1191 reset_connection ();
1161} 1192}
1162 1193
1163void connection::send_connect_request (int id) 1194void connection::send_connect_request (int id)
… …
1194 1225
1195const char *connection::script_node_up () 1226const char *connection::script_node_up ()
1196{ 1227{
1197 script_init_connect_env (); 1228 script_init_connect_env ();
1198 1229
1199 putenv ("STATE=up"); 1230 putenv ((char *)"STATE=up");
1200 1231
1201 char *filename; 1232 char *filename;
1202 asprintf (&filename, 1233 asprintf (&filename,
1203 "%s/%s", 1234 "%s/%s",
1204 confbase, 1235 confbase,
… …
1209 1240
1210const char *connection::script_node_down () 1241const char *connection::script_node_down ()
1211{ 1242{
1212 script_init_connect_env (); 1243 script_init_connect_env ();
1213 1244
1214 putenv ("STATE=down"); 1245 putenv ((char *)"STATE=down");
1215 1246
1216 char *filename; 1247 char *filename;
1217 asprintf (&filename, 1248 asprintf (&filename,
1218 "%s/%s", 1249 "%s/%s",
1219 confbase, 1250 confbase,

Diff Legend

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