MINOR: listener: remove the inherited arg to create_listener()

This argument can now safely be determined from fd != -1, let's just
drop it.

diff --git a/include/haproxy/listener.h b/include/haproxy/listener.h
index 2f7231e6334d75eeba3d84cdacd790029ee5bf56..fc37128a6594fe84cbc791642944dc485dce4680 100644 (file)
--- a/include/haproxy/listener.h
+++ b/include/haproxy/listener.h
@@ -87,13 +87,11 @@ void unbind_listener_no_close(struct listener *listener);
  * range <portl> to <porth>, and possibly attached to fd <fd> (or -1 for auto
  * allocation). The address family is taken from ss->ss_family. The number of
  * jobs and listeners is automatically increased by the number of listeners
- * created. If the <inherited> argument is set to 1, it specifies that the FD
- * was obtained from a parent process.
- * It returns non-zero on success, zero on error with the error message
+ * created. It returns non-zero on success, zero on error with the error message
  * set in <err>.
  */
 int create_listeners(struct bind_conf *bc, const struct sockaddr_storage *ss,
-                     int portl, int porth, int fd, int inherited, char **err);
+                     int portl, int porth, int fd, char **err);
 
 /* Delete a listener from its protocol's list of listeners. The listener's
  * state is automatically updated from LI_ASSIGNED to LI_INIT. The protocol's

diff --git a/src/cfgparse.c b/src/cfgparse.c
index 864c5820e45f4ce15fa5a2ce42368172c6cd0364..1ff555c3599a7fff2b2d217a421d54b5c3ef25a0 100644 (file)
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -117,7 +117,6 @@ int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf,
        next = dupstr = strdup(str);
 
        while (next && *next) {
-               int inherited = 0;
                struct sockaddr_storage *ss2;
                int fd = -1;
 
@@ -136,7 +135,6 @@ int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf,
 
                if (ss2->ss_family == AF_CUST_EXISTING_FD) {
                        socklen_t addr_len;
-                       inherited = 1;
 
                        /* We want to attach to an already bound fd whose number
                         * is in the addr part of ss2 when cast to sockaddr_in.
@@ -155,7 +153,6 @@ int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf,
 
                } else if (ss2->ss_family == AF_CUST_SOCKPAIR) {
                        socklen_t addr_len;
-                       inherited = 1;
 
                        fd = ((struct sockaddr_in *)ss2)->sin_addr.s_addr;
                        addr_len = sizeof(*ss2);
@@ -169,7 +166,7 @@ int str2listener(char *str, struct proxy *curproxy, struct bind_conf *bind_conf,
                }
 
                /* OK the address looks correct */
-               if (!create_listeners(bind_conf, ss2, port, end, fd, inherited, err)) {
+               if (!create_listeners(bind_conf, ss2, port, end, fd, err)) {
                        memprintf(err, "%s for address '%s'.\n", *err, str);
                        goto fail;
                }

diff --git a/src/listener.c b/src/listener.c
index 627f9200b802a7d3bd1217ae8ac1e1d003fbb78a..263508bc4e195146687a97e64d26423f1e3f03f2 100644 (file)
--- a/src/listener.c
+++ b/src/listener.c
@@ -537,13 +537,11 @@ void unbind_listener_no_close(struct listener *listener)
  * range <portl> to <porth>, and possibly attached to fd <fd> (or -1 for auto
  * allocation). The address family is taken from ss->ss_family. The number of
  * jobs and listeners is automatically increased by the number of listeners
- * created. If the <inherited> argument is set to 1, it specifies that the FD
- * was obtained from a parent process.
- * It returns non-zero on success, zero on error with the error message
+ * created. It returns non-zero on success, zero on error with the error message
  * set in <err>.
  */
 int create_listeners(struct bind_conf *bc, const struct sockaddr_storage *ss,
-                     int portl, int porth, int fd, int inherited, char **err)
+                     int portl, int porth, int fd, char **err)
 {
        struct protocol *proto = protocol_by_family(ss->ss_family);
        struct listener *l;
@@ -573,7 +571,7 @@ int create_listeners(struct bind_conf *bc, const struct sockaddr_storage *ss,
 
                proto->add(l, port);
 
-               if (inherited)
+               if (fd != -1)
                        l->rx.flags |= RX_F_INHERITED;
 
                HA_SPIN_INIT(&l->lock);