diff options
| author | cmetz <cmetz@cvs.openbsd.org> | 1999-07-28 05:37:19 +0000 |
|---|---|---|
| committer | cmetz <cmetz@cvs.openbsd.org> | 1999-07-28 05:37:19 +0000 |
| commit | dee74378496f9ed82d21a891e6e0eae68b236284 (patch) | |
| tree | aa45a7ec4a6161318c40527e6183cfa8ec88e2cc /sys | |
| parent | 0a84ea57db5e9cc22e332c915bb1cb244d7c3751 (diff) | |
Moved the m_data/m_len shave of IP and TCP headers back to its original
location, as attempts to do it differently have caused too many problems.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/netinet/tcp_input.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index 48657232bbf..6905966ebf4 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tcp_input.c,v 1.44 1999/07/22 17:14:18 niklas Exp $ */ +/* $OpenBSD: tcp_input.c,v 1.45 1999/07/28 05:37:18 cmetz Exp $ */ /* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */ /* @@ -893,6 +893,12 @@ findpcb: } /* + * Drop TCP, IP headers and TCP options. + */ + m->m_data += iphlen + off; + m->m_len -= iphlen + off; + + /* * Calculate amount of space in receive window, * and then do TCP input processing. * Receive window is amount of space in rcv queue, @@ -1953,13 +1959,6 @@ step6: if (SEQ_GT(tp->rcv_nxt, tp->rcv_up)) tp->rcv_up = tp->rcv_nxt; dodata: /* XXX */ - - /* - * Drop TCP, IP headers and TCP options. - */ - m->m_data += iphlen + off; - m->m_len -= iphlen + off; - /* * Process the segment text, merging it into the TCP sequencing queue, * and arranging for acknowledgment of receipt if necessary. |