Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. =================================================================== RCS file: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v rcsdiff: /ftp/cvs/cvsroot/src/sys/netinet/ip_input.c,v: warning: Unknown phrases like `commitid ...;' are present. retrieving revision 1.205 retrieving revision 1.220 diff -u -p -r1.205 -r1.220 --- src/sys/netinet/ip_input.c 2004/10/06 01:34:11 1.205 +++ src/sys/netinet/ip_input.c 2005/10/23 18:38:53 1.220 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.205 2004/10/06 01:34:11 darrenr Exp $ */ +/* $NetBSD: ip_input.c,v 1.220 2005/10/23 18:38:53 christos Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -98,7 +98,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.205 2004/10/06 01:34:11 darrenr Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.220 2005/10/23 18:38:53 christos Exp $"); #include "opt_inet.h" #include "opt_gateway.h" @@ -131,6 +131,7 @@ __KERNEL_RCSID(0, "$NetBSD: ip_input.c,v #include #include #include +#include #include #include #include @@ -222,7 +223,7 @@ struct rttimer_queue *ip_mtudisc_timeout int ipqmaxlen = IFQ_MAXLEN; u_long in_ifaddrhash; /* size of hash table - 1 */ int in_ifaddrentries; /* total number of addrs */ -struct in_ifaddrhead in_ifaddrhead; +struct in_ifaddrhead in_ifaddrhead; struct in_ifaddrhashhead *in_ifaddrhashtbl; u_long in_multihash; /* size of hash table - 1 */ int in_multientries; /* total number of addrs */ @@ -240,7 +241,7 @@ struct pfil_head inet_pfil_hook; * recalculate IP parameters derived from nmbclusters. */ static int ip_nmbclusters; /* copy of nmbclusters */ -static void ip_nmbclusters_changed __P((void)); /* recalc limits */ +static void ip_nmbclusters_changed(void); /* recalc limits */ #define CHECK_NMBCLUSTER_PARAMS() \ do { \ @@ -256,7 +257,7 @@ do { \ (((((x) & 0xF) | ((((x) >> 8) & 0xF) << 4)) ^ (y)) & IPREASS_HMASK) struct ipqhead ipq[IPREASS_NHASH]; int ipq_locked; -static int ip_nfragpackets; /* packets in reass queue */ +static int ip_nfragpackets; /* packets in reass queue */ static int ip_nfrags; /* total fragments in reass queues */ int ip_maxfragpackets = 200; /* limit on packets. XXX sysctl */ @@ -266,7 +267,7 @@ int ip_maxfrags; /* limit on fr /* * Additive-Increase/Multiplicative-Decrease (AIMD) strategy for * IP reassembly queue buffer managment. - * + * * We keep a count of total IP fragments (NB: not fragmented packets!) * awaiting reassembly (ip_nfrags) and a limit (ip_maxfrags) on fragments. * If ip_nfrags exceeds ip_maxfrags the limit, we drop half the @@ -274,15 +275,15 @@ int ip_maxfrags; /* limit on fr * repeatedly deleting single packets under heavy fragmentation load * (e.g., from lossy NFS peers). */ -static u_int ip_reass_ttl_decr __P((u_int ticks)); -static void ip_reass_drophalf __P((void)); +static u_int ip_reass_ttl_decr(u_int ticks); +static void ip_reass_drophalf(void); -static __inline int ipq_lock_try __P((void)); -static __inline void ipq_unlock __P((void)); +static __inline int ipq_lock_try(void); +static __inline void ipq_unlock(void); static __inline int -ipq_lock_try() +ipq_lock_try(void) { int s; @@ -301,7 +302,7 @@ ipq_lock_try() } static __inline void -ipq_unlock() +ipq_unlock(void) { int s; @@ -372,7 +373,7 @@ static struct ip_srcrt { struct in_addr route[MAX_IPOPTLEN/sizeof(struct in_addr)]; } ip_srcrt; -static void save_rte __P((u_char *, struct in_addr)); +static void save_rte(u_char *, struct in_addr); #ifdef MBUFTRACE struct mowner ip_rx_mowner = { "internet", "rx" }; @@ -394,7 +395,7 @@ ip_nmbclusters_changed(void) * All protocols not implemented in kernel go to raw IP protocol handler. */ void -ip_init() +ip_init(void) { const struct protosw *pr; int i; @@ -451,7 +452,7 @@ struct route ipforward_rt; * IP software interrupt routine */ void -ipintr() +ipintr(void) { int s; struct mbuf *m; @@ -572,10 +573,16 @@ ip_input(struct mbuf *m) break; default: - /* Must compute it ourselves. */ - INET_CSUM_COUNTER_INCR(&ip_swcsum); - if (in_cksum(m, hlen) != 0) - goto badcsum; + /* + * Must compute it ourselves. Maybe skip checksum on + * loopback interfaces. + */ + if (__predict_true(!(m->m_pkthdr.rcvif->if_flags & + IFF_LOOPBACK) || ip_do_loopback_cksum)) { + INET_CSUM_COUNTER_INCR(&ip_swcsum); + if (in_cksum(m, hlen) != 0) + goto badcsum; + } break; } @@ -661,7 +668,7 @@ ip_input(struct mbuf *m) * default route for hosts on 1.1.1.0/24. Of course this * also requires a "map tlp0 ..." to complete the story. * One might argue whether or not this kind of network config. - * should be supported in this manner... + * should be supported in this manner... */ srcrt = (odst.s_addr != ip->ip_dst.s_addr); } @@ -726,7 +733,7 @@ ip_input(struct mbuf *m) if (ia != NULL) goto ours; if (m->m_pkthdr.rcvif->if_flags & IFF_BROADCAST) { - TAILQ_FOREACH(ifa, &m->m_pkthdr.rcvif->if_addrlist, ifa_list) { + IFADDR_FOREACH(ifa, m->m_pkthdr.rcvif) { if (ifa->ifa_addr->sa_family != AF_INET) continue; ia = ifatoia(ifa); @@ -829,7 +836,7 @@ ip_input(struct mbuf *m) sp = ipsec_getpolicy(tdbi, IPSEC_DIR_INBOUND); } else { sp = ipsec_getpolicybyaddr(m, IPSEC_DIR_INBOUND, - IP_FORWARDING, &error); + IP_FORWARDING, &error); } if (sp == NULL) { /* NB: can happen if error */ splx(s); @@ -979,7 +986,7 @@ found: * done. If so, then just pass it along. This tag gets * set during AH, ESP, etc. input handling, before the * packet is returned to the ip input queue for delivery. - */ + */ mtag = m_tag_find(m, PACKET_TAG_IPSEC_IN_DONE, NULL); s = splsoftnet(); if (mtag != NULL) { @@ -987,7 +994,7 @@ found: sp = ipsec_getpolicy(tdbi, IPSEC_DIR_INBOUND); } else { sp = ipsec_getpolicybyaddr(m, IPSEC_DIR_INBOUND, - IP_FORWARDING, &error); + IP_FORWARDING, &error); } if (sp != NULL) { /* @@ -1037,10 +1044,7 @@ badcsum: * is given as fp; otherwise have to make a chain. */ struct mbuf * -ip_reass(ipqe, fp, ipqhead) - struct ipqent *ipqe; - struct ipq *fp; - struct ipqhead *ipqhead; +ip_reass(struct ipqent *ipqe, struct ipq *fp, struct ipqhead *ipqhead) { struct mbuf *m = ipqe->ipqe_m; struct ipqent *nq, *p, *q; @@ -1071,7 +1075,7 @@ ip_reass(ipqe, fp, ipqhead) * We are about to add a fragment; increment frag count. */ ip_nfrags++; - + /* * If first fragment to arrive, create a reassembly queue. */ @@ -1222,6 +1226,7 @@ insert: for (t = m; t; t = t->m_next) plen += t->m_len; m->m_pkthdr.len = plen; + m->m_pkthdr.csum_flags = 0; } return (m); @@ -1240,8 +1245,7 @@ dropfrag: * associated datagrams. */ void -ip_freef(fp) - struct ipq *fp; +ip_freef(struct ipq *fp) { struct ipqent *q, *p; u_int nfrags = 0; @@ -1282,10 +1286,10 @@ ip_reass_ttl_decr(u_int ticks) u_int nfrags, median, dropfraction, keepfraction; struct ipq *fp, *nfp; int i; - + nfrags = 0; memset(fragttl_histo, 0, sizeof fragttl_histo); - + for (i = 0; i < IPREASS_NHASH; i++) { for (fp = LIST_FIRST(&ipq[i]); fp != NULL; fp = nfp) { fp->ipq_ttl = ((fp->ipq_ttl <= ticks) ? @@ -1338,7 +1342,7 @@ ip_reass_drophalf(void) * queue, discard it. */ void -ip_slowtimo() +ip_slowtimo(void) { static u_int dropscanidx = 0; u_int i; @@ -1395,7 +1399,7 @@ ip_slowtimo() * Drain off all datagram fragments. */ void -ip_drain() +ip_drain(void) { /* @@ -1422,8 +1426,7 @@ ip_drain() * 0 if the packet should be processed further. */ int -ip_dooptions(m) - struct mbuf *m; +ip_dooptions(struct mbuf *m) { struct ip *ip = mtod(m, struct ip *); u_char *cp, *cp0; @@ -1652,8 +1655,7 @@ bad: * return internet address info of interface to be used to get there. */ struct in_ifaddr * -ip_rtaddr(dst) - struct in_addr dst; +ip_rtaddr(struct in_addr dst) { struct sockaddr_in *sin; @@ -1680,9 +1682,7 @@ ip_rtaddr(dst) * to be picked up later by ip_srcroute if the receiver is interested. */ void -save_rte(option, dst) - u_char *option; - struct in_addr dst; +save_rte(u_char *option, struct in_addr dst) { unsigned olen; @@ -1704,7 +1704,7 @@ save_rte(option, dst) * The first hop is placed before the options, will be removed later. */ struct mbuf * -ip_srcroute() +ip_srcroute(void) { struct in_addr *p, *q; struct mbuf *m; @@ -1776,9 +1776,7 @@ ip_srcroute() * XXX should be deleted; last arg currently ignored. */ void -ip_stripoptions(m, mopt) - struct mbuf *m; - struct mbuf *mopt; +ip_stripoptions(struct mbuf *m, struct mbuf *mopt) { int i; struct ip *ip = mtod(m, struct ip *); @@ -1820,20 +1818,14 @@ const int inetctlerrmap[PRC_NCMDS] = { * via a source route. */ void -ip_forward(m, srcrt) - struct mbuf *m; - int srcrt; +ip_forward(struct mbuf *m, int srcrt) { struct ip *ip = mtod(m, struct ip *); struct sockaddr_in *sin; struct rtentry *rt; - int error, type = 0, code = 0; + int error, type = 0, code = 0, destmtu = 0; struct mbuf *mcopy; n_long dest; - struct ifnet *destifp; -#if defined(IPSEC) || defined(FAST_IPSEC) - struct ifnet dummyifp; -#endif /* * We are now in the output path. @@ -1876,7 +1868,7 @@ ip_forward(m, srcrt) rtalloc(&ipforward_rt); if (ipforward_rt.ro_rt == 0) { - icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_HOST, dest, 0); + icmp_error(m, ICMP_UNREACH, ICMP_UNREACH_NET, dest, 0); return; } rt = ipforward_rt.ro_rt; @@ -1947,7 +1939,6 @@ ip_forward(m, srcrt) } if (mcopy == NULL) return; - destifp = NULL; switch (error) { @@ -1969,7 +1960,7 @@ ip_forward(m, srcrt) code = ICMP_UNREACH_NEEDFRAG; #if !defined(IPSEC) && !defined(FAST_IPSEC) if (ipforward_rt.ro_rt) - destifp = ipforward_rt.ro_rt->rt_ifp; + destmtu = ipforward_rt.ro_rt->rt_ifp->if_mtu; #else /* * If the packet is routed over IPsec tunnel, tell the @@ -1988,7 +1979,7 @@ ip_forward(m, srcrt) &ipsecerror); if (sp == NULL) - destifp = ipforward_rt.ro_rt->rt_ifp; + destmtu = ipforward_rt.ro_rt->rt_ifp->if_mtu; else { /* count IPsec header size */ ipsechdr = ipsec4_hdrsiz(mcopy, @@ -1997,24 +1988,18 @@ ip_forward(m, srcrt) /* * find the correct route for outer IPv4 * header, compute tunnel MTU. - * - * XXX BUG ALERT - * The "dummyifp" code relies upon the fact - * that icmp_error() touches only ifp->if_mtu. */ - /*XXX*/ - destifp = NULL; + if (sp->req != NULL && sp->req->sav != NULL && sp->req->sav->sah != NULL) { ro = &sp->req->sav->sah->sa_route; if (ro->ro_rt && ro->ro_rt->rt_ifp) { - dummyifp.if_mtu = + destmtu = ro->ro_rt->rt_rmx.rmx_mtu ? ro->ro_rt->rt_rmx.rmx_mtu : ro->ro_rt->rt_ifp->if_mtu; - dummyifp.if_mtu -= ipsechdr; - destifp = &dummyifp; + destmtu -= ipsechdr; } } @@ -2046,15 +2031,12 @@ ip_forward(m, srcrt) break; #endif } - icmp_error(mcopy, type, code, dest, destifp); + icmp_error(mcopy, type, code, dest, destmtu); } void -ip_savecontrol(inp, mp, ip, m) - struct inpcb *inp; - struct mbuf **mp; - struct ip *ip; - struct mbuf *m; +ip_savecontrol(struct inpcb *inp, struct mbuf **mp, struct ip *ip, + struct mbuf *m) { if (inp->inp_socket->so_options & SO_TIMESTAMP) { @@ -2147,7 +2129,7 @@ sysctl_net_inet_ip_maxflows(SYSCTLFN_ARG s = sysctl_lookup(SYSCTLFN_CALL(rnode)); if (s) return (s); - + s = splsoftnet(); ipflow_reap(0); splx(s); @@ -2178,7 +2160,7 @@ SYSCTL_SETUP(sysctl_net_inet_ip_setup, " SYSCTL_DESCR("IPv4 related settings"), NULL, 0, NULL, 0, CTL_NET, PF_INET, IPPROTO_IP, CTL_EOL); - + sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READWRITE, CTLTYPE_INT, "forwarding", @@ -2342,4 +2324,18 @@ SYSCTL_SETUP(sysctl_net_inet_ip_setup, " NULL, 0, &ip_do_randomid, 0, CTL_NET, PF_INET, IPPROTO_IP, IPCTL_RANDOMID, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READWRITE, + CTLTYPE_INT, "do_loopback_cksum", + SYSCTL_DESCR("Perform IP checksum on loopback"), + NULL, 0, &ip_do_loopback_cksum, 0, + CTL_NET, PF_INET, IPPROTO_IP, + IPCTL_LOOPBACKCKSUM, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT, + CTLTYPE_STRUCT, "stats", + SYSCTL_DESCR("IP statistics"), + NULL, 0, &ipstat, sizeof(ipstat), + CTL_NET, PF_INET, IPPROTO_IP, IPCTL_STATS, + CTL_EOL); }