aniani/icecast-server
1
0
Fork 0
mirror of https://gitlab.xiph.org/xiph/icecast-server.git synced 2024-12-04 14:46:30 -05:00
Code

Update: Prefer to bind to IPv6 if we have IPv4-mapped support

Browse Source
This commit is contained in:
Philipp Schafft 2022-03-07 09:56:41 +00:00
parent 81e965a08f
commit 661f736415
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/listensocket.c
View File

@ -37,6 +37,7 @@
struct listensocket_container_tag { struct listensocket_container_tag {
refobject_base_t __base; refobject_base_t __base;
mutex_t lock; mutex_t lock;
bool prefer_inet6;
listensocket_t **sock; listensocket_t **sock;
int *sockref; int *sockref;
size_t sock_len; size_t sock_len;
@ -60,6 +61,8 @@ static listensocket_t * listensocket_new(const listener_t *listener);
static int listensocket_apply_config(listensocket_t *self); static int listensocket_apply_config(listensocket_t *self);
static int listensocket_apply_config__unlocked(listensocket_t *self); static int listensocket_apply_config__unlocked(listensocket_t *self);
static int listensocket_set_update(listensocket_t *self, const listener_t *listener); static int listensocket_set_update(listensocket_t *self, const listener_t *listener);
static int listensocket_refsock(listensocket_t *self, bool prefer_inet6);
static int listensocket_unrefsock(listensocket_t *self);
#ifdef HAVE_POLL #ifdef HAVE_POLL
static inline int listensocket__poll_fill(listensocket_t *self, struct pollfd *p); static inline int listensocket__poll_fill(listensocket_t *self, struct pollfd *p);
#else #else
@ -271,11 +274,15 @@ int listensocket_container_configure_and_setup(listensoc
{ {
void (*cb)(size_t count, void *userdata); void (*cb)(size_t count, void *userdata);
int ret; int ret;
bool prefer_inet6;
if (!self) if (!self)
return -1; return -1;
prefer_inet6 = sock_is_ipv4_mapped_supported(); /* test before we enter lock to minimise locked time */
thread_mutex_lock(&self->lock); thread_mutex_lock(&self->lock);
self->prefer_inet6 = prefer_inet6;
cb = self->sockcount_cb; cb = self->sockcount_cb;
self->sockcount_cb = NULL; self->sockcount_cb = NULL;
@ -295,11 +302,15 @@ int listensocket_container_configure_and_setup(listensoc
int listensocket_container_setup(listensocket_container_t *self) int listensocket_container_setup(listensocket_container_t *self)
{ {
int ret; int ret;
bool prefer_inet6;
if (!self) if (!self)
return -1; return -1;
prefer_inet6 = sock_is_ipv4_mapped_supported(); /* test before we enter lock to minimise locked time */
thread_mutex_lock(&self->lock); thread_mutex_lock(&self->lock);
self->prefer_inet6 = prefer_inet6;
ret = listensocket_container_setup__unlocked(self); ret = listensocket_container_setup__unlocked(self);
thread_mutex_unlock(&self->lock); thread_mutex_unlock(&self->lock);
@ -320,7 +331,7 @@ static int listensocket_container_setup__unlocked(listensocket_container_t *self
self->sockref[i] = 0; self->sockref[i] = 0;
} }
} else if (!self->sockref[i] && type != LISTENER_TYPE_VIRTUAL) { } else if (!self->sockref[i] && type != LISTENER_TYPE_VIRTUAL) {
if (listensocket_refsock(self->sock[i]) == 0) { if (listensocket_refsock(self->sock[i], self->prefer_inet6) == 0) {
self->sockref[i] = 1; self->sockref[i] = 1;
} else { } else {
ICECAST_LOG_DEBUG("Can not ref socket."); ICECAST_LOG_DEBUG("Can not ref socket.");
@ -676,7 +687,7 @@ static int listensocket_set_update(listensocket_t *self, const list
return 0; return 0;
} }
int listensocket_refsock(listensocket_t *self) static int listensocket_refsock(listensocket_t *self, bool prefer_inet6)
{ {
if (!self) if (!self)
return -1; return -1;
@ -689,7 +700,7 @@ int listensocket_refsock(listensocket_t *self)
} }
thread_rwlock_rlock(&self->listener_rwlock); thread_rwlock_rlock(&self->listener_rwlock);
self->sock = sock_get_server_socket(self->listener->port, self->listener->bind_address); self->sock = sock_get_server_socket(self->listener->port, self->listener->bind_address, self->listener->bind_address ? false : prefer_inet6);
thread_rwlock_unlock(&self->listener_rwlock); thread_rwlock_unlock(&self->listener_rwlock);
if (self->sock == SOCK_ERROR) { if (self->sock == SOCK_ERROR) {
thread_mutex_unlock(&self->lock); thread_mutex_unlock(&self->lock);
@ -717,7 +728,7 @@ int listensocket_refsock(listensocket_t *self)
return 0; return 0;
} }
int listensocket_unrefsock(listensocket_t *self) static int listensocket_unrefsock(listensocket_t *self)
{ {
if (!self) if (!self)
return -1; return -1;

2
src/listensocket.h
View File

@ -32,8 +32,6 @@ bool listensocket_container_is_family_included(listensock
REFOBJECT_FORWARD_TYPE(listensocket_t); REFOBJECT_FORWARD_TYPE(listensocket_t);
int listensocket_refsock(listensocket_t *self);
int listensocket_unrefsock(listensocket_t *self);
connection_t * listensocket_accept(listensocket_t *self, listensocket_container_t *container); connection_t * listensocket_accept(listensocket_t *self, listensocket_container_t *container);
const listener_t * listensocket_get_listener(listensocket_t *self); const listener_t * listensocket_get_listener(listensocket_t *self);
int listensocket_release_listener(listensocket_t *self); int listensocket_release_listener(listensocket_t *self);