count number of ipsec encapsulations on ipsec4_output, so that

we can tell ip_output() how to handle the packet further.
kame · Nov 20, 2001 · 190df42 · 190df42
1 parent 6fd5957
commit 190df42
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/kame/sys/netinet6/ipsec.c b/kame/sys/netinet6/ipsec.c
@@ -1,4 +1,4 @@
-/*	$KAME: ipsec.c,v 1.131 2001/11/06 08:06:21 sakane Exp $	*/
+/*	$KAME: ipsec.c,v 1.132 2001/11/20 08:32:38 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -2748,6 +2748,7 @@ ipsec4_output(state, sp, flags)
 		panic("state->ro == NULL in ipsec4_output");
 	if (!state->dst)
 		panic("state->dst == NULL in ipsec4_output");
+	state->encap = 0;
 
 	KEYDEBUG(KEYDEBUG_IPSEC_DATA,
 		printf("ipsec4_output: applyed SP\n");
@@ -2889,6 +2890,8 @@ ipsec4_output(state, sp, flags)
 				state->dst = (struct sockaddr *)state->ro->ro_rt->rt_gateway;
 				dst4 = (struct sockaddr_in *)state->dst;
 			}
+
+			state->encap++;
 		} else
 			splx(s);
 

diff --git a/kame/sys/netinet6/ipsec.h b/kame/sys/netinet6/ipsec.h
@@ -1,4 +1,4 @@
-/*	$KAME: ipsec.h,v 1.52 2001/09/21 05:12:53 sakane Exp $	*/
+/*	$KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -338,6 +338,7 @@ struct ipsec_output_state {
 	struct mbuf *m;
 	struct route *ro;
 	struct sockaddr *dst;
+	int encap;
 };
 
 struct ipsec_history {