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

listen: moved code to listen_add_port()

Browse Source 
Split code from the rather large function listen_add_config_param().
This commit is contained in:
Max Kellermann 2009-02-24 17:51:32 +01:00
parent dbb067c016
commit 36b1a860d3
1 changed files with 57 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
src/listen.c
View File

@ -148,15 +148,20 @@ is_ipv6_enabled(void)
} }
#endif #endif
/**
* Add a listener on a port on all interfaces.
*
* @param port the TCP port
* @param error location to store the error occuring, or NULL to ignore errors
* @return true on success
*/
static bool static bool
listen_add_config_param(G_GNUC_UNUSED unsigned int port, listen_add_port(unsigned int port, GError **error)
const struct config_param *param,
GError **error)
{ {
#ifdef HAVE_TCP
bool success; bool success;
const struct sockaddr *addrp; const struct sockaddr *addrp;
socklen_t addrlen; socklen_t addrlen;
#ifdef HAVE_TCP
struct sockaddr_in sin4; struct sockaddr_in sin4;
#ifdef HAVE_IPV6 #ifdef HAVE_IPV6
struct sockaddr_in6 sin6; struct sockaddr_in6 sin6;
@ -169,45 +174,57 @@ listen_add_config_param(G_GNUC_UNUSED unsigned int port,
memset(&sin4, 0, sizeof(struct sockaddr_in)); memset(&sin4, 0, sizeof(struct sockaddr_in));
sin4.sin_port = htons(port); sin4.sin_port = htons(port);
sin4.sin_family = AF_INET; sin4.sin_family = AF_INET;
g_debug("binding to any address");
#ifdef HAVE_IPV6
if (ipv6_enabled) {
sin6.sin6_addr = in6addr_any;
addrp = (const struct sockaddr *)&sin6;
addrlen = sizeof(struct sockaddr_in6);
success = listen_add_address(PF_INET6, addrp, addrlen,
error);
if (!success)
return false;
}
#endif
sin4.sin_addr.s_addr = INADDR_ANY;
addrp = (const struct sockaddr *)&sin4;
addrlen = sizeof(struct sockaddr_in);
success = listen_add_address(PF_INET, addrp, addrlen, error);
if (!success) {
#ifdef HAVE_IPV6
if (ipv6_enabled)
/* non-critical: IPv6 listener is
already set up */
g_clear_error(error);
else
#endif
return false;
}
return true;
#else /* HAVE_TCP */
(void)port;
g_set_error(error, listen_quark(), 0,
"TCP support is disabled");
return false;
#endif /* HAVE_TCP */ #endif /* HAVE_TCP */
}
static bool
listen_add_config_param(unsigned int port,
const struct config_param *param,
GError **error)
{
bool success;
const struct sockaddr *addrp;
socklen_t addrlen;
if (!param || 0 == strcmp(param->value, "any")) { if (!param || 0 == strcmp(param->value, "any")) {
#ifdef HAVE_TCP return listen_add_port(port, error);
g_debug("binding to any address");
#ifdef HAVE_IPV6
if (ipv6_enabled) {
sin6.sin6_addr = in6addr_any;
addrp = (const struct sockaddr *)&sin6;
addrlen = sizeof(struct sockaddr_in6);
success = listen_add_address(PF_INET6, addrp, addrlen,
error);
if (!success)
return false;
}
#endif
sin4.sin_addr.s_addr = INADDR_ANY;
addrp = (const struct sockaddr *)&sin4;
addrlen = sizeof(struct sockaddr_in);
success = listen_add_address(PF_INET, addrp, addrlen, error);
if (!success) {
#ifdef HAVE_IPV6
if (ipv6_enabled)
/* non-critical: IPv6 listener is
already set up */
g_clear_error(error);
else
#endif
return false;
}
return true;
#else /* HAVE_TCP */
g_set_error(error, listen_quark(), 0,
"TCP support is disabled");
return false;
#endif /* HAVE_TCP */
#ifdef HAVE_UN #ifdef HAVE_UN
} else if (param->value[0] == '/') { } else if (param->value[0] == '/') {
size_t path_length; size_t path_length;