diff options
| author | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-25 17:34:32 +0000 |
|---|---|---|
| committer | Alexander Bluhm <bluhm@cvs.openbsd.org> | 2017-01-25 17:34:32 +0000 |
| commit | 759669db69ca341876a0af1e0abc98af49c4a3d8 (patch) | |
| tree | be8139d53bbf33aefbe757800ac18ac4137c34b6 /sys/netinet/udp_usrreq.c | |
| parent | fb34f730610f368d97d9636e7f5714656e624c8c (diff) | |
Since raw_input() and route_input() are gone from pr_input, we can
make the variable parameters of the protocol input functions fixed.
Also add the proto to make it similar to IPv6.
OK mpi@ guenther@ millert@
Diffstat (limited to 'sys/netinet/udp_usrreq.c')
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index 22e1513cdb2..6020c90a961 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.226 2016/12/19 15:47:19 mpi Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.227 2017/01/25 17:34:31 bluhm Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -159,15 +159,14 @@ udp6_input(struct mbuf **mp, int *offp, int proto) #endif void -udp_input(struct mbuf *m, ...) +udp_input(struct mbuf *m, int iphlen, int proto) { struct ip *ip; struct udphdr *uh; struct inpcb *inp = NULL; struct mbuf *opts = NULL; struct ip save_ip; - int iphlen, len; - va_list ap; + int len; u_int16_t savesum; union { struct sockaddr sa; @@ -189,10 +188,6 @@ udp_input(struct mbuf *m, ...) u_int32_t ipsecflowinfo = 0; #endif /* define(IPSEC) || defined(PIPEX) */ - va_start(ap, m); - iphlen = va_arg(ap, int); - va_end(ap); - udpstat_inc(udps_ipackets); switch (mtod(m, struct ip *)->ip_v) { |