git://git.onelab.eu
/
vsys-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/0.7' into 0.7
[vsys-scripts.git]
/
fd_tuntap.c
diff --git
a/fd_tuntap.c
b/fd_tuntap.c
index
668a9c5
..
45e66be
100644
(file)
--- a/
fd_tuntap.c
+++ b/
fd_tuntap.c
@@
-45,7
+45,7
@@
int send_vif_fd(int sock_fd, int vif_fd, char *vif_name)
msg.msg_flags = 0;
/* Send the interface name as the iov */
msg.msg_flags = 0;
/* Send the interface name as the iov */
- vec.iov_base =
&
vif_name;
+ vec.iov_base = vif_name;
vec.iov_len = strlen(vif_name)+1;
while ((retval = sendmsg(sock_fd, &msg, 0)) == -1 && errno == EINTR);
vec.iov_len = strlen(vif_name)+1;
while ((retval = sendmsg(sock_fd, &msg, 0)) == -1 && errno == EINTR);
@@
-105,10
+105,10
@@
int main(int argc, char *argv[])
}
/* Open tun device */
}
/* Open tun device */
- if( (tap_fd = open("/dev/
std
tun", O_RDWR)) < 0 ) {
+ if( (tap_fd = open("/dev/
net/
tun", O_RDWR)) < 0 ) {
system("modprobe tun");
system("modprobe tun");
- if( (tap_fd = open("/dev/
std
tun", O_RDWR)) < 0 ) {
- perror("ERROR: tun_alloc():open(/dev/
std
tun)");
+ if( (tap_fd = open("/dev/
net/
tun", O_RDWR)) < 0 ) {
+ perror("ERROR: tun_alloc():open(/dev/
net/
tun)");
exit(-1);
}
}
exit(-1);
}
}
@@
-129,7
+129,7
@@
int main(int argc, char *argv[])
/* Send tap_fd to slice */
/* Send tap_fd to slice */
-
//
send_vif_fd(control_channel_fd, tap_fd, if_name);
+ send_vif_fd(control_channel_fd, tap_fd, if_name);
return 0;
}
return 0;
}