From 5ad62c80ee213c7ff7aff6f0f67109c880e39c70 Mon Sep 17 00:00:00 2001 From: Simon Arlott Date: Sun, 24 Apr 2016 17:11:20 +0100 Subject: [PATCH] librb: remove socklen parameter from rb_connect_tcp --- authd/providers/ident.c | 2 +- authd/providers/opm.c | 2 -- ircd/s_serv.c | 1 - librb/include/commio-ssl.h | 2 +- librb/include/rb_commio.h | 4 ++-- librb/src/commio.c | 8 ++++---- librb/src/gnutls.c | 4 ++-- librb/src/mbedtls.c | 4 ++-- librb/src/nossl.c | 2 +- librb/src/openssl.c | 5 ++--- 10 files changed, 15 insertions(+), 19 deletions(-) diff --git a/authd/providers/ident.c b/authd/providers/ident.c index f3733cea..959bdb57 100644 --- 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 3fbc53a6..ca3cfd2b 100644 --- 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 28ed4286..e6c424f2 100644 --- 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 adcce1ae..cb6bda7a 100644 --- 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 5c15b0a2..4be81773 100644 --- 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 fde467c8..bd401b18 100644 --- 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 efff9757..b374dd0c 100644 --- 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 4fd38f17..55cdccdc 100644 --- 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 e97843b9..85e6e51c 100644 --- 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 85f07c5e..99948aa8 100644 --- 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