diff options
| author | julian <julian@FreeBSD.org> | 2001-09-07 07:19:12 +0000 |
|---|---|---|
| committer | julian <julian@FreeBSD.org> | 2001-09-07 07:19:12 +0000 |
| commit | 3cc9960fd1b52e850d61e0fdab1cf2cb1a9f3735 (patch) | |
| tree | d013f55450d9cf7688fbd35f24d13797e19ae112 /sys/netinet6/ipcomp_input.c | |
| parent | f307b418db18dcf0791a53a9429ff162625fbd9c (diff) | |
| download | FreeBSD-src-3cc9960fd1b52e850d61e0fdab1cf2cb1a9f3735.zip FreeBSD-src-3cc9960fd1b52e850d61e0fdab1cf2cb1a9f3735.tar.gz | |
Patches from KAME to remove usage of Varargs in existing
IPV4 code. For now they will still have some in the developing stuff (IPv6)
Submitted by: Keiichi SHIMA / <keiichi@iij.ad.jp>
Obtained from: KAME
Diffstat (limited to 'sys/netinet6/ipcomp_input.c')
| -rw-r--r-- | sys/netinet6/ipcomp_input.c | 17 |
1 files changed, 4 insertions, 13 deletions
diff --git a/sys/netinet6/ipcomp_input.c b/sys/netinet6/ipcomp_input.c index f3143d2..ece1603 100644 --- a/sys/netinet6/ipcomp_input.c +++ b/sys/netinet6/ipcomp_input.c @@ -86,13 +86,9 @@ extern struct protosw inetsw[]; void -#if __STDC__ -ipcomp4_input(struct mbuf *m, ...) -#else -ipcomp4_input(m, va_alist) +ipcomp4_input(m, off) struct mbuf *m; - va_dcl -#endif + int off; { struct mbuf *md; struct ip *ip; @@ -104,13 +100,7 @@ ipcomp4_input(m, va_alist) int error; size_t newlen, olen; struct secasvar *sav = NULL; - int off, proto; - va_list ap; - - va_start(ap, m); - off = va_arg(ap, int); - proto = mtod(m, struct ip *)->ip_p; - va_end(ap); + int proto; if (m->m_pkthdr.len < off + sizeof(struct ipcomp)) { ipseclog((LOG_DEBUG, "IPv4 IPComp input: assumption failed " @@ -129,6 +119,7 @@ ipcomp4_input(m, va_alist) } 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; |
