Author: ae
Date: Wed Oct 3 12:47:54 2018
New Revision: 339123
URL: https://svnweb.freebsd.org/changeset/base/339123
Log:
MFC r338947:
Add "src-ip" or "dst-ip" keyword to the output, when we are printing the
rest of rule options.
Reported by: lev
Modified:
stable/11/sbin/ipfw/ipfw2.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sbin/ipfw/ipfw2.c
==============================================================================
--- stable/11/sbin/ipfw/ipfw2.c Wed Oct 3 11:34:28 2018 (r339122)
+++ stable/11/sbin/ipfw/ipfw2.c Wed Oct 3 12:47:54 2018 (r339123)
@@ -1466,19 +1466,31 @@ print_instruction(struct buf_pr *bp, const struct form
case O_IP_SRC_MASK:
case O_IP_SRC_ME:
case O_IP_SRC_SET:
+ if (state->flags & HAVE_SRCIP)
+ bprintf(bp, " src-ip");
+ print_ip(bp, fo, insntod(cmd, ip));
+ break;
case O_IP_DST:
case O_IP_DST_LOOKUP:
case O_IP_DST_MASK:
case O_IP_DST_ME:
case O_IP_DST_SET:
+ if (state->flags & HAVE_DSTIP)
+ bprintf(bp, " dst-ip");
print_ip(bp, fo, insntod(cmd, ip));
break;
case O_IP6_SRC:
case O_IP6_SRC_MASK:
case O_IP6_SRC_ME:
+ if (state->flags & HAVE_SRCIP)
+ bprintf(bp, " src-ip6");
+ print_ip6(bp, insntod(cmd, ip6));
+ break;
case O_IP6_DST:
case O_IP6_DST_MASK:
case O_IP6_DST_ME:
+ if (state->flags & HAVE_DSTIP)
+ bprintf(bp, " dst-ip6");
print_ip6(bp, insntod(cmd, ip6));
break;
case O_FLOW6ID:
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
