 @@ -1,14 +1,14 @@
-/*	$NetBSD: ip_var.h,v 1.124 2018/04/08 11:50:46 maxv Exp $	*/
+/*	$NetBSD: ip_var.h,v 1.125 2018/04/08 12:18:06 maxv Exp $	*/
 /*
  * Copyright (c) 1982, 1986, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -62,28 +62,27 @@ struct ipflow {
 	u_long ipf_uses;		/* number of uses in this period */
 	u_long ipf_last_uses;		/* number of uses in last period */
 	u_long ipf_dropped;		/* ENOBUFS retured by if_output */
 	u_long ipf_errors;		/* other errors returned by if_output */
 	u_int ipf_timer;		/* lifetime timer */
 };
 /*
  * TCP sequence queue structure.
  */
 TAILQ_HEAD(ipqehead, ipqent);
 struct ipqent {
 	TAILQ_ENTRY(ipqent) ipqe_q;
-	struct mbuf	*ipqe_m;	/* point to first mbuf */
+	struct mbuf *ipqe_m;
 	struct mbuf	*ipre_mlast;	/* point to last mbuf */
 	TAILQ_ENTRY(ipqent) ipqe_timeq;
 	u_int32_t ipqe_seq;
 	u_int32_t ipqe_len;
 	u_int32_t ipqe_flags;
 };
 /*
  * Structure stored in mbuf in inpcb.ip_options
  * and passed to ip_output when ip options are in use.
  * The actual length of the options (including ipopt_dst)
  * is in m_len.
  */
 #define	MAX_IPOPTLEN	40

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tcp_input.c,v 1.404 2018/04/03 09:03:59 maxv Exp $	*/
+/*	$NetBSD: tcp_input.c,v 1.405 2018/04/08 12:18:06 maxv Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -138,27 +138,27 @@
  */
 /*
  *	TODO list for SYN cache stuff:
+ *
  *	Find room for a "state" field, which is needed to keep a
  *	compressed state for TIME_WAIT TCBs.  It's been noted already
  *	that this is fairly important for very high-volume web and
  *	mail servers, which use a large number of short-lived
  *	connections.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.404 2018/04/03 09:03:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.405 2018/04/08 12:18:06 maxv Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_inet.h"
 #include "opt_ipsec.h"
 #include "opt_inet_csum.h"
 #include "opt_tcp_debug.h"
 #endif
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/malloc.h>
 #include <sys/mbuf.h>
 #include <sys/protosw.h>
 @@ -395,28 +395,26 @@ extern struct evcnt tcp_reass_fragdup;
 #endif /* TCP_REASS_COUNTERS */
 static int tcp_reass(struct tcpcb *, const struct tcphdr *, struct mbuf *,
     int);
 static int tcp_dooptions(struct tcpcb *, const u_char *, int,
     struct tcphdr *, struct mbuf *, int, struct tcp_opt_info *);
 static void tcp4_log_refused(const struct ip *, const struct tcphdr *);
 #ifdef INET6
 static void tcp6_log_refused(const struct ip6_hdr *, const struct tcphdr *);
 #endif
 #define	TRAVERSE(x) while ((x)->m_next) (x) = (x)->m_next
 #if defined(MBUFTRACE)
 struct mowner tcp_reass_mowner = MOWNER_INIT("tcp", "reass");
 #endif /* defined(MBUFTRACE) */
 static struct pool tcpipqent_pool;
 void
 tcpipqent_init(void)
+{
 	pool_init(&tcpipqent_pool, sizeof(struct ipqent), 0, 0, 0, "tcpipqepl",
 	    NULL, IPL_VM);
+}
 @@ -491,28 +489,27 @@ tcp_reass(struct tcpcb *tp, const struct
 	pkt_len = tlen;
 	pkt_flags = th->th_flags;
 	TCP_REASS_COUNTER_INCR(&tcp_reass_);
 	if ((p = TAILQ_LAST(&tp->segq, ipqehead)) != NULL) {
 		/*
 		 * When we miss a packet, the vast majority of time we get
 		 * packets that follow it in order.  So optimize for that.
 		 */
 		if (pkt_seq == p->ipqe_seq + p->ipqe_len) {
 			p->ipqe_len += pkt_len;
 			p->ipqe_flags |= pkt_flags;
-			m_cat(p->ipre_mlast, m);
+			m_cat(p->ipqe_m, m);
 			TRAVERSE(p->ipre_mlast);
 			m = NULL;
 			tiqe = p;
 			TAILQ_REMOVE(&tp->timeq, p, ipqe_timeq);
 			TCP_REASS_COUNTER_INCR(&tcp_reass_appendtail);
 			goto skip_replacement;
+		}
 		/*
 		 * While we're here, if the pkt is completely beyond
 		 * anything we have, just insert it at the tail.
 		 */
 		if (SEQ_GT(pkt_seq, p->ipqe_seq + p->ipqe_len)) {
 			TCP_REASS_COUNTER_INCR(&tcp_reass_inserttail);
 			goto insert_it;
 @@ -523,28 +520,26 @@ tcp_reass(struct tcpcb *tp, const struct
 	if (q != NULL) {
 		/*
 		 * If this segment immediately precedes the first out-of-order
 		 * block, simply slap the segment in front of it and (mostly)
 		 * skip the complicated logic.
 		 */
 		if (pkt_seq + pkt_len == q->ipqe_seq) {
 			q->ipqe_seq = pkt_seq;
 			q->ipqe_len += pkt_len;
 			q->ipqe_flags |= pkt_flags;
 			m_cat(m, q->ipqe_m);
 			q->ipqe_m = m;
 			q->ipre_mlast = m; /* last mbuf may have changed */
 			TRAVERSE(q->ipre_mlast);
 			tiqe = q;
 			TAILQ_REMOVE(&tp->timeq, q, ipqe_timeq);
 			TCP_REASS_COUNTER_INCR(&tcp_reass_prependfirst);
 			goto skip_replacement;
+		}
 	} else {
 		TCP_REASS_COUNTER_INCR(&tcp_reass_empty);
+	}
 	/*
 	 * Find a segment which begins after this one does.
 	 */
 	for (p = NULL; q != NULL; q = nq) {
 @@ -552,28 +547,27 @@ tcp_reass(struct tcpcb *tp, const struct
 #ifdef TCP_REASS_COUNTERS
 		count++;
 #endif
 		/*
 		 * If the received segment is just right after this
 		 * fragment, merge the two together and then check
 		 * for further overlaps.
 		 */
 		if (q->ipqe_seq + q->ipqe_len == pkt_seq) {
 			pkt_len += q->ipqe_len;
 			pkt_flags |= q->ipqe_flags;
 			pkt_seq = q->ipqe_seq;
-			m_cat(q->ipre_mlast, m);
+			m_cat(q->ipqe_m, m);
 			TRAVERSE(q->ipre_mlast);
 			m = q->ipqe_m;
 			TCP_REASS_COUNTER_INCR(&tcp_reass_append);
 			goto free_ipqe;
+		}
 		/*
 		 * If the received segment is completely past this
 		 * fragment, we need to go to the next fragment.
 		 */
 		if (SEQ_LT(q->ipqe_seq + q->ipqe_len, pkt_seq)) {
 			p = q;
 			continue;
+		}
 @@ -619,28 +613,27 @@ tcp_reass(struct tcpcb *tp, const struct
 			goto free_ipqe;
+		}
 		/*
 		 * Received segment extends past the end of the fragment.
 		 * Drop the overlapping bytes, merge the fragment and
 		 * segment, and treat as a longer received packet.
 		 */
 		if (SEQ_LT(q->ipqe_seq, pkt_seq) &&
 		    SEQ_GT(q->ipqe_seq + q->ipqe_len, pkt_seq))  {
 			int overlap = q->ipqe_seq + q->ipqe_len - pkt_seq;
 			m_adj(m, overlap);
 			rcvpartdupbyte += overlap;
-			m_cat(q->ipre_mlast, m);
+			m_cat(q->ipqe_m, m);
 			TRAVERSE(q->ipre_mlast);
 			m = q->ipqe_m;
 			pkt_seq = q->ipqe_seq;
 			pkt_len += q->ipqe_len - overlap;
 			rcvoobyte -= overlap;
 			TCP_REASS_COUNTER_INCR(&tcp_reass_overlaptail);
 			goto free_ipqe;
+		}
 		/*
 		 * Received segment extends past the front of the fragment.
 		 * Drop the overlapping bytes on the received packet. The
 		 * packet will then be concatenated with this fragment a
 		 * bit later.
 @@ -740,27 +733,26 @@ insert_it:
 	tcps = TCP_STAT_GETREF();
 	tcps[TCP_STAT_RCVOOPACK]++;
 	tcps[TCP_STAT_RCVOOBYTE] += rcvoobyte;
 	if (rcvpartdupbyte) {
 	    tcps[TCP_STAT_RCVPARTDUPPACK]++;
 	    tcps[TCP_STAT_RCVPARTDUPBYTE] += rcvpartdupbyte;
+	}
 	TCP_STAT_PUTREF();
 	/*
 	 * Insert the new fragment queue entry into both queues.
 	 */
 	tiqe->ipqe_m = m;
 	tiqe->ipre_mlast = m;
 	tiqe->ipqe_seq = pkt_seq;
 	tiqe->ipqe_len = pkt_len;
 	tiqe->ipqe_flags = pkt_flags;
 	if (p == NULL) {
 		TAILQ_INSERT_HEAD(&tp->segq, tiqe, ipqe_q);
 	} else {
 		TAILQ_INSERT_AFTER(&tp->segq, p, tiqe, ipqe_q);
+	}
 	tp->t_segqlen++;
 skip_replacement:
 	TAILQ_INSERT_HEAD(&tp->timeq, tiqe, ipqe_timeq);