Fix a KASSERT from r212803 to check the correct length also in case of

IPsec being compiled in and used.  Improve reporting by adding the length
fields to the panic message, so that we would have some immediate debugging
hints.

Discussed with:	jhb

This commit is contained in:

Bjoern A. Zeeb

2011-06-20 07:07:18 +00:00

parent 16f7d82285

commit 75497cc5eb

1 changed files with 8 additions and 1 deletions

									
										sys/netinet/tcp_output.c
									
		+8
		-1
	
												View File
												
				@@ -1102,8 +1102,15 @@ tcp_output(struct tcpcb *tp)

						m->m_pkthdr.tso_segsz = tp->t_maxopd - optlen;

					}

				#ifdef IPSEC

					KASSERT(len + hdrlen + ipoptlen - ipsec_optlen == m_length(m, NULL),

					    ("%s: mbuf chain shorter than expected: %ld + %u + %u - %u != %u",

					    __func__, len, hdrlen, ipoptlen, ipsec_optlen, m_length(m, NULL)));

				#else

					KASSERT(len + hdrlen + ipoptlen == m_length(m, NULL),

					    ("%s: mbuf chain shorter than expected", __func__));

					    ("%s: mbuf chain shorter than expected: %ld + %u + %u != %u",

					    __func__, len, hdrlen, ipoptlen, m_length(m, NULL)));

				#endif

					/*

					 * In transmit state, time the transmission and arrange for