haskal
/
iodine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix build error and a warning on OpenBSD

This commit is contained in:
Erik Ekman 2014-05-29 16:18:41 +02:00
parent 031953e295
commit b079b0eda5
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/common.c
View File

@ -149,8 +149,8 @@ get_addr(char *host, int port, int addr_family, int flags, struct sockaddr_stora
memset(&hints, 0, sizeof(hints)); memset(&hints, 0, sizeof(hints));
hints.ai_family = addr_family; hints.ai_family = addr_family;
#ifdef WINDOWS32 #if defined(WINDOWS32) || defined(OPENBSD)
/* AI_ADDRCONFIG misbehaves on windows */ /* AI_ADDRCONFIG misbehaves on windows, and does not exist in OpenBSD */
hints.ai_flags = flags; hints.ai_flags = flags;
#else #else
hints.ai_flags = AI_ADDRCONFIG | flags; hints.ai_flags = AI_ADDRCONFIG | flags;

2
src/tun.c
View File

@ -440,6 +440,7 @@ tun_setip(const char *ip, const char *other_ip, int netbits)
int i; int i;
#ifndef LINUX #ifndef LINUX
int r; int r;
struct in_addr netip;
#endif #endif
#ifdef WINDOWS32 #ifdef WINDOWS32
DWORD status; DWORD status;
@ -475,7 +476,6 @@ tun_setip(const char *ip, const char *other_ip, int netbits)
fprintf(stderr, "Setting IP of %s to %s\n", if_name, ip); fprintf(stderr, "Setting IP of %s to %s\n", if_name, ip);
#ifndef LINUX #ifndef LINUX
struct in_addr netip;
netip.s_addr = inet_addr(ip); netip.s_addr = inet_addr(ip);
netip.s_addr = netip.s_addr & net.s_addr; netip.s_addr = netip.s_addr & net.s_addr;
r = system(cmdline); r = system(cmdline);