--- gvpe/src/ether_emu.C	2004/01/17 01:18:36	1.4
+++ gvpe/src/ether_emu.C	2011/02/08 23:13:48	1.9
@@ -1,20 +1,32 @@
 /*
     ether_emu.C -- ethernet "emulator" library
-    Copyright (C) 2003-2004 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.
 */
 
 #include "config.h"
@@ -25,7 +37,8 @@
 
 extern struct vpn network;
 
-struct ether_emu : map<u32, int> {
+struct ether_emu : map<u32, int>
+{
   typedef map<u32, int> ipv4map;
   ipv4map ipv4;
 
@@ -40,7 +53,7 @@
 
 static struct ether_emu ether_emu;
 
-bool 
+bool
 ether_emu::tun_to_tap (tap_packet *pkt)
 {
   int dst;
@@ -86,7 +99,7 @@
   return true;
 }
 
-bool 
+bool
 ether_emu::tap_to_tun (tap_packet *pkt)
 {
   if (pkt->is_arp ())