… | |
… | |
38 | |
38 | |
39 | #include "connection.h" |
39 | #include "connection.h" |
40 | #include "util.h" |
40 | #include "util.h" |
41 | #include "vpn.h" |
41 | #include "vpn.h" |
42 | |
42 | |
43 | #if ENABLE_TCP |
|
|
44 | # include <map> |
|
|
45 | # include <unistd.h> |
|
|
46 | # include <fcntl.h> |
|
|
47 | # include <sys/poll.h> |
|
|
48 | #endif |
|
|
49 | |
|
|
50 | ///////////////////////////////////////////////////////////////////////////// |
43 | ///////////////////////////////////////////////////////////////////////////// |
51 | |
44 | |
52 | const char *vpn::script_if_up () |
45 | const char *vpn::script_if_up () |
53 | { |
46 | { |
54 | // the tunnel device mtu should be the physical mtu - overhead |
47 | // the tunnel device mtu should be the physical mtu - overhead |
… | |
… | |
78 | } |
71 | } |
79 | |
72 | |
80 | int |
73 | int |
81 | vpn::setup () |
74 | vpn::setup () |
82 | { |
75 | { |
|
|
76 | ipv4_fd = -1; |
|
|
77 | |
|
|
78 | if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) |
|
|
79 | { |
|
|
80 | ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); |
|
|
81 | |
|
|
82 | if (ipv4_fd < 0) |
|
|
83 | return -1; |
|
|
84 | |
|
|
85 | sockinfo si (THISNODE, PROT_IPv4); |
|
|
86 | |
|
|
87 | if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) |
|
|
88 | { |
|
|
89 | slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); |
|
|
90 | exit (1); |
|
|
91 | } |
|
|
92 | |
|
|
93 | #ifdef IP_MTU_DISCOVER |
|
|
94 | // this I really consider a linux bug. I am neither connected |
|
|
95 | // nor do I fragment myself. Linux still sets DF and doesn't |
|
|
96 | // fragment for me sometimes. |
|
|
97 | { |
|
|
98 | int oval = IP_PMTUDISC_DONT; |
|
|
99 | setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); |
|
|
100 | } |
|
|
101 | #endif |
|
|
102 | |
|
|
103 | ipv4_ev_watcher.start (ipv4_fd, POLLIN); |
|
|
104 | } |
|
|
105 | |
83 | udpv4_fd = -1; |
106 | udpv4_fd = -1; |
84 | |
107 | |
85 | if (THISNODE->protocols & PROT_UDPv4) |
108 | if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) |
86 | { |
109 | { |
87 | udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); |
110 | udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); |
88 | |
111 | |
89 | if (udpv4_fd < 0) |
112 | if (udpv4_fd < 0) |
90 | return -1; |
113 | return -1; |
|
|
114 | |
|
|
115 | // standard daemon practise... |
|
|
116 | { |
|
|
117 | int oval = 1; |
|
|
118 | setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); |
|
|
119 | } |
91 | |
120 | |
92 | sockinfo si (THISNODE, PROT_UDPv4); |
121 | sockinfo si (THISNODE, PROT_UDPv4); |
93 | |
122 | |
94 | if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) |
123 | if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) |
95 | { |
124 | { |
… | |
… | |
105 | int oval = IP_PMTUDISC_DONT; |
134 | int oval = IP_PMTUDISC_DONT; |
106 | setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); |
135 | setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); |
107 | } |
136 | } |
108 | #endif |
137 | #endif |
109 | |
138 | |
110 | // standard daemon practise... |
|
|
111 | { |
|
|
112 | int oval = 1; |
|
|
113 | setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); |
|
|
114 | } |
|
|
115 | |
|
|
116 | udpv4_ev_watcher.start (udpv4_fd, POLLIN); |
139 | udpv4_ev_watcher.start (udpv4_fd, POLLIN); |
117 | } |
140 | } |
118 | |
141 | |
119 | ipv4_fd = -1; |
142 | tcpv4_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 | |
|
|
135 | #ifdef IP_MTU_DISCOVER |
|
|
136 | // this I really consider a linux bug. I am neither connected |
|
|
137 | // nor do I fragment myself. Linux still sets DF and doesn't |
|
|
138 | // fragment for me sometimes. |
|
|
139 | { |
|
|
140 | int oval = IP_PMTUDISC_DONT; |
|
|
141 | setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); |
|
|
142 | } |
|
|
143 | #endif |
|
|
144 | |
|
|
145 | ipv4_ev_watcher.start (ipv4_fd, POLLIN); |
|
|
146 | } |
|
|
147 | |
143 | |
148 | #if ENABLE_TCP |
144 | #if ENABLE_TCP |
149 | if (THISNODE->protocols & PROT_TCPv4) |
145 | if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) |
150 | { |
146 | { |
151 | tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); |
147 | tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); |
152 | |
148 | |
153 | if (tcpv4_fd < 0) |
149 | if (tcpv4_fd < 0) |
154 | return -1; |
150 | return -1; |
155 | |
|
|
156 | sockinfo si (THISNODE, PROT_TCPv4); |
|
|
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 | |
151 | |
170 | // standard daemon practise... |
152 | // standard daemon practise... |
171 | { |
153 | { |
172 | int oval = 1; |
154 | int oval = 1; |
173 | setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); |
155 | setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); |
174 | } |
156 | } |
175 | |
157 | |
|
|
158 | sockinfo si (THISNODE, PROT_TCPv4); |
|
|
159 | |
|
|
160 | if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) |
|
|
161 | { |
|
|
162 | slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); |
|
|
163 | exit (1); |
|
|
164 | } |
|
|
165 | |
|
|
166 | if (listen (tcpv4_fd, 5)) |
|
|
167 | { |
|
|
168 | slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); |
|
|
169 | exit (1); |
|
|
170 | } |
|
|
171 | |
176 | tcpv4_accept_watcher.start (tcpv4_fd, POLLIN); |
172 | tcpv4_ev_watcher.start (tcpv4_fd, POLLIN); |
177 | } |
173 | } |
178 | #endif |
174 | #endif |
179 | |
175 | |
180 | tap = new tap_device (); |
176 | tap = new tap_device (); |
181 | if (!tap) //D this, of course, never catches |
177 | if (!tap) //D this, of course, never catches |
… | |
… | |
191 | reconnect_all (); |
187 | reconnect_all (); |
192 | |
188 | |
193 | return 0; |
189 | return 0; |
194 | } |
190 | } |
195 | |
191 | |
196 | void |
192 | // send a vpn packet out to other hosts |
|
|
193 | bool |
|
|
194 | vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) |
|
|
195 | { |
|
|
196 | switch (si.prot) |
|
|
197 | { |
|
|
198 | case PROT_IPv4: |
|
|
199 | return send_ipv4_packet (pkt, si, tos); |
|
|
200 | |
|
|
201 | case PROT_UDPv4: |
|
|
202 | return send_udpv4_packet (pkt, si, tos); |
|
|
203 | |
|
|
204 | #if ENABLE_TCP |
|
|
205 | case PROT_TCPv4: |
|
|
206 | return send_tcpv4_packet (pkt, si, tos); |
|
|
207 | #endif |
|
|
208 | |
|
|
209 | default: |
|
|
210 | slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); |
|
|
211 | return false; |
|
|
212 | } |
|
|
213 | } |
|
|
214 | |
|
|
215 | bool |
197 | vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) |
216 | vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) |
198 | { |
217 | { |
199 | setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); |
218 | setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); |
200 | sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); |
219 | sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); |
201 | } |
|
|
202 | |
220 | |
203 | void |
221 | return true; |
|
|
222 | } |
|
|
223 | |
|
|
224 | bool |
204 | vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) |
225 | vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) |
205 | { |
226 | { |
206 | setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); |
227 | setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); |
207 | sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); |
228 | sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); |
|
|
229 | |
|
|
230 | return true; |
208 | } |
231 | } |
209 | |
232 | |
210 | void |
233 | void |
211 | vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) |
234 | vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) |
212 | { |
235 | { |
… | |
… | |
219 | if (src == 0 || src > conns.size () |
242 | if (src == 0 || src > conns.size () |
220 | || dst > conns.size () |
243 | || dst > conns.size () |
221 | || pkt->typ () >= vpn_packet::PT_MAX) |
244 | || pkt->typ () >= vpn_packet::PT_MAX) |
222 | slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), |
245 | slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), |
223 | (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); |
246 | (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); |
|
|
247 | else if (dst > conns.size ()) |
|
|
248 | slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), |
|
|
249 | (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); |
224 | else |
250 | else |
225 | { |
251 | { |
226 | connection *c = conns[src - 1]; |
252 | connection *c = conns[src - 1]; |
227 | |
253 | |
228 | if (dst == 0 && !THISNODE->routerprio) |
254 | if (dst == 0 && !THISNODE->routerprio) |
229 | slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), |
255 | slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), |
230 | c->conf->nodename, (const char *)rsi); |
256 | c->conf->nodename, (const char *)rsi); |
231 | else if (dst != 0 && dst != THISNODE->id) |
257 | else if (dst != 0 && dst != THISNODE->id) |
232 | // FORWARDING NEEDED ;) |
258 | { |
|
|
259 | if (THISNODE->routerprio) |
|
|
260 | // the tos setting gets lost here. who cares. |
|
|
261 | conns[dst - 1]->inject_vpn_packet (pkt); |
|
|
262 | else |
233 | slog (L_WARN, |
263 | slog (L_WARN, |
234 | _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), |
264 | _("%s(%s): forwarding request (=> %s), but we are no router"), |
|
|
265 | c->conf->nodename, (const char *)rsi, |
235 | dst, conns[dst - 1]->conf->nodename, |
266 | conns[dst - 1]->conf->nodename); |
236 | (const char *)rsi, |
267 | } |
237 | THISNODE->id, THISNODE->nodename); |
|
|
238 | else |
268 | else |
239 | c->recv_vpn_packet (pkt, rsi); |
269 | c->recv_vpn_packet (pkt, rsi); |
240 | } |
270 | } |
241 | } |
271 | } |
242 | |
272 | |
243 | void |
273 | void |
244 | vpn::udpv4_ev (int fd, short revents) |
274 | vpn::udpv4_ev (io_watcher &w, short revents) |
245 | { |
275 | { |
246 | if (revents & (POLLIN | POLLERR)) |
276 | if (revents & (POLLIN | POLLERR)) |
247 | { |
277 | { |
248 | vpn_packet *pkt = new vpn_packet; |
278 | vpn_packet *pkt = new vpn_packet; |
249 | struct sockaddr_in sa; |
279 | struct sockaddr_in sa; |
250 | socklen_t sa_len = sizeof (sa); |
280 | socklen_t sa_len = sizeof (sa); |
251 | int len; |
281 | int len; |
252 | |
282 | |
253 | len = recvfrom (fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); |
283 | len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); |
254 | |
284 | |
255 | sockinfo si(sa); |
285 | sockinfo si(sa, PROT_UDPv4); |
256 | |
286 | |
257 | if (len > 0) |
287 | if (len > 0) |
258 | { |
288 | { |
259 | pkt->len = len; |
289 | pkt->len = len; |
260 | |
290 | |
261 | recv_vpn_packet (pkt, si); |
291 | recv_vpn_packet (pkt, si); |
262 | } |
292 | } |
263 | else |
293 | else |
264 | { |
294 | { |
265 | // probably ECONNRESET or somesuch |
295 | // probably ECONNRESET or somesuch |
266 | slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); |
296 | slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); |
267 | } |
297 | } |
268 | |
298 | |
269 | delete pkt; |
299 | delete pkt; |
270 | } |
300 | } |
271 | else if (revents & POLLHUP) |
301 | else if (revents & POLLHUP) |
… | |
… | |
282 | exit (1); |
312 | exit (1); |
283 | } |
313 | } |
284 | } |
314 | } |
285 | |
315 | |
286 | void |
316 | void |
287 | vpn::ipv4_ev (int fd, short revents) |
317 | vpn::ipv4_ev (io_watcher &w, short revents) |
288 | { |
318 | { |
289 | if (revents & (POLLIN | POLLERR)) |
319 | if (revents & (POLLIN | POLLERR)) |
290 | { |
320 | { |
291 | vpn_packet *pkt = new vpn_packet; |
321 | vpn_packet *pkt = new vpn_packet; |
292 | struct sockaddr_in sa; |
322 | struct sockaddr_in sa; |
293 | socklen_t sa_len = sizeof (sa); |
323 | socklen_t sa_len = sizeof (sa); |
294 | int len; |
324 | int len; |
295 | |
325 | |
296 | len = recvfrom (fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); |
326 | len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); |
297 | |
327 | |
298 | sockinfo si(sa, PROT_IPv4); |
328 | sockinfo si(sa, PROT_IPv4); |
299 | |
329 | |
300 | if (len > 0) |
330 | if (len > 0) |
301 | { |
331 | { |
… | |
… | |
328 | revents); |
358 | revents); |
329 | exit (1); |
359 | exit (1); |
330 | } |
360 | } |
331 | } |
361 | } |
332 | |
362 | |
333 | #if ENABLE_TCP |
|
|
334 | |
|
|
335 | struct 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 | |
|
|
349 | typedef map<sockinfo, tcp_info *> tcp_si_map; |
|
|
350 | typedef map<int, tcp_info *> tcp_fd_map; // unneecssary if iom would be cooler |
|
|
351 | static tcp_si_map tcp_si; |
|
|
352 | static tcp_fd_map tcp_fd; |
|
|
353 | |
|
|
354 | void |
363 | void |
355 | vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) |
|
|
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 | |
|
|
409 | void |
|
|
410 | vpn::tcpv4_accept (int fd, short revents) |
|
|
411 | { |
|
|
412 | if (revents & (POLLIN | POLLERR)) |
|
|
413 | { |
|
|
414 | struct sockaddr_in sa; |
|
|
415 | socklen_t sa_len = sizeof (sa); |
|
|
416 | int len; |
|
|
417 | |
|
|
418 | fd = accept (fd, (sockaddr *)&sa, &sa_len); |
|
|
419 | |
|
|
420 | if (fd >= 0) |
|
|
421 | { |
|
|
422 | fcntl (fd, F_SETFL, O_NONBLOCK); |
|
|
423 | |
|
|
424 | sockinfo si(sa, PROT_TCPv4); |
|
|
425 | tcp_info *i = new tcp_info (this); |
|
|
426 | |
|
|
427 | i->fd = fd; |
|
|
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 | } |
|
|
434 | } |
|
|
435 | } |
|
|
436 | |
|
|
437 | void |
|
|
438 | vpn::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 | { |
|
|
446 | tcp_info *i = info->second; |
|
|
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 | } |
|
|
465 | } |
|
|
466 | } |
|
|
467 | |
|
|
468 | #endif |
|
|
469 | |
|
|
470 | void |
|
|
471 | vpn::tap_ev (int fd, short revents) |
364 | vpn::tap_ev (io_watcher &w, short revents) |
472 | { |
365 | { |
473 | if (revents & POLLIN) |
366 | if (revents & POLLIN) |
474 | { |
367 | { |
475 | /* process data */ |
368 | /* process data */ |
476 | tap_packet *pkt; |
369 | tap_packet *pkt; |
… | |
… | |
526 | else |
419 | else |
527 | abort (); |
420 | abort (); |
528 | } |
421 | } |
529 | |
422 | |
530 | void |
423 | void |
531 | vpn::event_cb (tstamp &ts) |
424 | vpn::event_cb (time_watcher &w) |
532 | { |
425 | { |
533 | if (events) |
426 | if (events) |
534 | { |
427 | { |
535 | if (events & EVENT_SHUTDOWN) |
428 | if (events & EVENT_SHUTDOWN) |
536 | { |
429 | { |
… | |
… | |
553 | } |
446 | } |
554 | |
447 | |
555 | events = 0; |
448 | events = 0; |
556 | } |
449 | } |
557 | |
450 | |
558 | ts = TSTAMP_CANCEL; |
451 | w.at = TSTAMP_CANCEL; |
559 | } |
452 | } |
560 | |
453 | |
561 | void |
454 | void |
562 | vpn::shutdown_all () |
455 | vpn::shutdown_all () |
563 | { |
456 | { |
… | |
… | |
607 | } |
500 | } |
608 | |
501 | |
609 | return router; |
502 | return router; |
610 | } |
503 | } |
611 | |
504 | |
612 | void vpn::connect_request (int id) |
505 | void vpn::send_connect_request (int id) |
613 | { |
506 | { |
614 | connection *c = find_router (); |
507 | connection *c = find_router (); |
615 | |
508 | |
616 | if (c) |
509 | if (c) |
617 | c->connect_request (id); |
510 | c->send_connect_request (id); |
618 | //else // does not work, because all others must connect to the same router |
511 | else |
619 | // // no router found, aggressively connect to all routers |
512 | // no router found, aggressively connect to all routers |
620 | // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) |
513 | for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) |
621 | // if ((*i)->conf->routerprio) |
514 | if ((*i)->conf->routerprio) |
622 | // (*i)->establish_connection (); |
515 | (*i)->establish_connection (); |
623 | } |
516 | } |
624 | |
517 | |
625 | void |
518 | void |
626 | connection::dump_status () |
519 | connection::dump_status () |
627 | { |
520 | { |
… | |
… | |
649 | : event(this, &vpn::event_cb) |
542 | : event(this, &vpn::event_cb) |
650 | , udpv4_ev_watcher(this, &vpn::udpv4_ev) |
543 | , udpv4_ev_watcher(this, &vpn::udpv4_ev) |
651 | , ipv4_ev_watcher (this, &vpn::ipv4_ev) |
544 | , ipv4_ev_watcher (this, &vpn::ipv4_ev) |
652 | , tap_ev_watcher (this, &vpn::tap_ev) |
545 | , tap_ev_watcher (this, &vpn::tap_ev) |
653 | #if ENABLE_TCP |
546 | #if ENABLE_TCP |
654 | , tcpv4_accept_watcher(this, &vpn::tcpv4_accept) |
547 | , tcpv4_ev_watcher(this, &vpn::tcpv4_ev) |
655 | #endif |
548 | #endif |
656 | { |
549 | { |
657 | } |
550 | } |
658 | |
551 | |
659 | vpn::~vpn () |
552 | vpn::~vpn () |