kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

fix for Windows XP inet_ntop execution - you must compile with XP for support.

Browse Source
This commit is contained in:
Jeff Lenk 2010-05-05 11:58:09 -05:00
parent 3362335033
commit 99eebf2f96
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/switch_utils.c
View File

@ -1331,7 +1331,7 @@ static const char *switch_inet_ntop4(const unsigned char *src, char *dst, size_t
return strcpy(dst, tmp); return strcpy(dst, tmp);
} }
#if HAVE_SIN6 #if HAVE_SIN6 || (defined(NTDDI_VERSION) && (NTDDI_VERSION < NTDDI_VISTA))
/* const char * /* const char *
* inet_ntop6(src, dst, size) * inet_ntop6(src, dst, size)
* convert IPv6 binary address into presentation (printable) format * convert IPv6 binary address into presentation (printable) format
@ -1402,7 +1402,7 @@ static const char *switch_inet_ntop6(unsigned char const *src, char *dst, size_t
*tp++ = ':'; *tp++ = ':';
/* Is this address an encapsulated IPv4? */ /* Is this address an encapsulated IPv4? */
if (i == 6 && best.base == 0 && (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { if (i == 6 && best.base == 0 && (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) {
if (!inet_ntop4(src + 12, tp, sizeof tmp - (tp - tmp))) if (!switch_inet_ntop4(src + 12, tp, sizeof tmp - (tp - tmp)))
return (NULL); return (NULL);
tp += strlen(tp); tp += strlen(tp);
break; break;
@ -1488,7 +1488,11 @@ SWITCH_DECLARE(char *) get_addr6(char *buf, switch_size_t len, struct sockaddr_i
*buf = '\0'; *buf = '\0';
if (sa) { if (sa) {
#if defined(NTDDI_VERSION) && (NTDDI_VERSION < NTDDI_VISTA)
switch_inet_ntop6((unsigned char*)sa, buf, len);
#else
inet_ntop(AF_INET6, sa, buf, len); inet_ntop(AF_INET6, sa, buf, len);
#endif
} }
return buf; return buf;