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

resolver: add function resolve_host_port()

Browse Source
This commit is contained in:
Max Kellermann
2011-09-20 20:51:46 +02:00
parent 3ea1073809
commit 7d9d459ac2
4 changed files with 157 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
src/resolver.c
View File

@@ -19,6 +19,7 @@
#include "config.h"
#include "resolver.h"
#include "glib_compat.h"
#ifndef G_OS_WIN32
#include <sys/socket.h>
@@ -29,9 +30,7 @@
#include <winsock.h>
#endif /* G_OS_WIN32 */
#ifdef HAVE_IPV6
#include <string.h>
#endif
char *
sockaddr_to_string(const struct sockaddr *sa, size_t length, GError **error)
@@ -81,3 +80,63 @@ sockaddr_to_string(const struct sockaddr *sa, size_t length, GError **error)
return g_strconcat(host, ":", serv, NULL);
}
struct addrinfo *
resolve_host_port(const char *host_port, unsigned default_port,
int flags, int socktype,
GError **error_r)
{
char *p = g_strdup(host_port);
const char *host = p, *port = NULL;
if (host_port[0] == '[') {
/* IPv6 needs enclosing square braces, to
differentiate between IP colons and the port
separator */
char *q = strchr(p + 1, ']');
if (q != NULL && q[1] == ':' && q[2] != 0) {
*q = 0;
++host;
port = q + 2;
}
}
if (port == NULL) {
/* port is after the colon, but only if it's the only
colon (don't split IPv6 addresses) */
char *q = strchr(p, ':');
if (q != NULL && q[1] != 0 && strchr(q + 1, ':') == NULL) {
*q = 0;
port = q + 1;
}
}
char buffer[32];
if (port == NULL && default_port != 0) {
g_snprintf(buffer, sizeof(buffer), "%u", default_port);
port = buffer;
}
if ((flags & AI_PASSIVE) != 0 && strcmp(host, "*") == 0)
host = NULL;
const struct addrinfo hints = {
.ai_flags = flags,
.ai_family = AF_UNSPEC,
.ai_socktype = socktype,
};
struct addrinfo *ai;
int ret = getaddrinfo(host, port, &hints, &ai);
g_free(p);
if (ret != 0) {
g_set_error(error_r, resolver_quark(), ret,
"Failed to look up '%s': %s",
host_port, gai_strerror(ret));
return NULL;
}
return ai;
}

23
src/resolver.h
View File

@@ -23,6 +23,14 @@
#include <glib.h>
struct sockaddr;
struct addrinfo;
G_GNUC_CONST
static inline GQuark
resolver_quark(void)
{
return g_quark_from_static_string("resolver");
}
/**
* Converts the specified socket address into a string in the form
@@ -37,4 +45,19 @@ struct sockaddr;
char *
sockaddr_to_string(const struct sockaddr *sa, size_t length, GError **error);
/**
* Resolve a specification in the form "host", "host:port",
* "[host]:port". This is a convenience wrapper for getaddrinfo().
*
* @param default_port a default port number that will be used if none
* is given in the string (if applicable); pass 0 to go without a
* default
* @return an #addrinfo linked list that must be freed with
* freeaddrinfo(), or NULL on error
*/
struct addrinfo *
resolve_host_port(const char *host_port, unsigned default_port,
int flags, int socktype,
GError **error_r);
#endif