aboutsummaryrefslogtreecommitdiff
path: root/sbin/ipfw/ipv6.c
diff options
context:
space:
mode:
authorAndrey V. Elsukov <ae@FreeBSD.org>2018-04-12 19:44:04 +0000
committerAndrey V. Elsukov <ae@FreeBSD.org>2018-04-12 19:44:04 +0000
commitbd32e3355205a94d79e56970e6efbe2287c60de4 (patch)
treed6a0151266582ffa4562316cf43e6bbed007bcdc /sbin/ipfw/ipv6.c
parent09a6be91bc6952b8a4e7f3410597eb6c61567276 (diff)
downloadsrc-bd32e3355205a94d79e56970e6efbe2287c60de4.tar.gz
src-bd32e3355205a94d79e56970e6efbe2287c60de4.zip
Remove printing of "not" keyword from print_ip6() function.
After r331668 handling of F_NOT flag done in one place by print_instruction() function. Also remove unused argument from print_ip[6]() functions. MFC after: 1 week
Notes
Notes: svn path=/head/; revision=332449
Diffstat (limited to 'sbin/ipfw/ipv6.c')
-rw-r--r--sbin/ipfw/ipv6.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/sbin/ipfw/ipv6.c b/sbin/ipfw/ipv6.c
index 103e7438c8cd..8d7e20fff211 100644
--- a/sbin/ipfw/ipv6.c
+++ b/sbin/ipfw/ipv6.c
@@ -85,17 +85,15 @@ print_unreach6_code(struct buf_pr *bp, uint16_t code)
* Print the ip address contained in a command.
*/
void
-print_ip6(struct buf_pr *bp, ipfw_insn_ip6 *cmd, char const *s)
+print_ip6(struct buf_pr *bp, ipfw_insn_ip6 *cmd)
{
struct hostent *he = NULL;
int len = F_LEN((ipfw_insn *) cmd) - 1;
struct in6_addr *a = &(cmd->addr6);
char trad[255];
- bprintf(bp, "%s%s ", cmd->o.len & F_NOT ? " not": "", s);
-
if (cmd->o.opcode == O_IP6_SRC_ME || cmd->o.opcode == O_IP6_DST_ME) {
- bprintf(bp, "me6");
+ bprintf(bp, " me6");
return;
}
if (cmd->o.opcode == O_IP6) {
@@ -108,7 +106,7 @@ print_ip6(struct buf_pr *bp, ipfw_insn_ip6 *cmd, char const *s)
* addr/mask pairs have len = (2n+1). We convert len to n so we
* use that to count the number of entries.
*/
-
+ bprintf(bp, " ");
for (len = len / 4; len > 0; len -= 2, a += 2) {
int mb = /* mask length */
(cmd->o.opcode == O_IP6_SRC || cmd->o.opcode == O_IP6_DST) ?