commit e19f80400423f0275c9dd785179aa06a3efabab0 from: Omar Polo via: Thomas Adam date: Thu Jun 01 10:18:37 2023 UTC gotwebd: drop unused `prefixlen' from struct address ok stsp@ commit - 9619e975dc8d52d7b27a8fd99796d8cef68e78df commit + e19f80400423f0275c9dd785179aa06a3efabab0 blob - 821e58a3ea05345ba5395aa2a1c0479a70a16978 blob + d7d5433a5cc1129adfe0e4b5d94a8b24cc657002 --- gotwebd/gotwebd.h +++ gotwebd/gotwebd.h @@ -269,7 +269,6 @@ struct address { TAILQ_ENTRY(address) entry; struct sockaddr_storage ss; int ipproto; - int prefixlen; in_port_t port; char ifname[IFNAMSIZ]; }; blob - 2ce12171af2de27dad4d389dbbf8f9ea81cdb1ba blob + 0b684e23a4716d7b3d3a5e5d5a5280ba537ccc82 --- gotwebd/parse.y +++ gotwebd/parse.y @@ -1017,10 +1017,6 @@ host_v4(const char *s) fatal(__func__); sain = (struct sockaddr_in *)&h->ss; got_sockaddr_inet_init(sain, &ina); - if (sain->sin_addr.s_addr == INADDR_ANY) - h->prefixlen = 0; /* 0.0.0.0 address */ - else - h->prefixlen = -1; /* host address */ return (h); } @@ -1042,11 +1038,6 @@ host_v6(const char *s) ra = (struct sockaddr_in6 *)res->ai_addr; got_sockaddr_inet6_init(sa_in6, &ra->sin6_addr, ra->sin6_scope_id); - if (memcmp(&sa_in6->sin6_addr, &in6addr_any, - sizeof(sa_in6->sin6_addr)) == 0) - h->prefixlen = 0; /* any address */ - else - h->prefixlen = -1; /* host address */ freeaddrinfo(res); } @@ -1101,7 +1092,6 @@ host_dns(const char *s, struct server *new_srv, int ma if (ipproto != -1) h->ipproto = ipproto; h->ss.ss_family = res->ai_family; - h->prefixlen = -1; /* host address */ if (res->ai_family == AF_INET) { struct sockaddr_in *ra; @@ -1168,7 +1158,6 @@ host_if(const char *s, struct server *new_srv, int max if (ipproto != -1) h->ipproto = ipproto; h->ss.ss_family = af; - h->prefixlen = -1; /* host address */ if (af == AF_INET) { struct sockaddr_in *ra; blob - eacbdc8fa8acb1d85aef92bdaf14ba95977a69b1 blob + 771a0c2547f73ef4ea0982ca4f4d1c6310d39522 --- gotwebd/sockets.c +++ gotwebd/sockets.c @@ -230,7 +230,6 @@ sockets_conf_new_socket_fcgi(struct gotwebd *env, stru memcpy(&acp->ss, &a->ss, sizeof(acp->ss)); acp->ipproto = a->ipproto; - acp->prefixlen = a->prefixlen; acp->port = a->port; if (strlen(a->ifname) != 0) { if (strlcpy(acp->ifname, a->ifname,