mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2025-06-11 12:14:41 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Changed NO_IPV6 to USE_IPV6. Also, using inet_ntop() everywhere.

Browse Source
This commit is contained in:
Sergey Lyubka 2012-02-05 12:27:58 +00:00
parent 7af9df9fab
commit b5ed7ed7d1
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mongoose.c
View File

@ -369,7 +369,7 @@ static const char *month_names[] = {
union usa {
struct sockaddr sa;
struct sockaddr_in sin;
#if !defined(NO_IPV6)
#if defined(USE_IPV6)
struct sockaddr_in6 sin6;
#endif
};
@ -509,13 +509,12 @@ const char *mg_get_option(const struct mg_context *ctx, const char *name) {
static void sockaddr_to_string(char *buf, size_t len,
const union usa *usa) {
buf[0] = '\0';
#if !defined(NO_IPV6)
#if defined(USE_IPV6)
inet_ntop(usa->sa.sa_family, usa->sa.sa_family == AF_INET ?
(void *) &usa->sin.sin_addr :
(void *) &usa->sin6.sin6_addr, buf, len);
#else
// TODO(lsm): inet_ntoa is not thread safe, use inet_pton instead
strncpy(buf, inet_ntoa(usa->sin.sin_addr), len);
inet_ntop(usa->sa.sa_family, (void *) &usa->sin.sin_addr, buf, len);
#endif
}
@ -3434,7 +3433,7 @@ static int parse_port_string(const struct vec *vec, struct socket *so) {
}
so->is_ssl = vec->ptr[len] == 's';
#if !defined(NO_IPV6)
#if defined(USE_IPV6)
so->lsa.sin6.sin6_family = AF_INET6;
so->lsa.sin6.sin6_port = htons((uint16_t) port);
#else