From db21f015161aac244ec5600c4d0ff685549892c2 Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sat, 28 Oct 2000 21:52:22 +0000 Subject: [PATCH] - Override destination ethernet address on incoming packets with FE:FD:00:00:00:00 --- src/net.c | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/net.c b/src/net.c index 81b30296..3da023c3 100644 --- a/src/net.c +++ b/src/net.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - $Id: net.c,v 1.35.4.48 2000/10/28 21:25:20 guus Exp $ + $Id: net.c,v 1.35.4.49 2000/10/28 21:52:22 guus Exp $ */ #include "config.h" @@ -52,6 +52,8 @@ #include "netutl.h" #include "protocol.h" #include "meta.h" +#include "connlist.h" +#include "subnet.h" #include "system.h" @@ -67,6 +69,8 @@ static int seconds_till_retry; char *unknown = NULL; +subnet_t mymac; + /* strip off the MAC adresses of an ethernet frame */ @@ -145,9 +149,9 @@ cp outlen = outpkt.len+2; memcpy(&outpkt, inpkt, outlen); - /* FIXME sometime - add_mac_addresses(&outpkt); - */ + /* Fix mac address */ + + memcpy(outpkt.data, mymac.net.mac.address.x, 6); if(taptype == TAP_TYPE_TUNTAP) { @@ -381,7 +385,16 @@ cp cp tap_fd = nfd; + /* Set default MAC address for ethertap devices */ + taptype = TAP_TYPE_ETHERTAP; + mymac.type = SUBNET_MAC; + mymac.net.mac.address.x[0] = 0xfe; + mymac.net.mac.address.x[1] = 0xfd; + mymac.net.mac.address.x[2] = 0x00; + mymac.net.mac.address.x[3] = 0x00; + mymac.net.mac.address.x[4] = 0x00; + mymac.net.mac.address.x[5] = 0x00; #ifdef HAVE_TUNTAP /* Ok now check if this is an old ethertap or a new tun/tap thingie */ @@ -395,11 +408,6 @@ cp { syslog(LOG_INFO, _("%s is a new style tun/tap device"), tapfname); taptype = TAP_TYPE_TUNTAP; - - if((cfg = get_config_val(config, tapsubnet)) == NULL) - syslog(LOG_INFO, _("tun/tap device will be left unconfigured")); - else - /* Setup inetaddr/netmask etc */; } #endif -- 2.20.1