diff options
author | ume <ume@FreeBSD.org> | 2003-10-09 18:44:54 +0000 |
---|---|---|
committer | ume <ume@FreeBSD.org> | 2003-10-09 18:44:54 +0000 |
commit | 4ce3fa6f533f5d63a67fba7ffdf5771c7f13ed7b (patch) | |
tree | ef2427c092eafd80b2c0ce89d758a1a5352b9dbd /sys/netinet6/ipcomp_input.c | |
parent | d276421cb6698ad87fe6ddcaef3323f0f2d09336 (diff) | |
download | FreeBSD-src-4ce3fa6f533f5d63a67fba7ffdf5771c7f13ed7b.zip FreeBSD-src-4ce3fa6f533f5d63a67fba7ffdf5771c7f13ed7b.tar.gz |
- typo. found by markus@openbsd
- correct signedness mixup in pointer passing.
- drop meaningless variable.
Obtained from: KAME
Diffstat (limited to 'sys/netinet6/ipcomp_input.c')
-rw-r--r-- | sys/netinet6/ipcomp_input.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet6/ipcomp_input.c b/sys/netinet6/ipcomp_input.c index da30519..ca4f808 100644 --- a/sys/netinet6/ipcomp_input.c +++ b/sys/netinet6/ipcomp_input.c @@ -100,7 +100,6 @@ ipcomp4_input(m, off) int error; size_t newlen, olen; struct secasvar *sav = NULL; - int proto; if (m->m_pkthdr.len < off + sizeof(struct ipcomp)) { ipseclog((LOG_DEBUG, "IPv4 IPComp input: assumption failed " @@ -110,7 +109,7 @@ ipcomp4_input(m, off) } md = m_pulldown(m, off, sizeof(*ipcomp), NULL); - if (!m) { + if (!md) { m = NULL; /* already freed */ ipseclog((LOG_DEBUG, "IPv4 IPComp input: assumption failed " "(pulldown failure)\n")); @@ -119,7 +118,6 @@ ipcomp4_input(m, off) } ipcomp = mtod(md, struct ipcomp *); ip = mtod(m, struct ip *); - proto = ip->ip_p; nxt = ipcomp->comp_nxt; #ifdef _IP_VHL hlen = IP_VHL_HL(ip->ip_vhl) << 2; @@ -254,7 +252,7 @@ ipcomp6_input(mp, offp, proto) int error; size_t newlen; struct secasvar *sav = NULL; - char *prvnxtp; + u_int8_t *prvnxtp; m = *mp; off = *offp; |