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.60 by pcg, Sat Nov 10 05:14:22 2007 UTC vs.
Revision 1.67 by pcg, Thu Aug 7 16:34:21 2008 UTC

… …
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
85} 85}
86 86
87struct rsa_entry { 87struct rsa_entry
88{
88 tstamp expire; 89 tstamp expire;
89 rsaid id; 90 rsaid id;
90 rsachallenge chg; 91 rsachallenge chg;
91}; 92};
92 93
93struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
94{ 95{
95 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
96 97
97 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
98 { 99 {
99 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
100 { 101 {
101 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev::ev_now ()) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
102 { 103 {
103 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
104 105
105 erase (i); 106 erase (i);
106 return true; 107 return true;
… …
118 rsa_entry e; 119 rsa_entry e;
119 120
120 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
121 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
122 123
123 e.expire = ev::ev_now () + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
124 e.id = id; 125 e.id = id;
125 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
126 127
127 push_back (e); 128 push_back (e);
128 129
129 if (!cleaner.is_active ()) 130 if (!cleaner.is_active ())
130 cleaner.again (); 131 cleaner.again ();
131 } 132 }
132 133
133 rsa_cache () 134 rsa_cache ()
134 : cleaner (this, &rsa_cache::cleaner_cb)
135 { 135 {
136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
136 cleaner.set (RSA_TTL, RSA_TTL); 137 cleaner.set (RSA_TTL, RSA_TTL);
137 } 138 }
138 139
139} rsa_cache; 140} rsa_cache;
140 141
… …
143 if (empty ()) 144 if (empty ())
144 w.stop (); 145 w.stop ();
145 else 146 else
146 { 147 {
147 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
148 if (i->expire <= ev::ev_now ()) 149 if (i->expire <= ev_now ())
149 i = erase (i); 150 i = erase (i);
150 else 151 else
151 ++i; 152 ++i;
152 } 153 }
153} 154}
154 155
155////////////////////////////////////////////////////////////////////////////// 156//////////////////////////////////////////////////////////////////////////////
156 157
157void 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)
158{ 160{
159 if (queue[i]) 161 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 162
165 queue[i] = p;
166
167 i = (i + 1) % QUEUEDEPTH;
168}
169
170net_packet *pkt_queue::get ()
171{
172 net_packet *p = queue[j];
173
174 if (p)
175 {
176 queue[j] = 0;
177 j = (j + 1) % QUEUEDEPTH;
178 }
179
180 return p;
181}
182
183pkt_queue::pkt_queue ()
184{
185 memset (queue, 0, sizeof (queue));
186 i = 0; 163 i = 0;
187 j = 0; 164 j = 0;
165
166 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 167}
189 168
190pkt_queue::~pkt_queue () 169pkt_queue::~pkt_queue ()
191{ 170{
192 for (i = QUEUEDEPTH; --i > 0; ) 171 while (net_packet *p = get ())
172 delete p;
173
193 delete queue[i]; 174 delete [] queue;
194} 175}
195 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
196struct net_rateinfo { 230struct net_rateinfo
231{
197 u32 host; 232 u32 host;
198 double pcnt, diff; 233 double pcnt, diff;
199 tstamp last; 234 tstamp last;
200}; 235};
201 236
… …
220 iterator i; 255 iterator i;
221 256
222 for (i = begin (); i != end (); ) 257 for (i = begin (); i != end (); )
223 if (i->host == host) 258 if (i->host == host)
224 break; 259 break;
225 else if (i->last < ev::ev_now () - NRL_EXPIRE) 260 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 261 i = erase (i);
227 else 262 else
228 i++; 263 i++;
229 264
230 if (i == end ()) 265 if (i == end ())
… …
232 net_rateinfo ri; 267 net_rateinfo ri;
233 268
234 ri.host = host; 269 ri.host = host;
235 ri.pcnt = 1.; 270 ri.pcnt = 1.;
236 ri.diff = NRL_MAXDIF; 271 ri.diff = NRL_MAXDIF;
237 ri.last = ev::ev_now (); 272 ri.last = ev_now ();
238 273
239 push_front (ri); 274 push_front (ri);
240 275
241 return true; 276 return true;
242 } 277 }
… …
244 { 279 {
245 net_rateinfo ri (*i); 280 net_rateinfo ri (*i);
246 erase (i); 281 erase (i);
247 282
248 ri.pcnt = ri.pcnt * NRL_ALPHA; 283 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last); 284 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 285
251 ri.last = ev::ev_now (); 286 ri.last = ev_now ();
252 287
253 double dif = ri.diff / ri.pcnt; 288 double dif = ri.diff / ri.pcnt;
254 289
255 bool send = dif > NRL_CUTOFF; 290 bool send = dif > NRL_CUTOFF;
256 291
… …
584///////////////////////////////////////////////////////////////////////////// 619/////////////////////////////////////////////////////////////////////////////
585 620
586void 621void
587connection::connection_established () 622connection::connection_established ()
588{ 623{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
625
589 if (ictx && octx) 626 if (ictx && octx)
590 { 627 {
591 connectmode = conf->connectmode;
592
593 // make sure rekeying timeouts are slightly asymmetric 628 // make sure rekeying timeouts are slightly asymmetric
594 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
595 rekey.start (rekey_interval, rekey_interval); 630 rekey.start (rekey_interval, rekey_interval);
596 keepalive.start (::conf.keepalive); 631 keepalive.start (::conf.keepalive);
597 632
598 // send queued packets 633 // send queued packets
599 if (ictx && octx) 634 if (ictx && octx)
600 { 635 {
601 while (tap_packet *p = (tap_packet *)data_queue.get ()) 636 while (tap_packet *p = (tap_packet *)data_queue.get ())
602 { 637 {
603 send_data_packet (p); 638 if (p->len) send_data_packet (p);
604 delete p; 639 delete p;
605 } 640 }
606 641
607 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 642 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
608 { 643 {
609 send_vpn_packet (p, si, IPTOS_RELIABILITY); 644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
610 delete p; 645 delete p;
611 } 646 }
612 } 647 }
613 } 648 }
614 else 649 else
… …
741 send_vpn_packet (r, si); 776 send_vpn_packet (r, si);
742 777
743 delete r; 778 delete r;
744} 779}
745 780
746void 781inline void
747connection::establish_connection_cb (ev::timer &w, int revents) 782connection::establish_connection_cb (ev::timer &w, int revents)
748{ 783{
749 if (!ictx 784 if (!ictx
750 && conf != THISNODE 785 && conf != THISNODE
751 && connectmode != conf_node::C_NEVER 786 && connectmode != conf_node::C_NEVER
752 && connectmode != conf_node::C_DISABLED 787 && connectmode != conf_node::C_DISABLED
753 && !w.is_active ()) 788 && !w.is_active ())
754 { 789 {
790 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
791 // and stop trying. should probably be handled by a per-connection expire handler.
792 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
793 {
794 reset_connection ();
795 return;
796 }
797
755 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
756 ? (retry_cnt & 3) + 1 799 ? (retry_cnt & 3) + 1
757 : 1 << (retry_cnt >> 2)); 800 : 1 << (retry_cnt >> 2));
758 801
759 reset_si (); 802 reset_si ();
760 803
761 bool slow = si.prot & PROT_SLOW; 804 bool slow = si.prot & PROT_SLOW;
762 805
763 if (si.prot && !si.host) 806 if (si.prot && !si.host)
764 { 807 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
765 /*TODO*/ /* start the timer so we don't recurse endlessly */ 809 /*TODO*/ /* start the timer so we don't recurse endlessly */
766 w.start (1); 810 w.start (1);
767 vpn->send_connect_request (conf->id); 811 vpn->send_connect_request (conf->id);
768 } 812 }
769 else 813 else
770 { 814 {
815 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
816
771 const sockinfo &dsi = forward_si (si); 817 const sockinfo &dsi = forward_si (si);
772 818
773 slow = slow || (dsi.prot & PROT_SLOW); 819 slow = slow || (dsi.prot & PROT_SLOW);
774 820
775 if (dsi.valid () && auth_rate_limiter.can (dsi)) 821 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
799 { 845 {
800 slog (L_INFO, _("%s(%s): connection lost"), 846 slog (L_INFO, _("%s(%s): connection lost"),
801 conf->nodename, (const char *)si); 847 conf->nodename, (const char *)si);
802 848
803 if (::conf.script_node_down) 849 if (::conf.script_node_down)
804 if (!run_script (run_script_cb (this, &connection::script_node_down), false)) 850 {
851 run_script_cb cb;
852 cb.set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
805 slog (L_WARN, _("node-down command execution failed, continuing.")); 854 slog (L_WARN, _("node-down command execution failed, continuing."));
855 }
806 } 856 }
807 857
808 delete ictx; ictx = 0; 858 delete ictx; ictx = 0;
809 delete octx; octx = 0; 859 delete octx; octx = 0;
810#if ENABLE_DNS 860#if ENABLE_DNS
… …
828 send_reset (si); 878 send_reset (si);
829 879
830 reset_connection (); 880 reset_connection ();
831} 881}
832 882
833void 883inline void
834connection::rekey_cb (ev::timer &w, int revents) 884connection::rekey_cb (ev::timer &w, int revents)
835{ 885{
836 reset_connection (); 886 reset_connection ();
837 establish_connection (); 887 establish_connection ();
838} 888}
… …
883} 933}
884 934
885void 935void
886connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
887{ 937{
888 last_activity = ev::ev_now (); 938 last_activity = ev_now ();
889 939
890 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 940 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
891 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 941 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
942
943 if (connectmode == conf_node::C_DISABLED)
944 return;
892 945
893 switch (pkt->typ ()) 946 switch (pkt->typ ())
894 { 947 {
895 case vpn_packet::PT_PING: 948 case vpn_packet::PT_PING:
896 // we send pings instead of auth packets after some retries, 949 // we send pings instead of auth packets after some retries,
… …
1031 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1084 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1032 conf->nodename, (const char *)rsi, 1085 conf->nodename, (const char *)rsi,
1033 p->prot_major, p->prot_minor); 1086 p->prot_major, p->prot_minor);
1034 1087
1035 if (::conf.script_node_up) 1088 if (::conf.script_node_up)
1036 if (!run_script (run_script_cb (this, &connection::script_node_up), false)) 1089 {
1090 run_script_cb cb;
1091 cb.set<connection, &connection::script_node_up> (this);
1092 if (!run_script (cb, false))
1037 slog (L_WARN, _("node-up command execution failed, continuing.")); 1093 slog (L_WARN, _("node-up command execution failed, continuing."));
1094 }
1038 1095
1039 break; 1096 break;
1040 } 1097 }
1041 else 1098 else
1042 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1099 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1158 send_reset (rsi); 1215 send_reset (rsi);
1159 break; 1216 break;
1160 } 1217 }
1161} 1218}
1162 1219
1220inline void
1163void connection::keepalive_cb (ev::timer &w, int revents) 1221connection::keepalive_cb (ev::timer &w, int revents)
1164{ 1222{
1165 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30) 1223 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1166 { 1224 {
1167 reset_connection (); 1225 reset_connection ();
1168 establish_connection (); 1226 establish_connection ();
1169 } 1227 }
1170 else if (ev::ev_now () < last_activity + ::conf.keepalive) 1228 else if (ev_now () < last_activity + ::conf.keepalive)
1171 w.start (last_activity + ::conf.keepalive - ev::now ()); 1229 w.start (last_activity + ::conf.keepalive - ev::now ());
1172 else if (conf->connectmode != conf_node::C_ONDEMAND 1230 else if (conf->connectmode != conf_node::C_ONDEMAND
1173 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1231 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1174 { 1232 {
1175 send_ping (si); 1233 send_ping (si);
1176 w.start (5); 1234 w.start (5);
1177 } 1235 }
1178 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10) 1236 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1179 // hold ondemand connections implicitly a few seconds longer 1237 // hold ondemand connections implicitly a few seconds longer
1180 // should delete octx, though, or something like that ;) 1238 // should delete octx, though, or something like that ;)
1181 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1182 else 1240 else
1183 reset_connection (); 1241 reset_connection ();
… …
1213 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1214 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1215 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1216} 1274}
1217 1275
1276inline const char *
1218const char *connection::script_node_up () 1277connection::script_node_up ()
1219{ 1278{
1220 script_init_connect_env (); 1279 script_init_connect_env ();
1221 1280
1222 putenv ((char *)"STATE=up"); 1281 putenv ((char *)"STATE=up");
1223 1282
… …
1228 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1287 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1229 1288
1230 return filename; 1289 return filename;
1231} 1290}
1232 1291
1292inline const char *
1233const char *connection::script_node_down () 1293connection::script_node_down ()
1234{ 1294{
1235 script_init_connect_env (); 1295 script_init_connect_env ();
1236 1296
1237 putenv ((char *)"STATE=down"); 1297 putenv ((char *)"STATE=down");
1238 1298
… …
1244 1304
1245 return filename; 1305 return filename;
1246} 1306}
1247 1307
1248connection::connection (struct vpn *vpn, conf_node *conf) 1308connection::connection (struct vpn *vpn, conf_node *conf)
1249: vpn(vpn), conf(conf) 1309: vpn(vpn), conf(conf),
1250, rekey (this, &connection::rekey_cb)
1251, keepalive (this, &connection::keepalive_cb)
1252, establish_connection (this, &connection::establish_connection_cb)
1253#if ENABLE_DNS 1310#if ENABLE_DNS
1254, dns (0) 1311 dns (0),
1255#endif 1312#endif
1313 data_queue(conf->max_ttl, conf->max_queue),
1314 vpn_queue(conf->max_ttl, conf->max_queue)
1256{ 1315{
1316 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this);
1318 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1319
1257 octx = ictx = 0; 1320 octx = ictx = 0;
1258 retry_cnt = 0; 1321 retry_cnt = 0;
1259 1322
1260 if (!conf->protocols) // make sure some protocol is enabled 1323 if (!conf->protocols) // make sure some protocol is enabled
1261 conf->protocols = PROT_UDPv4; 1324 conf->protocols = PROT_UDPv4;
1262 1325
1263 connectmode = conf_node::C_ALWAYS; // initial setting 1326 connectmode = conf->connectmode;
1327
1328 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 {
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335
1264 reset_connection (); 1336 reset_connection ();
1265} 1337}
1266 1338
1267connection::~connection () 1339connection::~connection ()
1268{ 1340{

Diff Legend

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