diff options
| author | brian <brian@FreeBSD.org> | 2002-05-07 12:48:45 +0000 |
|---|---|---|
| committer | brian <brian@FreeBSD.org> | 2002-05-07 12:48:45 +0000 |
| commit | 87ffeeba8ef8aefeffe3bd992e8c4e89383b9ffa (patch) | |
| tree | 37a1382b3e0508b5c7c1c2ab8fba6c54f7111896 /usr.sbin/ppp | |
| parent | 134cdd39a6f72b435b400e01490ae945f3c6f73c (diff) | |
| download | FreeBSD-src-87ffeeba8ef8aefeffe3bd992e8c4e89383b9ffa.zip FreeBSD-src-87ffeeba8ef8aefeffe3bd992e8c4e89383b9ffa.tar.gz | |
Don't corrupt MP fragments when they're put back on the front of our
inbound queue.
Submitted by: "Amit K. Rao" <arao@niksun.com>
PR: 37813
MFC after: 1 week
Also fix a typo while I'm here.
Diffstat (limited to 'usr.sbin/ppp')
| -rw-r--r-- | usr.sbin/ppp/mp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/usr.sbin/ppp/mp.c b/usr.sbin/ppp/mp.c index d822517..bb26877 100644 --- a/usr.sbin/ppp/mp.c +++ b/usr.sbin/ppp/mp.c @@ -543,9 +543,6 @@ mp_Assemble(struct mp *mp, struct mbuf *m, struct physical *p) len = mp_ReadHeader(mp, *frag, &h); if (first == -1) first = h.seq; - (*frag)->m_offset += len; - (*frag)->m_len -= len; - (*frag)->m_nextpkt = NULL; if (frag == &q && !h.begin) { log_Printf(LogWARN, "Oops - MP frag %lu should have a begin flag\n", (u_long)h.seq); @@ -556,7 +553,7 @@ mp_Assemble(struct mp *mp, struct mbuf *m, struct physical *p) (u_long)h.seq - 1); /* * Stuff our fragment back at the front of the queue and zap - * our half-assembed packet. + * our half-assembled packet. */ (*frag)->m_nextpkt = mp->inbufs; mp->inbufs = *frag; @@ -565,10 +562,14 @@ mp_Assemble(struct mp *mp, struct mbuf *m, struct physical *p) q = NULL; frag = &q; h.end = 0; /* just in case it's a whole packet */ - } else + } else { + (*frag)->m_offset += len; + (*frag)->m_len -= len; + (*frag)->m_nextpkt = NULL; do frag = &(*frag)->m_next; while (*frag != NULL); + } } while (!h.end); if (q) { |
