--- gvpe/src/util.h	2008/08/07 17:54:27	1.25
+++ gvpe/src/util.h	2008/08/10 01:34:36	1.27
@@ -35,6 +35,7 @@
 #define UTIL_H__
 
 #include <cstring>
+#include <sys/types.h>
 
 #include <openssl/rsa.h>
 
@@ -85,14 +86,13 @@
       seq = seqno;
     }
 
-  bool recv_ok (u32 seqno)
+  // 0 == ok, 1 == silently ignore, 2 == error, reset
+  int seqno_classify (u32 seqno)
     {
       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);
-      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);
+        return 1;
+      else if (seqno > seq + WINDOWSIZE * 16)
+        return 2;
       else
         {
           while (seqno > seq)
@@ -111,23 +111,20 @@
           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);
+            return 1;
           else
             {
               *cell |= mask;
-              return true;
+              return 0;
             }
         }
-
-      return false;
     }
 };
 
 typedef callback<const char * ()> run_script_cb;
 
 // run a shell script (or actually an external program).
-bool run_script (const run_script_cb &cb, bool wait);
+pid_t run_script (const run_script_cb &cb, bool wait);
 
 #if ENABLE_HTTP_PROXY
 u8 *base64_encode (const u8 *data, unsigned int len);