Module Name: src
Committed By: mrg
Date: Sat May 7 04:38:09 UTC 2022
Modified Files:
src/sys/external/bsd/ipf/netinet: ip_nat.h
Log Message:
remove conditional code that defines members of natstat_t.
kernels without INET6 support end up with a different size of
this structure than the userland does and then it errors:
# ipnat -l
70:ioctl(SIOCGNATS) object size mismatch for copying out ipfobj
with these members (which are zeroed at ipf init) enabled, the
size check works.
XXX: pullup-9 (change tested there.)
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/external/bsd/ipf/netinet/ip_nat.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/ipf/netinet/ip_nat.h
diff -u src/sys/external/bsd/ipf/netinet/ip_nat.h:1.7 src/sys/external/bsd/ipf/netinet/ip_nat.h:1.8
--- src/sys/external/bsd/ipf/netinet/ip_nat.h:1.7 Fri Aug 7 17:31:12 2015
+++ src/sys/external/bsd/ipf/netinet/ip_nat.h Sat May 7 04:38:09 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_nat.h,v 1.7 2015/08/07 17:31:12 prlw1 Exp $ */
+/* $NetBSD: ip_nat.h,v 1.8 2022/05/07 04:38:09 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -571,9 +571,7 @@ typedef struct natstat {
u_int ns_wilds;
u_long ns_proto[256];
nat_stat_side_t ns_side[2];
-#ifdef USE_INET6
nat_stat_side_t ns_side6[2];
-#endif
} natstat_t;
typedef struct natlog {
