Add new sockaddr_storage port retrieval/setting macros

[solanum.git] / authd / provider.c

diff --git a/authd/provider.c b/authd/provider.c
index 3a7abf6e8b191a4b3b14a72015a9a063725b4c01..6cc6eee4ebd5bca9de9d263944dd694f1c1a2b42 100644 (file)
--- a/authd/provider.c
+++ b/authd/provider.c
@@ -272,24 +272,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);
+       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);
-
-#ifdef RB_IPV6
-       if(GET_SS_FAMILY(&auth->l_addr) == AF_INET6)
-               ((struct sockaddr_in6 *)&auth->l_addr)->sin6_port = htons(auth->l_port);
-       else
-#endif
-               ((struct sockaddr_in *)&auth->l_addr)->sin_port = htons(auth->l_port);
-
-#ifdef RB_IPV6
-       if(GET_SS_FAMILY(&auth->c_addr) == AF_INET6)
-               ((struct sockaddr_in6 *)&auth->c_addr)->sin6_port = htons(auth->c_port);
-       else
-#endif
-               ((struct sockaddr_in *)&auth->c_addr)->sin_port = htons(auth->c_port);
+       SET_SS_PORT(&auth->c_addr, htons(auth->c_port));
 
        rb_strlcpy(auth->hostname, "*", sizeof(auth->hostname));
        rb_strlcpy(auth->username, "*", sizeof(auth->username));