From 6713d4a747f3b3b00c7c82b74063726a121ee367 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Schmidt?= <sos@FreeBSD.org>
Date: Tue, 22 Oct 1996 22:26:02 +0000
Subject: [PATCH] Changed args to the nat functions.

---
 sys/netinet/in.h        | 4 ++--
 sys/netinet/ip_input.c  | 4 ++--
 sys/netinet/ip_output.c | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/netinet/in.h b/sys/netinet/in.h
index 882f4df9b653..21cfeef0f026 100644
--- a/sys/netinet/in.h
+++ b/sys/netinet/in.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)in.h	8.3 (Berkeley) 1/3/94
- * $Id: in.h,v 1.20 1996/08/21 21:36:53 sos Exp $
+ * $Id: in.h,v 1.21 1996/10/19 20:23:12 alex Exp $
  */
 
 #ifndef _NETINET_IN_H_
@@ -335,7 +335,7 @@ extern	ip_fw_chk_t *ip_fw_chk_ptr;
 extern	ip_fw_ctl_t *ip_fw_ctl_ptr;
 
 /* IP NAT hooks */
-typedef	int ip_nat_t __P((struct ip**, struct mbuf**, int));
+typedef	int ip_nat_t __P((struct ip**, struct mbuf**, struct ifnet*, int));
 typedef	int ip_nat_ctl_t __P((int, struct mbuf**));
 extern	ip_nat_t *ip_nat_ptr;
 extern	ip_nat_ctl_t *ip_nat_ctl_ptr;
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index 9b496601279c..d5c904d66d8e 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_input.c	8.2 (Berkeley) 1/4/94
- * $Id: ip_input.c,v 1.47 1996/09/08 13:45:49 davidg Exp $
+ * $Id: ip_input.c,v 1.48 1996/10/07 19:21:45 wollman Exp $
  *	$ANA: ip_input.c,v 1.5 1996/09/18 14:34:59 wollman Exp $
  */
 
@@ -329,7 +329,7 @@ tooshort:
 		}
 	}
 
-        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, IP_NAT_IN))
+        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, m->m_pkthdr.rcvif, IP_NAT_IN))
 		return;
 #endif
 
diff --git a/sys/netinet/ip_output.c b/sys/netinet/ip_output.c
index 3b733fa85839..85cd563c9f7a 100644
--- a/sys/netinet/ip_output.c
+++ b/sys/netinet/ip_output.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ip_output.c	8.3 (Berkeley) 1/21/94
- *	$Id: ip_output.c,v 1.42 1996/08/21 21:37:04 sos Exp $
+ *	$Id: ip_output.c,v 1.43 1996/10/07 19:21:46 wollman Exp $
  */
 
 #define _IP_VHL
@@ -340,7 +340,7 @@ sendit:
 	 */ 
 
 #ifdef COMPAT_IPFW
-        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, IP_NAT_OUT)) {
+        if (ip_nat_ptr && !(*ip_nat_ptr)(&ip, &m, ifp, IP_NAT_OUT)) {
 		error = EACCES; 
 		goto done;
 	}