oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

server_socket: use resolve_host_port() instead of getaddrinfo()

Browse Source 
Allow port specification in "bind_to_address" settings.
This commit is contained in:
Max Kellermann
2011-09-20 20:52:49 +02:00
parent 7d9d459ac2
commit a3f7947ad2
3 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/server_socket.c
View File

@@ -380,24 +380,11 @@ server_socket_add_host(struct server_socket *ss, const char *hostname,
unsigned port, GError **error_r)
{
#ifdef HAVE_TCP
struct addrinfo hints;
memset(&hints, 0, sizeof(hints));
hints.ai_flags = AI_PASSIVE;
hints.ai_family = PF_UNSPEC;
hints.ai_socktype = SOCK_STREAM;
hints.ai_protocol = IPPROTO_TCP;
char service[20];
g_snprintf(service, sizeof(service), "%u", port);
struct addrinfo *ai;
int ret = getaddrinfo(hostname, service, &hints, &ai);
if (ret != 0) {
g_set_error(error_r, server_socket_quark(), ret,
"Failed to look up host \"%s\": %s",
hostname, gai_strerror(ret));
struct addrinfo *ai = resolve_host_port(hostname, port,
AI_PASSIVE, SOCK_STREAM,
error_r);
if (ai == NULL)
return false;
}
for (const struct addrinfo *i = ai; i != NULL; i = i->ai_next)
server_socket_add_address(ss, i->ai_addr, i->ai_addrlen);