[ViewVC] Diff of: cvs/gvpe/src/connection.C

Comparing gvpe/src/connection.C (file contents):
Revision 1.15 by pcg, Fri Aug 8 10:58:28 2003 UTC vs.
Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC

 /*
     connection.C -- manage a single connection
+    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
     This program 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.
 #include "slog.h"
 #include "device.h"
 #include "vpn.h"
 #include "connection.h"
+#include "netcompat.h"
 #if !HAVE_RAND_PSEUDO_BYTES
 # define  RAND_pseudo_bytes RAND_bytes
 #endif
 #define MAGIC "vped\xbd\xc6\xdb\x82"	// 8 bytes of magic
 // only do action once every x seconds per host whole allowing bursts.
 // this implementation ("splay list" ;) is inefficient,
 // 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);
 };
 net_rate_limiter auth_rate_limiter, reset_rate_limiter;
   reset_connection ();
   establish_connection ();
 }
 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
+  if (conf->inherit_tos && pkt->is_ipv4 ())
-      && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
-      && ((*pkt)[14] & 0xf0) == 0x40)             // 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;
   if (oseqno > MAX_SEQNO)
     rekey ();
 }
 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
         data_queue.put (new tap_packet (*pkt));
                 rsachallenge k;
                 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"),
+                  slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
-                        conf->nodename, (const char *)rsi);
+                        conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
                 else
                   {
                     delete octx;
                     octx   = new crypto_ctx (k, 1);
               rsachallenge chg;
               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;
                 }
               else
                 {
                   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"
+                      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"),
+                                     "could be an attack, or just corruption or an synchronization error"),
-                          conf->nodename, (const char *)rsi);
+                            conf->nodename, (const char *)rsi);
+                      break;
+                    }
                   else
                     {
                       rsaresponse h;
                       rsa_hash (p->id, chg, h);
                 tap_packet *d = p->unpack (this, seqno);
                 if (iseqno.recv_ok (seqno))
                   {
                     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
                         si = rsi;

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.15 by pcg, Fri Aug 8 10:58:28 2003 UTC vs. Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.15 by pcg, Fri Aug 8 10:58:28 2003 UTC vs.
Revision 1.22 by pcg, Thu Oct 16 02:41:21 2003 UTC