diff options
| author |   pascoe <pascoe@openbsd.org> | 2006-06-15 10:08:34 +0000 |
|---|---|---|
| committer | pascoe <pascoe@openbsd.org> | 2006-06-15 10:08:34 +0000 |
| commit | 7d15f38ac9148b81890aedec9e0ef43eef7e43b4 (patch) | |
| tree | 120f32036d0502de64d15eb3949a9e4082c4cfc6 | |
| parent | Use new struct ctl_show_rib_request for show rib requests. OK henning@ (diff) | |
| download | wireguard-openbsd-7d15f38ac9148b81890aedec9e0ef43eef7e43b4.tar.xz wireguard-openbsd-7d15f38ac9148b81890aedec9e0ef43eef7e43b4.zip | |
Make number of varargs passed to ip_output match reality.
henning@ claudio@ ok
| -rw-r--r-- | sys/netinet/ip_input.c | 6 | ||||
| -rw-r--r-- | sys/netinet/udp_usrreq.c | 4 | ||||
| -rw-r--r-- | sys/netipx/ipx_ip.c | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c index 160fac4048d..abaef2d5bf6 100644 --- a/sys/netinet/ip_input.c +++ b/sys/netinet/ip_input.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_input.c,v 1.139 2006/05/29 20:42:27 claudio Exp $ */ +/* $OpenBSD: ip_input.c,v 1.140 2006/06/15 10:08:34 pascoe Exp $ */ /* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */ /* @@ -1488,9 +1488,9 @@ ip_forward(m, srcrt) } } - error = ip_output(m, (struct mbuf *)0, &ipforward_rt, + error = ip_output(m, (struct mbuf *)NULL, &ipforward_rt, (IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)), - 0, (void *)NULL, (void *)NULL); + (void *)NULL, (void *)NULL); if (error) ipstat.ips_cantforward++; else { diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c index d29e3674852..74566e38954 100644 --- a/sys/netinet/udp_usrreq.c +++ b/sys/netinet/udp_usrreq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: udp_usrreq.c,v 1.108 2006/05/29 20:42:27 claudio Exp $ */ +/* $OpenBSD: udp_usrreq.c,v 1.109 2006/06/15 10:12:36 pascoe Exp $ */ /* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */ /* @@ -963,7 +963,7 @@ udp_output(struct mbuf *m, ...) error = ip_output(m, inp->inp_options, &inp->inp_route, inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST | SO_JUMBO), - inp->inp_moptions, inp, (void *)NULL); + inp->inp_moptions, inp); bail: if (addr) { diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c index 1855c21134f..738ecb744d0 100644 --- a/sys/netipx/ipx_ip.c +++ b/sys/netipx/ipx_ip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipx_ip.c,v 1.21 2006/03/05 21:48:57 miod Exp $ */ +/* $OpenBSD: ipx_ip.c,v 1.22 2006/06/15 10:08:34 pascoe Exp $ */ /*- * @@ -300,7 +300,7 @@ ipxipoutput(ifp, m, dst, rt) /* * Output final datagram. */ - error = ip_output(m, NULL, ro, SO_BROADCAST, NULL, NULL, NULL); + error = ip_output(m, NULL, ro, SO_BROADCAST, NULL, NULL); if (error) { ifn->ifen_ifnet.if_oerrors++; ifn->ifen_ifnet.if_ierrors = error; |