make it compile

pull/36/head
Jeff Becker 6 years ago
parent 5fdb2ce7ff
commit 69e187cfd7
No known key found for this signature in database
GPG Key ID: F357B3B42F6F9B05

@ -67,6 +67,7 @@
"shared_mutex": "cpp",
"complex": "cpp",
"variant": "cpp",
"any": "cpp"
"any": "cpp",
"tuntap.h": "c"
}
}

@ -230,7 +230,7 @@ extern "C"
tuntap_sys_set_ipv4_tap(struct device *, t_tun_in_addr *, uint32_t);
int
tuntap_sys_set_ipv4_tun(struct device *dev, t_tun_in_addr *s4,
t_tun_in_addr *s4dest, uint32_t bits);
t_tun_in_addr *s4dest, uint32_t bits, int netmask);
#endif
int

@ -187,7 +187,8 @@ tuntap_sys_set_ipv4_tap(struct device *dev, t_tun_in_addr *s4, uint32_t bits)
}
static int
tuntap_sys_add_route(struct device *dev, t_tun_in_addr *s4, uint32_t bits)
tuntap_sys_add_route(struct device *dev, t_tun_in_addr *s4, uint32_t bits,
uint32_t netmask)
{
struct sockaddr_in mask;
mask.sin_family = AF_INET;
@ -205,8 +206,8 @@ tuntap_sys_add_route(struct device *dev, t_tun_in_addr *s4, uint32_t bits)
dev->if_name, addr, addr, netmask);
tuntap_log(TUNTAP_LOG_INFO, buf);
system(buf);
snprintf(buf, sizeof(buf), "route add %s/%d -interface %s", addr,
dev->netmask, dev->if_name);
snprintf(buf, sizeof(buf), "route add %s/%d -interface %s", addr, netmask,
dev->if_name);
tuntap_log(TUNTAP_LOG_INFO, buf);
system(buf);
return 0;
@ -214,7 +215,7 @@ tuntap_sys_add_route(struct device *dev, t_tun_in_addr *s4, uint32_t bits)
int
tuntap_sys_set_ipv4_tun(struct device *dev, t_tun_in_addr *s4,
t_tun_in_addr *s4dest, uint32_t bits)
t_tun_in_addr *s4dest, uint32_t bits, uint32_t netmask)
{
struct ifaliasreq ifrq;
struct sockaddr_in mask;
@ -252,7 +253,7 @@ tuntap_sys_set_ipv4_tun(struct device *dev, t_tun_in_addr *s4,
tuntap_log(TUNTAP_LOG_ERR, "Can't set IP address");
return -1;
}
return tuntap_sys_add_route(dev, s4, bits);
return tuntap_sys_add_route(dev, s4, bits, netmask);
}
int

@ -34,7 +34,7 @@
#ifndef _MSC_VER
extern "C" int
inet_pton(int af, const char *src, void *dst);
extern "C" const char *
extern "C" const char *
inet_ntop(int af, const void *src, char *dst, size_t size);
#endif
#else
@ -68,9 +68,9 @@ extern "C"
dev->tun_fd = TUNFD_INVALID_VALUE;
dev->ctrl_sock = -1;
dev->flags = 0;
#if defined(Windows)
memset(&dev->ovl[0], 0, sizeof(OVERLAPPED)*2);
#endif
#if defined(Windows)
memset(&dev->ovl[0], 0, sizeof(OVERLAPPED) * 2);
#endif
__tuntap_log = &tuntap_log_default;
return dev;
@ -143,7 +143,7 @@ extern "C"
errval = inet_pton(AF_INET, daddr, &(daddr4));
if(errval == 1)
{
return tuntap_sys_set_ipv4_tun(dev, &baddr4, &daddr4, mask);
return tuntap_sys_set_ipv4_tun(dev, &baddr4, &daddr4, mask, netmask);
}
else
{

Loading…
Cancel
Save