--- gvpe/src/connection.C	2003/08/08 09:29:22	1.14
+++ gvpe/src/connection.C	2003/10/16 02:28:36	1.21
@@ -37,6 +37,8 @@
 #include "vpn.h"
 #include "connection.h"
 
+#include "netcompat.h"
+
 #if !HAVE_RAND_PSEUDO_BYTES
 # define  RAND_pseudo_bytes RAND_bytes
 #endif
@@ -199,12 +201,12 @@
 // but low on resources.
 struct net_rate_limiter : list<net_rateinfo>
 {
-  static const double ALPHA  = 1. - 1. / 180.; // allow bursts
+  static const double ALPHA  = 1. - 1. / 600.; // allow bursts
   static const double CUTOFF = 10.;            // one event every CUTOFF seconds
   static const double EXPIRE = CUTOFF * 30.;   // expire entries after this time
   static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value
 
-  bool can (const sockinfo &si) { return can((u32)si.host);             }
+  bool can (const sockinfo &si) { return can((u32)si.host); }
   bool can (u32 host);
 };
 
@@ -477,14 +479,26 @@
 
 bool config_packet::chk_config () const
 {
-  return prot_major == PROTOCOL_MAJOR
-         && randsize == RAND_SIZE
-         && hmaclen == HMACLENGTH
-         && flags == curflags ()
-         && challengelen == sizeof (rsachallenge)
-         && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER))
-         && digest_nid == htonl (EVP_MD_type (RSA_HASH))
-         && hmac_nid   == htonl (EVP_MD_type (DIGEST));
+  if (prot_major != PROTOCOL_MAJOR)
+    slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR);
+  else if (randsize != RAND_SIZE)
+    slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE);
+  else if (hmaclen != HMACLENGTH)
+    slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH);
+  else if (flags != curflags ())
+    slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
+  else if (challengelen != sizeof (rsachallenge))
+    slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge));
+  else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
+    slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
+  else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
+    slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
+  else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
+    slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
+  else
+    return true;
+
+  return false;
 }
 
 struct auth_req_packet : config_packet
@@ -788,18 +802,16 @@
 }
 
 void
-connection::send_data_packet (tap_packet *pkt, bool broadcast)
+connection::send_data_packet (tap_packet *pkt)
 {
   vpndata_packet *p = new vpndata_packet;
   int tos = 0;
 
   // I am not hilarious about peeking into packets, but so be it.
-  if (conf->inherit_tos
-      && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
-      && ((*pkt)[14] & 0xf0) == 0x40)             // IPv4
+  if (conf->inherit_tos && pkt->is_ipv4 ())
     tos = (*pkt)[15] & IPTOS_TOS_MASK;
 
-  p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
+  p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
   send_vpn_packet (p, si, tos);
 
   delete p;
@@ -809,10 +821,10 @@
 }
 
 void
-connection::inject_data_packet (tap_packet *pkt, bool broadcast)
+connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
 {
   if (ictx && octx)
-    send_data_packet (pkt, broadcast);
+    send_data_packet (pkt);
   else
     {
       if (!broadcast)//DDDD
@@ -900,8 +912,8 @@
                 if (0 > RSA_private_decrypt (sizeof (p->encr),
                                              (unsigned char *)&p->encr, (unsigned char *)&k,
                                              ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
-                  slog (L_ERR, _("%s(%s): challenge illegal or corrupted"),
-                        conf->nodename, (const char *)rsi);
+                  slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
+                        conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
                 else
                   {
                     delete octx;
@@ -918,6 +930,9 @@
                     break;
                   }
               }
+            else
+              slog (L_WARN, _("%s(%s): protocol mismatch"),
+                    conf->nodename, (const char *)rsi);
 
             send_reset (rsi);
           }
@@ -941,7 +956,7 @@
 
               if (!rsa_cache.find (p->id, chg))
                 {
-                  slog (L_ERR, _("%s(%s): unrequested auth response"),
+                  slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
                         conf->nodename, (const char *)rsi);
                   break;
                 }
@@ -950,9 +965,12 @@
                   crypto_ctx *cctx = new crypto_ctx (chg, 0);
 
                   if (!p->hmac_chk (cctx))
-                    slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
-                                   "could be an attack, or just corruption or an synchronization error"),
-                          conf->nodename, (const char *)rsi);
+                    {
+                      slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
+                                     "could be an attack, or just corruption or an synchronization error"),
+                            conf->nodename, (const char *)rsi);
+                      break;
+                    }
                   else
                     {
                       rsaresponse h;
@@ -1019,15 +1037,6 @@
                   {
                     vpn->tap->send (d);
 
-                    if (p->dst () == 0) // re-broadcast
-                      for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
-                        {
-                          connection *c = *i;
-
-                          if (c->conf != THISNODE && c->conf != conf)
-                            c->inject_data_packet (d);
-                        }
-
                     if (si != rsi)
                       {
                         // fast re-sync on connection changes, useful especially for tcp/ip