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

snprintf() is a macro on some operating systems 

and having #ifdef statements in macro parameters has undefined behavior.
This commit is contained in:
Frank Denis 2013-05-20 10:39:05 -07:00
parent b31e66343a
commit 1523a4f035
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/tun.c
View File

@ -449,6 +449,7 @@ tun_setip(const char *ip, const char *other_ip, int netbits)
struct in_addr addr; struct in_addr addr;
DWORD len; DWORD len;
#endif #endif
const char *display_ip;
netmask = 0; netmask = 0;
for (i = 0; i < netbits; i++) { for (i = 0; i < netbits; i++) {
@ -462,15 +463,16 @@ tun_setip(const char *ip, const char *other_ip, int netbits)
return 1; return 1;
} }
#ifndef WINDOWS32 #ifndef WINDOWS32
# ifdef FREEBSD
display_ip = other_ip; /* FreeBSD wants other IP as second IP */
# else
display_ip = ip;
# endif
snprintf(cmdline, sizeof(cmdline), snprintf(cmdline, sizeof(cmdline),
IFCONFIGPATH "ifconfig %s %s %s netmask %s", IFCONFIGPATH "ifconfig %s %s %s netmask %s",
if_name, if_name,
ip, ip,
#ifdef FREEBSD display_ip,
other_ip, /* FreeBSD wants other IP as second IP */
#else
ip,
#endif
inet_ntoa(net)); inet_ntoa(net));
fprintf(stderr, "Setting IP of %s to %s\n", if_name, ip); fprintf(stderr, "Setting IP of %s to %s\n", if_name, ip);