--- gvpe/src/device.h 2003/10/16 02:41:21 1.11 +++ gvpe/src/device.h 2005/03/03 16:54:34 1.17 @@ -1,8 +1,10 @@ /* device.h -- generic header for device.c - Copyright (C) 2003 Marc Lehmann + Copyright (C) 2003-2005 Marc Lehmann - This program is free software; you can redistribute it and/or modify + 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 2 of the License, or (at your option) any later version. @@ -13,7 +15,7 @@ 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 + along with gvpe; if not, write to the Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -25,11 +27,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) { @@ -87,7 +91,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;