[ViewVC] Diff of: cvs/gvpe/src/vpn

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.22 by pcg, Sun Mar 6 21:47:35 2005 UTC vs.
Revision 1.39 by pcg, Tue Apr 26 00:55:56 2005 UTC

…		…
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	15	GNU General 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
18	along with gvpe; if not, write to the Free Software	18	along with gvpe; if not, write to the Free Software
19	Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA	19	Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20	*/	20	*/
		21
		22	// TODO: EDNS0 option to increase dns mtu?
		23	// TODO: re-write dns packet parsing/creation using a safe mem-buffer
		24	// to ensure no buffer overflows or similar problems.
21		25
22	#include "config.h"	26	#include "config.h"
23		27
24	#if ENABLE_DNS	28	#if ENABLE_DNS
25		29
…		…
44		48
45	#include "netcompat.h"	49	#include "netcompat.h"
46		50
47	#include "vpn.h"	51	#include "vpn.h"
48		52
49	#define MIN_POLL_INTERVAL .02 // how often to poll minimally when the server has data
50	#define MAX_POLL_INTERVAL 6. // how often to poll minimally when the server has no data	53	#define MAX_POLL_INTERVAL 5. // how often to poll minimally when the server has no data
51	#define ACTIVITY_INTERVAL 5.	54	#define ACTIVITY_INTERVAL 5.
52		55
53	#define INITIAL_TIMEOUT 0.1 // retry timeouts	56	#define INITIAL_TIMEOUT 0.1 // retry timeouts
54	#define INITIAL_SYN_TIMEOUT 10. // retry timeout for initial syn	57	#define INITIAL_SYN_TIMEOUT 2. // retry timeout for initial syn
55		58
56	#define MIN_SEND_INTERVAL 0.01 // wait at least this time between sending requests
57	#define MAX_SEND_INTERVAL 0.5 // optimistic?	59	#define MAX_SEND_INTERVAL 2. // optimistic?
58		60
59	#define MAX_OUTSTANDING 10 // max. outstanding requests
60	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog	61	#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING, and backlog
61	#define MAX_BACKLOG (100*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE	62	#define MAX_BACKLOG (64*1024) // size of gvpe protocol backlog (bytes), must be > MAXSIZE
62		63
63	#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well	64	#define MAX_DOMAIN_SIZE 240 // 255 is legal limit, but bind doesn't compress well
64	// 240 leaves about 4 bytes of server reply data	65	// 240 leaves about 4 bytes of server reply data
65	// every two request bytes less give room for one reply byte	66	// every request byte less give room for two reply bytes
66		67
67	#define SEQNO_MASK 0x3fff	68	#define SEQNO_MASK 0x3fff
68	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )	69	#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) )
69		70
70	#define MAX_LBL_SIZE 63	71	#define MAX_LBL_SIZE 63
…		…
265	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");	266	static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO");
266		267
267	/////////////////////////////////////////////////////////////////////////////	268	/////////////////////////////////////////////////////////////////////////////
268		269
269	#define HDRSIZE 6	270	#define HDRSIZE 6
270		271
271	inline void encode_header (char *data, int clientid, int seqno, int retry = 0)	272	inline void encode_header (char *data, int clientid, int seqno, int retry = 0)
272	{	273	{
273	seqno &= SEQNO_MASK;	274	seqno &= SEQNO_MASK;
274		275
275	u8 hdr[3] = {	276	u8 hdr[3] = {
…		…
409	struct dns_cfg	410	struct dns_cfg
410	{	411	{
411	static int next_uid;	412	static int next_uid;
412		413
413	u8 id1, id2, id3, id4;	414	u8 id1, id2, id3, id4;
		415
414	u8 version;	416	u8 version;
		417	u8 flags;
415	u8 rrtype;	418	u8 rrtype;
416	u8 flags;
417	u8 def_ttl;	419	u8 def_ttl;
418	u8 rcv_cdc;	420
419	u8 snd_cdc;
420	u16 max_size;
421	u16 client;	421	u16 client;
422	u16 uid; // to make request unique	422	u16 uid; // to make request unique
423		423
424	u8 reserved[8];	424	u16 max_size;
		425	u8 seq_cdc;
		426	u8 req_cdc;
		427
		428	u8 rep_cdc;
		429	u8 delay; // time in 0.01s units that the server may delay replying packets
		430	u8 r3, r4;
		431
		432	u8 r5, r6, r7, r8;
425		433
426	void reset (int clientid);	434	void reset (int clientid);
427	bool valid ();	435	bool valid ();
428	};	436	};
429		437
…		…
438		446
439	version = 1;	447	version = 1;
440		448
441	rrtype = RR_TYPE_TXT;	449	rrtype = RR_TYPE_TXT;
442	flags = 0;	450	flags = 0;
443	def_ttl = 1;	451	def_ttl = 0;
		452	seq_cdc = 26;
		453	req_cdc = 62;
444	rcv_cdc = 0;	454	rep_cdc = 0;
445	snd_cdc = 62;
446	max_size = ntohs (MAX_PKT_SIZE);	455	max_size = htons (MAX_PKT_SIZE);
447	client = ntohs (clientid);	456	client = htons (clientid);
448	uid = next_uid++;	457	uid = next_uid++;
		458	delay = 0;
449		459
450	memset (reserved, 0, 8);	460	r3 = r4 = 0;
		461	r4 = r5 = r6 = r7 = 0;
451	}	462	}
452		463
453	bool dns_cfg::valid ()	464	bool dns_cfg::valid ()
454	{	465	{
455	return id1 == 'G'	466	return id1 == 'G'
456	&& id2 == 'V'	467	&& id2 == 'V'
457	&& id3 == 'P'	468	&& id3 == 'P'
458	&& id4 == 'E'	469	&& id4 == 'E'
		470	&& seq_cdc == 26
		471	&& req_cdc == 62
		472	&& rep_cdc == 0
459	&& version == 1	473	&& version == 1;
460	&& flags == 0
461	&& rcv_cdc == 0
462	&& snd_cdc == 62
463	&& max_size == ntohs (MAX_PKT_SIZE);
464	}	474	}
465		475
466	struct dns_packet : net_packet	476	struct dns_packet : net_packet
467	{	477	{
468	u16 id;	478	u16 id;
469	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4	479	u16 flags; // QR:1 Opcode:4 AA:1 TC:1 RD:1 RA:1 Z:3 RCODE:4
470	u16 qdcount, ancount, nscount, arcount;	480	u16 qdcount, ancount, nscount, arcount;
471		481
472	u8 data[MAXSIZE - 6 * 2];	482	u8 data [MAXSIZE - 6 * 2];
473		483
474	int decode_label (char *data, int size, int &offs);	484	int decode_label (char *data, int size, int &offs);
475	};	485	};
476		486
477	int dns_packet::decode_label (char *data, int size, int &offs)	487	int dns_packet::decode_label (char *data, int size, int &offs)
…		…
539		549
540	bool established;	550	bool established;
541		551
542	tstamp last_received;	552	tstamp last_received;
543	tstamp last_sent;	553	tstamp last_sent;
544	double last_latency;	554	double min_latency;
545	double poll_interval, send_interval;	555	double poll_interval, send_interval;
546		556
547	vector<dns_rcv *> rcvpq;	557	vector<dns_rcv *> rcvpq;
548		558
549	byte_stream rcvdq; int rcvseq;	559	byte_stream rcvdq; int rcvseq; int repseq;
550	byte_stream snddq; int sndseq;	560	byte_stream snddq; int sndseq;
551		561
552	void time_cb (time_watcher &w); time_watcher tw;	562	void time_cb (time_watcher &w); time_watcher tw;
553	void receive_rep (dns_rcv *r);	563	void receive_rep (dns_rcv *r);
554		564
…		…
711	/////////////////////////////////////////////////////////////////////////////	721	/////////////////////////////////////////////////////////////////////////////
712		722
713	dns_connection::dns_connection (connection *c)	723	dns_connection::dns_connection (connection *c)
714	: c (c)	724	: c (c)
715	, rcvdq (MAX_BACKLOG * 2)	725	, rcvdq (MAX_BACKLOG * 2)
716	, snddq (MAX_BACKLOG * 2)	726	, snddq (MAX_BACKLOG)
717	, tw (this, &dns_connection::time_cb)	727	, tw (this, &dns_connection::time_cb)
718	{	728	{
719	vpn = c->vpn;	729	vpn = c->vpn;
720		730
721	established = false;	731	established = false;
722		732
723	rcvseq = sndseq = 0;	733	rcvseq = repseq = sndseq = 0;
724		734
725	last_sent = last_received = 0;	735	last_sent = last_received = 0;
726	poll_interval = MIN_POLL_INTERVAL;	736	poll_interval = 0.5; // starting here
727	send_interval = 0.5; // starting rate	737	send_interval = 0.5; // starting rate
728	last_latency = INITIAL_TIMEOUT;	738	min_latency = INITIAL_TIMEOUT;
729	}	739	}
730		740
731	dns_connection::~dns_connection ()	741	dns_connection::~dns_connection ()
732	{	742	{
733	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();	743	for (vector<dns_rcv *>::iterator i = rcvpq.begin ();
…		…
746	poll_interval = send_interval;	756	poll_interval = send_interval;
747	}	757	}
748	else	758	else
749	{	759	{
750	poll_interval *= 1.5;	760	poll_interval *= 1.5;
		761
751	if (poll_interval > MAX_POLL_INTERVAL)	762	if (poll_interval > MAX_POLL_INTERVAL)
752	poll_interval = MAX_POLL_INTERVAL;	763	poll_interval = MAX_POLL_INTERVAL;
753	}	764	}
754		765
755	rcvpq.push_back (r);	766	rcvpq.push_back (r);
…		…
781	}	792	}
782		793
783	while (vpn_packet *pkt = rcvdq.get ())	794	while (vpn_packet *pkt = rcvdq.get ())
784	{	795	{
785	sockinfo si;	796	sockinfo si;
786	si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4;	797	si.host = htonl (c->conf->id); si.port = 0; si.prot = PROT_DNSv4;
787		798
788	vpn->recv_vpn_packet (pkt, si);	799	vpn->recv_vpn_packet (pkt, si);
789		800
790	delete pkt;	801	delete pkt;
791	}	802	}
…		…
805	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);	816	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_FORMERR);
806		817
807	if (0 == (flags & (FLAG_RESPONSE \| FLAG_OP_MASK))	818	if (0 == (flags & (FLAG_RESPONSE \| FLAG_OP_MASK))
808	&& pkt.qdcount == htons (1))	819	&& pkt.qdcount == htons (1))
809	{	820	{
810	char qname[MAXSIZE];	821	char qname [MAXSIZE];
811	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);	822	int qlen = pkt.decode_label ((char *)qname, MAXSIZE - offs, offs);
812		823
813	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];	824	u16 qtype = pkt [offs++] << 8; qtype \|= pkt [offs++];
814	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];	825	u16 qclass = pkt [offs++] << 8; qclass \|= pkt [offs++];
815		826
…		…
822		833
823	int dlen = strlen (THISNODE->domain);	834	int dlen = strlen (THISNODE->domain);
824		835
825	if (qclass == RR_CLASS_IN	836	if (qclass == RR_CLASS_IN
826	&& qlen > dlen + 1	837	&& qlen > dlen + 1
827	&& !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen))	838	&& !memcmp (qname + qlen - (dlen + 1), THISNODE->domain, dlen))
828	{	839	{
829	// now generate reply	840	// now generate reply
830	pkt.ancount = htons (1); // one answer RR	841	pkt.ancount = htons (1); // one answer RR
831	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);	842	pkt.flags = htons (DEFAULT_SERVER_FLAGS \| FLAG_RCODE_OK);
832		843
…		…
845	if (0 < client && client <= conns.size ())	856	if (0 < client && client <= conns.size ())
846	{	857	{
847	connection *c = conns [client - 1];	858	connection *c = conns [client - 1];
848	dns_connection *dns = c->dns;	859	dns_connection *dns = c->dns;
849	dns_rcv *rcv;	860	dns_rcv *rcv;
850	bool in_seq;
851		861
852	if (dns)	862	if (dns)
853	{	863	{
854	for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); )	864	for (vector<dns_rcv *>::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); )
855	if (SEQNO_EQ ((*i)->seqno, seqno))	865	if (SEQNO_EQ ((*i)->seqno, seqno))
…		…
866	memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);	876	memcpy (pkt.at (0), r->pkt->at (0), offs = r->pkt->len);
867		877
868	goto duplicate_request;	878	goto duplicate_request;
869	}	879	}
870		880
871	in_seq = dns->rcvseq == seqno;
872
873	// new packet, queue	881	// new packet, queue
874	rcv = new dns_rcv (seqno, data, datalen);	882	rcv = new dns_rcv (seqno, data, datalen);
875	dns->receive_rep (rcv);	883	dns->receive_rep (rcv);
876	}	884	}
877		885
…		…
884	pkt [offs++] = 0; pkt [offs++] = 0;	892	pkt [offs++] = 0; pkt [offs++] = 0;
885	pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL	893	pkt [offs++] = 0; pkt [offs++] = dns ? dns->cfg.def_ttl : 0; // TTL
886		894
887	int rdlen_offs = offs += 2;	895	int rdlen_offs = offs += 2;
888		896
889	int dlen = (dns ? ntohs (dns->cfg.max_size) : MAX_PKT_SIZE) - offs;
890	// bind doesn't compress well, so reduce further by one label length
891	dlen -= qlen;
892
893	if (dns)	897	if (dns)
894	{	898	{
		899	int dlen = ntohs (dns->cfg.max_size) - offs;
		900
		901	// bind doesn't compress well, so reduce further by one label length
		902	dlen -= qlen;
		903
895	// only put data into in-order sequence packets, if	904	// only put data into in-order sequence packets, if
896	// we receive out-of-order packets we generate empty	905	// we receive out-of-order packets we generate empty
897	// replies	906	// replies
898	while (dlen > 1 && !dns->snddq.empty () && in_seq)	907	//printf ("%d - %d & %x (=%d) < %d\n", seqno, dns->repseq, SEQNO_MASK, (seqno - dns->repseq) & SEQNO_MASK, MAX_WINDOW);//D
		908	if (((seqno - dns->repseq) & SEQNO_MASK) <= MAX_WINDOW)
899	{	909	{
		910	dns->repseq = seqno;
		911
		912	while (dlen > 1 && !dns->snddq.empty ())
		913	{
900	int txtlen = dlen <= 255 ? dlen - 1 : 255;	914	int txtlen = dlen <= 255 ? dlen - 1 : 255;
901		915
902	if (txtlen > dns->snddq.size ())	916	if (txtlen > dns->snddq.size ())
903	txtlen = dns->snddq.size ();	917	txtlen = dns->snddq.size ();
904		918
905	pkt[offs++] = txtlen;	919	pkt[offs++] = txtlen;
906	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);	920	memcpy (pkt.at (offs), dns->snddq.begin (), txtlen);
907	offs += txtlen;	921	offs += txtlen;
908	dns->snddq.remove (txtlen);	922	dns->snddq.remove (txtlen);
909		923
910	dlen -= txtlen + 1;	924	dlen -= txtlen + 1;
		925	}
911	}	926	}
912		927
913	// avoid empty TXT rdata	928	// avoid completely empty TXT rdata
914	if (offs == rdlen_offs)	929	if (offs == rdlen_offs)
915	pkt[offs++] = 0;	930	pkt[offs++] = 0;
916		931
917	slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());	932	slog (L_NOISE, "DNS: snddq %d", dns->snddq.size ());
918	}	933	}
…		…
954	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class	969	pkt [offs++] = RR_CLASS_IN >> 8; pkt [offs++] = RR_CLASS_IN; // class
955	pkt [offs++] = 0; pkt [offs++] = 0;	970	pkt [offs++] = 0; pkt [offs++] = 0;
956	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL	971	pkt [offs++] = 0; pkt [offs++] = cfg.def_ttl; // TTL
957	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength	972	pkt [offs++] = 0; pkt [offs++] = 4; // rdlength
958		973
959	slog (L_INFO, _("DNS: client %d tries to connect"), client);	974	slog (L_INFO, _("DNS: client %d connects"), client);
960		975
961	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;	976	pkt [offs++] = CMD_IP_1; pkt [offs++] = CMD_IP_2; pkt [offs++] = CMD_IP_3;
962	pkt [offs++] = CMD_IP_REJ;	977	pkt [offs++] = CMD_IP_REJ;
963		978
964	if (0 < client && client <= conns.size ())	979	if (0 < client && client <= conns.size ())
…		…
1007	if (dns->send_interval > MAX_SEND_INTERVAL)	1022	if (dns->send_interval > MAX_SEND_INTERVAL)
1008	dns->send_interval = MAX_SEND_INTERVAL;	1023	dns->send_interval = MAX_SEND_INTERVAL;
1009	}	1024	}
1010	else	1025	else
1011	{	1026	{
1012	#if 1	1027	#if 0
1013	dns->send_interval *= 0.999;	1028	dns->send_interval *= 0.999;
1014	#endif	1029	#endif
1015	if (dns->send_interval < MIN_SEND_INTERVAL)
1016	dns->send_interval = MIN_SEND_INTERVAL;
1017
1018	// the latency surely puts an upper bound on	1030	// the latency surely puts an upper bound on
1019	// the minimum send interval	1031	// the minimum send interval
1020	double latency = NOW - (*i)->sent;	1032	double latency = NOW - (*i)->sent;
		1033
		1034	if (latency < dns->min_latency)
1021	dns->last_latency = latency;	1035	dns->min_latency = latency;
1022		1036
1023	if (dns->send_interval > latency)	1037	if (dns->send_interval > dns->min_latency * conf.dns_overlap_factor)
		1038	dns->send_interval = dns->min_latency * conf.dns_overlap_factor;
		1039
		1040	if (dns->send_interval < conf.dns_send_interval)
1024	dns->send_interval = latency;	1041	dns->send_interval = conf.dns_send_interval;
1025	}	1042	}
1026		1043
1027	delete *i;	1044	delete *i;
1028	dns_sndpq.erase (i);	1045	dns_sndpq.erase (i);
1029		1046
…		…
1146		1163
1147	pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);	1164	pkt->len = recvfrom (w.fd, pkt->at (0), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
1148		1165
1149	if (pkt->len > 0)	1166	if (pkt->len > 0)
1150	{	1167	{
1151	if (THISNODE->dns_port)	1168	if (ntohs (pkt->flags) & FLAG_RESPONSE)
		1169	dnsv4_client (*pkt);
		1170	else
1152	{	1171	{
1153	dnsv4_server (*pkt);	1172	dnsv4_server (*pkt);
1154	sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);	1173	sendto (w.fd, pkt->at (0), pkt->len, 0, (sockaddr *)&sa, sa_len);
1155	}	1174	}
1156	else
1157	dnsv4_client (*pkt);
1158		1175
1159	delete pkt;	1176	delete pkt;
1160	}	1177	}
1161	}	1178	}
1162	}	1179	}
1163		1180
1164	bool	1181	bool
1165	vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)	1182	vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
1166	{	1183	{
1167	int client = ntohs (si.port);	1184	int client = ntohl (si.host);
1168		1185
1169	assert (0 < client && client <= conns.size ());	1186	assert (0 < client && client <= conns.size ());
1170		1187
1171	connection *c = conns [client - 1];	1188	connection *c = conns [client - 1];
1172		1189
1173	if (!c->dns)	1190	if (!c->dns)
1174	c->dns = new dns_connection (c);	1191	c->dns = new dns_connection (c);
1175		1192
1176	if (!c->dns->snddq.put (pkt))	1193	if (c->dns->snddq.put (pkt))
1177	return false;
1178
1179	c->dns->tw.trigger ();	1194	c->dns->tw.trigger ();
1180		1195
		1196	// always return true even if the buffer overflows
1181	return true;	1197	return true;
1182	}	1198	}
1183		1199
1184	void	1200	void
1185	connection::dnsv4_reset_connection ()	1201	connection::dnsv4_reset_connection ()
…		…
1211	if (!send)	1227	if (!send)
1212	{	1228	{
1213	send = r;	1229	send = r;
1214		1230
1215	r->retry++;	1231	r->retry++;
1216	r->timeout = NOW + (r->retry * last_latency * 8.);	1232	r->timeout = NOW + (r->retry * min_latency * conf.dns_timeout_factor);
1217		1233
1218	// the following code changes the query section a bit, forcing	1234	// the following code changes the query section a bit, forcing
1219	// the forwarder to generate a new request	1235	// the forwarder to generate a new request
1220	if (r->stdhdr)	1236	if (r->stdhdr)
1221	{	1237	{
1222	//printf ("reencoded header for ID %d retry %d:%d:%d\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);printf ("reencoded header for ID %d retry %d:%d:%d\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);	1238	//printf ("reencoded header for ID %d retry %d:%d:%d (%p)\n", htons (r->pkt->id), THISNODE->id, r->seqno, r->retry);
1223	//encode_header ((char )r->pkt->at (6 2 + 1), THISNODE->id, r->seqno, r->retry);	1239	//encode_header ((char )r->pkt->at (6 2 + 1), THISNODE->id, r->seqno, r->retry);
1224	}	1240	}
1225	}	1241	}
1226	}	1242	}
1227	else	1243	else
1228	NEXT (r->timeout);	1244	NEXT (r->timeout);
1229	}	1245	}
1230		1246
1231	if (last_sent + send_interval <= NOW)
1232	{
1233	if (!send)	1247	if (!send)
		1248	{
		1249	// generate a new packet, if wise
		1250
		1251	if (!established)
1234	{	1252	{
1235	// generate a new packet, if wise	1253	if (vpn->dns_sndpq.empty ())
1236
1237	if (!established)
1238	{	1254	{
1239	if (vpn->dns_sndpq.empty ())
1240	{
1241	send = new dns_snd (this);	1255	send = new dns_snd (this);
1242		1256
1243	printf ("new conn %p %d\n", this, c->conf->id);//D
1244	cfg.reset (THISNODE->id);	1257	cfg.reset (THISNODE->id);
1245	send->gen_syn_req ();	1258	send->gen_syn_req ();
1246	}
1247	}	1259	}
1248	else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING	1260	}
		1261	else if (vpn->dns_sndpq.size () < conf.dns_max_outstanding
1249	&& !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))	1262	&& !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
		1263	{
		1264	if (last_sent + send_interval <= NOW)
1250	{	1265	{
1251	//printf ("sending data request etc.\n"); //D	1266	//printf ("sending data request etc.\n"); //D
1252	if (!snddq.empty ())	1267	if (!snddq.empty () \|\| last_received + 1. > NOW)
1253	{	1268	{
1254	poll_interval = send_interval;	1269	poll_interval = send_interval;
1255	NEXT (NOW + send_interval);	1270	NEXT (NOW + send_interval);
1256	}	1271	}
1257		1272
1258	send = new dns_snd (this);	1273	send = new dns_snd (this);
1259	send->gen_stream_req (sndseq, snddq);	1274	send->gen_stream_req (sndseq, snddq);
1260	send->timeout = NOW + last_latency * 8.;	1275	send->timeout = NOW + min_latency * conf.dns_timeout_factor;
1261		1276
1262	sndseq = (sndseq + 1) & SEQNO_MASK;	1277	sndseq = (sndseq + 1) & SEQNO_MASK;
1263	}	1278	}
1264		1279	else
1265	if (send)	1280	NEXT (last_sent + send_interval);
1266	vpn->dns_sndpq.push_back (send);
1267	}	1281	}
1268		1282
1269	if (send)	1283	if (send)
1270	{	1284	vpn->dns_sndpq.push_back (send);
		1285	}
		1286
		1287	if (send)
		1288	{
1271	last_sent = NOW;	1289	last_sent = NOW;
1272	sendto (vpn->dnsv4_fd,	1290	sendto (vpn->dnsv4_fd,
1273	send->pkt->at (0), send->pkt->len, 0,	1291	send->pkt->at (0), send->pkt->len, 0,
1274	vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());	1292	vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ());
1275	}
1276	}	1293	}
1277	else
1278	NEXT (last_sent + send_interval);
1279		1294
1280	slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d)",	1295	slog (L_NOISE, "DNS: pi %f si %f N %f (%d:%d %d)",
1281	poll_interval, send_interval, next - NOW,	1296	poll_interval, send_interval, next - NOW,
1282	vpn->dns_sndpq.size (), snddq.size ());	1297	vpn->dns_sndpq.size (), snddq.size (),
		1298	rcvpq.size ());
1283		1299
1284	// TODO: no idea when this happens, but when next < NOW, we have a problem	1300	// TODO: no idea when this happens, but when next < NOW, we have a problem
		1301	// doesn't seem to happen anymore
1285	if (next < NOW + 0.0001)	1302	if (next < NOW + 0.001)
1286	next = NOW + 0.1;	1303	next = NOW + 0.1;
1287		1304
1288	w.start (next);	1305	w.start (next);
1289	}	1306	}
1290		1307

Diff Legend

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

Comparing gvpe/src/vpn_dns.C (file contents): Revision 1.22 by pcg, Sun Mar 6 21:47:35 2005 UTC vs. Revision 1.39 by pcg, Tue Apr 26 00:55:56 2005 UTC

Diff Legend

Comparing gvpe/src/vpn_dns.C (file contents):
Revision 1.22 by pcg, Sun Mar 6 21:47:35 2005 UTC vs.
Revision 1.39 by pcg, Tue Apr 26 00:55:56 2005 UTC