[src/netbsd-1-5]: src/sys/netinet Pull up revision 1.47 (via patch, requested...

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/fe23a2030a4d
branches:  netbsd-1-5
changeset: 490817:fe23a2030a4d
user:      he <he%NetBSD.org@localhost>
date:      Sun Mar 11 21:09:55 2001 +0000

description:
Pull up revision 1.47 (via patch, requested by itojun):
  Ensure that we enforce inbound IPsec policy on all IP protocols,
  not just TCP, UDP and ICMP.

diffstat:

 sys/netinet/in_proto.c |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (79 lines):

diff -r 050521fc8282 -r fe23a2030a4d sys/netinet/in_proto.c
--- a/sys/netinet/in_proto.c    Sun Mar 11 20:44:36 2001 +0000
+++ b/sys/netinet/in_proto.c    Sun Mar 11 21:09:55 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: in_proto.c,v 1.39.4.1 2000/08/16 01:22:22 itojun Exp $ */
+/*     $NetBSD: in_proto.c,v 1.39.4.2 2001/03/11 21:09:55 he Exp $     */
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -175,7 +175,7 @@
   rip_usrreq,
   0,           0,              0,              0,
 },
-{ SOCK_RAW,    &inetdomain,    IPPROTO_ICMP,   PR_ATOMIC|PR_ADDR,
+{ SOCK_RAW,    &inetdomain,    IPPROTO_ICMP,   PR_ATOMIC|PR_ADDR|PR_LASTHDR,
   icmp_input,  rip_output,     0,              rip_ctloutput,
   rip_usrreq,
   0,           0,              0,              0,              icmp_sysctl
@@ -199,37 +199,37 @@
   0,           0,              0,              0,              ipsec_sysctl
 },
 #endif /* IPSEC */
-{ SOCK_RAW,    &inetdomain,    IPPROTO_IPV4,   PR_ATOMIC|PR_ADDR,
+{ SOCK_RAW,    &inetdomain,    IPPROTO_IPV4,   PR_ATOMIC|PR_ADDR|PR_LASTHDR,
   encap4_input,        rip_output,     0,              rip_ctloutput,
   rip_usrreq,  /*XXX*/
   encap_init,  0,              0,              0,
 },
 #ifdef INET6
-{ SOCK_RAW,    &inetdomain,    IPPROTO_IPV6,   PR_ATOMIC|PR_ADDR,
+{ SOCK_RAW,    &inetdomain,    IPPROTO_IPV6,   PR_ATOMIC|PR_ADDR|PR_LASTHDR,
   encap4_input,        rip_output,     0,              rip_ctloutput,
   rip_usrreq,  /*XXX*/
   0,           0,              0,              0,
 },
 #endif /* INET6 */
 #if NGRE > 0
-{ SOCK_RAW,    &inetdomain,    IPPROTO_GRE,    PR_ATOMIC|PR_ADDR,
+{ SOCK_RAW,    &inetdomain,    IPPROTO_GRE,    PR_ATOMIC|PR_ADDR|PR_LASTHDR,
   gre_input,   rip_output,     0,              rip_ctloutput,
   rip_usrreq,
   0,           0,              0,              0,
 },
-{ SOCK_RAW,    &inetdomain,    IPPROTO_MOBILE, PR_ATOMIC|PR_ADDR,
+{ SOCK_RAW,    &inetdomain,    IPPROTO_MOBILE, PR_ATOMIC|PR_ADDR|PR_LASTHDR,
   gre_mobile_input,    rip_output,     0,              rip_ctloutput,
   rip_usrreq,
   0,           0,              0,              0,
 },
 #endif /* NGRE > 0 */
-{ SOCK_RAW,    &inetdomain,    IPPROTO_IGMP,   PR_ATOMIC|PR_ADDR,
+{ SOCK_RAW,    &inetdomain,    IPPROTO_IGMP,   PR_ATOMIC|PR_ADDR|PR_LASTHDR,
   igmp_input,  rip_output,     0,              rip_ctloutput,
   rip_usrreq,
   igmp_init,   igmp_fasttimo,  igmp_slowtimo,  0,
 },
 #ifdef TPIP
-{ SOCK_SEQPACKET,&inetdomain,  IPPROTO_TP,     PR_CONNREQUIRED|PR_WANTRCVD|PR_LISTEN,
+{ SOCK_SEQPACKET,&inetdomain,  IPPROTO_TP,     PR_CONNREQUIRED|PR_WANTRCVD|PR_LISTEN|PR_LASTHDR,
   tpip_input,  0,              tpip_ctlinput,  tp_ctloutput,
   tp_usrreq,
   tp_init,     0,              tp_slowtimo,    tp_drain,
@@ -237,14 +237,14 @@
 #endif /* TPIP */
 /* EON (ISO CLNL over IP) */
 #ifdef EON
-{ SOCK_RAW,    &inetdomain,    IPPROTO_EON,    0,
+{ SOCK_RAW,    &inetdomain,    IPPROTO_EON,    PR_LASTHDR,
   eoninput,    0,              eonctlinput,            0,
   0,
   eonprotoinit,        0,              0,              0,
 },
 #endif /* EON */
 #ifdef NSIP
-{ SOCK_RAW,    &inetdomain,    IPPROTO_IDP,    PR_ATOMIC|PR_ADDR,
+{ SOCK_RAW,    &inetdomain,    IPPROTO_IDP,    PR_ATOMIC|PR_ADDR|PR_LASTHDR,
   idpip_input, NULL,           nsip_ctlinput,  0,
   rip_usrreq,
   0,           0,              0,              0,