Remove mymac stuff from device.c.
This commit is contained in:
parent
31f17d4334
commit
12de5a8eed
10 changed files with 21 additions and 112 deletions
|
|
@ -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: device.c,v 1.1.2.12 2002/09/10 21:29:42 guus Exp $
|
||||
$Id: device.c,v 1.1.2.13 2003/06/11 19:28:37 guus Exp $
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
|
@ -56,8 +56,6 @@ char *device_info;
|
|||
int device_total_in = 0;
|
||||
int device_total_out = 0;
|
||||
|
||||
extern subnet_t mymac;
|
||||
|
||||
/*
|
||||
open the local ethertap device
|
||||
*/
|
||||
|
|
@ -75,15 +73,6 @@ int setup_device(void)
|
|||
return -1;
|
||||
}
|
||||
|
||||
/* Set default MAC address for ethertap devices */
|
||||
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;
|
||||
|
||||
device_info = _("OpenBSD tun device");
|
||||
|
||||
syslog(LOG_INFO, _("%s is a %s"), device, device_info);
|
||||
|
|
@ -112,9 +101,6 @@ int read_packet(vpn_packet_t *packet)
|
|||
return -1;
|
||||
}
|
||||
|
||||
memcpy(packet->data, mymac.net.mac.address.x, 6);
|
||||
memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
|
||||
|
||||
switch (ntohl(type)) {
|
||||
case AF_INET:
|
||||
packet->data[12] = 0x8;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue