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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.2 by pcg, Wed Apr 2 05:15:00 2003 UTC vs.
Revision 1.12 by pcg, Sun Apr 13 00:42:04 2003 UTC

26 26
27#include <sys/types.h> 27#include <sys/types.h>
28#include <sys/socket.h> 28#include <sys/socket.h>
29#include <sys/poll.h> 29#include <sys/poll.h>
30#include <sys/wait.h> 30#include <sys/wait.h>
31#include <netinet/in.h>
32#include <arpa/inet.h>
33#include <errno.h> 31#include <errno.h>
34#include <time.h> 32#include <time.h>
35#include <unistd.h> 33#include <unistd.h>
34#include <fcntl.h>
35#include <arpa/inet.h>
36#include <netinet/in.h>
37#include <netinet/ip_icmp.h>
36 38
37#include "pidfile.h" 39#include "pidfile.h"
38 40
39#include "connection.h" 41#include "connection.h"
40#include "util.h" 42#include "util.h"
41#include "vpn.h" 43#include "vpn.h"
42
43#if ENABLE_TCP
44# include <map>
45# include <unistd.h>
46# include <fcntl.h>
47# include <sys/poll.h>
48#endif
49 44
50///////////////////////////////////////////////////////////////////////////// 45/////////////////////////////////////////////////////////////////////////////
51 46
52const char *vpn::script_if_up () 47const char *vpn::script_if_up ()
53{ 48{
78} 73}
79 74
80int 75int
81vpn::setup () 76vpn::setup ()
82{ 77{
78 ipv4_fd = -1;
79
80 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
81 {
82 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
83
84 if (ipv4_fd < 0)
85 return -1;
86
87 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
88
89#ifdef IP_MTU_DISCOVER
90 // this I really consider a linux bug. I am neither connected
91 // nor do I fragment myself. Linux still sets DF and doesn't
92 // fragment for me sometimes.
93 {
94 int oval = IP_PMTUDISC_DONT;
95 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
96 }
97#endif
98
99 sockinfo si (THISNODE, PROT_IPv4);
100
101 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
102 {
103 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
104 exit (1);
105 }
106
107 ipv4_ev_watcher.start (ipv4_fd, POLLIN);
108 }
109
83 udpv4_fd = -1; 110 udpv4_fd = -1;
84 111
85 if (THISNODE->protocols & PROT_UDPv4) 112 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
86 { 113 {
87 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 114 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
88 115
89 if (udpv4_fd < 0) 116 if (udpv4_fd < 0)
90 return -1; 117 return -1;
91 118
92 sockinfo si (THISNODE, PROT_UDPv4); 119 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
93 120
94 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 121 // standard daemon practise...
95 { 122 {
96 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 123 int oval = 1;
97 exit (1); 124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
98 } 125 }
99 126
100#ifdef IP_MTU_DISCOVER 127#ifdef IP_MTU_DISCOVER
101 // this I really consider a linux bug. I am neither connected 128 // this I really consider a linux bug. I am neither connected
102 // nor do I fragment myself. Linux still sets DF and doesn't 129 // nor do I fragment myself. Linux still sets DF and doesn't
103 // fragment for me sometimes. 130 // fragment for me sometimes.
105 int oval = IP_PMTUDISC_DONT; 132 int oval = IP_PMTUDISC_DONT;
106 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 133 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
107 } 134 }
108#endif 135#endif
109 136
110 // standard daemon practise... 137 sockinfo si (THISNODE, PROT_UDPv4);
138
139 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
140 {
141 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
142 exit (1);
143 }
144
145 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
146 }
147
148 icmpv4_fd = -1;
149
150#if ENABLE_ICMP
151 if (THISNODE->protocols & PROT_ICMPv4)
152 {
153 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
154
155 if (icmpv4_fd < 0)
156 return -1;
157
158 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
159
160#ifdef ICMP_FILTER
111 { 161 {
112 int oval = 1; 162 icmp_filter oval;
163 oval.data = 0xffffffff;
164 if (::conf.icmp_type < 32)
165 oval.data &= ~(1 << ::conf.icmp_type);
166
113 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 167 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
114 } 168 }
115 169#endif
116 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
117 }
118
119 ipv4_fd = -1;
120 if (THISNODE->protocols & PROT_IPv4)
121 {
122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
123
124 if (ipv4_fd < 0)
125 return -1;
126
127 sockinfo si (THISNODE, PROT_IPv4);
128
129 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
130 {
131 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
132 exit (1);
133 }
134 170
135#ifdef IP_MTU_DISCOVER 171#ifdef IP_MTU_DISCOVER
136 // this I really consider a linux bug. I am neither connected 172 // this I really consider a linux bug. I am neither connected
137 // nor do I fragment myself. Linux still sets DF and doesn't 173 // nor do I fragment myself. Linux still sets DF and doesn't
138 // fragment for me sometimes. 174 // fragment for me sometimes.
139 { 175 {
140 int oval = IP_PMTUDISC_DONT; 176 int oval = IP_PMTUDISC_DONT;
141 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 177 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
142 } 178 }
143#endif 179#endif
144 180
181 sockinfo si (THISNODE, PROT_ICMPv4);
182
183 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
184 {
185 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
186 exit (1);
187 }
188
145 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 189 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
146 } 190 }
191#endif
192
193 tcpv4_fd = -1;
147 194
148#if ENABLE_TCP 195#if ENABLE_TCP
149 if (THISNODE->protocols & PROT_TCPv4) 196 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
150 { 197 {
151 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 198 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
152 199
153 if (tcpv4_fd < 0) 200 if (tcpv4_fd < 0)
154 return -1; 201 return -1;
155 202
156 sockinfo si (THISNODE, PROT_TCPv4); 203 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
157
158 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
159 {
160 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
161 exit (1);
162 }
163
164 if (listen (tcpv4_fd, 5))
165 {
166 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
167 exit (1);
168 }
169 204
170 // standard daemon practise... 205 // standard daemon practise...
171 { 206 {
172 int oval = 1; 207 int oval = 1;
173 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 208 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
174 } 209 }
175 210
211 sockinfo si (THISNODE, PROT_TCPv4);
212
213 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
214 {
215 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
216 exit (1);
217 }
218
219 if (listen (tcpv4_fd, 5))
220 {
221 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
222 exit (1);
223 }
224
176 tcpv4_accept_watcher.start (tcpv4_fd, POLLIN); 225 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
177 } 226 }
178#endif 227#endif
179 228
180 tap = new tap_device (); 229 tap = new tap_device ();
181 if (!tap) //D this, of course, never catches 230 if (!tap) //D this, of course, never catches
191 reconnect_all (); 240 reconnect_all ();
192 241
193 return 0; 242 return 0;
194} 243}
195 244
196void 245// send a vpn packet out to other hosts
246bool
247vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
248{
249 switch (si.prot)
250 {
251 case PROT_IPv4:
252 return send_ipv4_packet (pkt, si, tos);
253
254 case PROT_UDPv4:
255 return send_udpv4_packet (pkt, si, tos);
256
257#if ENABLE_TCP
258 case PROT_TCPv4:
259 return send_tcpv4_packet (pkt, si, tos);
260#endif
261
262#if ENABLE_ICMP
263 case PROT_ICMPv4:
264 return send_icmpv4_packet (pkt, si, tos);
265#endif
266
267 default:
268 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
269 return false;
270 }
271}
272
273bool
197vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
198{ 275{
199 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
200 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 277 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
201}
202 278
203void 279 return true;
280}
281
282static u16
283ipv4_checksum (u16 *data, unsigned int len)
284{
285 // use 32 bit accumulator and fold back carry bits at the end
286 u32 sum = 0;
287
288 while (len > 1)
289 {
290 sum += *data++;
291 len -= 2;
292 }
293
294 // odd byte left?
295 if (len)
296 sum += *(u8 *)data;
297
298 // add back carry bits
299 sum = (sum >> 16) + (sum & 0xffff); // lo += hi
300 sum += (sum >> 16); // carry
301
302 return ~sum;
303}
304
305bool
306vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
307{
308 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
309
310 pkt->unshift_hdr (4);
311
312 icmphdr *hdr = (icmphdr *)&((*pkt)[0]);
313 hdr->type = ::conf.icmp_type;
314 hdr->code = 255;
315 hdr->checksum = 0;
316 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
317
318 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
319
320 return true;
321}
322
323bool
204vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 324vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
205{ 325{
206 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 326 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
207 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 327 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
328
329 return true;
208} 330}
209 331
210void 332void
211vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 333vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
212{ 334{
219 if (src == 0 || src > conns.size () 341 if (src == 0 || src > conns.size ()
220 || dst > conns.size () 342 || dst > conns.size ()
221 || pkt->typ () >= vpn_packet::PT_MAX) 343 || pkt->typ () >= vpn_packet::PT_MAX)
222 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 344 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
223 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 345 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
346 else if (dst > conns.size ())
347 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
348 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
224 else 349 else
225 { 350 {
226 connection *c = conns[src - 1]; 351 connection *c = conns[src - 1];
227 352
228 if (dst == 0 && !THISNODE->routerprio) 353 if (dst == 0 && !THISNODE->routerprio)
229 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 354 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),
230 c->conf->nodename, (const char *)rsi); 355 c->conf->nodename, (const char *)rsi);
231 else if (dst != 0 && dst != THISNODE->id) 356 else if (dst != 0 && dst != THISNODE->id)
232 // FORWARDING NEEDED ;) 357 {
358 if (THISNODE->routerprio)
359 // the tos setting gets lost here. who cares.
360 conns[dst - 1]->inject_vpn_packet (pkt);
361 else
233 slog (L_WARN, 362 slog (L_WARN,
234 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), 363 _("%s(%s): forwarding request (=> %s), but we are no router"),
364 c->conf->nodename, (const char *)rsi,
235 dst, conns[dst - 1]->conf->nodename, 365 conns[dst - 1]->conf->nodename);
236 (const char *)rsi, 366 }
237 THISNODE->id, THISNODE->nodename);
238 else 367 else
239 c->recv_vpn_packet (pkt, rsi); 368 c->recv_vpn_packet (pkt, rsi);
240 } 369 }
241} 370}
242 371
243void 372void
244vpn::udpv4_ev (int fd, short revents) 373vpn::ipv4_ev (io_watcher &w, short revents)
245{ 374{
246 if (revents & (POLLIN | POLLERR)) 375 if (revents & (POLLIN | POLLERR))
247 { 376 {
248 vpn_packet *pkt = new vpn_packet; 377 vpn_packet *pkt = new vpn_packet;
249 struct sockaddr_in sa; 378 struct sockaddr_in sa;
250 socklen_t sa_len = sizeof (sa); 379 socklen_t sa_len = sizeof (sa);
251 int len; 380 int len;
252 381
253 len = recvfrom (fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 382 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
254 383
255 sockinfo si(sa); 384 sockinfo si(sa, PROT_IPv4);
256 385
257 if (len > 0) 386 if (len > 0)
258 { 387 {
259 pkt->len = len; 388 pkt->len = len;
389
390 // raw sockets deliver the ipv4, but don't expect it on sends
391 // this is slow, but...
392 pkt->skip_hdr (IP_OVERHEAD);
260 393
261 recv_vpn_packet (pkt, si); 394 recv_vpn_packet (pkt, si);
262 } 395 }
263 else 396 else
264 { 397 {
269 delete pkt; 402 delete pkt;
270 } 403 }
271 else if (revents & POLLHUP) 404 else if (revents & POLLHUP)
272 { 405 {
273 // this cannot ;) happen on udp sockets 406 // this cannot ;) happen on udp sockets
274 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); 407 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
275 exit (1); 408 exit (1);
276 } 409 }
277 else 410 else
278 { 411 {
279 slog (L_ERR, 412 slog (L_ERR,
282 exit (1); 415 exit (1);
283 } 416 }
284} 417}
285 418
286void 419void
287vpn::ipv4_ev (int fd, short revents) 420vpn::icmpv4_ev (io_watcher &w, short revents)
288{ 421{
289 if (revents & (POLLIN | POLLERR)) 422 if (revents & (POLLIN | POLLERR))
290 { 423 {
291 vpn_packet *pkt = new vpn_packet; 424 vpn_packet *pkt = new vpn_packet;
292 struct sockaddr_in sa; 425 struct sockaddr_in sa;
293 socklen_t sa_len = sizeof (sa); 426 socklen_t sa_len = sizeof (sa);
294 int len; 427 int len;
295 428
296 len = recvfrom (fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 429 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
297 430
298 sockinfo si(sa, PROT_IPv4); 431 sockinfo si(sa, PROT_ICMPv4);
299 432
300 if (len > 0) 433 if (len > 0)
301 { 434 {
302 pkt->len = len; 435 pkt->len = len;
303 436
437 icmphdr *hdr = (icmphdr *)&((*pkt)[IP_OVERHEAD]);
438
439 if (hdr->type == ::conf.icmp_type
440 && hdr->code == 255)
441 {
304 // raw sockets deliver the ipv4, but don't expect it on sends 442 // raw sockets deliver the ipv4, but don't expect it on sends
305 // this is slow, but... 443 // this is slow, but...
306 pkt->skip_hdr (IP_OVERHEAD); 444 pkt->skip_hdr (ICMP_OVERHEAD);
307 445
308 recv_vpn_packet (pkt, si); 446 recv_vpn_packet (pkt, si);
447 }
309 } 448 }
310 else 449 else
311 { 450 {
312 // probably ECONNRESET or somesuch 451 // probably ECONNRESET or somesuch
313 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 452 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
316 delete pkt; 455 delete pkt;
317 } 456 }
318 else if (revents & POLLHUP) 457 else if (revents & POLLHUP)
319 { 458 {
320 // this cannot ;) happen on udp sockets 459 // this cannot ;) happen on udp sockets
321 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); 460 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
322 exit (1); 461 exit (1);
323 } 462 }
324 else 463 else
325 { 464 {
326 slog (L_ERR, 465 slog (L_ERR,
328 revents); 467 revents);
329 exit (1); 468 exit (1);
330 } 469 }
331} 470}
332 471
333#if ENABLE_TCP
334
335struct tcp_info {
336 int fd;
337 bool ok;
338 io_watcher r;
339
340 tcp_info (vpn *v)
341 : r(v, &vpn::tcpv4_ev)
342 {
343 fd = -1;
344 }
345
346 ~tcp_info () { close (fd); }
347};
348
349typedef map<sockinfo, tcp_info *> tcp_si_map;
350typedef map<int, tcp_info *> tcp_fd_map; // unneecssary if iom would be cooler
351static tcp_si_map tcp_si;
352static tcp_fd_map tcp_fd;
353
354void 472void
355vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 473vpn::udpv4_ev (io_watcher &w, short revents)
356{
357 tcp_si_map::iterator info = tcp_si.find (si);
358
359 if (info == tcp_si.end ())
360 {
361 // woaw, the first lost packet ;)
362 tcp_info *i = new tcp_info (this);
363
364 i->ok = false;
365 i->fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
366
367 if (i->fd >= 0)
368 {
369 fcntl (i->fd, F_SETFL, O_NONBLOCK);
370
371 if (connect (i->fd, si.sav4 (), si.salenv4 ()) >= 0
372 || errno == EINPROGRESS)
373 {
374 tcp_si.insert (tcp_si_map::value_type (si, i));
375 tcp_fd.insert (tcp_fd_map::value_type (i->fd, i));
376 return;
377 }
378
379 delete i;
380 }
381 }
382 else
383 {
384 tcp_info *i = info->second;
385
386 if (i->ok)
387 {
388 setsockopt (i->fd, SOL_IP, IP_TOS, &tos, sizeof tos);
389
390 if (write (i->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32))
391 {
392 // error, close socket, forget it and retry immediately
393 tcp_si.erase (info);
394 tcp_fd.erase (i->fd);
395 delete i;
396
397 // tail recursion is... better than goto(?)
398 send_tcpv4_packet (pkt, si, tos);
399 }
400 }
401 }
402
403#if 0
404 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
405 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
406#endif
407}
408
409void
410vpn::tcpv4_accept (int fd, short revents)
411{ 474{
412 if (revents & (POLLIN | POLLERR)) 475 if (revents & (POLLIN | POLLERR))
413 { 476 {
477 vpn_packet *pkt = new vpn_packet;
414 struct sockaddr_in sa; 478 struct sockaddr_in sa;
415 socklen_t sa_len = sizeof (sa); 479 socklen_t sa_len = sizeof (sa);
416 int len; 480 int len;
417 481
418 fd = accept (fd, (sockaddr *)&sa, &sa_len); 482 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
419 483
420 if (fd >= 0)
421 {
422 fcntl (fd, F_SETFL, O_NONBLOCK);
423
424 sockinfo si(sa, PROT_TCPv4); 484 sockinfo si(sa, PROT_UDPv4);
425 tcp_info *i = new tcp_info (this);
426 485
427 i->fd = fd; 486 if (len > 0)
428 i->ok = true;
429 i->r.start (fd, POLLIN);
430
431 tcp_si.insert (tcp_si_map::value_type (si, i));
432 tcp_fd.insert (tcp_fd_map::value_type (fd, i));
433 } 487 {
434 } 488 pkt->len = len;
435}
436 489
437void 490 recv_vpn_packet (pkt, si);
438vpn::tcpv4_ev (int fd, short revents)
439{
440 if (revents & (POLLIN | POLLERR))
441 {
442 tcp_fd_map::iterator info = tcp_fd.find (fd);
443
444 if (info != tcp_fd.end ())
445 { 491 }
446 tcp_info *i = info->second; 492 else
447
448 if (!i->ok) // not yet established
449 {
450 i->ok = true;
451 fcntl (i->fd, F_SETFL, 0);
452 }
453
454 u32 len;
455
456 if (sizeof (len) == read (fd, &len, sizeof (len)))
457 {
458 slog (L_ERR, "%d bytes received\n", len);
459 }
460
461 //tcp_si.erase (i);
462 tcp_fd.erase (fd);
463 delete i;
464 } 493 {
494 // probably ECONNRESET or somesuch
495 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
496 }
497
498 delete pkt;
499 }
500 else if (revents & POLLHUP)
465 } 501 {
502 // this cannot ;) happen on udp sockets
503 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
504 exit (1);
505 }
506 else
507 {
508 slog (L_ERR,
509 _("FATAL: unknown revents %08x in socket, terminating\n"),
510 revents);
511 exit (1);
512 }
466} 513}
467 514
468#endif
469
470void 515void
471vpn::tap_ev (int fd, short revents) 516vpn::tap_ev (io_watcher &w, short revents)
472{ 517{
473 if (revents & POLLIN) 518 if (revents & POLLIN)
474 { 519 {
475 /* process data */ 520 /* process data */
476 tap_packet *pkt; 521 tap_packet *pkt;
526 else 571 else
527 abort (); 572 abort ();
528} 573}
529 574
530void 575void
531vpn::event_cb (tstamp &ts) 576vpn::event_cb (time_watcher &w)
532{ 577{
533 if (events) 578 if (events)
534 { 579 {
535 if (events & EVENT_SHUTDOWN) 580 if (events & EVENT_SHUTDOWN)
536 { 581 {
553 } 598 }
554 599
555 events = 0; 600 events = 0;
556 } 601 }
557 602
558 ts = TSTAMP_CANCEL; 603 w.at = TSTAMP_CANCEL;
559} 604}
560 605
561void 606void
562vpn::shutdown_all () 607vpn::shutdown_all ()
563{ 608{
587 } 632 }
588} 633}
589 634
590connection *vpn::find_router () 635connection *vpn::find_router ()
591{ 636{
592 u32 prio = 0; 637 u32 prio = 1;
593 connection *router = 0; 638 connection *router = 0;
594 639
595 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 640 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
596 { 641 {
597 connection *c = *i; 642 connection *c = *i;
598 643
599 if (c->conf->routerprio > prio 644 if (c->conf->routerprio >= prio
600 && c->connectmode == conf_node::C_ALWAYS 645 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
601 && c->conf != THISNODE
602 && c->ictx && c->octx) 646 && c->ictx && c->octx
647 && c->conf != THISNODE // redundant, since ictx==octx==0 always on thisnode
648 && (!THISNODE->routerprio
649 || c->conf->routerprio <= THISNODE->routerprio))
603 { 650 {
604 prio = c->conf->routerprio; 651 prio = c->conf->routerprio;
605 router = c; 652 router = c;
606 } 653 }
607 } 654 }
608 655
609 return router; 656 return router;
610} 657}
611 658
612void vpn::connect_request (int id) 659void vpn::send_connect_request (int id)
613{ 660{
614 connection *c = find_router (); 661 connection *c = find_router ();
615 662
616 if (c) 663 if (c)
617 c->connect_request (id); 664 c->send_connect_request (id);
618 //else // does not work, because all others must connect to the same router 665 else
619 // // no router found, aggressively connect to all routers 666 // no router found, aggressively connect to all routers
620 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 667 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
621 // if ((*i)->conf->routerprio) 668 if ((*i)->conf->routerprio)
622 // (*i)->establish_connection (); 669 (*i)->establish_connection ();
623} 670}
624 671
625void 672void
626connection::dump_status () 673connection::dump_status ()
627{ 674{
644 691
645 slog (L_NOTICE, _("END status dump")); 692 slog (L_NOTICE, _("END status dump"));
646} 693}
647 694
648vpn::vpn (void) 695vpn::vpn (void)
649: event(this, &vpn::event_cb) 696: event (this, &vpn::event_cb)
650, udpv4_ev_watcher(this, &vpn::udpv4_ev) 697, udpv4_ev_watcher (this, &vpn::udpv4_ev)
651, ipv4_ev_watcher (this, &vpn::ipv4_ev) 698, ipv4_ev_watcher (this, &vpn::ipv4_ev)
652, tap_ev_watcher (this, &vpn::tap_ev)
653#if ENABLE_TCP 699#if ENABLE_TCP
654, tcpv4_accept_watcher(this, &vpn::tcpv4_accept) 700, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
655#endif 701#endif
702#if ENABLE_ICMP
703, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
704#endif
705, tap_ev_watcher (this, &vpn::tap_ev)
656{ 706{
657} 707}
658 708
659vpn::~vpn () 709vpn::~vpn ()
660{ 710{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines