--- gvpe/src/device.h	2003/04/06 20:01:52	1.4
+++ gvpe/src/device.h	2003/10/14 03:22:09	1.6
@@ -19,7 +19,7 @@
 #ifndef VPE_DEVICE_H__
 #define VPE_DEVICE_H__
 
-#include <net/if.h>
+#define IFNAMESIZE 256
 
 #include "gettext.h"
 
@@ -30,9 +30,16 @@
 
   u8 &operator[] (u16 offset) const;
 
+  void unshift_hdr (u16 hdrsize)
+    {
+      memmove ((void *)&(*this)[hdrsize], (void *)&(*this)[0], len);
+      len += hdrsize;
+    }
+
   void skip_hdr (u16 hdrsize)
     {
-      memmove ((void *)&(*this)[0], (void *)&(*this)[hdrsize], len -= hdrsize);
+      len -= hdrsize;
+      memmove ((void *)&(*this)[0], (void *)&(*this)[hdrsize], len);
     }
 
   void set (const net_packet &pkt)
@@ -75,7 +82,7 @@
   int fd;
 
   // linux tuntap
-  char ifrname[IFNAMSIZ + 1];
+  char ifrname[IFNAMESIZE + 1];
 
   char *device;
 
@@ -83,7 +90,7 @@
   ~tap_device ();
 
   const char *interface () { return ifrname; }
-  const char *info () { return _("Linux tun/tap device"); }
+  const char *info ();
 
   tap_packet *recv ();
   void send (tap_packet *pkt);