--- gvpe/src/device.h	2003/10/16 14:12:00	1.12
+++ gvpe/src/device.h	2011/09/16 18:01:26	1.25
@@ -1,36 +1,50 @@
 /*
     device.h -- generic header for device.c
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
  
-    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
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
- 
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    This file is part of GVPE.
+
+    GVPE is free software; you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by the
+    Free Software Foundation; either version 3 of the License, or (at your
+    option) any later version.
+   
+    This program is distributed in the hope that it will be useful, but
+    WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General
+    Public License for more details.
+   
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, see <http://www.gnu.org/licenses/>.
+   
+    Additional permission under GNU GPL version 3 section 7
+   
+    If you modify this Program, or any covered work, by linking or
+    combining it with the OpenSSL project's OpenSSL library (or a modified
+    version of that library), containing parts covered by the terms of the
+    OpenSSL or SSLeay licenses, the licensors of this Program grant you
+    additional permission to convey the resulting work.  Corresponding
+    Source for a non-source form of such a combination shall include the
+    source code for the parts of OpenSSL used as well as that of the
+    covered work.
 */
 
-#ifndef VPE_DEVICE_H__
-#define VPE_DEVICE_H__
+#ifndef GVPE_DEVICE_H__
+#define GVPE_DEVICE_H__
 
-#define IFNAMESIZE 256 // be conservative
+#include "config.h"
 
-#include "gettext.h"
+#define IFNAMESIZE 256 // be conservative
 
 #include "global.h"
 #include "util.h"
 
-struct net_packet {
+struct net_packet
+{
   u32 len; // actually u16, but padding...
 
   u8 &operator[] (u16 offset) const;
+  u8 *at (u16 offset) const;
 
   void unshift_hdr (u16 hdrsize)
     {
@@ -44,6 +58,11 @@
       memmove ((void *)&(*this)[0], (void *)&(*this)[hdrsize], len);
     }
 
+  u16 ipv4_hdr_len () const
+    {
+      return ((*this)[0] & 15) << 2;
+    }
+
   void set (const net_packet &pkt)
     {
       len = pkt.len;
@@ -78,23 +97,32 @@
   void operator delete (void *p);
 };
 
-struct data_packet : net_packet {
+struct data_packet : net_packet
+{
   u8 data_[MAXSIZE];
 };
 
-inline 
+inline
 u8 &net_packet::operator[] (u16 offset) const
 {
   return ((data_packet *)this)->data_[offset];
 }
 
-struct tap_packet : net_packet {
+inline
+u8 *net_packet::at (u16 offset) const
+{
+  return &((*this)[offset]);
+}
+
+struct tap_packet : net_packet
+{
   mac dst;
   mac src;
   u8 data[MAXSIZE - 12];
 };
 
-struct tap_device {
+struct tap_device
+{
   int fd;
 
   // network interface name or identifier
@@ -110,6 +138,7 @@
 
   const char *interface () { return ifrname; }
   const char *info ();
+  const char *if_up ();
 
   tap_packet *recv ();
   void send (tap_packet *pkt);