Attachment 207584 Details for Bug 240650 – Patch (Revision 3)

[patch] Patch (Revision 3)

ipfw2-add_src-ipv4-not-notipv6-r3.patch (text/plain), 1.20 KB, created by Neel Chauhan on 2019-09-17 19:31:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neel Chauhan

Created: 2019-09-17 19:31:01 UTC

Size: 1.20 KB

patch

obsolete

>Index: sbin/ipfw/ipfw2.c
>===================================================================
>--- sbin/ipfw/ipfw2.c	(revision 352459)
>+++ sbin/ipfw/ipfw2.c	(working copy)
>@@ -3717,9 +3717,8 @@
> 	if (proto == IPPROTO_IPV6  || strcmp(av, "me6") == 0 ||
> 	    inet_pton(AF_INET6, host, &a) == 1)
> 		ret = add_srcip6(cmd, av, cblen, tstate);
>-	/* XXX: should check for IPv4, not !IPv6 */
>-	if (ret == NULL && (proto == IPPROTO_IP || strcmp(av, "me") == 0 ||
>-	    inet_pton(AF_INET6, host, &a) != 1))
>+	if (proto == IPPROTO_IP || strcmp(av, "me") == 0 ||
>+	    inet_pton(AF_INET, host, &a) == 1)
> 		ret = add_srcip(cmd, av, cblen, tstate);
> 	if (ret == NULL && strcmp(av, "any") != 0)
> 		ret = cmd;
>@@ -3748,9 +3747,8 @@
> 	if (proto == IPPROTO_IPV6  || strcmp(av, "me6") == 0 ||
> 	    inet_pton(AF_INET6, host, &a) == 1)
> 		ret = add_dstip6(cmd, av, cblen, tstate);
>-	/* XXX: should check for IPv4, not !IPv6 */
>-	if (ret == NULL && (proto == IPPROTO_IP || strcmp(av, "me") == 0 ||
>-	    inet_pton(AF_INET6, host, &a) != 1))
>+	if (proto == IPPROTO_IP || strcmp(av, "me") == 0 ||
>+           inet_pton(AF_INET, host, &a) == 1)
> 		ret = add_dstip(cmd, av, cblen, tstate);
> 	if (ret == NULL && strcmp(av, "any") != 0)
> 		ret = cmd;

Actions: View | Diff

Attachments on bug 240650: 207582 | 207583 | 207584 | 212336