Browse files

- swap HAO and ip6src before processing AH/ESP/MH.

  this is just a careless mistake when restructuring mip6 code.
  • Loading branch information...
1 parent 9ee33d1 commit 03a55100b13c37f43874b21ed72f69f10b0f738c keiichi committed Apr 24, 2003
Showing with 7 additions and 5 deletions.
  1. +7 −5 kame/sys/netinet6/ip6_input.c
View
12 kame/sys/netinet6/ip6_input.c
@@ -1,4 +1,4 @@
-/* $KAME: ip6_input.c,v 1.312 2003/04/23 09:15:50 keiichi Exp $ */
+/* $KAME: ip6_input.c,v 1.313 2003/04/24 12:47:42 keiichi Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -1219,23 +1219,25 @@ ip6_input(m)
goto bad;
}
#endif
-#if defined(MIP6) && defined(MIP6_MOBILE_NODE)
+#ifdef MIP6
+ if (dest6_mip6_hao(m, off, nxt) < 0)
+ goto bad;
+#ifdef MIP6_MOBILE_NODE
/*
* XXX
* check if the packet was tunneled after all extention
* headers have been processed. get from Ericsson
* code. need more consideration.
*/
- if (dest6_mip6_hao(m, off, nxt) < 0)
- goto bad;
if ((nxt != IPPROTO_HOPOPTS) && (nxt != IPPROTO_DSTOPTS) &&
(nxt != IPPROTO_ROUTING) && (nxt != IPPROTO_FRAGMENT) &&
(nxt != IPPROTO_ESP) && (nxt != IPPROTO_AH) &&
(nxt != IPPROTO_MOBILITY) && (nxt != IPPROTO_NONE)) {
if (mip6_route_optimize(m))
goto bad;
}
-#endif /* MIP6 && MIP6_MOBILE_NODE */
+#endif /* MIP6_MOBILE_NODE */
+#endif /* MIP6 */
nxt = (*inet6sw[ip6_protox[nxt]].pr_input)(&m, &off, nxt);
}
return;

0 comments on commit 03a5510

Please sign in to comment.