MEDIUM: listeners: make use of fd_want_recv_safe() to enable early receivers
We used to refrain from calling fd_want_recv() if fd_updt was not allocated
but it's not the right solution as this does not allow the FD to be set.
Instead, let's use the new fd_want_recv_safe() which will update the FD and
create an update entry only if possible. In addition, the equivalent test
before calling fd_stop_recv() was removed as totally useless since there's
not fd_updt creation in this case.
diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index f8e673d..cc92753 100644
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -107,21 +107,19 @@
}
/* Enable receipt of incoming connections for listener <l>. The receiver must
- * still be valid. Does nothing in early boot (needs fd_updt).
+ * still be valid.
*/
static void sockpair_enable_listener(struct listener *l)
{
- if (fd_updt)
- fd_want_recv(l->rx.fd);
+ fd_want_recv_safe(l->rx.fd);
}
/* Disable receipt of incoming connections for listener <l>. The receiver must
- * still be valid. Does nothing in early boot (needs fd_updt).
+ * still be valid.
*/
static void sockpair_disable_listener(struct listener *l)
{
- if (fd_updt)
- fd_stop_recv(l->rx.fd);
+ fd_stop_recv(l->rx.fd);
}
/* Binds receiver <rx>, and assigns rx->iocb and rx->owner as the callback
diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index e59aa96..06adf9b 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -749,21 +749,19 @@
}
/* Enable receipt of incoming connections for listener <l>. The receiver must
- * still be valid. Does nothing in early boot (needs fd_updt).
+ * still be valid.
*/
static void tcp_enable_listener(struct listener *l)
{
- if (fd_updt)
- fd_want_recv(l->rx.fd);
+ fd_want_recv_safe(l->rx.fd);
}
/* Disable receipt of incoming connections for listener <l>. The receiver must
- * still be valid. Does nothing in early boot (needs fd_updt).
+ * still be valid.
*/
static void tcp_disable_listener(struct listener *l)
{
- if (fd_updt)
- fd_stop_recv(l->rx.fd);
+ fd_stop_recv(l->rx.fd);
}
/* Suspend a receiver. Returns < 0 in case of failure, 0 if the receiver
diff --git a/src/proto_udp.c b/src/proto_udp.c
index 0724680..ae5562a 100644
--- a/src/proto_udp.c
+++ b/src/proto_udp.c
@@ -173,21 +173,19 @@
}
/* Enable receipt of incoming connections for listener <l>. The receiver must
- * still be valid. Does nothing in early boot (needs fd_updt).
+ * still be valid.
*/
static void udp_enable_listener(struct listener *l)
{
- if (fd_updt)
- fd_want_recv(l->rx.fd);
+ fd_want_recv_safe(l->rx.fd);
}
/* Disable receipt of incoming connections for listener <l>. The receiver must
- * still be valid. Does nothing in early boot (needs fd_updt).
+ * still be valid.
*/
static void udp_disable_listener(struct listener *l)
{
- if (fd_updt)
- fd_stop_recv(l->rx.fd);
+ fd_stop_recv(l->rx.fd);
}
/* Suspend a receiver. Returns < 0 in case of failure, 0 if the receiver
diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index d33f8c3..f558e5f 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -153,21 +153,19 @@
}
/* Enable receipt of incoming connections for listener <l>. The receiver must
- * still be valid. Does nothing in early boot (needs fd_updt).
+ * still be valid.
*/
static void uxst_enable_listener(struct listener *l)
{
- if (fd_updt)
- fd_want_recv(l->rx.fd);
+ fd_want_recv_safe(l->rx.fd);
}
/* Disable receipt of incoming connections for listener <l>. The receiver must
- * still be valid. Does nothing in early boot (needs fd_updt).
+ * still be valid.
*/
static void uxst_disable_listener(struct listener *l)
{
- if (fd_updt)
- fd_stop_recv(l->rx.fd);
+ fd_stop_recv(l->rx.fd);
}
/* Suspend a receiver. Returns < 0 in case of failure, 0 if the receiver
diff --git a/src/sock.c b/src/sock.c
index 192559b..3e2f208 100644
--- a/src/sock.c
+++ b/src/sock.c
@@ -186,21 +186,17 @@
return my_socketat(ns, conn->dst->ss_family, SOCK_STREAM, 0);
}
-/* Enables receiving on receiver <rx> once already bound. Does nothing in early
- * boot (needs fd_updt).
- */
+/* Enables receiving on receiver <rx> once already bound. */
void sock_enable(struct receiver *rx)
{
- if (rx->flags & RX_F_BOUND && fd_updt)
- fd_want_recv(rx->fd);
+ if (rx->flags & RX_F_BOUND)
+ fd_want_recv_safe(rx->fd);
}
-/* Disables receiving on receiver <rx> once already bound. Does nothing in early
- * boot (needs fd_updt).
- */
+/* Disables receiving on receiver <rx> once already bound. */
void sock_disable(struct receiver *rx)
{
- if (rx->flags & RX_F_BOUND && fd_updt)
+ if (rx->flags & RX_F_BOUND)
fd_stop_recv(rx->fd);
}