summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorPierre Ossman <ossman@cendio.se>2006-02-23 09:37:44 +0000
committerPierre Ossman <ossman@cendio.se>2006-02-23 09:37:44 +0000
commit4e8faa6debe0495a924aadb40ff033aeb93d0e4e (patch)
treec06217e5f22c2567dc6c3e8a8b8e214ae5bff495 /src
parentadad7dc672361142fef33d73264e6c053a2a29ce (diff)
inet_pton expects in[6]_addr structures, nothing else.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@583 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src')
-rw-r--r--src/polypcore/socket-server.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/polypcore/socket-server.c b/src/polypcore/socket-server.c
index 4e89c5d3..d457d626 100644
--- a/src/polypcore/socket-server.c
+++ b/src/polypcore/socket-server.c
@@ -339,18 +339,18 @@ pa_socket_server* pa_socket_server_new_ip_any(pa_mainloop_api *m, uint16_t port,
}
pa_socket_server* pa_socket_server_new_ip_string(pa_mainloop_api *m, const char *name, uint16_t port, const char *tcpwrap_service) {
- uint8_t ipv6[16];
- uint32_t ipv4;
+ struct in6_addr ipv6;
+ struct in_addr ipv4;
assert(m);
assert(name);
assert(port > 0);
- if (inet_pton(AF_INET6, name, ipv6) > 0)
- return pa_socket_server_new_ipv6(m, ipv6, port, tcpwrap_service);
+ if (inet_pton(AF_INET6, name, &ipv6) > 0)
+ return pa_socket_server_new_ipv6(m, ipv6.s6_addr, port, tcpwrap_service);
if (inet_pton(AF_INET, name, &ipv4) > 0)
- return pa_socket_server_new_ipv4(m, ntohl(ipv4), port, tcpwrap_service);
+ return pa_socket_server_new_ipv4(m, ntohl(ipv4.s_addr), port, tcpwrap_service);
pa_log_warn(__FILE__": failed to parse '%s'.", name);