--- gvpe/src/device.h	2003/10/14 16:59:34	1.7
+++ gvpe/src/device.h	2005/03/03 07:24:57	1.16
@@ -1,5 +1,6 @@
 /*
     device.h -- generic header for device.c
+    Copyright (C) 2003-2004 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
@@ -24,11 +25,13 @@
 #include "gettext.h"
 
 #include "global.h"
+#include "util.h"
 
 struct net_packet {
   u32 len; // actually u16, but padding...
 
   u8 &operator[] (u16 offset) const;
+  u8 *at (u16 offset) const;
 
   void unshift_hdr (u16 hdrsize)
     {
@@ -48,7 +51,23 @@
       memcpy (&((*this)[0]), &(pkt[0]), len);
     }
 
-  bool is_arp ()
+  bool is_ipv4 () const
+    {
+      return (*this)[12] == 0x08 && (*this)[13] == 0x00 // IP
+          && ((*this)[14] & 0xf0) == 0x40;              // IPv4
+    }
+
+  u32 &ipv4_src () const
+    {
+      return *(u32 *)&(*this)[26];
+    }
+  
+  u32 &ipv4_dst () const
+    {
+      return *(u32 *)&(*this)[30];
+    }
+  
+  bool is_arp () const
     {
       return (*this)[12] == 0x08 && (*this)[13] == 0x06		// 0806 protocol
           && (*this)[14] == 0x00 && (*this)[15] == 0x01		// 0001 hw_format
@@ -70,7 +89,11 @@
   return ((data_packet *)this)->data_[offset];
 }
 
-typedef u8 mac[6];
+inline 
+u8 *net_packet::at (u16 offset) const
+{
+  return &((*this)[offset]);
+}
 
 struct tap_packet : net_packet {
   mac dst;
@@ -78,7 +101,7 @@
   u8 data[MAXSIZE - 12];
 };
 
-struct tap_device_base {
+struct tap_device {
   int fd;
 
   // network interface name or identifier
@@ -86,8 +109,11 @@
 
   char *device;
 
-  bool open ();
-  void close ();
+  tap_device ();
+  ~tap_device ();
+
+  //bool open ();
+  //void close ();
 
   const char *interface () { return ifrname; }
   const char *info ();
@@ -96,9 +122,7 @@
   void send (tap_packet *pkt);
 };
 
-struct tap_device;
-
-extern tap_device tap;
+//extern tap_device *tap_device ();
 
 #endif