summaryrefslogtreecommitdiff
path: root/gencode.c
diff options
context:
space:
mode:
authorGuy Harris <gharris@sonic.net>2023-05-06 15:50:41 -0700
committerGuy Harris <gharris@sonic.net>2023-05-06 15:50:41 -0700
commitc6fb4eb56c839a3f04b51181992ba14b05d57bd2 (patch)
treebcd937a43b2451a805a710734dcf1e1c55bf9b78 /gencode.c
parentecbab714ecbe6893e6415295e4bf2fcc9d0d94b5 (diff)
downloadlibpcap-c6fb4eb56c839a3f04b51181992ba14b05d57bd2.tar.gz
compiler: remove unneeded argument from gen_mcode6().
We don't support "<ipv6net> mask <ipv6mask>", so no need to pass an <ipv6mask> argument.
Diffstat (limited to 'gencode.c')
-rw-r--r--gencode.c15
1 files changed, 6 insertions, 9 deletions
diff --git a/gencode.c b/gencode.c
index f6a2cac2..138ed3ac 100644
--- a/gencode.c
+++ b/gencode.c
@@ -7188,8 +7188,8 @@ gen_ncode(compiler_state_t *cstate, const char *s, bpf_u_int32 v, struct qual q)
#ifdef INET6
struct block *
-gen_mcode6(compiler_state_t *cstate, const char *s1, const char *s2,
- bpf_u_int32 masklen, struct qual q)
+gen_mcode6(compiler_state_t *cstate, const char *s, bpf_u_int32 masklen,
+ struct qual q)
{
struct addrinfo *res;
struct in6_addr *addr;
@@ -7204,15 +7204,12 @@ gen_mcode6(compiler_state_t *cstate, const char *s1, const char *s2,
if (setjmp(cstate->top_ctx))
return (NULL);
- if (s2)
- bpf_error(cstate, "no mask %s supported", s2);
-
- res = pcap_nametoaddrinfo(s1);
+ res = pcap_nametoaddrinfo(s);
if (!res)
- bpf_error(cstate, "invalid ip6 address %s", s1);
+ bpf_error(cstate, "invalid ip6 address %s", s);
cstate->ai = res;
if (res->ai_next)
- bpf_error(cstate, "%s resolved to multiple address", s1);
+ bpf_error(cstate, "%s resolved to multiple address", s);
addr = &((struct sockaddr_in6 *)res->ai_addr)->sin6_addr;
if (masklen > sizeof(mask.s6_addr) * 8)
@@ -7228,7 +7225,7 @@ gen_mcode6(compiler_state_t *cstate, const char *s1, const char *s2,
memcpy(m, &mask, sizeof(m));
if ((a[0] & ~m[0]) || (a[1] & ~m[1])
|| (a[2] & ~m[2]) || (a[3] & ~m[3])) {
- bpf_error(cstate, "non-network bits set in \"%s/%d\"", s1, masklen);
+ bpf_error(cstate, "non-network bits set in \"%s/%d\"", s, masklen);
}
switch (q.addr) {