Module Name: src
Committed By: darrenr
Date: Sun Jun 29 08:51:01 UTC 2014
Modified Files:
src/external/bsd/ipf/dist/lib: printnat.c
Log Message:
#536 ipnat can try to print rule as dstlist incorrectly
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/bsd/ipf/dist/lib/printnat.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/ipf/dist/lib/printnat.c
diff -u src/external/bsd/ipf/dist/lib/printnat.c:1.2 src/external/bsd/ipf/dist/lib/printnat.c:1.3
--- src/external/bsd/ipf/dist/lib/printnat.c:1.2 Sun Jul 22 14:27:37 2012
+++ src/external/bsd/ipf/dist/lib/printnat.c Sun Jun 29 08:51:01 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: printnat.c,v 1.2 2012/07/22 14:27:37 darrenr Exp $ */
+/* $NetBSD: printnat.c,v 1.3 2014/06/29 08:51:01 darrenr Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -153,7 +153,8 @@ printnat(np, opts)
} else if (np->in_redir & NAT_REWRITE) {
PRINTF(" -> src ");
- if (np->in_nsrc.na_type == IPLT_DSTLIST) {
+ if (np->in_nsrc.na_atype == FRI_LOOKUP &&
+ np->in_nsrc.na_type == IPLT_DSTLIST) {
PRINTF("dstlist/");
if (np->in_nsrc.na_subtype == 0)
PRINTF("%d", np->in_nsrc.na_num);
@@ -174,7 +175,8 @@ printnat(np, opts)
}
}
PRINTF(" dst ");
- if (np->in_ndst.na_type == IPLT_DSTLIST) {
+ if (np->in_ndst.na_atype == FRI_LOOKUP &&
+ np->in_ndst.na_type == IPLT_DSTLIST) {
PRINTF("dstlist/");
if (np->in_ndst.na_subtype == 0)
PRINTF("%d", np->in_nsrc.na_num);
