Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/external/bsd/ipf/netinet fix !INET6 builds
details: https://anonhg.NetBSD.org/src/rev/a36537166ecb
branches: trunk
changeset: 348363:a36537166ecb
user: mrg <mrg%NetBSD.org@localhost>
date: Sun Oct 16 05:11:34 2016 +0000
description:
fix !INET6 builds
diffstat:
sys/external/bsd/ipf/netinet/ip_ftp_pxy.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diffs (39 lines):
diff -r f8f88f6efb35 -r a36537166ecb sys/external/bsd/ipf/netinet/ip_ftp_pxy.c
--- a/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c Sun Oct 16 05:08:59 2016 +0000
+++ b/sys/external/bsd/ipf/netinet/ip_ftp_pxy.c Sun Oct 16 05:11:34 2016 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: ip_ftp_pxy.c,v 1.5 2014/03/20 20:43:12 christos Exp $ */
+/* $NetBSD: ip_ftp_pxy.c,v 1.6 2016/10/16 05:11:34 mrg Exp $ */
/*
* Copyright (C) 2012 by Darren Reed.
@@ -12,7 +12,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: ip_ftp_pxy.c,v 1.5 2014/03/20 20:43:12 christos Exp $");
+__KERNEL_RCSID(1, "$NetBSD: ip_ftp_pxy.c,v 1.6 2016/10/16 05:11:34 mrg Exp $");
#define IPF_FTP_PROXY
@@ -497,8 +497,8 @@
* Add skeleton NAT entry for connection which will come back the
* other way.
*/
+#ifdef USE_INET6
if (nat->nat_v[0] == 6) {
-#ifdef USE_INET6
if (nat->nat_dir == NAT_OUTBOUND) {
nat2 = ipf_nat6_outlookup(&fi, IPN_TCP|NAT_SEARCH,
nat->nat_pr[1],
@@ -510,8 +510,9 @@
&nat->nat_odst6.in6,
&nat->nat_osrc6.in6);
}
+ } else
#endif
- } else {
+ {
if (nat->nat_dir == NAT_OUTBOUND) {
nat2 = ipf_nat_outlookup(&fi, IPN_TCP|NAT_SEARCH,
nat->nat_pr[1],
Home |
Main Index |
Thread Index |
Old Index