mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
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
This commit is contained in:
parent
adad7dc672
commit
4e8faa6deb
1 changed files with 5 additions and 5 deletions
|
|
@ -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) {
|
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];
|
struct in6_addr ipv6;
|
||||||
uint32_t ipv4;
|
struct in_addr ipv4;
|
||||||
|
|
||||||
assert(m);
|
assert(m);
|
||||||
assert(name);
|
assert(name);
|
||||||
assert(port > 0);
|
assert(port > 0);
|
||||||
|
|
||||||
if (inet_pton(AF_INET6, name, ipv6) > 0)
|
if (inet_pton(AF_INET6, name, &ipv6) > 0)
|
||||||
return pa_socket_server_new_ipv6(m, ipv6, port, tcpwrap_service);
|
return pa_socket_server_new_ipv6(m, ipv6.s6_addr, port, tcpwrap_service);
|
||||||
|
|
||||||
if (inet_pton(AF_INET, name, &ipv4) > 0)
|
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);
|
pa_log_warn(__FILE__": failed to parse '%s'.", name);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue