--- gvpe/src/vpn_dns.C	2005/03/05 03:47:05	1.17
+++ gvpe/src/vpn_dns.C	2005/03/06 21:32:15	1.20
@@ -27,6 +27,7 @@
 // it's a hack, use only in emergency situations please.
 
 #include <cstring>
+#include <cassert>
 
 #include <sys/types.h>
 #include <sys/socket.h>
@@ -358,11 +359,20 @@
 
 vpn_packet *byte_stream::get ()
 {
-  unsigned int len = (data [0] << 8) | data [1];
+  unsigned int len;
+  
+  for (;;)
+    {
+      len = (data [0] << 8) | data [1];
 
-  if (len > MAXSIZE && fill >= 2)
-    assert (len <= MAXSIZE || fill < 2); // TODO handle this gracefully, connection reset
+      if (len <= MAXSIZE || fill < 2)
+        break;
 
+      // TODO: handle this better than skipping, e.g. by reset
+      slog (L_DEBUG, _("DNS: corrupted packet stream skipping a byte..."));
+      remove (1);
+    }
+      
   if (fill < len + 2)
     return 0;
 
@@ -500,6 +510,52 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
+static u16 dns_id = 0; // TODO: should be per-vpn
+
+static u16 next_id ()
+{
+  if (!dns_id)
+    dns_id = time (0);
+
+  // 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);
+
+  return dns_id;
+}
+
+struct dns_rcv;
+struct dns_snd;
+
+struct dns_connection
+{
+  connection *c;
+  struct vpn *vpn;
+
+  dns_cfg cfg;
+
+  bool established;
+
+  tstamp last_received;
+  tstamp last_sent;
+  double last_latency;
+  double poll_interval, send_interval;
+
+  vector<dns_rcv *> rcvpq;
+
+  byte_stream rcvdq; int rcvseq;
+  byte_stream snddq; int sndseq;
+
+  void time_cb (time_watcher &w); time_watcher tw;
+  void receive_rep (dns_rcv *r);
+
+  dns_connection (connection *c);
+  ~dns_connection ();
+};
+
 struct dns_snd
 {
   dns_packet *pkt;
@@ -510,26 +566,12 @@
   bool stdhdr;
 
   void gen_stream_req (int seqno, byte_stream &stream);
-  void gen_syn_req (const dns_cfg &cfg);
+  void gen_syn_req ();
 
   dns_snd (dns_connection *dns);
   ~dns_snd ();
 };
 
-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);
-
-  return dns_id;
-}
-
 dns_snd::dns_snd (dns_connection *dns)
 : dns (dns)
 {
@@ -583,7 +625,7 @@
   pkt->qdcount = htons (1);
 
   int offs = 6*2;
-  int dlen = MAX_DOMAIN_SIZE - (strlen (THISNODE->domain) + 2);
+  int dlen = MAX_DOMAIN_SIZE - (strlen (dns->c->conf->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
 
@@ -611,7 +653,7 @@
       enclen -= lbllen;
     }
 
-  append_domain (*pkt, offs, THISNODE->domain);
+  append_domain (*pkt, offs, dns->c->conf->domain);
 
   (*pkt)[offs++] = 0;
   (*pkt)[offs++] = RR_TYPE_ANY >> 8; (*pkt)[offs++] = RR_TYPE_ANY;
@@ -620,22 +662,24 @@
   pkt->len = offs;
 }
 
-void dns_snd::gen_syn_req (const dns_cfg &cfg)
+void dns_snd::gen_syn_req ()
 {
   timeout = NOW + INITIAL_SYN_TIMEOUT;
 
+  printf ("send syn\n");//D
+
   pkt->flags = htons (DEFAULT_CLIENT_FLAGS);
   pkt->qdcount = htons (1);
 
-  int offs = 6*2;
+  int offs = 6 * 2;
 
-  int elen = cdc26.encode ((char *)pkt->at (offs + 1), (u8 *)&cfg, sizeof (dns_cfg));
+  int elen = cdc26.encode ((char *)pkt->at (offs + 1), (u8 *)&dns->cfg, sizeof (dns_cfg));
 
   assert (elen <= MAX_LBL_SIZE);
 
   (*pkt)[offs] = elen;
   offs += elen + 1;
-  append_domain (*pkt, offs, THISNODE->domain);
+  append_domain (*pkt, offs, dns->c->conf->domain);
 
   (*pkt)[offs++] = 0;
   (*pkt)[offs++] = RR_TYPE_A   >> 8; (*pkt)[offs++] = RR_TYPE_A;
@@ -668,32 +712,6 @@
 
 /////////////////////////////////////////////////////////////////////////////
     
-struct dns_connection
-{
-  connection *c;
-  struct vpn *vpn;
-
-  dns_cfg cfg;
-
-  bool established;
-
-  tstamp last_received;
-  tstamp last_sent;
-  double last_latency;
-  double poll_interval, send_interval;
-
-  vector<dns_rcv *> rcvpq;
-
-  byte_stream rcvdq; int rcvseq;
-  byte_stream snddq; int sndseq;
-
-  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)
@@ -767,7 +785,7 @@
         while (vpn_packet *pkt = rcvdq.get ())
           {
             sockinfo si;
-            si.host = 0; si.port = 0; si.prot = PROT_DNSv4;
+            si.host = 0x01010101; si.port = htons (c->conf->id); si.prot = PROT_DNSv4;
 
             vpn->recv_vpn_packet (pkt, si);
 
@@ -1144,15 +1162,21 @@
 }
 
 bool
-connection::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
+vpn::send_dnsv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
-  if (!dns)
-    dns = new dns_connection (this);
+  int client = ntohs (si.port);
+
+  assert (0 < client && client <= conns.size ());
+
+  connection *c = conns [client - 1];
+
+  if (!c->dns)
+    c->dns = new dns_connection (c);
   
-  if (!dns->snddq.put (pkt))
+  if (!c->dns->snddq.put (pkt))
     return false;
 
-  dns->tw.trigger ();
+  c->dns->tw.trigger ();
 
   return true;
 }
@@ -1216,13 +1240,15 @@
                 {
                   send = new dns_snd (this);
 
+                  printf ("new conn %p %d\n", this, c->conf->id);//D
                   cfg.reset (THISNODE->id);
-                  send->gen_syn_req (cfg);
+                  send->gen_syn_req ();
                 }
             }
           else if (vpn->dns_sndpq.size () < MAX_OUTSTANDING
                    && !SEQNO_EQ (rcvseq, sndseq - (MAX_WINDOW - 1)))
             {
+              //printf ("sending data request etc.\n"); //D
               if (!snddq.empty ())
                 {
                   poll_interval = send_interval;