commit b3580b19c808e9d899879eca846db63ff5d7ffb8
author Willy Tarreau <w@1wt.eu> Tue Sep 01 10:26:22 2020 +0200
committer Willy Tarreau <w@1wt.eu> Wed Sep 16 22:08:07 2020 +0200
tree 95985c57d5213672cd571a49951aadb326db7801
parent c049c0d5ad51e07c5dadfe3a43cc2c7d1690d3db

MINOR: protocol: rename the ->bind field to ->listen

The function currently is doing both the bind() and the listen(), so
let's call it ->listen so that the bind() operation can move to another
place.

src/listener.c

diff --git a/src/listener.c b/src/listener.c
index ededb1a..627f920 100644
--- a/src/listener.c
+++ b/src/listener.c
@@ -349,7 +349,7 @@
 		char msg[100];
 		int err;
 
-		err = l->rx.proto->bind(l, msg, sizeof(msg));
+		err = l->rx.proto->listen(l, msg, sizeof(msg));
 		if (err & ERR_ALERT)
 			ha_alert("Resuming listener: %s\n", msg);
 		else if (err & ERR_WARN)

src/proto_sockpair.c

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index d25ab5a..c5361c6 100644
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -55,7 +55,7 @@
 	.l3_addrlen = sizeof(((struct sockaddr_un*)0)->sun_path),/* path len */
 	.accept = &listener_accept,
 	.connect = &sockpair_connect_server,
-	.bind = sockpair_bind_listener,
+	.listen = sockpair_bind_listener,
 	.enable_all = enable_all_listeners,
 	.disable_all = disable_all_listeners,
 	.get_src = NULL,

src/proto_tcp.c

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 258a72d..a400b0f 100644
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -59,7 +59,7 @@
 	.l3_addrlen = 32/8,
 	.accept = &listener_accept,
 	.connect = tcp_connect_server,
-	.bind = tcp_bind_listener,
+	.listen = tcp_bind_listener,
 	.enable_all = enable_all_listeners,
 	.get_src = sock_get_src,
 	.get_dst = sock_inet_get_dst,
@@ -83,7 +83,7 @@
 	.l3_addrlen = 128/8,
 	.accept = &listener_accept,
 	.connect = tcp_connect_server,
-	.bind = tcp_bind_listener,
+	.listen = tcp_bind_listener,
 	.enable_all = enable_all_listeners,
 	.get_src = sock_get_src,
 	.get_dst = sock_get_dst,

src/proto_udp.c

diff --git a/src/proto_udp.c b/src/proto_udp.c
index 82a9387..eea2583 100644
--- a/src/proto_udp.c
+++ b/src/proto_udp.c
@@ -55,7 +55,7 @@
 	.l3_addrlen = 32/8,
 	.accept = NULL,
 	.connect = NULL,
-	.bind = udp_bind_listener,
+	.listen = udp_bind_listener,
 	.enable_all = enable_all_listeners,
 	.get_src = udp_get_src,
 	.get_dst = udp_get_dst,
@@ -79,7 +79,7 @@
 	.l3_addrlen = 128/8,
 	.accept = NULL,
 	.connect = NULL,
-	.bind = udp_bind_listener,
+	.listen = udp_bind_listener,
 	.enable_all = enable_all_listeners,
 	.get_src = udp6_get_src,
 	.get_dst = udp6_get_dst,

src/proto_uxst.c

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 6691e85..24ab191 100644
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -56,7 +56,7 @@
 	.l3_addrlen = sizeof(((struct sockaddr_un*)0)->sun_path),/* path len */
 	.accept = &listener_accept,
 	.connect = &uxst_connect_server,
-	.bind = uxst_bind_listener,
+	.listen = uxst_bind_listener,
 	.enable_all = enable_all_listeners,
 	.disable_all = disable_all_listeners,
 	.get_src = sock_get_src,

src/protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index bf1b1c5..6ea6033 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -67,7 +67,7 @@
 	HA_SPIN_LOCK(PROTO_LOCK, &proto_lock);
 	list_for_each_entry(proto, &protocols, list) {
 		list_for_each_entry(listener, &proto->listeners, rx.proto_list) {
-			lerr = proto->bind(listener, msg, sizeof(msg));
+			lerr = proto->listen(listener, msg, sizeof(msg));
 
 			/* errors are reported if <verbose> is set or if they are fatal */
 			if (verbose || (lerr & (ERR_FATAL | ERR_ABORT))) {