--- gvpe/src/vpn_dns.C 2005/03/02 05:49:31 1.4 +++ gvpe/src/vpn_dns.C 2005/03/04 04:52:38 1.9 @@ -1,8 +1,10 @@ /* vpn_dns.C -- handle the dns tunnel part of the protocol. - Copyright (C) 2003-2004 Marc Lehmann + Copyright (C) 2003-2005 Marc Lehmann - This program is free software; you can redistribute it and/or modify + This file is part of GVPE. + + GVPE is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -13,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software + along with gvpe; if not, write to the Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -37,114 +39,239 @@ #include +#include + #include "netcompat.h" #include "vpn.h" #define MIN_RETRY 1. -#define MAX_RETRY 60. +#define MAX_RETRY 6. -#define MAX_OUTSTANDING 10 // max. outstanding requests -#define MAX_WINDOW 100 // max. for MAX_OUTSTANDING -#define MAX_RATE 1 // requests/s -#define MAX_BACKLOG (10*1024) // size of protocol backlog +#define MAX_OUTSTANDING 400 // max. outstanding requests +#define MAX_WINDOW 1000 // max. for MAX_OUTSTANDING +#define MAX_RATE 100 // requests/s +#define MAX_BACKLOG (10*1024) // size of protocol backlog, must be > MAXSIZE + +#define MAX_DOMAIN_SIZE 220 // 255 is legal limit, but bind doesn't compress well +// 240 leaves about 4 bytes of server reply data +// every two request byte sless give room for one reply byte -/* +#define SEQNO_MASK 0xffff +#define SEQNO_EQ(a,b) ( 0 == ( ((a) ^ (b)) & SEQNO_MASK) ) -protocol, in shorthand :) +#define MAX_LBL_SIZE 63 +#define MAX_PKT_SIZE 512 -client -> server ANY? -server -> client TXT +#define RR_TYPE_TXT 16 +#define RR_TYPE_ANY 255 +#define RR_CLASS_IN 1 - is dns64-encoded [] - is dns64-encoded <0:12>[] +// works for cmaps up to 255 (not 256!) +struct charmap +{ + enum { INVALID = (u8)255 }; -if is zero, the connection will be configured: + char encode [256]; // index => char + u8 decode [256]; // char => index + unsigned int size; -<0:12><0:4>client-id:12> + charmap (const char *cmap); +}; -*/ +charmap::charmap (const char *cmap) +{ + char *enc = encode; + u8 *dec = decode; -#define MAX_LBL_SIZE 63 -#define MAX_PKT_SIZE 512 + memset (enc, (char) 0, 256); + memset (dec, (char)INVALID, 256); -#define RR_TYPE_TXT 16 -#define RR_TYPE_ANY 255 -#define RR_CLASS_IN 1 + for (size = 0; cmap [size]; size++) + { + enc [size] = cmap [size]; + dec [(u8)enc [size]] = size; + } -// the "_" is not valid but widely accepted (all octets should be supported, but let's be conservative) -struct dns64 + assert (size < 256); +} + +#define MAX_DEC_LEN 500 +#define MAX_ENC_LEN (MAX_DEC_LEN * 2) +#define MAX_LIMBS ((MAX_DEC_LEN * 8 + GMP_NUMB_BITS - 1) / GMP_NUMB_BITS) + +// ugly. minimum base is 16(!) +struct basecoder +{ + charmap cmap; + unsigned int enc_len [MAX_DEC_LEN]; + unsigned int dec_len [MAX_ENC_LEN]; + + unsigned int encode_len (unsigned int len); + unsigned int decode_len (unsigned int len); + + unsigned int encode (char *dst, u8 *src, unsigned int len); + unsigned int decode (u8 *dst, char *src, unsigned int len); + + basecoder (const char *cmap); +}; + +basecoder::basecoder (const char *cmap) +: cmap (cmap) { - static const char encode_chars[64 + 1]; - static s8 decode_chars[256]; + for (unsigned int len = 0; len < MAX_DEC_LEN; ++len) + { + u8 src [MAX_DEC_LEN]; + u8 dst [MAX_ENC_LEN]; - static int encode_len (int bytes) { return (bytes * 8 + 5) / 6; } - static int decode_len (int bytes) { return (bytes * 6) / 8; } - static int encode (char *dst, u8 *src, int len); - static int decode (u8 *dst, char *src, int len); + memset (src, 255, len); - dns64 (); -} dns64; + mp_limb_t m [MAX_LIMBS]; + mp_size_t n; -const char dns64::encode_chars[64 + 1] = "0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ_-"; -s8 dns64::decode_chars[256]; + n = mpn_set_str (m, src, len, 256); + n = mpn_get_str (dst, this->cmap.size, m, n); -dns64::dns64 () + for (int i = 0; !dst [i]; ++i) + n--; + + enc_len [len] = n; + dec_len [n] = len; + } +} + +unsigned int basecoder::encode_len (unsigned int len) { - for (int i = 0; i < 64; i++) - decode_chars [encode_chars [i]] = i + 1; + return enc_len [len]; } -int dns64::encode (char *dst, u8 *src, int len) +unsigned int basecoder::decode_len (unsigned int len) { - // slow, but easy to debug - char *beg = dst; - unsigned int accum, bits = 0; + while (len && !dec_len [len]) + --len; - while (len--) - { - accum <<= 8; - accum |= *src++; - bits += 8; + return dec_len [len]; +} - while (bits >= 6) - { - *dst++ = encode_chars [(accum >> (bits - 6)) & 63]; - bits -= 6; - } +unsigned int basecoder::encode (char *dst, u8 *src, unsigned int len) +{ + if (!len) + return 0; + + int elen = encode_len (len); + + mp_limb_t m [MAX_LIMBS]; + mp_size_t n; + + u8 dst_ [MAX_ENC_LEN]; + + n = mpn_set_str (m, src, len, 256); + n = mpn_get_str (dst_, cmap.size, m, n); + + int plen = elen; // for padding + + while (n < plen) + { + *dst++ = cmap.encode [0]; + plen--; } - if (bits) - *dst++ = encode_chars [(accum << (6 - bits)) & 63]; + for (unsigned int i = n - plen; i < n; ++i) + *dst++ = cmap.encode [dst_ [i]]; - return dst - beg; + return elen; } -int dns64::decode (u8 *dst, char *src, int len) +unsigned int basecoder::decode (u8 *dst, char *src, unsigned int len) { - // slow, but easy to debug - u8 *beg = dst; - unsigned int accum, bits = 0; + if (!len) + return 0; + + u8 src_ [MAX_ENC_LEN]; + unsigned int elen = 0; while (len--) { - s8 chr = decode_chars [(u8)*src++]; + u8 val = cmap.decode [(u8)*src++]; - if (!chr) - break; + if (val != charmap::INVALID) + src_ [elen++] = val; + } - accum <<= 6; - accum |= chr - 1; - bits += 6; + int dlen = decode_len (elen); - while (bits >= 8) - { - *dst++ = accum >> (bits - 8); - bits -= 8; - } + mp_limb_t m [MAX_LIMBS]; + mp_size_t n; + + u8 dst_ [MAX_DEC_LEN]; + + n = mpn_set_str (m, src_, elen, cmap.size); + n = mpn_get_str (dst_, 256, m, n); + + if (n < dlen) + { + memset (dst, 0, dlen - n); + memcpy (dst + dlen - n, dst_, n); } + else + memcpy (dst, dst_ + n - dlen, dlen); + + return dlen; +} - return dst - beg; +#if 0 +struct test { test (); } test; + +test::test () +{ + basecoder cdc ("0123456789abcdefghijklmnopqrstuvwxyz"); + + u8 in[] = "0123456789abcdefghijklmnopqrstuvwxyz"; + static char enc[200]; + static u8 dec[200]; + + for (int i = 1; i < 20; i++) + { + int elen = cdc.encode (enc, in, i); + int dlen = cdc.decode (dec, enc, elen); + + printf ("%d>%d>%d (%s>%s)\n", i, elen, dlen, enc, dec); + } + abort (); +} +#endif + +// the following sequence has been crafted to +// a) look somewhat random +// b) the even (and odd) indices never share the same character as upper/lowercase +// the "_" is not valid but widely accepted (all octets should be supported, but let's be conservative) +// the other sequences are obviously derived +//static basecoder cdc63 ("_dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI"); +static basecoder cdc62 ("dDpPhHzZrR06QqMmjJkKBb34TtSsvVlL81xXaAeEFf92WwGgYyoO57UucCNniI"); +//static basecoder cdc36 ("dphzr06qmjkb34tsvl81xaef92wgyo57ucni"); // unused as of yet +static basecoder cdc26 ("dPhZrQmJkBtSvLxAeFwGyO"); + +///////////////////////////////////////////////////////////////////////////// + +#define HDRSIZE 6 + +inline void encode_header (char *data, int clientid, int seqno) +{ + u8 hdr[3] = { clientid, seqno >> 8, seqno }; + + assert (clientid < 256); + + cdc26.encode (data, hdr, 3); +} + +inline void decode_header (char *data, int &clientid, int &seqno) +{ + u8 hdr[3]; + + cdc26.decode (hdr, data, HDRSIZE); + + clientid = hdr[0]; + seqno = (hdr[1] << 8) | hdr[2]; } ///////////////////////////////////////////////////////////////////////////// @@ -161,6 +288,7 @@ bool empty () { return !fill; } int size () { return fill; } + bool put (u8 *data, unsigned int datalen); bool put (vpn_packet *pkt); vpn_packet *get (); @@ -187,6 +315,16 @@ memmove (data, data + count, fill -= count); } +bool byte_stream::put (u8 *data, unsigned int datalen) +{ + if (maxsize - fill < datalen) + return false; + + memcpy (this->data + fill, data, datalen); fill += datalen; + + return true; +} + bool byte_stream::put (vpn_packet *pkt) { if (maxsize - fill < pkt->len + 2) @@ -204,10 +342,15 @@ { int len = (data [0] << 8) | data [1]; + if (len > MAXSIZE && fill >= 2) + abort (); // TODO handle this gracefully, connection reset + if (fill < len + 2) return 0; vpn_packet *pkt = new vpn_packet; + + pkt->len = len; memcpy (&((*pkt)[0]), data + 2, len); remove (len + 2); @@ -218,12 +361,13 @@ #define FLAG_QUERY ( 0 << 15) #define FLAG_RESPONSE ( 1 << 15) -#define FLAG_OP_MASK (15 << 14) +#define FLAG_OP_MASK (15 << 11) #define FLAG_OP_QUERY ( 0 << 11) #define FLAG_AA ( 1 << 10) #define FLAG_TC ( 1 << 9) #define FLAG_RD ( 1 << 8) #define FLAG_RA ( 1 << 7) +#define FLAG_AUTH ( 1 << 5) #define FLAG_RCODE_MASK (15 << 0) #define FLAG_RCODE_OK ( 0 << 0) #define FLAG_RCODE_FORMERR ( 1 << 0) @@ -232,7 +376,7 @@ #define FLAG_RCODE_REFUSED ( 5 << 0) #define DEFAULT_CLIENT_FLAGS (FLAG_QUERY | FLAG_OP_QUERY | FLAG_RD) -#define DEFAULT_SERVER_FLAGS (FLAG_RESPONSE | FLAG_OP_QUERY | FLAG_AA | FLAG_RD) +#define DEFAULT_SERVER_FLAGS (FLAG_RESPONSE | FLAG_OP_QUERY | FLAG_AA | FLAG_RD | FLAG_RA) struct dns_packet : net_packet { @@ -286,68 +430,72 @@ dns_packet *pkt; tstamp next; int retry; - connection *conn; + struct dns_connection *dns; + int seqno; - dns_req (connection *c, int seqno, byte_stream *stream); + dns_req (dns_connection *dns); + void gen_stream_req (int seqno, byte_stream &stream); }; -struct dns_rep +static u16 dns_id = 12098; // TODO: should be per-vpn + +static u16 next_id () { -}; + // the simplest lsfr with periodicity 65535 i could find + dns_id = (dns_id << 1) + | (((dns_id >> 1) + ^ (dns_id >> 2) + ^ (dns_id >> 4) + ^ (dns_id >> 15)) & 1); -static u16 dns_id; // TODO: should be per-vpn + return dns_id; +} -dns_req::dns_req (connection *c, int seqno, byte_stream *stream) -: conn (c) +dns_req::dns_req (dns_connection *dns) +: dns (dns) { next = 0; retry = 0; pkt = new dns_packet; - pkt->id = dns_id++; - pkt->flags = DEFAULT_CLIENT_FLAGS; + pkt->id = next_id (); +} + +void dns_req::gen_stream_req (int seqno, byte_stream &stream) +{ + this->seqno = seqno; + + pkt->flags = htons (DEFAULT_CLIENT_FLAGS); pkt->qdcount = htons (1); - pkt->ancount = 0; - pkt->nscount = 0; - pkt->arcount = 0; int offs = 6*2; - int dlen = 255 - strlen (THISNODE->domain) - 1; // here we always have room for the max. label length + int dlen = MAX_DOMAIN_SIZE - (strlen (THISNODE->domain) + 2); + // MAX_DOMAIN_SIZE is technically 255, but bind doesn't compress responses well, + // so we need to have space for 2*MAX_DOMAIN_SIZE + header + extra - u8 lbl[64]; //D - char enc[65]; - int lbllen = 3; - lbl[0] = c->conf->id; //D - lbl[1] = seqno >> 8; //D - lbl[2] = seqno; //D + char enc[256], *encp = enc; + encode_header (enc, THISNODE->id, seqno); - while (dlen > 0) - { - int sndlen = dlen; + int datalen = cdc62.decode_len (dlen - (dlen + MAX_LBL_SIZE - 1) / MAX_LBL_SIZE - HDRSIZE); - if (sndlen + lbllen > dns64::decode_len (MAX_LBL_SIZE)) - sndlen = dns64::decode_len (MAX_LBL_SIZE) - lbllen; + if (datalen > stream.size ()) + datalen = stream.size (); - if (sndlen > stream->size ()) - sndlen = stream->size (); + int enclen = cdc62.encode (enc + HDRSIZE, stream.begin (), datalen) + HDRSIZE; + stream.remove (datalen); - if (sndlen + lbllen == 0) - break; + while (enclen) + { + int lbllen = enclen < MAX_LBL_SIZE ? enclen : MAX_LBL_SIZE; - memcpy (lbl + lbllen, stream->begin (), sndlen); - stream->remove (sndlen); - lbllen += sndlen; - - dns64::encode (enc, lbl, lbllen); - - int elen = dns64::encode_len (lbllen); - (*pkt)[offs++] = elen; - memcpy (&((*pkt)[offs]), enc, elen); - offs += elen; - dlen -= elen + 1; + (*pkt)[offs++] = lbllen; + memcpy (pkt->at (offs), encp, lbllen); - lbllen = 0; + offs += lbllen; + encp += lbllen; + + enclen -= lbllen; } const char *suffix = THISNODE->domain; @@ -377,11 +525,70 @@ (*pkt)[offs++] = RR_CLASS_IN >> 8; (*pkt)[offs++] = RR_CLASS_IN; pkt->len = offs; +} + +struct dns_rcv +{ + int seqno; + dns_packet *pkt; // reply packet + u8 data [MAXSIZE]; // actually part of the reply packet... + int datalen; + + dns_rcv (int seqno, u8 *data, int datalen); + ~dns_rcv (); +}; - c->vpn->dns_sndpq.push_back (this); +dns_rcv::dns_rcv (int seqno, u8 *data, int datalen) +: seqno (seqno), pkt (new dns_packet), datalen (datalen) +{ + memcpy (this->data, data, datalen); +} + +dns_rcv::~dns_rcv () +{ + delete pkt; } ///////////////////////////////////////////////////////////////////////////// + +struct dns_connection +{ + connection *c; + struct vpn *vpn; + + vector rcvpq; + + int rcvseq; + int sndseq; + + byte_stream rcvdq; + byte_stream snddq; + + void time_cb (time_watcher &w); time_watcher tw; + void receive_rep (dns_rcv *r); + + dns_connection (connection *c); + ~dns_connection (); +}; + +dns_connection::dns_connection (connection *c) +: c (c) +, rcvdq (MAX_BACKLOG * 2) +, snddq (MAX_BACKLOG * 2) +, tw (this, &dns_connection::time_cb) +{ + vpn = c->vpn; + + rcvseq = sndseq = 0; +} + +dns_connection::~dns_connection () +{ + for (vector::iterator i = rcvpq.begin (); + i != rcvpq.end (); + ++i) + delete *i; +} struct dns_cfg { @@ -392,6 +599,46 @@ u8 flags1, flags2; }; +void dns_connection::receive_rep (dns_rcv *r) +{ + rcvpq.push_back (r); + + redo: + + // find next packet + for (vector::iterator i = rcvpq.end (); i-- != rcvpq.begin (); ) + if (SEQNO_EQ (rcvseq, (*i)->seqno)) + { + // enter the packet into our input stream + r = *i; + + // remove the oldest packet, look forward, as it's oldest first + for (vector::iterator j = rcvpq.begin (); j != rcvpq.end (); ++j) + if (SEQNO_EQ ((*j)->seqno, rcvseq - MAX_WINDOW)) + { + delete *j; + rcvpq.erase (j); + break; + } + + rcvseq = (rcvseq + 1) & SEQNO_MASK; + + if (!rcvdq.put (r->data, r->datalen)) + abort (); // MUST never overflow, can be caused by data corruption, TODO + + while (vpn_packet *pkt = rcvdq.get ()) + { + sockinfo si; + si.host = 0; si.port = 0; si.prot = PROT_DNSv4; + + vpn->recv_vpn_packet (pkt, si); + } + + // check for further packets + goto redo; + } +} + dns_packet * vpn::dnsv4_server (dns_packet *pkt) { @@ -402,15 +649,12 @@ pkt->flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR); - if (!(flags & (FLAG_RESPONSE | FLAG_OP_MASK | FLAG_TC)) + if (0 == (flags & (FLAG_RESPONSE | FLAG_OP_MASK | FLAG_TC)) && pkt->qdcount == htons (1)) { char qname[MAXSIZE]; int qlen = pkt->decode_label ((char *)qname, MAXSIZE - offs, offs); - printf ("rcvd packet len %d, id%04x flags%04x q%04x a%04x n%04x a%04x <%s>\n", pkt->len, - pkt->id, flags, pkt->qdcount, pkt->ancount, pkt->nscount, pkt->arcount, qname);//D - u16 qtype = (*pkt) [offs++] << 8; qtype |= (*pkt) [offs++]; u16 qclass = (*pkt) [offs++] << 8; qclass |= (*pkt) [offs++]; @@ -425,71 +669,99 @@ if (qclass == RR_CLASS_IN && (qtype == RR_TYPE_ANY || qtype == RR_TYPE_TXT) - && qlen > dlen + 1 + && qlen > dlen + 1 + HDRSIZE && !memcmp (qname + qlen - dlen - 1, THISNODE->domain, dlen)) { - // correct class, domain, parse + // correct class, domain: parse + int client, seqno; + decode_header (qname, client, seqno); + u8 data[MAXSIZE]; - int datalen = dns64::decode (data, qname, qlen - dlen - 1); + int datalen = cdc62.decode (data, qname + HDRSIZE, qlen - (dlen + 1 + HDRSIZE)); + + if (0 < client && client <= conns.size ()) + { + connection *c = conns [client - 1]; - for (int i = 0; i < datalen; i++) - printf ("%02x ", data[i]); - printf ("\n"); + if (!c->dns) + c->dns = new dns_connection (c); - + dns_connection *dns = c->dns; + for (vector::iterator i = dns->rcvpq.end (); i-- != dns->rcvpq.begin (); ) + if (SEQNO_EQ ((*i)->seqno, seqno)) + { + // already seen that request: simply reply with the cached reply + dns_rcv *r = *i; -#if 0 - // now generate reply - rep->ancount = htons (1); // one answer RR - rep->flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_OK); + printf ("DUPLICATE %d\n", htons (r->pkt->id));//D - (*rep) [offs++] = 0xc0; - (*rep) [offs++] = 6 * 2; // same as in query section + memcpy (pkt->at (0), r->pkt->at (0), offs = r->pkt->len); + pkt->id = r->pkt->id; + goto duplicate_request; + } - (*rep) [offs++] = RR_TYPE_TXT >> 8; (*rep) [offs++] = RR_TYPE_TXT; - (*rep) [offs++] = RR_CLASS_IN >> 8; (*rep) [offs++] = RR_CLASS_IN; + // new packet, queue + dns_rcv *rcv = new dns_rcv (seqno, data, datalen); + dns->receive_rep (rcv); - (*rep) [offs++] = 0; (*rep) [offs++] = 0; - (*rep) [offs++] = 0; (*rep) [offs++] = 0; // TTL + // now generate reply + pkt->ancount = htons (1); // one answer RR + pkt->flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_OK); - int dlen = MAX_PKT_SIZE - offs - 2; + (*pkt) [offs++] = 0xc0; + (*pkt) [offs++] = 6 * 2; // same as in query section - printf ("we have room for %d bytes\n", dlen); + (*pkt) [offs++] = RR_TYPE_TXT >> 8; (*pkt) [offs++] = RR_TYPE_TXT; + (*pkt) [offs++] = RR_CLASS_IN >> 8; (*pkt) [offs++] = RR_CLASS_IN; - int rdlen_offs = offs += 2; + (*pkt) [offs++] = 0; (*pkt) [offs++] = 0; + (*pkt) [offs++] = 0; (*pkt) [offs++] = 0; // TTL - u8 txt[255]; - txt[0] = 0; - txt[1] = 0; + int dlen = MAX_PKT_SIZE - offs - 2; - int txtlen = 2; + // bind doesn't compress well, so reduce further by one label length + dlen -= qlen; - while (dlen > 1) - { - int sndlen = --dlen; + int rdlen_offs = offs += 2; - if (sndlen + txtlen > 255) - sndlen = 255 - txtlen; + while (dlen > 1 && !dns->snddq.empty ()) + { + int txtlen = dlen <= 255 ? dlen - 1 : 255; - sndlen = 0; + if (txtlen > dns->snddq.size ()) + txtlen = dns->snddq.size (); - (*rep)[offs++] = sndlen + txtlen; - memcpy (&((*rep)[offs]), txt, txtlen); - offs += txtlen; + (*pkt)[offs++] = txtlen; + memcpy (pkt->at (offs), dns->snddq.begin (), txtlen); + offs += txtlen; + dns->snddq.remove (txtlen); - //if (sndlen + txtlen > dns_snddq. - } + dlen -= txtlen + 1; + } - int rdlen = offs - rdlen_offs; + // avoid empty TXT rdata + if (offs == rdlen_offs) + (*pkt)[offs++] = 0; - (*rep) [rdlen_offs - 2] = rdlen >> 8; - (*rep) [rdlen_offs - 1] = rdlen; -#endif + int rdlen = offs - rdlen_offs; + + (*pkt) [rdlen_offs - 2] = rdlen >> 8; + (*pkt) [rdlen_offs - 1] = rdlen; + + // now update dns_rcv copy + rcv->pkt->len = offs; + memcpy (rcv->pkt->at (0), pkt->at (0), offs); + + duplicate_request: ; + } + else + pkt->flags = htons (DEFAULT_SERVER_FLAGS | FLAG_RCODE_FORMERR); } + + pkt->len = offs; } - pkt->len = offs; return pkt; } @@ -502,17 +774,20 @@ pkt->qdcount = ntohs (pkt->qdcount); pkt->ancount = ntohs (pkt->ancount); + // go through our request list and find the corresponding request for (vector::iterator i = dns_sndpq.begin (); i != dns_sndpq.end (); ++i) if ((*i)->pkt->id == pkt->id) { - connection *c = (*i)->conn; - printf ("GOT RESPONSE id %x %p\n", pkt->id, c);//D + dns_connection *dns = (*i)->dns; + int seqno = (*i)->seqno; + u8 data[MAXSIZE], *datap = data; + delete *i; dns_sndpq.erase (i); - if (flags & (FLAG_RESPONSE | FLAG_OP_MASK | FLAG_TC)) + if (flags & FLAG_RESPONSE && !(flags & (FLAG_OP_MASK | FLAG_TC))) { char qname[MAXSIZE]; @@ -522,9 +797,9 @@ offs += 4; // skip qtype, qclass } - while (pkt->ancount-- && offs < MAXSIZE - 10) + while (pkt->ancount-- && offs < MAXSIZE - 10 && datap) { - pkt->decode_label ((char *)qname, MAXSIZE - offs, offs); + int qlen = pkt->decode_label ((char *)qname, MAXSIZE - offs, offs); u16 qtype = (*pkt) [offs++] << 8; qtype |= (*pkt) [offs++]; u16 qclass = (*pkt) [offs++] << 8; qclass |= (*pkt) [offs++]; @@ -535,19 +810,47 @@ u16 rdlen = (*pkt) [offs++] << 8; rdlen |= (*pkt) [offs++]; - printf ("REPLY %d:%d TTL %d RD %d\n", qtype, qclass, ttl, rdlen); + if (rdlen <= MAXSIZE - offs) + { + // decode bytes, finally + + while (rdlen) + { + int txtlen = (*pkt) [offs++]; - offs += rdlen; + assert (txtlen + offs < MAXSIZE - 1); + + memcpy (datap, pkt->at (offs), txtlen); + datap += txtlen; offs += txtlen; + + rdlen -= txtlen + 1; + } + } - if (MAXSIZE - offs < rdlen) + int client, rseqno; + decode_header (qname, client, rseqno); + + if (client != THISNODE->id) { - // decode bytes, finally + slog (L_INFO, _("got dns tunnel response with wrong clientid, ignoring")); + datap = 0; + } + else if (rseqno != seqno) + { + slog (L_DEBUG, _("got dns tunnel response with wrong seqno, badly caching nameserver?")); + datap = 0; } } } + // todo: pkt now used + if (datap) + dns->receive_rep (new dns_rcv (seqno, data, datap - data)); + break; } + + delete pkt; } void @@ -562,49 +865,47 @@ pkt->len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); if (pkt->len > 0) - if (THISNODE->dns_port) - { - pkt = dnsv4_server (pkt); - sendto (w.fd, &((*pkt)[0]), pkt->len, 0, (sockaddr *)&sa, sa_len); - } - else - dnsv4_client (pkt); + { + if (pkt->flags & htons (FLAG_TC)) + { + slog (L_WARN, _("DNS request/response truncated, check protocol settings.")); + //TODO connection reset + } + + if (THISNODE->dns_port) + { + pkt = dnsv4_server (pkt); + sendto (w.fd, &((*pkt)[0]), pkt->len, 0, (sockaddr *)&sa, sa_len); + } + else + dnsv4_client (pkt); + } } } bool connection::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) { - // never initialized - if (!dns_snddq && !dns_rcvdq) - { - dns_rcvdq = new byte_stream (MAX_BACKLOG * 2); - dns_snddq = new byte_stream (MAX_BACKLOG); - - dns_rcvseq = dns_sndseq = 0; - - dns_si.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); - } + if (!dns) + dns = new dns_connection (this); - if (!dns_snddq->put (pkt)) + if (!dns->snddq.put (pkt)) return false; // start timer if neccessary - if (!dnsv4_tw.active) - dnsv4_cb (dnsv4_tw); + if (!THISNODE->dns_port && !dns->tw.active) + dns->tw.trigger (); return true; } void -connection::dnsv4_cb (time_watcher &w) +dns_connection::time_cb (time_watcher &w) { // check for timeouts and (re)transmit tstamp next = NOW + 60; dns_req *send = 0; - slog (L_NOISE, _("dnsv4, %d packets in send queue\n"), vpn->dns_sndpq.size ()); - for (vector::iterator i = vpn->dns_sndpq.begin (); i != vpn->dns_sndpq.end (); ++i) @@ -617,7 +918,8 @@ { send = r; - slog (L_NOISE, _("dnsv4, send req %d\n"), r->pkt->id); + if (r->retry)//D + printf ("req %d:%d, retry %d\n", r->seqno, r->pkt->id, r->retry); r->retry++; r->next = NOW + r->retry; } @@ -629,7 +931,13 @@ if (!send && vpn->dns_sndpq.size () < MAX_OUTSTANDING) - send = new dns_req (this, dns_sndseq++, dns_snddq); + { + send = new dns_req (this); + send->gen_stream_req (sndseq, snddq); + vpn->dns_sndpq.push_back (send); + + sndseq = (sndseq + 1) & SEQNO_MASK; + } tstamp min_next = NOW + (1. / (tstamp)MAX_RATE); @@ -639,7 +947,8 @@ next = min_next; - sendto (vpn->dnsv4_fd, &((*pkt)[0]), pkt->len, 0, dns_si.sav4 (), dns_si.salenv4 ()); + sendto (vpn->dnsv4_fd, &((*pkt)[0]), pkt->len, 0, + vpn->dns_forwarder.sav4 (), vpn->dns_forwarder.salenv4 ()); } else if (next < min_next) next = min_next;