- Adjust variable name to a NATPT related name.

s/ip6_protocol_tr/natpt_enable/
kame · Jan 13, 2002 · 9601f6e · 9601f6e
1 parent 1da574d
commit 9601f6e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 17 deletions.
diff --git a/freebsd4/sys/netinet/ip_input.c b/freebsd4/sys/netinet/ip_input.c
@@ -234,8 +234,8 @@ static struct	in_ifaddr *ip_rtaddr __P((struct in_addr));
 static void	ipintr __P((void));
 
 #ifdef NATPT
-extern	int			ip6_protocol_tr;
-int	natpt_in4		__P((struct mbuf *, struct mbuf **));
+extern	int			natpt_enable;
+extern	int natpt_in4		__P((struct mbuf *, struct mbuf **));
 extern	void ip6_forward	__P((struct mbuf *, int));
 #endif	/* NATPT */
 
@@ -520,7 +520,7 @@ ip_input(struct mbuf *m)
 	/*
 	 * NATPT (Network Address Translation - Protocol Translation)
 	 */
-	if (ip6_protocol_tr) {
+	if (natpt_enable) {
 		struct mbuf	*m1 = NULL;
 
 		switch (natpt_in4(m, &m1)) {

diff --git a/kame/sys/netinet6/ip6_input.c b/kame/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/*	$KAME: ip6_input.c,v 1.250 2002/01/11 15:49:51 jinmei Exp $	*/
+/*	$KAME: ip6_input.c,v 1.251 2002/01/13 06:11:07 fujisawa Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -256,9 +256,8 @@ static struct mbuf *ip6_pullexthdr __P((struct mbuf *, size_t, int));
 #endif
 
 #ifdef NATPT
-extern int ip6_protocol_tr;
-
-int natpt_in6 __P((struct mbuf *, struct mbuf **));
+extern int natpt_enable;
+extern int natpt_in6 __P((struct mbuf *, struct mbuf **));
 extern void ip_forward __P((struct mbuf *, int));
 #endif
 
@@ -1035,7 +1034,7 @@ ip6_input(m)
 	/*
 	 * NAT-PT (Network Address Translation - Protocol Translation)
 	 */
-	if (ip6_protocol_tr) {
+	if (natpt_enable) {
 		struct mbuf *m1 = NULL;
 
 		switch (natpt_in6(m, &m1)) {

diff --git a/kame/sys/netinet6/natpt_dispatch.c b/kame/sys/netinet6/natpt_dispatch.c
@@ -1,4 +1,4 @@
-/*	$KAME: natpt_dispatch.c,v 1.38 2001/12/27 07:24:09 fujisawa Exp $	*/
+/*	$KAME: natpt_dispatch.c,v 1.39 2002/01/13 06:11:07 fujisawa Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 and 2001 WIDE Project.
@@ -64,7 +64,7 @@
  *
  */
 
-int		ip6_protocol_tr;
+int		natpt_enable;
 int		natpt_initialized;
 u_int		natpt_debug;
 u_int		natpt_dump;

diff --git a/kame/sys/netinet6/natpt_rule.c b/kame/sys/netinet6/natpt_rule.c
@@ -1,4 +1,4 @@
-/*	$KAME: natpt_rule.c,v 1.37 2001/11/14 11:42:54 fujisawa Exp $	*/
+/*	$KAME: natpt_rule.c,v 1.38 2002/01/13 06:11:07 fujisawa Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 and 2001 WIDE Project.
@@ -427,11 +427,11 @@ natpt_setOnOff(int cmd)
 
 	switch (cmd) {
 	case SIOCENBTRANS:
-		ip6_protocol_tr = TRUE;
+		natpt_enable = TRUE;
 		break;
 
 	case SIOCDSBTRANS:
-		ip6_protocol_tr = FALSE;
+		natpt_enable = FALSE;
 		break;
 	}
 

diff --git a/kame/sys/netinet6/natpt_usrreq.c b/kame/sys/netinet6/natpt_usrreq.c
@@ -1,4 +1,4 @@
-/*	$KAME: natpt_usrreq.c,v 1.17 2001/10/17 07:02:49 fujisawa Exp $	*/
+/*	$KAME: natpt_usrreq.c,v 1.18 2002/01/13 06:11:07 fujisawa Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 and 2001 WIDE Project.
@@ -116,7 +116,7 @@ void
 natpt_init()
 {
 	natpt_initialized = 1;
-	ip6_protocol_tr = 0;
+	natpt_enable = 0;
 
 	natpt_init_rule();
 	natpt_init_tslot();

diff --git a/kame/sys/netinet6/natpt_var.h b/kame/sys/netinet6/natpt_var.h
@@ -1,4 +1,4 @@
-/*	$KAME: natpt_var.h,v 1.20 2001/12/12 13:14:33 fujisawa Exp $	*/
+/*	$KAME: natpt_var.h,v 1.21 2002/01/13 06:11:07 fujisawa Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 and 2001 WIDE Project.
@@ -29,7 +29,7 @@
  * SUCH DAMAGE.
  */
 
-extern int		ip6_protocol_tr;
+extern int		natpt_enable;
 extern int		natpt_initialized;
 extern u_int		natpt_debug;
 extern u_int		natpt_dump;