MINOR: listener: prefer to retrieve the socket's settings via the receiver
Some socket settings used to be retrieved via the listener and the
bind_conf. Now instead we use the receiver and its settings whenever
appropriate. This will simplify the removal of the dependency on the
listener.
diff --git a/src/proto_udp.c b/src/proto_udp.c
index 5cd7b73..9325ba8 100644
--- a/src/proto_udp.c
+++ b/src/proto_udp.c
@@ -200,7 +200,7 @@
* IPPROTO (sockaddr is not enough)
*/
- fd = my_socketat(listener->bind_conf->settings.netns,
+ fd = my_socketat(listener->rx.settings->netns,
listener->rx.proto->sock_family,
listener->rx.proto->sock_type,
listener->rx.proto->sock_prot);
@@ -255,10 +255,10 @@
#ifdef SO_BINDTODEVICE
/* Note: this might fail if not CAP_NET_RAW */
- if (listener->bind_conf->settings.interface) {
+ if (listener->rx.settings->interface) {
if (setsockopt(fd, SOL_SOCKET, SO_BINDTODEVICE,
- listener->bind_conf->settings.interface,
- strlen(listener->bind_conf->settings.interface) + 1) == -1) {
+ listener->rx.settings->interface,
+ strlen(listener->rx.settings->interface) + 1) == -1) {
msg = "cannot bind listener to device";
err |= ERR_WARN;
}
@@ -283,7 +283,7 @@
if (listener->bind_conf->frontend->mode == PR_MODE_SYSLOG)
fd_insert(fd, listener, syslog_fd_handler,
- thread_mask(listener->bind_conf->settings.bind_thread) & all_threads_mask);
+ thread_mask(listener->rx.settings->bind_thread) & all_threads_mask);
else {
err |= ERR_FATAL | ERR_ALERT;
msg = "UDP is not yet supported on this proxy mode";