Module Name: src
Committed By: martin
Date: Mon May 25 17:27:19 UTC 2020
Modified Files:
src/usr.sbin/npf/npfctl [netbsd-9]: npf_show.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.28.2.2 -r1.28.2.3 src/usr.sbin/npf/npfctl/npf_show.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/npf/npfctl/npf_show.c
diff -u src/usr.sbin/npf/npfctl/npf_show.c:1.28.2.2 src/usr.sbin/npf/npfctl/npf_show.c:1.28.2.3
--- src/usr.sbin/npf/npfctl/npf_show.c:1.28.2.2 Mon May 25 17:25:28 2020
+++ src/usr.sbin/npf/npfctl/npf_show.c Mon May 25 17:27:19 2020
@@ -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 @@ tcpflags2string(char *buf, u_int tfl)
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 @@ static char *
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) {
