Remove mymac stuff from device.c.

[tinc] / src / darwin / device.c

diff --git a/src/darwin/device.c b/src/darwin/device.c
index 99741f6..c08153f 100644 (file)
--- a/src/darwin/device.c
+++ b/src/darwin/device.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: device.c,v 1.1.2.4 2002/09/09 22:33:23 guus Exp $
+    $Id: device.c,v 1.1.2.6 2003/06/11 19:28:36 guus Exp $
 */
 
 #include "config.h"
@@ -51,41 +51,36 @@ char *device_info;
 int device_total_in = 0;
 int device_total_out = 0;
 
-extern subnet_t mymac;
-
 /*
   open the local ethertap device
 */
 int setup_device(void)
 {
-       cp if(!get_config_string(lookup_config(config_tree, "Device"), &device))
+       cp();
+
+       if(!get_config_string(lookup_config(config_tree, "Device"), &device))
                device = DEFAULT_DEVICE;
 
        if(!get_config_string(lookup_config(config_tree, "Interface"), &interface))
                interface = rindex(device, '/') ? rindex(device, '/') + 1 : device;
-       cp if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
+
+       if((device_fd = open(device, O_RDWR | O_NONBLOCK)) < 0) {
                syslog(LOG_ERR, _("Could not open %s: %s"), device, strerror(errno));
                return -1;
        }
-       cp
-               /* 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 = _("MacOS/X tun device");
 
        syslog(LOG_INFO, _("%s is a %s"), device, device_info);
-       cp return 0;
+
+       return 0;
 }
 
 void close_device(void)
 {
-       cp close(device_fd);
+       cp();
+
+       close(device_fd);
 }
 
 /*
@@ -95,14 +90,15 @@ void close_device(void)
 int read_packet(vpn_packet_t *packet)
 {
        int lenin;
-       cp if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
+
+       cp();
+
+       if((lenin = read(device_fd, packet->data + 14, MTU - 14)) <= 0) {
                syslog(LOG_ERR, _("Error while reading from %s %s: %s"), device_info,
                           device, strerror(errno));
                return -1;
        }
 
-       memcpy(packet->data, mymac.net.mac.address.x, 6);
-       memcpy(packet->data + 6, mymac.net.mac.address.x, 6);
        packet->data[12] = 0x08;
        packet->data[13] = 0x00;
 
@@ -115,11 +111,13 @@ int read_packet(vpn_packet_t *packet)
                           packet->len, device_info);
 
        return 0;
-cp}
+}
 
 int write_packet(vpn_packet_t *packet)
 {
-       cp if(debug_lvl >= DEBUG_TRAFFIC)
+       cp();
+
+       if(debug_lvl >= DEBUG_TRAFFIC)
                syslog(LOG_DEBUG, _("Writing packet of %d bytes to %s"),
                           packet->len, device_info);
 
@@ -130,11 +128,13 @@ int write_packet(vpn_packet_t *packet)
        }
 
        device_total_out += packet->len;
-cp}
+}
 
 void dump_device_stats(void)
 {
-       cp syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
+       cp();
+
+       syslog(LOG_DEBUG, _("Statistics for %s %s:"), device_info, device);
        syslog(LOG_DEBUG, _(" total bytes in:  %10d"), device_total_in);
        syslog(LOG_DEBUG, _(" total bytes out: %10d"), device_total_out);
-cp}
+}