d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert r358858 as it breaks some ipfw(8) setups.

Browse Source 
Reported by:	O. Hartmann <o.hartmann@walstatt.org>
This commit is contained in:
Alexander V. Chernikov 2020-03-11 08:08:53 +00:00
parent b0ecfb42d1
commit e3bf606c5d
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sbin/ipfw/ipfw2.c
View File

@ -3717,10 +3717,11 @@ add_src(ipfw_insn *cmd, char *av, u_char proto, int cblen, struct tidx *tstate)
if (proto == IPPROTO_IPV6 || strcmp(av, "me6") == 0 ||
inet_pton(AF_INET6, host, &a) == 1)
ret = add_srcip6(cmd, av, cblen, tstate);
else if (proto == IPPROTO_IP || strcmp(av, "me") == 0 ||
inet_pton(AF_INET, host, &a) == 1)
/* XXX: should check for IPv4, not !IPv6 */
if (ret == NULL && (proto == IPPROTO_IP || strcmp(av, "me") == 0 ||
inet_pton(AF_INET6, host, &a) != 1))
ret = add_srcip(cmd, av, cblen, tstate);
else if (ret == NULL && strcmp(av, "any") != 0)
if (ret == NULL && strcmp(av, "any") != 0)
ret = cmd;
return ret;
@ -3747,10 +3748,11 @@ add_dst(ipfw_insn *cmd, char *av, u_char proto, int cblen, struct tidx *tstate)
if (proto == IPPROTO_IPV6 || strcmp(av, "me6") == 0 ||
inet_pton(AF_INET6, host, &a) == 1)
ret = add_dstip6(cmd, av, cblen, tstate);
else if (proto == IPPROTO_IP || strcmp(av, "me") == 0 ||
inet_pton(AF_INET, host, &a) == 1)
/* XXX: should check for IPv4, not !IPv6 */
if (ret == NULL && (proto == IPPROTO_IP || strcmp(av, "me") == 0 ||
inet_pton(AF_INET6, host, &a) != 1))
ret = add_dstip(cmd, av, cblen, tstate);
else if (ret == NULL && strcmp(av, "any") != 0)
if (ret == NULL && strcmp(av, "any") != 0)
ret = cmd;
return ret;