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.15 retrieving revision 1.42 diff -u -p -r1.15 -r1.42 --- src/sys/netinet/ip_input.c 1995/04/13 06:33:21 1.15 +++ src/sys/netinet/ip_input.c 1996/12/20 08:39:27 1.42 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.15 1995/04/13 06:33:21 cgd Exp $ */ +/* $NetBSD: ip_input.c,v 1.42 1996/12/20 08:39:27 mrg Exp $ */ /* * Copyright (c) 1982, 1986, 1988, 1993 @@ -45,6 +45,10 @@ #include #include #include +#include + +#include +#include #include #include @@ -57,6 +61,10 @@ #include #include +#ifdef PFIL_HOOKS +#include +#endif /* PFIL_HOOKS */ + #ifndef IPFORWARDING #ifdef GATEWAY #define IPFORWARDING 1 /* forward IP packets not for us */ @@ -67,9 +75,25 @@ #ifndef IPSENDREDIRECTS #define IPSENDREDIRECTS 1 #endif +#ifndef IPFORWSRCRT +#define IPFORWSRCRT 1 /* allow source-routed packets */ +#endif +/* + * Note: DIRECTED_BROADCAST is handled this way so that previous + * configuration using this option will Just Work. + */ +#ifndef IPDIRECTEDBCAST +#ifdef DIRECTED_BROADCAST +#define IPDIRECTEDBCAST 1 +#else +#define IPDIRECTEDBCAST 0 +#endif /* DIRECTED_BROADCAST */ +#endif /* IPDIRECTEDBCAST */ int ipforwarding = IPFORWARDING; int ipsendredirects = IPSENDREDIRECTS; int ip_defttl = IPDEFTTL; +int ip_forwsrcrt = IPFORWSRCRT; +int ip_directedbcast = IPDIRECTEDBCAST; #ifdef DIAGNOSTIC int ipprintfs = 0; #endif @@ -78,7 +102,7 @@ extern struct domain inetdomain; extern struct protosw inetsw[]; u_char ip_protox[IPPROTO_MAX]; int ipqmaxlen = IFQ_MAXLEN; -struct in_ifaddr *in_ifaddr; /* first inet address */ +struct in_ifaddrhead in_ifaddr; struct ifqueue ipintrq; /* @@ -96,12 +120,8 @@ static struct ip_srcrt { struct in_addr route[MAX_IPOPTLEN/sizeof(struct in_addr)]; } ip_srcrt; -#ifdef GATEWAY -extern int if_index; -u_int32_t *ip_ifmatrix; -#endif - static void save_rte __P((u_char *, struct in_addr)); + /* * IP initialization: fill in IP protocol switch table. * All protocols not implemented in kernel go to raw IP protocol handler. @@ -122,14 +142,10 @@ ip_init() if (pr->pr_domain->dom_family == PF_INET && pr->pr_protocol && pr->pr_protocol != IPPROTO_RAW) ip_protox[pr->pr_protocol] = pr - inetsw; - ipq.next = ipq.prev = &ipq; + LIST_INIT(&ipq); ip_id = time.tv_sec & 0xffff; ipintrq.ifq_maxlen = ipqmaxlen; -#ifdef GATEWAY - i = (if_index + 1) * (if_index + 1) * sizeof (u_int32_t); - ip_ifmatrix = (u_int32_t *) malloc(i, M_RTABLE, M_WAITOK); - bzero((char *)ip_ifmatrix, i); -#endif + TAILQ_INIT(&in_ifaddr); } struct sockaddr_in ipaddr = { sizeof(ipaddr), AF_INET }; @@ -142,11 +158,16 @@ struct route ipforward_rt; void ipintr() { - register struct ip *ip; + register struct ip *ip = NULL; register struct mbuf *m; register struct ipq *fp; register struct in_ifaddr *ia; - int hlen, s; + struct ipqent *ipqe; + int hlen = 0, mff, len, s; +#ifdef PFIL_HOOKS + struct packet_filter_hook *pfh; + struct mbuf *m0; +#endif /* PFIL_HOOKS */ next: /* @@ -166,7 +187,7 @@ next: * If no IP addresses have been set yet but the interfaces * are receiving, can't do anything with incoming packets yet. */ - if (in_ifaddr == NULL) + if (in_ifaddr.tqh_first == 0) goto bad; ipstat.ips_total++; if (m->m_len < sizeof (struct ip) && @@ -191,7 +212,7 @@ next: } ip = mtod(m, struct ip *); } - if (ip->ip_sum = in_cksum(m, hlen)) { + if ((ip->ip_sum = in_cksum(m, hlen)) != 0) { ipstat.ips_badsum++; goto bad; } @@ -200,12 +221,9 @@ next: * Convert fields to host representation. */ NTOHS(ip->ip_len); - if (ip->ip_len < hlen) { - ipstat.ips_badlen++; - goto bad; - } NTOHS(ip->ip_id); NTOHS(ip->ip_off); + len = ip->ip_len; /* * Check that the amount of data in the buffers @@ -213,18 +231,32 @@ next: * Trim mbufs if longer than we expect. * Drop packet if shorter than we expect. */ - if (m->m_pkthdr.len < ip->ip_len) { + if (m->m_pkthdr.len < len) { ipstat.ips_tooshort++; goto bad; } - if (m->m_pkthdr.len > ip->ip_len) { + if (m->m_pkthdr.len > len) { if (m->m_len == m->m_pkthdr.len) { - m->m_len = ip->ip_len; - m->m_pkthdr.len = ip->ip_len; + m->m_len = len; + m->m_pkthdr.len = len; } else - m_adj(m, ip->ip_len - m->m_pkthdr.len); + m_adj(m, len - m->m_pkthdr.len); } +#ifdef PFIL_HOOKS + /* + * Run through list of hooks for input packets. + */ + m0 = m; + for (pfh = pfil_hook_get(PFIL_IN); pfh; pfh = pfh->pfil_link.le_next) + if (pfh->pfil_func) { + if (pfh->pfil_func(ip, hlen, m->m_pkthdr.rcvif, 0, &m0)) + goto next; + else + ip = mtod(m = m0, struct ip *); + } +#endif /* PFIL_HOOKS */ + /* * Process options and, if not destined for us, * ship it on. ip_dooptions returns 1 when an @@ -238,35 +270,24 @@ next: /* * Check our list of addresses, to see if the packet is for us. */ - for (ia = in_ifaddr; ia; ia = ia->ia_next) { -#define satosin(sa) ((struct sockaddr_in *)(sa)) - - if (IA_SIN(ia)->sin_addr.s_addr == ip->ip_dst.s_addr) + for (ia = in_ifaddr.tqh_first; ia; ia = ia->ia_list.tqe_next) { + if (in_hosteq(ip->ip_dst, ia->ia_addr.sin_addr)) goto ours; - if ( -#ifdef DIRECTED_BROADCAST - ia->ia_ifp == m->m_pkthdr.rcvif && -#endif + if (((ip_directedbcast == 0) || (ip_directedbcast && + ia->ia_ifp == m->m_pkthdr.rcvif)) && (ia->ia_ifp->if_flags & IFF_BROADCAST)) { - u_int32_t t; - - if (satosin(&ia->ia_broadaddr)->sin_addr.s_addr == - ip->ip_dst.s_addr) - goto ours; - if (ip->ip_dst.s_addr == ia->ia_netbroadcast.s_addr) - goto ours; - /* - * Look for all-0's host part (old broadcast addr), - * either for subnet or net. - */ - t = ntohl(ip->ip_dst.s_addr); - if (t == ia->ia_subnet) - goto ours; - if (t == ia->ia_net) + if (in_hosteq(ip->ip_dst, ia->ia_broadaddr.sin_addr) || + in_hosteq(ip->ip_dst, ia->ia_netbroadcast) || + /* + * Look for all-0's host part (old broadcast addr), + * either for subnet or net. + */ + ip->ip_dst.s_addr == ia->ia_subnet || + ip->ip_dst.s_addr == ia->ia_net) goto ours; } } - if (IN_MULTICAST(ntohl(ip->ip_dst.s_addr))) { + if (IN_MULTICAST(ip->ip_dst.s_addr)) { struct in_multi *inm; #ifdef MROUTING extern struct socket *ip_mrouter; @@ -322,9 +343,8 @@ next: } goto ours; } - if (ip->ip_dst.s_addr == (u_int32_t)INADDR_BROADCAST) - goto ours; - if (ip->ip_dst.s_addr == INADDR_ANY) + if (ip->ip_dst.s_addr == INADDR_BROADCAST || + in_nullhost(ip->ip_dst)) goto ours; /* @@ -345,7 +365,7 @@ ours: * if the packet was previously fragmented, * but it's not worth the time; just let them time out.) */ - if (ip->ip_off &~ IP_DF) { + if (ip->ip_off & ~(IP_DF|IP_RF)) { if (m->m_flags & M_EXT) { /* XXX */ if ((m = m_pullup(m, sizeof (struct ip))) == 0) { ipstat.ips_toosmall++; @@ -357,10 +377,10 @@ ours: * Look for queue of fragments * of this datagram. */ - for (fp = ipq.next; fp != &ipq; fp = fp->next) + for (fp = ipq.lh_first; fp != NULL; fp = fp->ipq_q.le_next) if (ip->ip_id == fp->ipq_id && - ip->ip_src.s_addr == fp->ipq_src.s_addr && - ip->ip_dst.s_addr == fp->ipq_dst.s_addr && + in_hosteq(ip->ip_src, fp->ipq_src) && + in_hosteq(ip->ip_dst, fp->ipq_dst) && ip->ip_p == fp->ipq_p) goto found; fp = 0; @@ -368,13 +388,21 @@ found: /* * Adjust ip_len to not reflect header, - * set ip_mff if more fragments are expected, + * set ipqe_mff if more fragments are expected, * convert offset of this to bytes. */ ip->ip_len -= hlen; - ((struct ipasfrag *)ip)->ipf_mff &= ~1; - if (ip->ip_off & IP_MF) - ((struct ipasfrag *)ip)->ipf_mff |= 1; + mff = (ip->ip_off & IP_MF) != 0; + if (mff) { + /* + * Make sure that fragments have a data length + * that's a non-zero multiple of 8 bytes. + */ + if (ip->ip_len == 0 || (ip->ip_len & 0x7) != 0) { + ipstat.ips_badfrags++; + goto bad; + } + } ip->ip_off <<= 3; /* @@ -382,9 +410,17 @@ found: * or if this is not the first fragment, * attempt reassembly; if it succeeds, proceed. */ - if (((struct ipasfrag *)ip)->ipf_mff & 1 || ip->ip_off) { + if (mff || ip->ip_off) { ipstat.ips_fragments++; - ip = ip_reass((struct ipasfrag *)ip, fp); + MALLOC(ipqe, struct ipqent *, sizeof (struct ipqent), + M_IPQ, M_NOWAIT); + if (ipqe == NULL) { + ipstat.ips_rcvmemdrop++; + goto bad; + } + ipqe->ipqe_mff = mff; + ipqe->ipqe_ip = ip; + ip = ip_reass(ipqe, fp); if (ip == 0) goto next; ipstat.ips_reassembled++; @@ -413,14 +449,15 @@ bad: * is given as fp; otherwise have to make a chain. */ struct ip * -ip_reass(ip, fp) - register struct ipasfrag *ip; +ip_reass(ipqe, fp) + register struct ipqent *ipqe; register struct ipq *fp; { - register struct mbuf *m = dtom(ip); - register struct ipasfrag *q; + register struct mbuf *m = dtom(ipqe->ipqe_ip); + register struct ipqent *nq, *p, *q; + struct ip *ip; struct mbuf *t; - int hlen = ip->ip_hl << 2; + int hlen = ipqe->ipqe_ip->ip_hl << 2; int i, next; /* @@ -437,22 +474,23 @@ ip_reass(ip, fp) if ((t = m_get(M_DONTWAIT, MT_FTABLE)) == NULL) goto dropfrag; fp = mtod(t, struct ipq *); - insque(fp, &ipq); + LIST_INSERT_HEAD(&ipq, fp, ipq_q); fp->ipq_ttl = IPFRAGTTL; - fp->ipq_p = ip->ip_p; - fp->ipq_id = ip->ip_id; - fp->ipq_next = fp->ipq_prev = (struct ipasfrag *)fp; - fp->ipq_src = ((struct ip *)ip)->ip_src; - fp->ipq_dst = ((struct ip *)ip)->ip_dst; - q = (struct ipasfrag *)fp; + fp->ipq_p = ipqe->ipqe_ip->ip_p; + fp->ipq_id = ipqe->ipqe_ip->ip_id; + LIST_INIT(&fp->ipq_fragq); + fp->ipq_src = ipqe->ipqe_ip->ip_src; + fp->ipq_dst = ipqe->ipqe_ip->ip_dst; + p = NULL; goto insert; } /* * Find a segment which begins after this one does. */ - for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next) - if (q->ip_off > ip->ip_off) + for (p = NULL, q = fp->ipq_fragq.lh_first; q != NULL; + p = q, q = q->ipqe_q.le_next) + if (q->ipqe_ip->ip_off > ipqe->ipqe_ip->ip_off) break; /* @@ -460,14 +498,15 @@ ip_reass(ip, fp) * our data already. If so, drop the data from the incoming * segment. If it provides all of our data, drop us. */ - if (q->ipf_prev != (struct ipasfrag *)fp) { - i = q->ipf_prev->ip_off + q->ipf_prev->ip_len - ip->ip_off; + if (p != NULL) { + i = p->ipqe_ip->ip_off + p->ipqe_ip->ip_len - + ipqe->ipqe_ip->ip_off; if (i > 0) { - if (i >= ip->ip_len) + if (i >= ipqe->ipqe_ip->ip_len) goto dropfrag; - m_adj(dtom(ip), i); - ip->ip_off += i; - ip->ip_len -= i; + m_adj(dtom(ipqe->ipqe_ip), i); + ipqe->ipqe_ip->ip_off += i; + ipqe->ipqe_ip->ip_len -= i; } } @@ -475,17 +514,20 @@ ip_reass(ip, fp) * While we overlap succeeding segments trim them or, * if they are completely covered, dequeue them. */ - while (q != (struct ipasfrag *)fp && ip->ip_off + ip->ip_len > q->ip_off) { - i = (ip->ip_off + ip->ip_len) - q->ip_off; - if (i < q->ip_len) { - q->ip_len -= i; - q->ip_off += i; - m_adj(dtom(q), i); + for (; q != NULL && ipqe->ipqe_ip->ip_off + ipqe->ipqe_ip->ip_len > + q->ipqe_ip->ip_off; q = nq) { + i = (ipqe->ipqe_ip->ip_off + ipqe->ipqe_ip->ip_len) - + q->ipqe_ip->ip_off; + if (i < q->ipqe_ip->ip_len) { + q->ipqe_ip->ip_len -= i; + q->ipqe_ip->ip_off += i; + m_adj(dtom(q->ipqe_ip), i); break; } - q = q->ipf_next; - m_freem(dtom(q->ipf_prev)); - ip_deq(q->ipf_prev); + nq = q->ipqe_q.le_next; + m_freem(dtom(q->ipqe_ip)); + LIST_REMOVE(q, ipqe_q); + FREE(q, M_IPQ); } insert: @@ -493,28 +535,42 @@ insert: * Stick new segment in its place; * check for complete reassembly. */ - ip_enq(ip, q->ipf_prev); + if (p == NULL) { + LIST_INSERT_HEAD(&fp->ipq_fragq, ipqe, ipqe_q); + } else { + LIST_INSERT_AFTER(p, ipqe, ipqe_q); + } next = 0; - for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = q->ipf_next) { - if (q->ip_off != next) + for (p = NULL, q = fp->ipq_fragq.lh_first; q != NULL; + p = q, q = q->ipqe_q.le_next) { + if (q->ipqe_ip->ip_off != next) return (0); - next += q->ip_len; + next += q->ipqe_ip->ip_len; } - if (q->ipf_prev->ipf_mff & 1) + if (p->ipqe_mff) return (0); /* - * Reassembly is complete; concatenate fragments. + * Reassembly is complete. Check for a bogus message size and + * concatenate fragments. */ - q = fp->ipq_next; - m = dtom(q); + q = fp->ipq_fragq.lh_first; + ip = q->ipqe_ip; + if ((next + (ip->ip_hl << 2)) > IP_MAXPACKET) { + ipstat.ips_toolong++; + ip_freef(fp); + return (0); + } + m = dtom(q->ipqe_ip); t = m->m_next; m->m_next = 0; m_cat(m, t); - q = q->ipf_next; - while (q != (struct ipasfrag *)fp) { - t = dtom(q); - q = q->ipf_next; + nq = q->ipqe_q.le_next; + FREE(q, M_IPQ); + for (q = nq; q != NULL; q = nq) { + t = dtom(q->ipqe_ip); + nq = q->ipqe_q.le_next; + FREE(q, M_IPQ); m_cat(m, t); } @@ -524,14 +580,11 @@ insert: * dequeue and discard fragment reassembly header. * Make header visible. */ - ip = fp->ipq_next; ip->ip_len = next; - ip->ipf_mff &= ~1; - ((struct ip *)ip)->ip_src = fp->ipq_src; - ((struct ip *)ip)->ip_dst = fp->ipq_dst; - remque(fp); + ip->ip_src = fp->ipq_src; + ip->ip_dst = fp->ipq_dst; + LIST_REMOVE(fp, ipq_q); (void) m_free(dtom(fp)); - m = dtom(ip); m->m_len += (ip->ip_hl << 2); m->m_data -= (ip->ip_hl << 2); /* some debugging cruft by sklower, below, will go away soon */ @@ -541,11 +594,12 @@ insert: plen += m->m_len; t->m_pkthdr.len = plen; } - return ((struct ip *)ip); + return (ip); dropfrag: ipstat.ips_fragdropped++; m_freem(m); + FREE(ipqe, M_IPQ); return (0); } @@ -557,45 +611,19 @@ void ip_freef(fp) struct ipq *fp; { - register struct ipasfrag *q, *p; + register struct ipqent *q, *p; - for (q = fp->ipq_next; q != (struct ipasfrag *)fp; q = p) { - p = q->ipf_next; - ip_deq(q); - m_freem(dtom(q)); + for (q = fp->ipq_fragq.lh_first; q != NULL; q = p) { + p = q->ipqe_q.le_next; + m_freem(dtom(q->ipqe_ip)); + LIST_REMOVE(q, ipqe_q); + FREE(q, M_IPQ); } - remque(fp); + LIST_REMOVE(fp, ipq_q); (void) m_free(dtom(fp)); } /* - * Put an ip fragment on a reassembly chain. - * Like insque, but pointers in middle of structure. - */ -void -ip_enq(p, prev) - register struct ipasfrag *p, *prev; -{ - - p->ipf_prev = prev; - p->ipf_next = prev->ipf_next; - prev->ipf_next->ipf_prev = p; - prev->ipf_next = p; -} - -/* - * To ip_enq as remque is to insque. - */ -void -ip_deq(p) - register struct ipasfrag *p; -{ - - p->ipf_prev->ipf_next = p->ipf_next; - p->ipf_next->ipf_prev = p->ipf_prev; -} - -/* * IP timer processing; * if a timer expires on a reassembly * queue, discard it. @@ -603,20 +631,14 @@ ip_deq(p) void ip_slowtimo() { - register struct ipq *fp; - int s = splnet(); + register struct ipq *fp, *nfp; + int s = splsoftnet(); - fp = ipq.next; - if (fp == 0) { - splx(s); - return; - } - while (fp != &ipq) { - --fp->ipq_ttl; - fp = fp->next; - if (fp->prev->ipq_ttl == 0) { + for (fp = ipq.lh_first; fp != NULL; fp = nfp) { + nfp = fp->ipq_q.le_next; + if (--fp->ipq_ttl == 0) { ipstat.ips_fragtimeout++; - ip_freef(fp->prev); + ip_freef(fp); } } splx(s); @@ -629,9 +651,9 @@ void ip_drain() { - while (ipq.next != &ipq) { + while (ipq.lh_first != NULL) { ipstat.ips_fragdropped++; - ip_freef(ipq.next); + ip_freef(ipq.lh_first); } } @@ -691,8 +713,7 @@ ip_dooptions(m) goto bad; } ipaddr.sin_addr = ip->ip_dst; - ia = (struct in_ifaddr *) - ifa_ifwithaddr((struct sockaddr *)&ipaddr); + ia = ifatoia(ifa_ifwithaddr(sintosa(&ipaddr))); if (ia == 0) { if (opt == IPOPT_SSRR) { type = ICMP_UNREACH; @@ -721,8 +742,7 @@ ip_dooptions(m) if (opt == IPOPT_SSRR) { #define INA struct in_ifaddr * #define SA struct sockaddr * - if ((ia = (INA)ifa_ifwithdstaddr((SA)&ipaddr)) == 0) - ia = (INA)ifa_ifwithnet((SA)&ipaddr); + ia = (INA)ifa_ifwithladdr((SA)&ipaddr); } else ia = ip_rtaddr(ipaddr.sin_addr); if (ia == 0) { @@ -731,13 +751,13 @@ ip_dooptions(m) goto bad; } ip->ip_dst = ipaddr.sin_addr; - bcopy((caddr_t)&(IA_SIN(ia)->sin_addr), + bcopy((caddr_t)&ia->ia_addr.sin_addr, (caddr_t)(cp + off), sizeof(struct in_addr)); cp[IPOPT_OFFSET] += sizeof(struct in_addr); /* * Let ip_intr's mcast routing check handle mcast pkts */ - forward = !IN_MULTICAST(ntohl(ip->ip_dst.s_addr)); + forward = !IN_MULTICAST(ip->ip_dst.s_addr); break; case IPOPT_RR: @@ -763,7 +783,7 @@ ip_dooptions(m) code = ICMP_UNREACH_HOST; goto bad; } - bcopy((caddr_t)&(IA_SIN(ia)->sin_addr), + bcopy((caddr_t)&ia->ia_addr.sin_addr, (caddr_t)(cp + off), sizeof(struct in_addr)); cp[IPOPT_OFFSET] += sizeof(struct in_addr); break; @@ -793,7 +813,7 @@ ip_dooptions(m) m->m_pkthdr.rcvif); if (ia == 0) continue; - bcopy((caddr_t)&IA_SIN(ia)->sin_addr, + bcopy((caddr_t)&ia->ia_addr.sin_addr, (caddr_t)sin, sizeof(struct in_addr)); ipt->ipt_ptr += sizeof(struct in_addr); break; @@ -819,6 +839,11 @@ ip_dooptions(m) } } if (forward) { + if (ip_forwsrcrt == 0) { + type = ICMP_UNREACH; + code = ICMP_UNREACH_SRCFAIL; + goto bad; + } ip_forward(m, 1); return (1); } @@ -840,9 +865,9 @@ ip_rtaddr(dst) { register struct sockaddr_in *sin; - sin = (struct sockaddr_in *) &ipforward_rt.ro_dst; + sin = satosin(&ipforward_rt.ro_dst); - if (ipforward_rt.ro_rt == 0 || dst.s_addr != sin->sin_addr.s_addr) { + if (ipforward_rt.ro_rt == 0 || !in_hosteq(dst, sin->sin_addr)) { if (ipforward_rt.ro_rt) { RTFREE(ipforward_rt.ro_rt); ipforward_rt.ro_rt = 0; @@ -855,7 +880,7 @@ ip_rtaddr(dst) } if (ipforward_rt.ro_rt == 0) return ((struct in_ifaddr *)0); - return ((struct in_ifaddr *) ipforward_rt.ro_rt->rt_ifa); + return (ifatoia(ipforward_rt.ro_rt->rt_ifa)); } /* @@ -915,7 +940,7 @@ ip_srcroute() *(mtod(m, struct in_addr *)) = *p--; #ifdef DIAGNOSTIC if (ipprintfs) - printf(" hops %lx", ntohl(mtod(m, struct in_addr *)->s_addr)); + printf(" hops %x", ntohl(mtod(m, struct in_addr *)->s_addr)); #endif /* @@ -935,7 +960,7 @@ ip_srcroute() while (p >= ip_srcrt.route) { #ifdef DIAGNOSTIC if (ipprintfs) - printf(" %lx", ntohl(q->s_addr)); + printf(" %x", ntohl(q->s_addr)); #endif *q++ = *p--; } @@ -945,7 +970,7 @@ ip_srcroute() *q = ip_srcrt.dst; #ifdef DIAGNOSTIC if (ipprintfs) - printf(" %lx\n", ntohl(q->s_addr)); + printf(" %x\n", ntohl(q->s_addr)); #endif return (m); } @@ -977,7 +1002,7 @@ ip_stripoptions(m, mopt) ip->ip_hl = sizeof(struct ip) >> 2; } -u_char inetctlerrmap[PRC_NCMDS] = { +int inetctlerrmap[PRC_NCMDS] = { 0, 0, 0, 0, 0, EMSGSIZE, EHOSTDOWN, EHOSTUNREACH, EHOSTUNREACH, EHOSTUNREACH, ECONNREFUSED, ECONNREFUSED, @@ -1008,7 +1033,7 @@ ip_forward(m, srcrt) register struct ip *ip = mtod(m, struct ip *); register struct sockaddr_in *sin; register struct rtentry *rt; - int error, type = 0, code; + int error, type = 0, code = 0; struct mbuf *mcopy; n_long dest; struct ifnet *destifp; @@ -1016,8 +1041,8 @@ ip_forward(m, srcrt) dest = 0; #ifdef DIAGNOSTIC if (ipprintfs) - printf("forward: src %x dst %x ttl %x\n", ip->ip_src, - ip->ip_dst, ip->ip_ttl); + printf("forward: src %x dst %x ttl %x\n", + ip->ip_src.s_addr, ip->ip_dst.s_addr, ip->ip_ttl); #endif if (m->m_flags & M_BCAST || in_canforward(ip->ip_dst) == 0) { ipstat.ips_cantforward++; @@ -1031,15 +1056,15 @@ ip_forward(m, srcrt) } ip->ip_ttl -= IPTTLDEC; - sin = (struct sockaddr_in *)&ipforward_rt.ro_dst; + sin = satosin(&ipforward_rt.ro_dst); if ((rt = ipforward_rt.ro_rt) == 0 || - ip->ip_dst.s_addr != sin->sin_addr.s_addr) { + !in_hosteq(ip->ip_dst, sin->sin_addr)) { if (ipforward_rt.ro_rt) { RTFREE(ipforward_rt.ro_rt); ipforward_rt.ro_rt = 0; } sin->sin_family = AF_INET; - sin->sin_len = sizeof(*sin); + sin->sin_len = sizeof(struct sockaddr_in); sin->sin_addr = ip->ip_dst; rtalloc(&ipforward_rt); @@ -1051,15 +1076,11 @@ ip_forward(m, srcrt) } /* - * Save at most 64 bytes of the packet in case + * Save at most 68 bytes of the packet in case * we need to generate an ICMP message to the src. */ - mcopy = m_copy(m, 0, imin((int)ip->ip_len, 64)); + mcopy = m_copy(m, 0, imin((int)ip->ip_len, 68)); -#ifdef GATEWAY - ip_ifmatrix[rt->rt_ifp->if_index + - if_index * m->m_pkthdr.rcvif->if_index]++; -#endif /* * If forwarding packet using same interface that it came in on, * perhaps should send a redirect to sender to shortcut a hop. @@ -1068,16 +1089,13 @@ ip_forward(m, srcrt) * Also, don't send redirect if forwarding using a default route * or a route modified by a redirect. */ -#define satosin(sa) ((struct sockaddr_in *)(sa)) if (rt->rt_ifp == m->m_pkthdr.rcvif && (rt->rt_flags & (RTF_DYNAMIC|RTF_MODIFIED)) == 0 && - satosin(rt_key(rt))->sin_addr.s_addr != 0 && + !in_nullhost(satosin(rt_key(rt))->sin_addr) && ipsendredirects && !srcrt) { -#define RTA(rt) ((struct in_ifaddr *)(rt->rt_ifa)) - u_int32_t src = ntohl(ip->ip_src.s_addr); - - if (RTA(rt) && - (src & RTA(rt)->ia_subnetmask) == RTA(rt)->ia_subnet) { + if (rt->rt_ifa && + (ip->ip_src.s_addr & ifatoia(rt->rt_ifa)->ia_subnetmask) == + ifatoia(rt->rt_ifa)->ia_subnet) { if (rt->rt_flags & RTF_GATEWAY) dest = satosin(rt->rt_gateway)->sin_addr.s_addr; else @@ -1087,16 +1105,13 @@ ip_forward(m, srcrt) code = ICMP_REDIRECT_HOST; #ifdef DIAGNOSTIC if (ipprintfs) - printf("redirect (%d) to %lx\n", code, (u_int32_t)dest); + printf("redirect (%d) to %x\n", code, (u_int32_t)dest); #endif } } - error = ip_output(m, (struct mbuf *)0, &ipforward_rt, IP_FORWARDING -#ifdef DIRECTED_BROADCAST - | IP_ALLOWBROADCAST -#endif - , 0); + error = ip_output(m, (struct mbuf *)0, &ipforward_rt, + (IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)), 0); if (error) ipstat.ips_cantforward++; else { @@ -1169,6 +1184,17 @@ ip_sysctl(name, namelen, oldp, oldlenp, case IPCTL_DEFMTU: return (sysctl_int(oldp, oldlenp, newp, newlen, &ip_mtu)); #endif + case IPCTL_FORWSRCRT: + /* + * Don't allow this to change in a secure environment. + */ + if (securelevel > 0) + return (EPERM); + return (sysctl_int(oldp, oldlenp, newp, newlen, + &ip_forwsrcrt)); + case IPCTL_DIRECTEDBCAST: + return (sysctl_int(oldp, oldlenp, newp, newlen, + &ip_directedbcast)); default: return (EOPNOTSUPP); }