On Mon, Sep 10, 2018 at 11:59:55AM +0200, Klemens Nanni wrote:
> Small helper to put the dance around `af' into one single location.
New diff with less cleverness^Wstupidity.
regress passes, Both IPv4 and IPV6 addresses are parsed/copied correctly.
I'd like to commit this before the `host_ip()' change so that this diff
gets a tad smaller since `host_v4()' gets simplified here.
OK?
Index: pfctl_parser.c
===================================================================
RCS file: /cvs/src/sbin/pfctl/pfctl_parser.c,v
retrieving revision 1.332
diff -u -p -r1.332 pfctl_parser.c
--- pfctl_parser.c 7 Sep 2018 21:37:03 -0000 1.332
+++ pfctl_parser.c 10 Sep 2018 11:01:33 -0000
@@ -62,6 +62,7 @@
#include "pfctl_parser.h"
#include "pfctl.h"
+void copy_sa(int, struct pf_addr *, struct sockaddr *);
void print_op (u_int8_t, const char *, const char *);
void print_port (u_int8_t, u_int16_t, u_int16_t, const char *, int);
void print_ugid (u_int8_t, unsigned, unsigned, const char *,
unsigned);
@@ -211,6 +212,17 @@ const struct pf_timeout pf_timeouts[] =
enum { PF_POOL_ROUTE, PF_POOL_NAT, PF_POOL_RDR };
+void
+copy_sa(int af, struct pf_addr *pfa, struct sockaddr *sa)
+{
+ if (af == AF_INET6)
+ memcpy(pfa, &((struct sockaddr_in6 *)sa)->sin6_addr.s6_addr,
+ sizeof(struct in6_addr));
+ else
+ memcpy(pfa, &((struct sockaddr_in *)sa)->sin_addr.s_addr,
+ sizeof(struct in_addr));
+}
+
const struct icmptypeent *
geticmptypebynumber(u_int8_t type, sa_family_t af)
{
@@ -1371,41 +1383,19 @@ ifa_load(void)
}
#endif
n->ifindex = 0;
- if (n->af == AF_INET) {
- memcpy(&n->addr.v.a.addr, &((struct sockaddr_in *)
- ifa->ifa_addr)->sin_addr.s_addr,
- sizeof(struct in_addr));
- memcpy(&n->addr.v.a.mask, &((struct sockaddr_in *)
- ifa->ifa_netmask)->sin_addr.s_addr,
- sizeof(struct in_addr));
- if (ifa->ifa_broadaddr != NULL)
- memcpy(&n->bcast, &((struct sockaddr_in *)
- ifa->ifa_broadaddr)->sin_addr.s_addr,
- sizeof(struct in_addr));
- if (ifa->ifa_dstaddr != NULL)
- memcpy(&n->peer, &((struct sockaddr_in *)
- ifa->ifa_dstaddr)->sin_addr.s_addr,
- sizeof(struct in_addr));
- } else if (n->af == AF_INET6) {
- memcpy(&n->addr.v.a.addr, &((struct sockaddr_in6 *)
- ifa->ifa_addr)->sin6_addr.s6_addr,
- sizeof(struct in6_addr));
- memcpy(&n->addr.v.a.mask, &((struct sockaddr_in6 *)
- ifa->ifa_netmask)->sin6_addr.s6_addr,
- sizeof(struct in6_addr));
- if (ifa->ifa_broadaddr != NULL)
- memcpy(&n->bcast, &((struct sockaddr_in6 *)
- ifa->ifa_broadaddr)->sin6_addr.s6_addr,
- sizeof(struct in6_addr));
- if (ifa->ifa_dstaddr != NULL)
- memcpy(&n->peer, &((struct sockaddr_in6 *)
- ifa->ifa_dstaddr)->sin6_addr.s6_addr,
- sizeof(struct in6_addr));
- n->ifindex = ((struct sockaddr_in6 *)
- ifa->ifa_addr)->sin6_scope_id;
- } else if (n->af == AF_LINK) {
+ if (n->af == AF_LINK)
n->ifindex = ((struct sockaddr_dl *)
ifa->ifa_addr)->sdl_index;
+ else {
+ //copy_sa(n->af, &n->addr.v.a.addr, ifa->ifa_addr);
+ //copy_sa(n->af, &n->addr.v.a.mask, ifa->ifa_netmask);
+ if (ifa->ifa_broadaddr != NULL)
+ //copy_sa(n->af, &n->bcast, ifa->ifa_broadaddr);
+ if (ifa->ifa_dstaddr != NULL)
+ //copy_sa(n->af, &n->peer, ifa->ifa_dstaddr);
+ if (n->af == AF_INET6)
+ n->ifindex = ((struct sockaddr_in6 *)
+ ifa->ifa_addr)->sin6_scope_id;
}
if ((n->ifname = strdup(ifa->ifa_name)) == NULL)
err(1, "%s: strdup", __func__);
@@ -1760,9 +1750,7 @@ host_v6(const char *s, int mask)
err(1, "address: calloc");
h->ifname = NULL;
h->af = AF_INET6;
- memcpy(&h->addr.v.a.addr,
- &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr,
- sizeof(h->addr.v.a.addr));
+ copy_sa(h->af, &h->addr.v.a.addr, res->ai_addr);
h->ifindex =
((struct sockaddr_in6 *)res->ai_addr)->sin6_scope_id;
set_ipmask(h, mask);
@@ -1816,20 +1804,11 @@ host_dns(const char *s, int mask, int nu
err(1, "host_dns: calloc");
n->ifname = NULL;
n->af = res->ai_family;
- if (res->ai_family == AF_INET) {
- memcpy(&n->addr.v.a.addr,
- &((struct sockaddr_in *)
- res->ai_addr)->sin_addr.s_addr,
- sizeof(struct in_addr));
- } else {
- memcpy(&n->addr.v.a.addr,
- &((struct sockaddr_in6 *)
- res->ai_addr)->sin6_addr.s6_addr,
- sizeof(struct in6_addr));
+ //copy_sa(n->af, &n->addr.v.a.addr, res->ai_addr);
+ if (res->ai_family == AF_INET6)
n->ifindex =
((struct sockaddr_in6 *)
res->ai_addr)->sin6_scope_id;
- }
set_ipmask(n, mask);
n->next = NULL;
n->tail = n;
