status-im
/
miniupnp
mirror of https://github.com/status-im/miniupnp.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

miniupnpc.c: dont use if_indextoname() under MS Windows 

fixes #85
This commit is contained in:
Thomas Bernard 2014-11-27 12:59:12 +01:00
parent 725632f27d
commit 4cae31c948
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
miniupnpc/miniupnpc.c
View File

@ -790,11 +790,11 @@ build_absolute_url(const char * baseurl, const char * descURL,
char * s; char * s;
const char * base; const char * base;
char * p; char * p;
#ifdef IF_NAMESIZE #if defined(IF_NAMESIZE) && !defined(_WIN32)
char ifname[IF_NAMESIZE]; char ifname[IF_NAMESIZE];
#else #else /* defined(IF_NAMESIZE) && !defined(_WIN32) */
char scope_str[8]; char scope_str[8];
#endif #endif /* defined(IF_NAMESIZE) && !defined(_WIN32) */
if( (url[0] == 'h') if( (url[0] == 'h')
&&(url[1] == 't') &&(url[1] == 't')
@ -815,14 +815,14 @@ build_absolute_url(const char * baseurl, const char * descURL,
if(url[0] != '/') if(url[0] != '/')
l++; l++;
if(scope_id != 0) { if(scope_id != 0) {
#ifdef IF_NAMESIZE #if defined(IF_NAMESIZE) && !defined(_WIN32)
if(if_indextoname(scope_id, ifname)) { if(if_indextoname(scope_id, ifname)) {
l += 3 + strlen(ifname); /* 3 == strlen(%25) */ l += 3 + strlen(ifname); /* 3 == strlen(%25) */
} }
#else #else /* defined(IF_NAMESIZE) && !defined(_WIN32) */
/* under windows, scope is numerical */ /* under windows, scope is numerical */
l += 3 + snprintf(scope_str, sizeof(scope_str), "%u", scope_id); l += 3 + snprintf(scope_str, sizeof(scope_str), "%u", scope_id);
#endif #endif /* defined(IF_NAMESIZE) && !defined(_WIN32) */
} }
s = malloc(l); s = malloc(l);
if(s == NULL) return NULL; if(s == NULL) return NULL;