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

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.38 by pcg, Tue Apr 19 04:23:38 2005 UTC vs.
Revision 1.49 by root, Tue Feb 8 23:11:36 2011 UTC

1/* 1/*
2 vpn_dns.C -- handle the dns tunnel part of the protocol. 2 vpn_dns.C -- handle the dns tunnel part of the protocol.
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 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 along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22// TODO: EDNS0 option to increase dns mtu? 32// TODO: EDNS0 option to increase dns mtu?
23// TODO: re-write dns packet parsing/creation using a safe mem-buffer 33// TODO: re-write dns packet parsing/creation using a safe mem-buffer
24// to ensure no buffer overflows or similar problems. 34// to ensure no buffer overflows or similar problems.
… …
42#include <unistd.h> 52#include <unistd.h>
43#include <fcntl.h> 53#include <fcntl.h>
44 54
45#include <map> 55#include <map>
46 56
57#include <cstdio> /* bug in libgmp: gmp.h relies on cstdio being included */
47#include <gmp.h> 58#include <gmp.h>
48 59
49#include "netcompat.h" 60#include "netcompat.h"
50 61
51#include "vpn.h" 62#include "vpn.h"
… …
72#define MAX_PKT_SIZE 512 83#define MAX_PKT_SIZE 512
73 84
74#define RR_TYPE_A 1 85#define RR_TYPE_A 1
75#define RR_TYPE_NULL 10 86#define RR_TYPE_NULL 10
76#define RR_TYPE_TXT 16 87#define RR_TYPE_TXT 16
88#define RR_TYPE_AAAA 28
77#define RR_TYPE_ANY 255 89#define RR_TYPE_ANY 255
78 90
79#define RR_CLASS_IN 1 91#define RR_CLASS_IN 1
80 92
81#define CMD_IP_1 207 93#define CMD_IP_1 207
… …
156 enc_len [len] = n; 168 enc_len [len] = n;
157 dec_len [n] = len; 169 dec_len [n] = len;
158 } 170 }
159} 171}
160 172
173unsigned int
161unsigned int basecoder::encode_len (unsigned int len) 174basecoder::encode_len (unsigned int len)
162{ 175{
163 return enc_len [len]; 176 return enc_len [len];
164} 177}
165 178
179unsigned int
166unsigned int basecoder::decode_len (unsigned int len) 180basecoder::decode_len (unsigned int len)
167{ 181{
168 while (len && !dec_len [len]) 182 while (len && !dec_len [len])
169 --len; 183 --len;
170 184
171 return dec_len [len]; 185 return dec_len [len];
172} 186}
173 187
188unsigned int
174unsigned int basecoder::encode (char *dst, u8 *src, unsigned int len) 189basecoder::encode (char *dst, u8 *src, unsigned int len)
175{ 190{
176 if (!len || len > MAX_DEC_LEN) 191 if (!len || len > MAX_DEC_LEN)
177 return 0; 192 return 0;
178 193
179 int elen = encode_len (len); 194 int elen = encode_len (len);
… …
198 *dst++ = cmap.encode [dst_ [i]]; 213 *dst++ = cmap.encode [dst_ [i]];
199 214
200 return elen; 215 return elen;
201} 216}
202 217
218unsigned int
203unsigned int basecoder::decode (u8 *dst, char *src, unsigned int len) 219basecoder::decode (u8 *dst, char *src, unsigned int len)
204{ 220{
205 if (!len || len > MAX_ENC_LEN) 221 if (!len || len > MAX_ENC_LEN)
206 return 0; 222 return 0;
207 223
208 u8 src_ [MAX_ENC_LEN]; 224 u8 src_ [MAX_ENC_LEN];
… …
267 283
268///////////////////////////////////////////////////////////////////////////// 284/////////////////////////////////////////////////////////////////////////////
269 285
270#define HDRSIZE 6 286#define HDRSIZE 6
271 287
288inline void
272inline void encode_header (char *data, int clientid, int seqno, int retry = 0) 289encode_header (char *data, int clientid, int seqno, int retry = 0)
273{ 290{
274 seqno &= SEQNO_MASK; 291 seqno &= SEQNO_MASK;
275 292
276 u8 hdr[3] = { 293 u8 hdr[3] = {
277 clientid, 294 clientid,
… …
282 assert (clientid < 256); 299 assert (clientid < 256);
283 300
284 cdc26.encode (data, hdr, 3); 301 cdc26.encode (data, hdr, 3);
285} 302}
286 303
304inline void
287inline void decode_header (char *data, int &clientid, int &seqno) 305decode_header (char *data, int &clientid, int &seqno)
288{ 306{
289 u8 hdr[3]; 307 u8 hdr[3];
290 308
291 cdc26.decode (hdr, data, HDRSIZE); 309 cdc26.decode (hdr, data, HDRSIZE);
292 310
… …
325byte_stream::~byte_stream () 343byte_stream::~byte_stream ()
326{ 344{
327 delete data; 345 delete data;
328} 346}
329 347
348void
330void byte_stream::remove (int count) 349byte_stream::remove (int count)
331{ 350{
332 if (count > fill) 351 if (count > fill)
333 assert (count <= fill); 352 assert (count <= fill);
334 353
335 memmove (data, data + count, fill -= count); 354 memmove (data, data + count, fill -= count);
336} 355}
337 356
357bool
338bool byte_stream::put (u8 *data, unsigned int datalen) 358byte_stream::put (u8 *data, unsigned int datalen)
339{ 359{
340 if (maxsize - fill < datalen) 360 if (maxsize - fill < datalen)
341 return false; 361 return false;
342 362
343 memcpy (this->data + fill, data, datalen); fill += datalen; 363 memcpy (this->data + fill, data, datalen); fill += datalen;
344 364
345 return true; 365 return true;
346} 366}
347 367
368bool
348bool byte_stream::put (vpn_packet *pkt) 369byte_stream::put (vpn_packet *pkt)
349{ 370{
350 if (maxsize - fill < pkt->len + 2) 371 if (maxsize - fill < pkt->len + 2)
351 return false; 372 return false;
352 373
353 data [fill++] = pkt->len >> 8; 374 data [fill++] = pkt->len >> 8;
… …
435 bool valid (); 456 bool valid ();
436}; 457};
437 458
438int dns_cfg::next_uid; 459int dns_cfg::next_uid;
439 460
461void
440void dns_cfg::reset (int clientid) 462dns_cfg::reset (int clientid)
441{ 463{
442 id1 = 'G'; 464 id1 = 'G';
443 id2 = 'V'; 465 id2 = 'V';
444 id3 = 'P'; 466 id3 = 'P';
445 id4 = 'E'; 467 id4 = 'E';
… …
459 481
460 r3 = r4 = 0; 482 r3 = r4 = 0;
461 r4 = r5 = r6 = r7 = 0; 483 r4 = r5 = r6 = r7 = 0;
462} 484}
463 485
486bool
464bool dns_cfg::valid () 487dns_cfg::valid ()
465{ 488{
489 // although the protocol itself allows for some configurability,
490 // only the following encoding/decoding settings are implemented.
466 return id1 == 'G' 491 return id1 == 'G'
467 && id2 == 'V' 492 && id2 == 'V'
468 && id3 == 'P' 493 && id3 == 'P'
469 && id4 == 'E' 494 && id4 == 'E'
470 && seq_cdc == 26 495 && seq_cdc == 26
… …
482 u8 data [MAXSIZE - 6 * 2]; 507 u8 data [MAXSIZE - 6 * 2];
483 508
484 int decode_label (char *data, int size, int &offs); 509 int decode_label (char *data, int size, int &offs);
485}; 510};
486 511
512int
487int dns_packet::decode_label (char *data, int size, int &offs) 513dns_packet::decode_label (char *data, int size, int &offs)
488{ 514{
489 char *orig = data; 515 char *orig = data;
490 516
491 memset (data, 0, size); 517 memset (data, 0, size);
492 518
… …
518 return data - orig; 544 return data - orig;
519} 545}
520 546
521///////////////////////////////////////////////////////////////////////////// 547/////////////////////////////////////////////////////////////////////////////
522 548
549static
550u16 next_id ()
551{
523static u16 dns_id = 0; // TODO: should be per-vpn 552 static u16 dns_id = 0; // TODO: should be per-vpn
524 553
525static u16 next_id ()
526{
527 if (!dns_id) 554 if (!dns_id)
528 dns_id = time (0); 555 dns_id = time (0);
529 556
530 // the simplest lsfr with periodicity 65535 i could find 557 // the simplest lsfr with periodicity 65535 i could find
531 dns_id = (dns_id << 1) 558 dns_id = (dns_id << 1)
… …
557 vector<dns_rcv *> rcvpq; 584 vector<dns_rcv *> rcvpq;
558 585
559 byte_stream rcvdq; int rcvseq; int repseq; 586 byte_stream rcvdq; int rcvseq; int repseq;
560 byte_stream snddq; int sndseq; 587 byte_stream snddq; int sndseq;
561 588
562 void time_cb (time_watcher &w); time_watcher tw; 589 inline void time_cb (ev::timer &w, int revents); ev::timer tw;
563 void receive_rep (dns_rcv *r); 590 void receive_rep (dns_rcv *r);
564 591
565 dns_connection (connection *c); 592 dns_connection (connection *c);
566 ~dns_connection (); 593 ~dns_connection ();
567}; 594};
… …
586: dns (dns) 613: dns (dns)
587{ 614{
588 timeout = 0; 615 timeout = 0;
589 retry = 0; 616 retry = 0;
590 seqno = 0; 617 seqno = 0;
591 sent = NOW; 618 sent = ev_now ();
592 stdhdr = false; 619 stdhdr = false;
593 620
594 pkt = new dns_packet; 621 pkt = new dns_packet;
595 622
596 pkt->id = next_id (); 623 pkt->id = next_id ();
… …
599dns_snd::~dns_snd () 626dns_snd::~dns_snd ()
600{ 627{
601 delete pkt; 628 delete pkt;
602} 629}
603 630
631static void
604static void append_domain (dns_packet &pkt, int &offs, const char *domain) 632append_domain (dns_packet &pkt, int &offs, const char *domain)
605{ 633{
606 // add tunnel domain 634 // add tunnel domain
607 for (;;) 635 for (;;)
608 { 636 {
609 const char *end = strchr (domain, '.'); 637 const char *end = strchr (domain, '.');
… …
622 650
623 domain = end + 1; 651 domain = end + 1;
624 } 652 }
625} 653}
626 654
655void
627void dns_snd::gen_stream_req (int seqno, byte_stream &stream) 656dns_snd::gen_stream_req (int seqno, byte_stream &stream)
628{ 657{
629 stdhdr = true; 658 stdhdr = true;
630 this->seqno = seqno; 659 this->seqno = seqno;
631 660
632 timeout = NOW + INITIAL_TIMEOUT; 661 timeout = ev_now () + INITIAL_TIMEOUT;
633 662
634 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 663 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
635 pkt->qdcount = htons (1); 664 pkt->qdcount = htons (1);
636 665
637 int offs = 6*2; 666 int offs = 6*2;
… …
670 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN; 699 (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN;
671 700
672 pkt->len = offs; 701 pkt->len = offs;
673} 702}
674 703
704void
675void dns_snd::gen_syn_req () 705dns_snd::gen_syn_req ()
676{ 706{
677 timeout = NOW + INITIAL_SYN_TIMEOUT; 707 timeout = ev_now () + INITIAL_SYN_TIMEOUT;
678 708
679 pkt->flags = htons (DEFAULT_CLIENT_FLAGS); 709 pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
680 pkt->qdcount = htons (1); 710 pkt->qdcount = htons (1);
681 711
682 int offs = 6 * 2; 712 int offs = 6 * 2;
… …
722 752
723dns_connection::dns_connection (connection *c) 753dns_connection::dns_connection (connection *c)
724: c (c) 754: c (c)
725, rcvdq (MAX_BACKLOG * 2) 755, rcvdq (MAX_BACKLOG * 2)
726, snddq (MAX_BACKLOG) 756, snddq (MAX_BACKLOG)
727, tw (this, &dns_connection::time_cb)
728{ 757{
758 tw.set<dns_connection, &dns_connection::time_cb> (this);
759
729 vpn = c->vpn; 760 vpn = c->vpn;
730 761
731 established = false; 762 established = false;
732 763
733 rcvseq = repseq = sndseq = 0; 764 rcvseq = repseq = sndseq = 0;
… …
744 i != rcvpq.end (); 775 i != rcvpq.end ();
745 ++i) 776 ++i)
746 delete *i; 777 delete *i;
747} 778}
748 779
780void
749void dns_connection::receive_rep (dns_rcv *r) 781dns_connection::receive_rep (dns_rcv *r)
750{ 782{
751 if (r->datalen) 783 if (r->datalen)
752 { 784 {
753 last_received = NOW; 785 last_received = ev_now ();
754 tw.trigger (); 786 tw ();
755 787
756 poll_interval = send_interval; 788 poll_interval = send_interval;
757 } 789 }
758 else 790 else
759 { 791 {
… …
769 801
770 // find next packet 802 // find next packet
771 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); ) 803 for (vector<dns_rcv *>::iterator i = rcvpq.end (); i-- != rcvpq.begin (); )
772 if (SEQNO_EQ (rcvseq, (*i)->seqno)) 804 if (SEQNO_EQ (rcvseq, (*i)->seqno))
773 { 805 {
806 //printf ("seqno eq %x %x\n", rcvseq, (*i)->seqno);//D
774 // enter the packet into our input stream 807 // enter the packet into our input stream
775 r = *i; 808 r = *i;
776 809
777 // remove the oldest packet, look forward, as it's oldest first 810 // remove the oldest packet, look forward, as it's oldest first
778 for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j) 811 for (vector<dns_rcv *>::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j)
779 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW)) 812 if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW))
780 { 813 {
814 //printf ("seqno RR %x %x\n", (*j)->seqno, rcvseq - MAX_WINDOW);//D
781 delete *j; 815 delete *j;
782 rcvpq.erase (j); 816 rcvpq.erase (j);
783 break; 817 break;
784 } 818 }
785 819
… …
1013 { 1047 {
1014 dns_connection *dns = (*i)->dns; 1048 dns_connection *dns = (*i)->dns;
1015 connection *c = dns->c; 1049 connection *c = dns->c;
1016 int seqno = (*i)->seqno; 1050 int seqno = (*i)->seqno;
1017 u8 data[MAXSIZE], *datap = data; 1051 u8 data[MAXSIZE], *datap = data;
1052 //printf ("rcv pkt %x\n", seqno);//D
1018 1053
1019 if ((*i)->retry) 1054 if ((*i)->retry)
1020 { 1055 {
1021 dns->send_interval *= 1.01; 1056 dns->send_interval *= 1.01;
1022 if (dns->send_interval > MAX_SEND_INTERVAL) 1057 if (dns->send_interval > MAX_SEND_INTERVAL)
… …
1027#if 0 1062#if 0
1028 dns->send_interval *= 0.999; 1063 dns->send_interval *= 0.999;
1029#endif 1064#endif
1030 // the latency surely puts an upper bound on 1065 // the latency surely puts an upper bound on
1031 // the minimum send interval 1066 // the minimum send interval
1032 double latency = NOW - (*i)->sent; 1067 double latency = ev_now () - (*i)->sent;
1033 1068
1034 if (latency < dns->min_latency) 1069 if (latency < dns->min_latency)
1035 dns->min_latency = latency; 1070 dns->min_latency = latency;
1036 1071
1037 if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor) 1072 if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
… …
1151 break; 1186 break;
1152 } 1187 }
1153} 1188}
1154 1189
1155void 1190void
1156vpn::dnsv4_ev (io_watcher &w, short revents) 1191vpn::dnsv4_ev (ev::io &w, int revents)
1157{ 1192{
1158 if (revents & EVENT_READ) 1193 if (revents & EV_READ)
1159 { 1194 {
1160 dns_packet *pkt = new dns_packet; 1195 dns_packet *pkt = new dns_packet;
1161 struct sockaddr_in sa; 1196 struct sockaddr_in sa;
1162 socklen_t sa_len = sizeof (sa); 1197 socklen_t sa_len = sizeof (sa);
1163 1198
… …
1189 1224
1190 if (!c->dns) 1225 if (!c->dns)
1191 c->dns = new dns_connection (c); 1226 c->dns = new dns_connection (c);
1192 1227
1193 if (c->dns->snddq.put (pkt)) 1228 if (c->dns->snddq.put (pkt))
1194 c->dns->tw.trigger (); 1229 c->dns->tw ();
1195 1230
1196 // always return true even if the buffer overflows 1231 // always return true even if the buffer overflows
1197 return true; 1232 return true;
1198} 1233}
1199 1234
… …
1204} 1239}
1205 1240
1206#define NEXT(w) do { if (next > (w)) next = w; } while (0) 1241#define NEXT(w) do { if (next > (w)) next = w; } while (0)
1207 1242
1208void 1243void
1209dns_connection::time_cb (time_watcher &w) 1244dns_connection::time_cb (ev::timer &w, int revents)
1210{ 1245{
1211 // servers have to be polled 1246 // servers have to be polled
1212 if (THISNODE->dns_port) 1247 if (THISNODE->dns_port)
1213 return; 1248 return;
1214 1249
1215 // check for timeouts and (re)transmit 1250 // check for timeouts and (re)transmit
1216 tstamp next = NOW + poll_interval; 1251 tstamp next = ev::now () + poll_interval;
1217 dns_snd *send = 0; 1252 dns_snd *send = 0;
1218 1253
1219 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin (); 1254 for (vector<dns_snd *>::iterator i = vpn->dns_sndpq.begin ();
1220 i != vpn->dns_sndpq.end (); 1255 i != vpn->dns_sndpq.end ();
1221 ++i) 1256 ++i)
1222 { 1257 {
1223 dns_snd *r = *i; 1258 dns_snd *r = *i;
1224 1259
1225 if (r->timeout <= NOW) 1260 if (r->timeout <= ev_now ())
1226 { 1261 {
1227 if (!send) 1262 if (!send)
1228 { 1263 {
1229 send = r; 1264 send = r;
1230 1265
1231 r->retry++; 1266 r->retry++;
1232 r->timeout = NOW + (r->retry * min_latency * conf.dns_timeout_factor); 1267 r->timeout = ev_now () + (r->retry * min_latency * conf.dns_timeout_factor);
1268 //printf ("RETRY %x (%d, %f)\n", r->seqno, r->retry, r->timeout - ev_now ());//D
1233 1269
1234 // the following code changes the query section a bit, forcing 1270 // the following code changes the query section a bit, forcing
1235 // the forwarder to generate a new request 1271 // the forwarder to generate a new request
1236 if (r->stdhdr) 1272 if (r->stdhdr)
1237 {
1238 //printf ("reencoded header for ID %d retry %d:%d:%d (%p)\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);
1239 //encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry); 1273 encode_header ((char *)r->pkt->at (6 * 2 + 1), THISNODE->id, r->seqno, r->retry);
1240 }
1241 } 1274 }
1242 } 1275 }
1243 else 1276 else
1244 NEXT (r->timeout); 1277 NEXT (r->timeout);
1245 } 1278 }
… …
1259 } 1292 }
1260 } 1293 }
1261 else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding 1294 else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
1262 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1))) 1295 && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
1263 { 1296 {
1264 if (last_sent + send_interval <= NOW) 1297 if (last_sent + send_interval <= ev_now ())
1265 { 1298 {
1266 //printf ("sending data request etc.\n"); //D 1299 //printf ("sending data request etc.\n"); //D
1267 if (!snddq.empty () || last_received + 1. > NOW) 1300 if (!snddq.empty () || last_received + 1. > ev_now ())
1268 { 1301 {
1269 poll_interval = send_interval; 1302 poll_interval = send_interval;
1270 NEXT (NOW + send_interval); 1303 NEXT (ev_now () + send_interval);
1271 } 1304 }
1272 1305
1273 send = new dns_snd (this); 1306 send = new dns_snd (this);
1274 send->gen_stream_req (sndseq, snddq); 1307 send->gen_stream_req (sndseq, snddq);
1275 send->timeout = NOW + min_latency * conf.dns_timeout_factor; 1308 send->timeout = ev_now () + min_latency * conf.dns_timeout_factor;
1309 //printf ("SEND %x (%f)\n", send->seqno, send->timeout - ev_now (), min_latency, conf.dns_timeout_factor);//D
1276 1310
1277 sndseq = (sndseq + 1) & SEQNO_MASK; 1311 sndseq = (sndseq + 1) & SEQNO_MASK;
1278 } 1312 }
1279 else 1313 else
1280 NEXT (last_sent + send_interval); 1314 NEXT (last_sent + send_interval);
… …
1284 vpn->dns_sndpq.push_back (send); 1318 vpn->dns_sndpq.push_back (send);
1285 } 1319 }
1286 1320
1287 if (send) 1321 if (send)
1288 { 1322 {
1289 last_sent = NOW; 1323 last_sent = ev_now ();
1290 sendto (vpn->dnsv4_fd, 1324 sendto (vpn->dnsv4_fd,
1291 send->pkt->at (0), send->pkt->len, 0, 1325 send->pkt->at (0), send->pkt->len, 0,
1292 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); 1326 vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1293 } 1327 }
1294 1328
1295 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)", 1329 slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)",
1296 poll_interval, send_interval, next - NOW, 1330 poll_interval, send_interval, next - ev_now (),
1297 vpn->dns_sndpq.size (), snddq.size (), 1331 vpn->dns_sndpq.size (), snddq.size (),
1298 rcvpq.size ()); 1332 rcvpq.size ());
1299 1333
1300 // TODO: no idea when this happens, but when next < NOW, we have a problem 1334 // TODO: no idea when this happens, but when next < ev_now (), we have a problem
1301 // doesn't seem to happen anymore 1335 // doesn't seem to happen anymore
1302 if (next < NOW + 0.001) 1336 if (next < ev_now () + 0.001)
1303 next = NOW + 0.1; 1337 next = ev_now () + 0.1;
1304 1338
1305 w.start (next); 1339 w.start (next - ev_now ());
1306} 1340}
1307 1341
1308#endif 1342#endif
1309 1343

Diff Legend

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