From e867208deb228f61806ae0a448145e7de15db1c2 Mon Sep 17 00:00:00 2001 From: William Pitcock Date: Sun, 20 Mar 2016 01:54:24 -0500 Subject: [PATCH] ircd: use GET_SS_FAMILY() in a bunch of places --- ircd/channel.c | 2 +- ircd/client.c | 4 ++-- ircd/listener.c | 8 ++++---- ircd/s_auth.c | 6 +++--- ircd/s_conf.c | 6 +++--- ircd/s_newconf.c | 2 +- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/ircd/channel.c b/ircd/channel.c index 35a9afb6..77bb26c4 100644 --- a/ircd/channel.c +++ b/ircd/channel.c @@ -581,7 +581,7 @@ is_banned_list(struct Channel *chptr, rb_dlink_list *list, } } #ifdef RB_IPV6 - if(who->localClient->ip.ss_family == AF_INET6 && + if(GET_SS_FAMILY(&who->localClient->ip) == AF_INET6 && ipv4_from_ipv6((const struct sockaddr_in6 *)&who->localClient->ip, &ip4)) { sprintf(src_ip4host, "%s!%s@", who->name, who->username); diff --git a/ircd/client.c b/ircd/client.c index 08489109..332a3b49 100644 --- a/ircd/client.c +++ b/ircd/client.c @@ -542,7 +542,7 @@ check_dlines(void) if(IsMe(client_p)) continue; - if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip,client_p->localClient->ip.ss_family)) != NULL) + if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip, GET_SS_FAMILY(&client_p->localClient->ip))) != NULL) { if(aconf->status & CONF_EXEMPTDLINE) continue; @@ -561,7 +561,7 @@ check_dlines(void) { client_p = ptr->data; - if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip,client_p->localClient->ip.ss_family)) != NULL) + if((aconf = find_dline((struct sockaddr *)&client_p->localClient->ip, GET_SS_FAMILY(&client_p->localClient->ip))) != NULL) { if(aconf->status & CONF_EXEMPTDLINE) continue; diff --git a/ircd/listener.c b/ircd/listener.c index 9fa0ca1b..f89128b3 100644 --- a/ircd/listener.c +++ b/ircd/listener.c @@ -106,7 +106,7 @@ static uint16_t get_listener_port(const struct Listener *listener) { #ifdef RB_IPV6 - if(listener->addr.ss_family == AF_INET6) + if(GET_SS_FAMILY(&listener->addr) == AF_INET6) return ntohs(((const struct sockaddr_in6 *)&listener->addr)->sin6_port); else #endif @@ -180,7 +180,7 @@ inetport(struct Listener *listener) F = rb_socket(GET_SS_FAMILY(&listener->addr), SOCK_STREAM, 0, "Listener socket"); #ifdef RB_IPV6 - if(listener->addr.ss_family == AF_INET6) + if(GET_SS_FAMILY(&listener->addr) == AF_INET6) { struct sockaddr_in6 *in6 = (struct sockaddr_in6 *)&listener->addr; if(!IN6_ARE_ADDR_EQUAL(&in6->sin6_addr, &in6addr_any)) @@ -279,7 +279,7 @@ find_listener(struct rb_sockaddr_storage *addr) for (listener = ListenerPollList; listener; listener = listener->next) { - if(addr->ss_family != listener->addr.ss_family) + if(GET_SS_FAMILY(addr) != GET_SS_FAMILY(&listener->addr)) continue; switch(addr->ss_family) @@ -342,7 +342,7 @@ add_listener(int port, const char *vhost_ip, int family, int ssl, int defer_acce if(port == 0) return; memset(&vaddr, 0, sizeof(vaddr)); - vaddr.ss_family = family; + SET_SS_FAMILY(&vaddr, family); if(vhost_ip != NULL) { diff --git a/ircd/s_auth.c b/ircd/s_auth.c index ea237808..d9cdadfa 100644 --- a/ircd/s_auth.c +++ b/ircd/s_auth.c @@ -269,7 +269,7 @@ start_auth_query(struct AuthRequest *auth) if(IsAnyDead(auth->client)) return 0; - family = auth->client->localClient->ip.ss_family; + family = GET_SS_FAMILY(&auth->client->localClient->ip); if((F = rb_socket(family, SOCK_STREAM, 0, "ident")) == NULL) { ilog_error("creating auth stream socket"); @@ -302,7 +302,7 @@ start_auth_query(struct AuthRequest *auth) /* XXX mangle_mapped_sockaddr((struct sockaddr *)&localaddr); */ #ifdef RB_IPV6 - if(localaddr.ss_family == AF_INET6) + if(GET_SS_FAMILY(&localaddr) == AF_INET6) { auth->lport = ntohs(((struct sockaddr_in6 *)&localaddr)->sin6_port); ((struct sockaddr_in6 *)&localaddr)->sin6_port = 0; @@ -316,7 +316,7 @@ start_auth_query(struct AuthRequest *auth) destaddr = auth->client->localClient->ip; #ifdef RB_IPV6 - if(localaddr.ss_family == AF_INET6) + if(GET_SS_FAMILY(&localaddr) == AF_INET6) { auth->rport = ntohs(((struct sockaddr_in6 *)&destaddr)->sin6_port); ((struct sockaddr_in6 *)&destaddr)->sin6_port = htons(113); diff --git a/ircd/s_conf.c b/ircd/s_conf.c index 66fa637d..65023627 100644 --- a/ircd/s_conf.c +++ b/ircd/s_conf.c @@ -261,7 +261,7 @@ check_client(struct Client *client_p, struct Client *source_p, const char *usern { int port = -1; #ifdef RB_IPV6 - if(source_p->localClient->ip.ss_family == AF_INET6) + if(GET_SS_FAMILY(&source_p->localClient->ip) == AF_INET6) port = ntohs(((struct sockaddr_in6 *)&source_p->localClient->listener->addr)->sin6_port); else #endif @@ -394,7 +394,7 @@ find_address_conf_by_client(struct Client *client_p, const char *username) aconf = find_address_conf(client_p->host, client_p->sockhost, client_p->username, client_p->username, (struct sockaddr *) &client_p->localClient->ip, - client_p->localClient->ip.ss_family, + GET_SS_FAMILY(&client_p->localClient->ip), client_p->localClient->auth_user); } else @@ -404,7 +404,7 @@ find_address_conf_by_client(struct Client *client_p, const char *username) aconf = find_address_conf(client_p->host, client_p->sockhost, non_ident, client_p->username, (struct sockaddr *) &client_p->localClient->ip, - client_p->localClient->ip.ss_family, + GET_SS_FAMILY(&client_p->localClient->ip), client_p->localClient->auth_user); } return aconf; diff --git a/ircd/s_newconf.c b/ircd/s_newconf.c index d5e5a9d2..842701f6 100644 --- a/ircd/s_newconf.c +++ b/ircd/s_newconf.c @@ -305,7 +305,7 @@ find_oper_conf(const char *username, const char *host, const char *locip, const if(parse_netmask(addr, &ip, &bits) != HM_HOST) { - if(ip.ss_family == cip.ss_family && + if(GET_SS_FAMILY(&ip) == GET_SS_FAMILY(&cip) && comp_with_mask_sock((struct sockaddr *)&ip, (struct sockaddr *)&cip, bits)) return oper_p; }