ipfw(8): When checking for IPv4 in add_src() and add_dat(), don't assume !IPv6 is IPv4

[nc]

Summary

When checking for IPv4 in add_src() and add_dat(), don't assume !IPv6 is IPv4. Revised patch which also takes the "any" operator into account.

Also, switch to if...else if statements.

Submitted by: Neel Chauhan <neel AT neelc DOT org>

[melifaro]

LGTM.

Could you please consider avoiding putting the diffs without the context next time?

sbin/ipfw/ipfw2.c

3750

Why not if .. else if .. else if pattern?

[melifaro]

In the current state, it breaks rules with "any" keyword specified as a destination.
Could you please add atf-based tests on the proposed changes?

[nc]

The issue is the use of "strcmp(av, "any") != 0" which should be "strcmp(av, "any") == 0"

I opened a new revision to fix the issue at D24025.

[nc]

This patch should fix the "any" use case.

[nc]

About the atf-sh tests, I can write them. Let's first commit D24021 since there will be a merge conflict with the two.

[nc]

I'm merging this effort with D24021.