X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetlab%2Fpltap-ovs%2Ftunalloc.c;fp=planetlab%2Fpltap-ovs%2Ftunalloc.c;h=1f083e517817d6fc754cad5d00a37de70674fb87;hb=9767e8618cb1f33de272b42d3ec22a909caff952;hp=6adcf24a54b2513a2e4eab09deda86ab55533b44;hpb=57406936ba65c2cd83b2c3de62f4b69889c3f29b;p=sliver-openvswitch.git

diff --git a/planetlab/pltap-ovs/tunalloc.c b/planetlab/pltap-ovs/tunalloc.c
index 6adcf24a5..1f083e517 100644
--- a/planetlab/pltap-ovs/tunalloc.c
+++ b/planetlab/pltap-ovs/tunalloc.c
@@ -17,8 +17,12 @@
 
 #define VSYS_TUNTAP "/vsys/fd_tuntap.control"
 
+
+int tun_alloc(int iftype, char *if_name);
+
 /* Reads vif FD from "fd", writes interface name to vif_name, and returns vif FD.
  * vif_name should be IFNAMSIZ chars long. */
+static
 int receive_vif_fd(int fd, char *vif_name)
 {
 	struct msghdr msg;
@@ -26,6 +30,7 @@ int receive_vif_fd(int fd, char *vif_name)
 	int rv;
 	size_t ccmsg[CMSG_SPACE(sizeof(int)) / sizeof(size_t)];
 	struct cmsghdr *cmsg;
+	unsigned char *data;
 
     /* Use IOV to read interface name */
 	iov.iov_base = vif_name;
@@ -56,7 +61,8 @@ int receive_vif_fd(int fd, char *vif_name)
 			cmsg->cmsg_type);
 		return -1;
 	}
-	return *(int*)CMSG_DATA(cmsg);
+	data = CMSG_DATA(cmsg);
+	return *(int*)data;
 }