--- gvpe/src/util.h	2003/03/17 15:20:18	1.2
+++ gvpe/src/util.h	2003/03/28 04:05:10	1.4
@@ -22,15 +22,9 @@
 #ifndef UTIL_H__
 #define UTIL_H__
 
-#include <sys/socket.h>
-#include <netinet/in.h>
-
-#include <map>
-
+#include "iom.h"
 #include "device.h"
 
-#define SOCKADDR	sockaddr_in	// this is lame, I know
-
 /*
  * check for an existing vped for this net, and write pid to pidfile
  */
@@ -71,97 +65,6 @@
 
 #define mac2id(p) (p[0] & 0x01 ? 0 : (p[4] << 8) | p[5])
 
-// a very simple fifo pkt-queue
-class pkt_queue
-  {
-    tap_packet *queue[QUEUEDEPTH];
-    int i, j;
-
-  public:
-
-    void put (tap_packet *p);
-    tap_packet *get ();
-
-    pkt_queue ();
-    ~pkt_queue ();
-  };
-
-struct sockinfo
-  {
-    u32 host;
-    u16 port;
-
-    void set (const SOCKADDR *sa)
-    {
-      host = sa->sin_addr.s_addr;
-      port = sa->sin_port;
-    }
-
-    sockinfo()
-    {
-      host = port = 0;
-    }
-
-    sockinfo(const SOCKADDR &sa)
-    {
-      set (&sa);
-    }
-
-    sockinfo(const SOCKADDR *sa)
-    {
-      set (sa);
-    }
-
-    SOCKADDR *sa()
-    {
-      static SOCKADDR sa;
-
-      sa.sin_family = AF_INET;
-      sa.sin_port = port;
-      sa.sin_addr.s_addr = host;
-
-      return &sa;
-    }
-
-    operator const char *();
-  };
-
-inline bool
-operator == (const sockinfo &a, const sockinfo &b)
-{
-  return a.host == b.host && a.port == b.port;
-}
-
-inline bool
-operator < (const sockinfo &a, const sockinfo &b)
-{
-  return a.host < b.host 
-         || (a.host == b.host && a.port < b.port);
-}
-
-// only do action once every x seconds per host.
-// currently this is quite a slow implementation,
-// but suffices for normal operation.
-struct u32_rate_limiter : private map<u32, time_t>
- {
-   int every;
-
-   bool can (u32 host);
-
-   u32_rate_limiter (time_t every = 1)
-   {
-     this->every = every;
-   }
- };
-
-struct net_rate_limiter : u32_rate_limiter
-  {
-    bool can (SOCKADDR *sa) { return u32_rate_limiter::can((u32)sa->sin_addr.s_addr); }
-    bool can (sockinfo &si) { return u32_rate_limiter::can((u32)si.host); }
-
-    net_rate_limiter (time_t every) : u32_rate_limiter (every) {}
-  };
-
 struct sliding_window {
   u32 v[(WINDOWSIZE + 31) / 32];
   u32 seq;
@@ -197,7 +100,6 @@
           u32 *cell = v + (s >> 5);
           u32 mask = 1 << (s & 31);
 
-          //printf ("received seqno %08lx, seq %08lx, mask %08lx is %08lx\n", seqno, seq, mask, ismask);
           if (*cell & mask)
             {
               slog (L_ERR, _("received duplicate packet (received %08lx, expected %08lx)\n"