librb: remove socklen parameter from rb_connect_tcp

diff --git a/authd/providers/ident.c b/authd/providers/ident.c
index f3733ceaf6ae3002bd7a3fcf6acda7b2e523ea29..959bdb5763fc2a04c44e17a05d8052cf84ebd4b8 100644 (file)
--- a/authd/providers/ident.c
+++ b/authd/providers/ident.c
@@ -324,7 +324,7 @@ ident_start(struct auth_client *auth)
 
        rb_connect_tcp(query->F, (struct sockaddr *)&c_addr,
                        (struct sockaddr *)&l_addr,
-                       GET_SS_LEN(&l_addr), ident_connected,
+                       ident_connected,
                        auth, ident_timeout);
 
        set_provider_running(auth, SELF_PID);

diff --git a/authd/providers/opm.c b/authd/providers/opm.c
index 3fbc53a65a06cc3bfa36eeb723e4c23ca586a511..ca3cfd2b70254f013b7e4b8603d2352be8cdc410 100644 (file)
--- a/authd/providers/opm.c
+++ b/authd/providers/opm.c
@@ -456,13 +456,11 @@ establish_connection(struct auth_client *auth, struct opm_proxy *proxy)
                rb_connect_tcp(scan->F,
                                (struct sockaddr *)&c_a,
                                (struct sockaddr *)&l_a,
-                               GET_SS_LEN(&l_a),
                                opm_connected, scan, opm_timeout);
        else
                rb_connect_tcp_ssl(scan->F,
                                (struct sockaddr *)&c_a,
                                (struct sockaddr *)&l_a,
-                               GET_SS_LEN(&l_a),
                                opm_connected, scan, opm_timeout);
 }
 

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 28ed4286b9f093f45430bd0c9eb89c035e560dd8..e6c424f2febc40337ec201472c0426fee4e5477f 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -1155,7 +1155,6 @@ serv_connect(struct server_conf *server_p, struct Client *by)
        rb_connect_tcp(client_p->localClient->F,
                (struct sockaddr *)&sa_connect,
                GET_SS_FAMILY(&sa_bind) == AF_UNSPEC ? NULL : (struct sockaddr *)&sa_bind,
-               GET_SS_LEN(&sa_bind),
                ServerConfSSL(server_p) ? serv_connect_ssl_callback : serv_connect_callback,
                client_p, ConfigFileEntry.connect_timeout);
        return 1;

diff --git a/librb/include/commio-ssl.h b/librb/include/commio-ssl.h
index adcce1ae35ae73c773e4d9d544e89379e1015870..cb6bda7a4202b52347196218524e738483bfe62a 100644 (file)
--- a/librb/include/commio-ssl.h
+++ b/librb/include/commio-ssl.h
@@ -34,7 +34,7 @@ int rb_get_random(void *buf, size_t length);
 const char *rb_get_ssl_strerror(rb_fde_t *F);
 void rb_ssl_start_accepted(rb_fde_t *new_F, ACCB * cb, void *data, int timeout);
 void rb_ssl_start_connected(rb_fde_t *F, CNCB * callback, void *data, int timeout);
-void rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest, struct sockaddr *clocal, int socklen,
+void rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest, struct sockaddr *clocal,
                        CNCB * callback, void *data, int timeout);
 void rb_ssl_accept_setup(rb_fde_t *F, rb_fde_t *new_F, struct sockaddr *st, int addrlen);
 void rb_ssl_shutdown(rb_fde_t *F);

diff --git a/librb/include/rb_commio.h b/librb/include/rb_commio.h
index 5c15b0a224114c022b477e205ec62766dc736c6d..4be817731caf3df2979afc8dc5aa45870eb41c61 100644 (file)
--- a/librb/include/rb_commio.h
+++ b/librb/include/rb_commio.h
@@ -121,8 +121,8 @@ int rb_get_sockerr(rb_fde_t *);
 
 void rb_settimeout(rb_fde_t *, time_t, PF *, void *);
 void rb_checktimeouts(void *);
-void rb_connect_tcp(rb_fde_t *, struct sockaddr *, struct sockaddr *, int, CNCB *, void *, int);
-void rb_connect_tcp_ssl(rb_fde_t *, struct sockaddr *, struct sockaddr *, int, CNCB *, void *, int);
+void rb_connect_tcp(rb_fde_t *, struct sockaddr *, struct sockaddr *, CNCB *, void *, int);
+void rb_connect_tcp_ssl(rb_fde_t *, struct sockaddr *, struct sockaddr *, CNCB *, void *, int);
 int rb_connect_sockaddr(rb_fde_t *, struct sockaddr *addr, int len);
 
 const char *rb_errstr(int status);

diff --git a/librb/src/commio.c b/librb/src/commio.c
index fde467c83213471869328b26235f8f258419208b..bd401b185120f78e4f58ffab118687e9f81f7bc7 100644 (file)
--- a/librb/src/commio.c
+++ b/librb/src/commio.c
@@ -410,10 +410,10 @@ rb_accept_tcp(rb_fde_t *F, ACPRE * precb, ACCB * callback, void *data)
 
 /*
  * void rb_connect_tcp(rb_platform_fd_t fd, struct sockaddr *dest,
- *                       struct sockaddr *clocal, int socklen,
+ *                       struct sockaddr *clocal,
  *                       CNCB *callback, void *data, int timeout)
  * Input: An fd to connect with, a host and port to connect to,
- *        a local sockaddr to connect from + length(or NULL to use the
+ *        a local sockaddr to connect from (or NULL to use the
  *        default), a callback, the data to pass into the callback, the
  *        address family.
  * Output: None.
@@ -423,7 +423,7 @@ rb_accept_tcp(rb_fde_t *F, ACPRE * precb, ACCB * callback, void *data)
  */
 void
 rb_connect_tcp(rb_fde_t *F, struct sockaddr *dest,
-              struct sockaddr *clocal, int socklen, CNCB * callback, void *data, int timeout)
+              struct sockaddr *clocal, CNCB * callback, void *data, int timeout)
 {
        if(F == NULL)
                return;
@@ -442,7 +442,7 @@ rb_connect_tcp(rb_fde_t *F, struct sockaddr *dest,
         * virtual host IP, for completeness.
         *   -- adrian
         */
-       if((clocal != NULL) && (bind(F->fd, clocal, socklen) < 0))
+       if((clocal != NULL) && (bind(F->fd, clocal, GET_SS_LEN(clocal)) < 0))
        {
                /* Failure, call the callback with RB_ERR_BIND */
                rb_connect_callback(F, RB_ERR_BIND);

diff --git a/librb/src/gnutls.c b/librb/src/gnutls.c
index efff9757a57177cbaa1eccc64c365c79759b4934..b374dd0c911e0cf1cbb144eac06e92c9c5e0a188 100644 (file)
--- a/librb/src/gnutls.c
+++ b/librb/src/gnutls.c
@@ -526,7 +526,7 @@ rb_ssl_tryconn(rb_fde_t *F, int status, void *data)
 
 void
 rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest,
-                  struct sockaddr *clocal, int socklen, CNCB * callback, void *data, int timeout)
+                  struct sockaddr *clocal, CNCB * callback, void *data, int timeout)
 {
        struct ssl_connect *sconn;
        if(F == NULL)
@@ -536,7 +536,7 @@ rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest,
        sconn->data = data;
        sconn->callback = callback;
        sconn->timeout = timeout;
-       rb_connect_tcp(F, dest, clocal, socklen, rb_ssl_tryconn, sconn, timeout);
+       rb_connect_tcp(F, dest, clocal, rb_ssl_tryconn, sconn, timeout);
 
 }
 

diff --git a/librb/src/mbedtls.c b/librb/src/mbedtls.c
index 4fd38f177dfdc64e5cf83f7b255ed86d9df7e72f..55cdccdccae70b815551d0d2bd24daa25d8b34ab 100644 (file)
--- a/librb/src/mbedtls.c
+++ b/librb/src/mbedtls.c
@@ -474,7 +474,7 @@ rb_ssl_tryconn(rb_fde_t *F, int status, void *data)
 
 void
 rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest,
-                  struct sockaddr *clocal, int socklen, CNCB * callback, void *data, int timeout)
+                  struct sockaddr *clocal, CNCB * callback, void *data, int timeout)
 {
        struct ssl_connect *sconn;
        if(F == NULL)
@@ -484,7 +484,7 @@ rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest,
        sconn->data = data;
        sconn->callback = callback;
        sconn->timeout = timeout;
-       rb_connect_tcp(F, dest, clocal, socklen, rb_ssl_tryconn, sconn, timeout);
+       rb_connect_tcp(F, dest, clocal, rb_ssl_tryconn, sconn, timeout);
 }
 
 void

diff --git a/librb/src/nossl.c b/librb/src/nossl.c
index e97843b93b4b25e9a3daa4d7c7fd8d0653af8fcf..85e6e51c979b59f3590fb54a2bafd680561da335 100644 (file)
--- a/librb/src/nossl.c
+++ b/librb/src/nossl.c
@@ -112,7 +112,7 @@ rb_ssl_start_connected(rb_fde_t *F, CNCB * callback, void *data, int timeout)
 
 void
 rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest,
-                  struct sockaddr *clocal, int socklen, CNCB * callback, void *data, int timeout)
+                  struct sockaddr *clocal, CNCB * callback, void *data, int timeout)
 {
        return;
 }

diff --git a/librb/src/openssl.c b/librb/src/openssl.c
index 85f07c5ef3325254991cf050a07058a38950f225..99948aa87e9608e975404dfa51eb64c346cd9e5a 100644 (file)
--- a/librb/src/openssl.c
+++ b/librb/src/openssl.c
@@ -575,7 +575,7 @@ rb_ssl_tryconn(rb_fde_t *F, int status, void *data)
 
 void
 rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest,
-                  struct sockaddr *clocal, int socklen, CNCB * callback, void *data, int timeout)
+                  struct sockaddr *clocal, CNCB * callback, void *data, int timeout)
 {
        struct ssl_connect *sconn;
        if(F == NULL)
@@ -585,8 +585,7 @@ rb_connect_tcp_ssl(rb_fde_t *F, struct sockaddr *dest,
        sconn->data = data;
        sconn->callback = callback;
        sconn->timeout = timeout;
-       rb_connect_tcp(F, dest, clocal, socklen, rb_ssl_tryconn, sconn, timeout);
-
+       rb_connect_tcp(F, dest, clocal, rb_ssl_tryconn, sconn, timeout);
 }
 
 void