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.

diff --git a/include/haproxy/protocol-t.h b/include/haproxy/protocol-t.h
index 15396275b3c089848f38226a28cf9906479c415b..07532e126156532d507d551e532bcc2050846d19 100644 (file)
--- a/include/haproxy/protocol-t.h
+++ b/include/haproxy/protocol-t.h
@@ -71,7 +71,7 @@ struct protocol {
        socklen_t sock_addrlen;                         /* socket address length, used by bind() */
        int l3_addrlen;                                 /* layer3 address length, used by hashes */
        void (*accept)(int fd);                         /* generic accept function */
-       int (*bind)(struct listener *l, char *errmsg, int errlen); /* bind a listener */
+       int (*listen)(struct listener *l, char *errmsg, int errlen); /* start a listener */
        int (*enable_all)(struct protocol *proto);      /* enable all bound listeners */
        int (*disable_all)(struct protocol *proto);     /* disable all bound listeners */
        int (*connect)(struct connection *, int flags); /* connect function if any, see below for flags values */

diff --git a/src/listener.c b/src/listener.c
index ededb1aa519160889314256ee86347c7b1e9ca38..627f9200b802a7d3bd1217ae8ac1e1d003fbb78a 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -349,7 +349,7 @@ int resume_listener(struct listener *l)
                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)

diff --git a/src/proto_sockpair.c b/src/proto_sockpair.c
index d25ab5a4248d38f8eecd885d847bd56cc40813c9..c5361c67832978ad559c4a792774eaadc906394d 100644 (file)
--- a/src/proto_sockpair.c
+++ b/src/proto_sockpair.c
@@ -55,7 +55,7 @@ static struct protocol proto_sockpair = {
        .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,

diff --git a/src/proto_tcp.c b/src/proto_tcp.c
index 258a72ddc69ff04abd1763e1f22d37c34cd36c78..a400b0fa9932adc02a6e34744b9fba7c7e7cd511 100644 (file)
--- a/src/proto_tcp.c
+++ b/src/proto_tcp.c
@@ -59,7 +59,7 @@ static struct protocol proto_tcpv4 = {
        .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 @@ static struct protocol proto_tcpv6 = {
        .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,

diff --git a/src/proto_udp.c b/src/proto_udp.c
index 82a93873ec1cbc3986631ed3bb02b8aa8ab463ed..eea2583ac6f9f209b7f0056b87ae05fd0e97aa81 100644 (file)
--- a/src/proto_udp.c
+++ b/src/proto_udp.c
@@ -55,7 +55,7 @@ static struct protocol proto_udp4 = {
        .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 @@ static struct protocol proto_udp6 = {
        .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,

diff --git a/src/proto_uxst.c b/src/proto_uxst.c
index 6691e85ab17a34cd99200ded0f42d047235d72ca..24ab191dd57aa7193ef425e9769df08e1aa0eb0c 100644 (file)
--- a/src/proto_uxst.c
+++ b/src/proto_uxst.c
@@ -56,7 +56,7 @@ static struct protocol proto_unix = {
        .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,

diff --git a/src/protocol.c b/src/protocol.c
index bf1b1c5cbde7df72c2934ca62ece21f3a8727d1d..6ea60337a28adf2591cd4abfe27654e90b0ed31a 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -67,7 +67,7 @@ int protocol_bind_all(int verbose)
        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))) {