Page MenuHomeFreeBSD
Files F140977329

D21812.id69376.diff
No OneTemporary
Actions

D21812.id69376.diff
View Options

Index: head/sbin/ipfw/ipfw2.c
===================================================================
--- head/sbin/ipfw/ipfw2.c
+++ head/sbin/ipfw/ipfw2.c
@@ -3717,11 +3717,10 @@
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))
+ else 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)
+ else if (ret == NULL && strcmp(av, "any") != 0)
ret = cmd;
return ret;
@@ -3748,11 +3747,10 @@
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))
+ else 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)
+ else if (ret == NULL && strcmp(av, "any") != 0)
ret = cmd;
return ret;

File Metadata

Mime Type
text/plain
Expires
Wed, Dec 31, 8:15 AM (15 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
27406379
Default Alt Text
D21812.id69376.diff (1 KB)

Event Timeline