Merge pull request meyerd#6 from syxoasis/master

fix "tun_close" compile error on OS X
martin-zheng · Nov 30, 2015 · f1014fd · f1014fd
2 parents 3eb9869 + 7e16a04
commit f1014fd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git a/n2n_v1/tuntap_osx.c b/n2n_v1/tuntap_osx.c
@@ -19,14 +19,14 @@
 
 #ifdef _DARWIN_
 
-void tun_close(tuntap_dev *device);
+void tuntap_close(tuntap_dev *device);
 
 /* ********************************** */
 
 #define N2N_OSX_TAPDEVICE_SIZE 32
-int tuntap_open(tuntap_dev *device /* ignored */, 
-                char *dev, 
-                char *device_ip, 
+int tuntap_open(tuntap_dev *device /* ignored */,
+                char *dev,
+                char *device_ip,
                 char *device_mask,
                 const char * device_mac,
 		int mtu) {
@@ -42,7 +42,7 @@ int tuntap_open(tuntap_dev *device /* ignored */,
       break;
     }
   }
-  
+
   if(device->fd < 0) {
     traceEvent(TRACE_ERROR, "Unable to open tap device");
     return(-1);
@@ -76,15 +76,15 @@ int tuntap_open(tuntap_dev *device /* ignored */,
 
     fd = popen(buf, "r");
     if(fd < 0) {
-      tun_close(device);
+      tuntap_close(device);
       return(-1);
     } else {
       int a, b, c, d, e, f;
 
       buf[0] = 0;
       fgets(buf, sizeof(buf), fd);
       pclose(fd);
-      
+
       if(buf[0] == '\0') {
 	traceEvent(TRACE_ERROR, "Unable to read tap%d interface MAC address");
 	exit(0);

diff --git a/n2n_v2/tuntap_osx.c b/n2n_v2/tuntap_osx.c
@@ -19,15 +19,15 @@
 
 #ifdef _DARWIN_
 
-void tun_close(tuntap_dev *device);
+void tuntap_close(tuntap_dev *device);
 
 /* ********************************** */
 
 #define N2N_OSX_TAPDEVICE_SIZE 32
-int tuntap_open(tuntap_dev *device /* ignored */, 
-                char *dev, 
+int tuntap_open(tuntap_dev *device /* ignored */,
+                char *dev,
                 const char *address_mode, /* static or dhcp */
-                char *device_ip, 
+                char *device_ip,
                 char *device_mask,
                 const char * device_mac,
 		int mtu) {
@@ -43,7 +43,7 @@ int tuntap_open(tuntap_dev *device /* ignored */,
       break;
     }
   }
-  
+
   if(device->fd < 0) {
     traceEvent(TRACE_ERROR, "Unable to open tap device");
     return(-1);
@@ -77,15 +77,15 @@ int tuntap_open(tuntap_dev *device /* ignored */,
 
     fd = popen(buf, "r");
     if(fd < 0) {
-      tun_close(device);
+      tuntap_close(device);
       return(-1);
     } else {
       int a, b, c, d, e, f;
 
       buf[0] = 0;
       fgets(buf, sizeof(buf), fd);
       pclose(fd);
-      
+
       if(buf[0] == '\0') {
 	traceEvent(TRACE_ERROR, "Unable to read tap%d interface MAC address");
 	exit(0);