[src/netbsd-9]: src/usr.sbin/npf/npfctl Pull up following revision(s) (reques...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/04aa1038914f
branches:  netbsd-9
changeset: 963913:04aa1038914f
user:      martin <martin%NetBSD.org@localhost>
date:      Mon May 25 17:27:19 2020 +0000

description:
Pull up following revision(s) (requested by rmind in ticket #931):

        usr.sbin/npf/npfctl/npf_show.c: revision 1.30

PR/54670: Azuma OKAMOTO: Consistently use 'W' for TH_CWN, and bump buffer
size.

diffstat:

 usr.sbin/npf/npfctl/npf_show.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 964f4fa24956 -r 04aa1038914f usr.sbin/npf/npfctl/npf_show.c
--- a/usr.sbin/npf/npfctl/npf_show.c    Mon May 25 17:25:28 2020 +0000
+++ b/usr.sbin/npf/npfctl/npf_show.c    Mon May 25 17:27:19 2020 +0000
@@ -34,7 +34,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: npf_show.c,v 1.28.2.2 2020/05/25 17:25:28 martin Exp $");
+__RCSID("$NetBSD: npf_show.c,v 1.28.2.3 2020/05/25 17:27:19 martin Exp $");
 
 #include <sys/socket.h>
 #define        __FAVOR_BSD
@@ -125,7 +125,7 @@
        if (tfl & TH_ACK)       buf[i++] = 'A';
        if (tfl & TH_URG)       buf[i++] = 'U';
        if (tfl & TH_ECE)       buf[i++] = 'E';
-       if (tfl & TH_CWR)       buf[i++] = 'C';
+       if (tfl & TH_CWR)       buf[i++] = 'W';
        buf[i] = '\0';
        return i;
 }
@@ -209,7 +209,7 @@
 print_tcpflags(npf_conf_info_t *ctx __unused, const uint32_t *words)
 {
        const u_int tf = words[0], tf_mask = words[1];
-       char buf[16];
+       char buf[20];
 
        size_t n = tcpflags2string(buf, tf);
        if (tf != tf_mask) {