librb: Fix type of dst for rb_inet_pton_sock()

diff --git a/authd/dns.c b/authd/dns.c
index b251dd636a18df0ed08ad321556378632a84a08c..1d953e67b481f7b08b9c4332e21c3ba87c995a38 100644 (file)
--- a/authd/dns.c
+++ b/authd/dns.c
@@ -75,7 +75,7 @@ lookup_hostname(const char *ip, DNSCB callback, void *data)
        struct dns_query *query = rb_malloc(sizeof(struct dns_query));
        int aftype;
 
-       if(!rb_inet_pton_sock(ip, (struct sockaddr *)&query->addr))
+       if(!rb_inet_pton_sock(ip, &query->addr))
        {
                rb_free(query);
                return NULL;

diff --git a/authd/provider.c b/authd/provider.c
index aabfa119e4134143deada922c66e791dedb1e94b..35e4a6c650ea1f61cc1c11fcb9b3eebbb42bc34f 100644 (file)
--- a/authd/provider.c
+++ b/authd/provider.c
@@ -317,12 +317,12 @@ start_auth(const char *cid, const char *l_ip, const char *l_port, const char *c_
 
        rb_strlcpy(auth->l_ip, l_ip, sizeof(auth->l_ip));
        auth->l_port = (uint16_t)atoi(l_port);  /* should be safe */
-       (void) rb_inet_pton_sock(l_ip, (struct sockaddr *)&auth->l_addr);
+       (void) rb_inet_pton_sock(l_ip, &auth->l_addr);
        SET_SS_PORT(&auth->l_addr, htons(auth->l_port));
 
        rb_strlcpy(auth->c_ip, c_ip, sizeof(auth->c_ip));
        auth->c_port = (uint16_t)atoi(c_port);
-       (void) rb_inet_pton_sock(c_ip, (struct sockaddr *)&auth->c_addr);
+       (void) rb_inet_pton_sock(c_ip, &auth->c_addr);
        SET_SS_PORT(&auth->c_addr, htons(auth->c_port));
 
        rb_strlcpy(auth->hostname, "*", sizeof(auth->hostname));

diff --git a/authd/providers/opm.c b/authd/providers/opm.c
index 29e4a1970ae54fe3726c70e4c5eeabf54eefe1f2..12a1ae3ced48c54375d33d870ba25e810668f3a7 100644 (file)
--- a/authd/providers/opm.c
+++ b/authd/providers/opm.c
@@ -465,7 +465,7 @@ create_listener(const char *ip, uint16_t port)
        rb_fde_t *F;
        int opt = 1;
 
-       if(!rb_inet_pton_sock(ip, (struct sockaddr *)&addr))
+       if(!rb_inet_pton_sock(ip, &addr))
        {
                warn_opers(L_CRIT, "OPM: got a bad listener: %s:%hu", ip, port);
                exit(EX_PROVIDER_ERROR);

diff --git a/extensions/m_webirc.c b/extensions/m_webirc.c
index b61c403587c8c7eaa57ae9ca601fe3fc67a78178..499c40596df40957fdb4116a89b77df74348b63c 100644 (file)
--- a/extensions/m_webirc.c
+++ b/extensions/m_webirc.c
@@ -112,7 +112,7 @@ mr_webirc(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *sourc
                return;
        }
 
-       if (rb_inet_pton_sock(parv[4], (struct sockaddr *)&addr) <= 0)
+       if (rb_inet_pton_sock(parv[4], &addr) <= 0)
        {
                sendto_one(source_p, "NOTICE * :Invalid IP");
                return;

diff --git a/ircd/client.c b/ircd/client.c
index 3378bc4a7d30ea3f3de78de82b4cfa6f93b016e9..3916cbc16fee12f98b5cb5622c2042c7a7eb0027 100644 (file)
--- a/ircd/client.c
+++ b/ircd/client.c
@@ -249,6 +249,7 @@ make_client(struct Client *from)
        SetUnknown(client_p);
        rb_strlcpy(client_p->username, "unknown", sizeof(client_p->username));
 
+printf("client_p=%p (%zu)\n", client_p, sizeof(client_p));
        return client_p;
 }
 

diff --git a/ircd/hostmask.c b/ircd/hostmask.c
index c342f2c203e85b5090a5051921ce6ac3c3b6ba8a..919f620beca1a846b2ca46554464f5cad7af05ec 100644 (file)
--- a/ircd/hostmask.c
+++ b/ircd/hostmask.c
@@ -79,7 +79,7 @@ parse_netmask(const char *text, struct rb_sockaddr_storage *naddr, int *nb)
                                return HM_HOST;
                } else
                        *b = 128;
-               if(rb_inet_pton_sock(ip, (struct sockaddr *)addr) > 0)
+               if(rb_inet_pton_sock(ip, addr) > 0)
                        return HM_IPV6;
                else
                        return HM_HOST;
@@ -98,7 +98,7 @@ parse_netmask(const char *text, struct rb_sockaddr_storage *naddr, int *nb)
                                return HM_HOST;
                } else
                        *b = 32;
-               if(rb_inet_pton_sock(ip, (struct sockaddr *)addr) > 0)
+               if(rb_inet_pton_sock(ip, addr) > 0)
                        return HM_IPV4;
                else
                        return HM_HOST;

diff --git a/ircd/newconf.c b/ircd/newconf.c
index 83f899e4ada8c491c1cb4ae5e5204a174d84c2da..59c9ca8e07c6b34d886e56f08448c8f4c185b9ea 100644 (file)
--- a/ircd/newconf.c
+++ b/ircd/newconf.c
@@ -247,7 +247,7 @@ conf_set_serverinfo_vhost(void *data)
 {
        struct rb_sockaddr_storage addr;
 
-       if(rb_inet_pton_sock(data, (struct sockaddr *)&addr) <= 0 || GET_SS_FAMILY(&addr) != AF_INET)
+       if(rb_inet_pton_sock(data, &addr) <= 0 || GET_SS_FAMILY(&addr) != AF_INET)
        {
                conf_report_error("Invalid IPv4 address for server vhost (%s)", (char *) data);
                return;
@@ -263,7 +263,7 @@ conf_set_serverinfo_vhost6(void *data)
 #ifdef RB_IPV6
        struct rb_sockaddr_storage addr;
 
-       if(rb_inet_pton_sock(data, (struct sockaddr *)&addr) <= 0 || GET_SS_FAMILY(&addr) != AF_INET6)
+       if(rb_inet_pton_sock(data, &addr) <= 0 || GET_SS_FAMILY(&addr) != AF_INET6)
        {
                conf_report_error("Invalid IPv6 address for server vhost (%s)", (char *) data);
                return;
@@ -1340,7 +1340,7 @@ conf_set_connect_host(void *data)
 {
        struct rb_sockaddr_storage addr;
 
-       if(rb_inet_pton_sock(data, (struct sockaddr *)&addr) <= 0)
+       if(rb_inet_pton_sock(data, &addr) <= 0)
        {
                rb_free(yy_server->connect_host);
                yy_server->connect_host = rb_strdup(data);
@@ -1368,7 +1368,7 @@ conf_set_connect_vhost(void *data)
 {
        struct rb_sockaddr_storage addr;
 
-       if(rb_inet_pton_sock(data, (struct sockaddr *)&addr) <= 0)
+       if(rb_inet_pton_sock(data, &addr) <= 0)
        {
                rb_free(yy_server->bind_host);
                yy_server->bind_host = rb_strdup(data);
@@ -2293,7 +2293,7 @@ conf_set_opm_listen_address_both(void *data, bool ipv6)
        const char *confstr = (ipv6 ? "opm::listen_ipv6" : "opm::listen_ipv4");
        char *ip = data;
 
-       if(!rb_inet_pton_sock(ip, (struct sockaddr *)&addr))
+       if(!rb_inet_pton_sock(ip, &addr))
        {
                conf_report_error("%s is an invalid address: %s", confstr, ip);
                return;

diff --git a/ircd/s_newconf.c b/ircd/s_newconf.c
index c593635a1e76a0ec3e78269f8363ec6956a74486..b8db8a87ebc3267e8d0c7ad76570288be52c783a 100644 (file)
--- a/ircd/s_newconf.c
+++ b/ircd/s_newconf.c
@@ -389,7 +389,7 @@ conf_connect_dns_callback(const char *result, int status, int aftype, void *data
        if(aftype == AF_INET)
        {
                if(status == 1)
-                       rb_inet_pton_sock(result, (struct sockaddr *)&server_p->connect4);
+                       rb_inet_pton_sock(result, &server_p->connect4);
 
                server_p->dns_query_connect4 = 0;
        }
@@ -397,7 +397,7 @@ conf_connect_dns_callback(const char *result, int status, int aftype, void *data
        else if(aftype == AF_INET6)
        {
                if(status == 1)
-                       rb_inet_pton_sock(result, (struct sockaddr *)&server_p->connect6);
+                       rb_inet_pton_sock(result, &server_p->connect6);
 
                server_p->dns_query_connect6 = 0;
        }
@@ -422,7 +422,7 @@ conf_bind_dns_callback(const char *result, int status, int aftype, void *data)
        if(aftype == AF_INET)
        {
                if(status == 1)
-                       rb_inet_pton_sock(result, (struct sockaddr *)&server_p->bind4);
+                       rb_inet_pton_sock(result, &server_p->bind4);
 
                server_p->dns_query_bind4 = 0;
        }
@@ -430,7 +430,7 @@ conf_bind_dns_callback(const char *result, int status, int aftype, void *data)
        else if(aftype == AF_INET6)
        {
                if(status == 1)
-                       rb_inet_pton_sock(result, (struct sockaddr *)&server_p->bind6);
+                       rb_inet_pton_sock(result, &server_p->bind6);
 
                server_p->dns_query_bind6 = 0;
        }

diff --git a/ircd/s_serv.c b/ircd/s_serv.c
index 6d75f93fcad94a3d2037ba63bdcfec999192c54a..a5489436af53ab3cbd9f7ebd52c91110510d77fc 100644 (file)
--- a/ircd/s_serv.c
+++ b/ircd/s_serv.c
@@ -372,7 +372,7 @@ check_server(const char *name, struct Client *client_p)
 
                name_matched = true;
 
-               if(rb_inet_pton_sock(client_p->sockhost, (struct sockaddr *)&client_addr) <= 0)
+               if(rb_inet_pton_sock(client_p->sockhost, &client_addr) <= 0)
                        SET_SS_FAMILY(&client_addr, AF_UNSPEC);
 
                if((tmp_p->connect_host && match(tmp_p->connect_host, client_p->host))

diff --git a/librb/include/rb_commio.h b/librb/include/rb_commio.h
index f4dc687bafebe1cdc560de11408a81e7a4ed557e..488dc8a34a4ebbdbc94631ced35c9c1e4ee80253 100644 (file)
--- a/librb/include/rb_commio.h
+++ b/librb/include/rb_commio.h
@@ -144,7 +144,7 @@ int rb_listen(rb_fde_t *, int backlog, int defer_accept);
 const char *rb_inet_ntop(int af, const void *src, char *dst, unsigned int size);
 int rb_inet_pton(int af, const char *src, void *dst);
 const char *rb_inet_ntop_sock(struct sockaddr *src, char *dst, unsigned int size);
-int rb_inet_pton_sock(const char *src, struct sockaddr *dst);
+int rb_inet_pton_sock(const char *src, struct sockaddr_storage *dst);
 int rb_getmaxconnect(void);
 int rb_ignore_errno(int);
 

diff --git a/librb/src/commio.c b/librb/src/commio.c
index f8bd8fa5ee83d0b1cd054c5dd16825517a888498..1488fee45fd8445fc575e8004673ca96b1291372 100644 (file)
--- a/librb/src/commio.c
+++ b/librb/src/commio.c
@@ -1317,7 +1317,7 @@ inet_ntop6(const unsigned char *src, char *dst, unsigned int size)
 #endif
 
 int
-rb_inet_pton_sock(const char *src, struct sockaddr *dst)
+rb_inet_pton_sock(const char *src, struct sockaddr_storage *dst)
 {
        if(rb_inet_pton(AF_INET, src, &((struct sockaddr_in *)dst)->sin_addr))
        {

diff --git a/tests/client_util.c b/tests/client_util.c
index d13e0d5460393bd2df1ad757285508c2d49d4d1b..69e5afb069f0565d2d61c4dc6e13099afaff6f50 100644 (file)
--- a/tests/client_util.c
+++ b/tests/client_util.c
@@ -77,7 +77,7 @@ struct Client *make_local_person_full(const char *nick, const char *username, co
        make_user(client);
        SetClient(client);
 
-       rb_inet_pton_sock(ip, (struct sockaddr *)&client->localClient->ip);
+       rb_inet_pton_sock(ip, &client->localClient->ip);
        rb_strlcpy(client->name, nick, sizeof(client->name));
        rb_strlcpy(client->username, username, sizeof(client->username));
        rb_strlcpy(client->host, hostname, sizeof(client->host));
@@ -150,7 +150,7 @@ struct Client *make_remote_person_nick(struct Client *server, const char *nick)
 struct Client *make_remote_person_full(struct Client *server, const char *nick, const char *username, const char *hostname, const char *ip, const char *realname)
 {
        struct Client *client;
-       struct sockaddr addr;
+       struct sockaddr_storage addr;
 
        client = make_client(server);
        make_user(client);
@@ -163,7 +163,7 @@ struct Client *make_remote_person_full(struct Client *server, const char *nick,
        rb_strlcpy(client->name, nick, sizeof(client->name));
        rb_strlcpy(client->username, username, sizeof(client->username));
        rb_strlcpy(client->host, hostname, sizeof(client->host));
-       rb_inet_ntop_sock(&addr, client->sockhost, sizeof(client->sockhost));
+       rb_inet_ntop_sock((struct sockaddr *)&addr, client->sockhost, sizeof(client->sockhost));
        rb_strlcpy(client->info, realname, sizeof(client->info));
 
        add_to_client_hash(nick, client);

diff --git a/tests/sasl_abort1.c b/tests/sasl_abort1.c
index d2e5321a66e42511f166681d8c68383c89ed2fcd..cdd5b924ec2e106c927f9de23f639bbbe238d6ac 100644 (file)
--- a/tests/sasl_abort1.c
+++ b/tests/sasl_abort1.c
@@ -45,7 +45,7 @@ static void common_sasl_test(bool aborted, bool by_user)
        struct Client *server = make_remote_server(&me);
        struct Client *remote = make_remote_person(server);
 
-       rb_inet_pton_sock(TEST_IP, (struct sockaddr *)&user->localClient->ip);
+       rb_inet_pton_sock(TEST_IP, &user->localClient->ip);
        rb_strlcpy(user->host, TEST_HOSTNAME, sizeof(user->host));
        rb_inet_ntop_sock((struct sockaddr *)&user->localClient->ip, user->sockhost, sizeof(user->sockhost));