miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
angt
2015-11-18 10:17:50 +01:00
parent baca343fdf
commit 4337251218
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/tun.c
View File

@@ -63,30 +63,30 @@ int tun_create (char *name, int multiqueue)
#elif defined(__APPLE__) #elif defined(__APPLE__)
int tun_create (_unused_ char *name, _unused_ int mq) int tun_create (_unused_ char *name, _unused_ int mq)
{ {
struct ctl_info ctlInfo;
struct sockaddr_ctl sc;
int fd;
for (unsigned dev_id = 0U; dev_id<32U; dev_id++) { for (unsigned dev_id = 0U; dev_id<32U; dev_id++) {
byte_set(&ctlInfo, 0, sizeof(ctlInfo)); struct ctl_info ci;
str_cpy(ctlInfo.ctl_name, UTUN_CONTROL_NAME, sizeof(ctlInfo.ctl_name)); byte_set(&ci, 0, sizeof(ci));
fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL); str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name)-1);
int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
if (fd==-1) if (fd==-1)
return -1; return -1;
if (ioctl(fd, CTLIOCGINFO, &ctlInfo)==-1) { if (ioctl(fd, CTLIOCGINFO, &ci)==-1) {
close(fd); close(fd);
continue; continue;
} }
sc.sc_id = ctlInfo.ctl_id; struct sockaddr_ctl sc = {
sc.sc_len = sizeof(sc); .sc_id = ci.ctl_id,
sc.sc_family = AF_SYSTEM; .sc_len = sizeof(sc),
sc.ss_sysaddr = AF_SYS_CONTROL; .sc_family = AF_SYSTEM,
sc.sc_unit = dev_id+1; .ss_sysaddr = AF_SYS_CONTROL,
.sc_unit = dev_id+1,
};
if (connect(fd, (struct sockaddr *) &sc, sizeof(sc))==-1) { if (connect(fd, (struct sockaddr *)&sc, sizeof(sc))==-1) {
close(fd); close(fd);
continue; continue;
} }