X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fdarwin%2Fdevice.c;h=4b597ad2f912271a578009b713cf08ab21dd5f53;hp=d30f0b6a7719f32885237c00d9a4114506aeb0b0;hb=7d21a8d1c7fd8909fe02385dbb4717c074db4648;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/darwin/device.c b/src/darwin/device.c
index d30f0b6a..4b597ad2 100644
--- 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.3 2002/09/09 21:25:19 guus Exp $
+    $Id: device.c,v 1.1.2.5 2002/09/10 21:29:42 guus Exp $
 */
 
 #include "config.h"
@@ -58,18 +58,21 @@ extern subnet_t mymac;
 */
 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;
+
+	/* 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;
@@ -80,22 +83,28 @@ int setup_device(void)
 	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);
 }
 
 /*
   read, encrypt and send data that is
   available through the ethertap device
 */
-int read_packet(vpn_packet_t * packet)
+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;
@@ -115,11 +124,13 @@ int read_packet(vpn_packet_t * packet)
 			   packet->len, device_info);
 
 	return 0;
-cp}
+}
 
-int write_packet(vpn_packet_t * packet)
+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 +141,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}
+}