--- gvpe/src/util.h	2005/04/26 00:55:56	1.18
+++ gvpe/src/util.h	2007/12/02 00:09:36	1.22
@@ -29,7 +29,10 @@
 #include "gettext.h"
 
 #include "slog.h"
-#include "iom.h"
+#include "ev_cpp.h"
+#include "callback.h"
+
+typedef ev_tstamp tstamp;
 
 /*
  * check for an existing gvpe for this net, and write pid to pidfile
@@ -59,7 +62,8 @@
 
 #define mac2id(p) ((p)[0] & 0x01 ? 0 : ((p)[4] << 8) | (p)[5])
 
-struct sliding_window {
+struct sliding_window
+{
   u32 v[(WINDOWSIZE + 31) / 32];
   u32 seq;
 
@@ -73,10 +77,10 @@
     {
       if (seqno <= seq - WINDOWSIZE)
         slog (L_ERR, _("received duplicate or outdated packet (received %08lx, expected %08lx)\n"
-                       "possible replay attack, or just massive packet reordering"), seqno, seq + 1);//D
-      else if (seqno > seq + WINDOWSIZE)
+                       "possible replay attack, or just massive packet reordering"), seqno, seq + 1);
+      else if (seqno > seq + WINDOWSIZE * 4)
         slog (L_ERR, _("received duplicate or out-of-sync packet (received %08lx, expected %08lx)\n"
-                       "possible replay attack, or just massive packet loss"), seqno, seq + 1);//D
+                       "possible replay attack, or just massive packet loss"), seqno, seq + 1);
       else
         {
           while (seqno > seq)
@@ -95,17 +99,16 @@
           u32 mask = 1 << (s & 31);
 
           if (*cell & mask)
-            {
-              slog (L_ERR, _("received duplicate packet (received %08lx, expected %08lx)\n"
-                             "possible replay attack, or just packet duplication"), seqno, seq + 1);//D
-              return false;
-            }
+            slog (L_ERR, _("received duplicate packet (received %08lx, expected %08lx)\n"
+                           "possible replay attack, or just packet duplication"), seqno, seq + 1);
           else
             {
               *cell |= mask;
               return true;
             }
         }
+
+      return false;
     }
 };