~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
lib/macros.c: Use `void (*)(void)' as the universal function-pointer.
[disorder]
/
lib
/
addr.c
diff --git
a/lib/addr.c
b/lib/addr.c
index
bb4f06c
..
1b62251
100644
(file)
--- a/
lib/addr.c
+++ b/
lib/addr.c
@@
-33,6
+33,9
@@
#if HAVE_SYS_UN_H
# include <sys/un.h>
#endif
#if HAVE_SYS_UN_H
# include <sys/un.h>
#endif
+#if HAVE_WS2TCPIP_H
+# include <Ws2tcpip.h>
+#endif
#include "log.h"
#include "printf.h"
#include "log.h"
#include "printf.h"
@@
-170,12
+173,12
@@
static inline char *format_sockaddr4(const struct sockaddr_in *sin4) {
if(sin4->sin_port)
byte_xasprintf(&r, "%s port %u",
if(sin4->sin_port)
byte_xasprintf(&r, "%s port %u",
- inet_ntop(sin4->sin_family, &sin4->sin_addr,
+ inet_ntop(sin4->sin_family,
(void *)
&sin4->sin_addr,
buffer, sizeof buffer),
ntohs(sin4->sin_port));
else
byte_xasprintf(&r, "%s",
buffer, sizeof buffer),
ntohs(sin4->sin_port));
else
byte_xasprintf(&r, "%s",
- inet_ntop(sin4->sin_family, &sin4->sin_addr,
+ inet_ntop(sin4->sin_family,
(void *)
&sin4->sin_addr,
buffer, sizeof buffer));
return r;
}
buffer, sizeof buffer));
return r;
}
@@
-186,12
+189,12
@@
static inline char *format_sockaddr6(const struct sockaddr_in6 *sin6) {
if(sin6->sin6_port)
byte_xasprintf(&r, "%s port %u",
if(sin6->sin6_port)
byte_xasprintf(&r, "%s port %u",
- inet_ntop(sin6->sin6_family, &sin6->sin6_addr,
+ inet_ntop(sin6->sin6_family,
(void *)
&sin6->sin6_addr,
buffer, sizeof buffer),
ntohs(sin6->sin6_port));
else
byte_xasprintf(&r, "%s",
buffer, sizeof buffer),
ntohs(sin6->sin6_port));
else
byte_xasprintf(&r, "%s",
- inet_ntop(sin6->sin6_family, &sin6->sin6_addr,
+ inet_ntop(sin6->sin6_family,
(void *)
&sin6->sin6_addr,
buffer, sizeof buffer));
return r;
}
buffer, sizeof buffer));
return r;
}
@@
-321,7
+324,7
@@
void netaddress_format(const struct netaddress *na,
if(na->port != -1) {
char buffer[64];
if(na->port != -1) {
char buffer[64];
- snprintf(buffer, sizeof buffer, "%d", na->port);
+
byte_
snprintf(buffer, sizeof buffer, "%d", na->port);
vector_append(v, xstrdup(buffer));
}
vector_terminate(v);
vector_append(v, xstrdup(buffer));
}
vector_terminate(v);
@@
-349,7
+352,7
@@
struct addrinfo *netaddress_resolve(const struct netaddress *na,
hints->ai_family = na->af;
hints->ai_protocol = protocol;
hints->ai_flags = passive ? AI_PASSIVE : 0;
hints->ai_family = na->af;
hints->ai_protocol = protocol;
hints->ai_flags = passive ? AI_PASSIVE : 0;
- snprintf(service, sizeof service, "%d", na->port);
+
byte_
snprintf(service, sizeof service, "%d", na->port);
rc = getaddrinfo(na->address, service, hints, &res);
if(rc) {
disorder_error(0, "getaddrinfo %s %d: %s",
rc = getaddrinfo(na->address, service, hints, &res);
if(rc) {
disorder_error(0, "getaddrinfo %s %d: %s",