Changed args to the nat functions.

This commit is contained in:
Søren Schmidt 1996-10-22 22:26:02 +00:00
parent f9dc19265e
commit 6713d4a747
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=19113
3 changed files with 6 additions and 6 deletions

View File

@ -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;

View File

@ -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

View File

@ -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;
}