summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sys/net/if_gre.c4
-rw-r--r--sys/net/pf.c5
-rw-r--r--sys/netinet/igmp.c4
-rw-r--r--sys/netinet/in_gif.c4
-rw-r--r--sys/netinet/ip_icmp.c4
-rw-r--r--sys/netinet/ip_input.c4
-rw-r--r--sys/netinet/ip_mroute.c6
-rw-r--r--sys/netinet/ipsec_output.c4
-rw-r--r--sys/netinet/tcp_output.c4
-rw-r--r--sys/netinet/tcp_subr.c7
-rw-r--r--sys/netinet/udp_usrreq.c4
-rw-r--r--sys/netipx/ipx_ip.c4
-rw-r--r--sys/netiso/if_eon.c4
-rw-r--r--sys/netiso/tp_inet.c4
-rw-r--r--sys/netns/ns_ip.c4
15 files changed, 33 insertions, 33 deletions
diff --git a/sys/net/if_gre.c b/sys/net/if_gre.c
index 47c5f62aba9..85194a8963b 100644
--- a/sys/net/if_gre.c
+++ b/sys/net/if_gre.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_gre.c,v 1.23 2002/06/30 13:04:36 itojun Exp $ */
+/* $OpenBSD: if_gre.c,v 1.24 2002/08/28 15:43:02 pefo Exp $ */
/* $NetBSD: if_gre.c,v 1.9 1999/10/25 19:18:11 drochner Exp $ */
/*
@@ -385,7 +385,7 @@ gre_output(struct ifnet *ifp, struct mbuf *m, struct sockaddr *dst,
ifp->if_obytes += m->m_pkthdr.len;
/* Send it off */
- error = ip_output(m, NULL, &sc->route, 0, NULL, NULL);
+ error = ip_output(m, (void *)NULL, &sc->route, 0, (void *)NULL, (void *)NULL);
end:
if (error)
ifp->if_oerrors++;
diff --git a/sys/net/pf.c b/sys/net/pf.c
index 4a000063ce6..042a7495b07 100644
--- a/sys/net/pf.c
+++ b/sys/net/pf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf.c,v 1.242 2002/08/12 16:41:25 dhartmei Exp $ */
+/* $OpenBSD: pf.c,v 1.243 2002/08/28 15:43:02 pefo Exp $ */
/*
* Copyright (c) 2001 Daniel Hartmeier
@@ -1205,7 +1205,8 @@ pf_send_reset(int off, struct tcphdr *th, struct pf_pdesc *pd, int af,
h2->ip_sum = 0;
h2->ip_len = len;
h2->ip_off = ip_mtudisc ? IP_DF : 0;
- ip_output(m, NULL, NULL, 0, NULL, NULL);
+ ip_output(m, (void *)NULL, (void *)NULL, 0, (void *)NULL,
+ (void *)NULL);
break;
#endif /* INET */
#ifdef INET6
diff --git a/sys/netinet/igmp.c b/sys/netinet/igmp.c
index fea0c69bda1..db98e185411 100644
--- a/sys/netinet/igmp.c
+++ b/sys/netinet/igmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: igmp.c,v 1.15 2002/06/09 16:26:10 itojun Exp $ */
+/* $OpenBSD: igmp.c,v 1.16 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: igmp.c,v 1.15 1996/02/13 23:41:25 christos Exp $ */
/*
@@ -552,7 +552,7 @@ igmp_sendpkt(inm, type, addr)
#endif /* MROUTING */
ip_output(m, (struct mbuf *)0, (struct route *)0, IP_MULTICASTOPTS,
- &imo, NULL);
+ &imo, (void *)NULL);
++igmpstat.igps_snd_reports;
}
diff --git a/sys/netinet/in_gif.c b/sys/netinet/in_gif.c
index 3583403749e..2b8372a7b7b 100644
--- a/sys/netinet/in_gif.c
+++ b/sys/netinet/in_gif.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in_gif.c,v 1.25 2002/06/09 16:26:10 itojun Exp $ */
+/* $OpenBSD: in_gif.c,v 1.26 2002/08/28 15:43:03 pefo Exp $ */
/* $KAME: in_gif.c,v 1.50 2001/01/22 07:27:16 itojun Exp $ */
/*
@@ -156,7 +156,7 @@ in_gif_output(ifp, family, m, rt)
m_copyback(m, offsetof(struct ip, ip_len), sizeof(u_int16_t),
(caddr_t) &plen);
- return ip_output(m, NULL, NULL, 0, NULL, NULL);
+ return ip_output(m, (void *)NULL, (void *)NULL, 0, (void *)NULL, (void *)NULL);
}
void
diff --git a/sys/netinet/ip_icmp.c b/sys/netinet/ip_icmp.c
index af50040940a..b3e8beb3a5e 100644
--- a/sys/netinet/ip_icmp.c
+++ b/sys/netinet/ip_icmp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_icmp.c,v 1.52 2002/06/10 09:13:26 itojun Exp $ */
+/* $OpenBSD: ip_icmp.c,v 1.53 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: ip_icmp.c,v 1.19 1996/02/13 23:42:22 christos Exp $ */
/*
@@ -791,7 +791,7 @@ icmp_send(m, opts)
buf, inet_ntoa(ip->ip_src));
}
#endif
- (void) ip_output(m, opts, NULL, 0, NULL, NULL);
+ (void) ip_output(m, opts, (void *)NULL, 0, (void *)NULL, (void *)NULL);
}
n_time
diff --git a/sys/netinet/ip_input.c b/sys/netinet/ip_input.c
index d520ca07a97..44d4d989666 100644
--- a/sys/netinet/ip_input.c
+++ b/sys/netinet/ip_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_input.c,v 1.105 2002/07/03 21:19:08 miod Exp $ */
+/* $OpenBSD: ip_input.c,v 1.106 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: ip_input.c,v 1.30 1996/03/16 23:53:58 christos Exp $ */
/*
@@ -1513,7 +1513,7 @@ ip_forward(m, srcrt)
error = ip_output(m, (struct mbuf *)0, &ipforward_rt,
(IP_FORWARDING | (ip_directedbcast ? IP_ALLOWBROADCAST : 0)),
- 0, NULL, NULL);
+ 0, (void *)NULL, (void *)NULL);
if (error)
ipstat.ips_cantforward++;
else {
diff --git a/sys/netinet/ip_mroute.c b/sys/netinet/ip_mroute.c
index a379fcb5bfb..36aa36caf3e 100644
--- a/sys/netinet/ip_mroute.c
+++ b/sys/netinet/ip_mroute.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip_mroute.c,v 1.27 2002/07/31 04:05:57 itojun Exp $ */
+/* $OpenBSD: ip_mroute.c,v 1.28 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: ip_mroute.c,v 1.27 1996/05/07 02:40:50 thorpej Exp $ */
/*
@@ -1747,7 +1747,7 @@ tbf_send_packet(vifp,m)
if (vifp->v_flags & VIFF_TUNNEL) {
/* If tunnel options */
ip_output(m, (struct mbuf *)0, &vifp->v_route,
- IP_FORWARDING, NULL, NULL);
+ IP_FORWARDING, (void *)NULL, (void *)NULL);
} else {
/* if physical interface option, extract the options and then send */
struct ip *ip = mtod(m, struct ip *);
@@ -1760,7 +1760,7 @@ tbf_send_packet(vifp,m)
#endif
error = ip_output(m, (struct mbuf *)0, (struct route *)0,
- IP_FORWARDING|IP_MULTICASTOPTS, &imo, NULL);
+ IP_FORWARDING|IP_MULTICASTOPTS, &imo, (void *)NULL);
if (mrtdebug & DEBUG_XMIT)
log(LOG_DEBUG, "phyint_send on vif %d err %d\n", vifp-viftable, error);
}
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c
index d9fcce7c4fb..719e707a839 100644
--- a/sys/netinet/ipsec_output.c
+++ b/sys/netinet/ipsec_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec_output.c,v 1.24 2002/07/01 18:29:28 angelos Exp $ */
+/* $OpenBSD: ipsec_output.c,v 1.25 2002/08/28 15:43:03 pefo Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
*
@@ -410,7 +410,7 @@ ipsp_process_done(struct mbuf *m, struct tdb *tdb)
NTOHS(ip->ip_len);
NTOHS(ip->ip_off);
- return ip_output(m, NULL, NULL, IP_RAWOUTPUT, NULL, NULL);
+ return ip_output(m, (void *)NULL, (void *)NULL, IP_RAWOUTPUT, (void *)NULL, (void *)NULL);
#endif /* INET */
#ifdef INET6
diff --git a/sys/netinet/tcp_output.c b/sys/netinet/tcp_output.c
index 1b4897d9ae1..5523f172ec8 100644
--- a/sys/netinet/tcp_output.c
+++ b/sys/netinet/tcp_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_output.c,v 1.52 2002/06/09 16:26:11 itojun Exp $ */
+/* $OpenBSD: tcp_output.c,v 1.53 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: tcp_output.c,v 1.16 1997/06/03 16:17:09 kml Exp $ */
/*
@@ -1111,7 +1111,7 @@ send:
&tp->t_inpcb->inp_route,
(ip_mtudisc ? IP_MTUDISC : 0) |
(so->so_options & SO_DONTROUTE),
- 0, tp->t_inpcb);
+ (void *)NULL, tp->t_inpcb);
break;
#endif /* INET */
#ifdef INET6
diff --git a/sys/netinet/tcp_subr.c b/sys/netinet/tcp_subr.c
index 0224280f9e1..ec6a6d9e0e1 100644
--- a/sys/netinet/tcp_subr.c
+++ b/sys/netinet/tcp_subr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_subr.c,v 1.64 2002/06/09 16:26:11 itojun Exp $ */
+/* $OpenBSD: tcp_subr.c,v 1.65 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: tcp_subr.c,v 1.22 1996/02/13 23:44:00 christos Exp $ */
/*
@@ -454,9 +454,8 @@ tcp_respond(tp, template, m, ack, seq, flags)
th->th_sum = in_cksum(m, tlen);
((struct ip *)ti)->ip_len = tlen;
((struct ip *)ti)->ip_ttl = ip_defttl;
- ip_output(m, NULL, ro, ip_mtudisc ? IP_MTUDISC : 0, NULL,
- tp ? tp->t_inpcb : NULL);
- break;
+ ip_output(m, (void *)NULL, ro, ip_mtudisc ? IP_MTUDISC : 0,
+ (void *)NULL, tp ? tp->t_inpcb : (void *)NULL);
}
}
diff --git a/sys/netinet/udp_usrreq.c b/sys/netinet/udp_usrreq.c
index 342c9551339..094fcdbc17b 100644
--- a/sys/netinet/udp_usrreq.c
+++ b/sys/netinet/udp_usrreq.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: udp_usrreq.c,v 1.85 2002/08/19 02:31:02 itojun Exp $ */
+/* $OpenBSD: udp_usrreq.c,v 1.86 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: udp_usrreq.c,v 1.28 1996/03/16 23:54:03 christos Exp $ */
/*
@@ -970,7 +970,7 @@ udp_output(struct mbuf *m, ...)
udpstat.udps_opackets++;
error = ip_output(m, inp->inp_options, &inp->inp_route,
inp->inp_socket->so_options & (SO_DONTROUTE | SO_BROADCAST),
- inp->inp_moptions, inp, NULL);
+ inp->inp_moptions, inp, (void *)NULL);
bail:
if (addr) {
diff --git a/sys/netipx/ipx_ip.c b/sys/netipx/ipx_ip.c
index a01098637c4..782980532b1 100644
--- a/sys/netipx/ipx_ip.c
+++ b/sys/netipx/ipx_ip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipx_ip.c,v 1.11 2001/09/23 10:22:13 mickey Exp $ */
+/* $OpenBSD: ipx_ip.c,v 1.12 2002/08/28 15:43:03 pefo Exp $ */
/*-
*
@@ -300,7 +300,7 @@ ipxipoutput(ifp, m, dst, rt)
/*
* Output final datagram.
*/
- error = (ip_output(m, (struct mbuf *)0, ro, SO_BROADCAST, NULL));
+ error = (ip_output(m, (struct mbuf *)0, ro, SO_BROADCAST, (void *)NULL), (void *)NULL);
if (error) {
ifn->ifen_ifnet.if_oerrors++;
ifn->ifen_ifnet.if_ierrors = error;
diff --git a/sys/netiso/if_eon.c b/sys/netiso/if_eon.c
index c01712b8f41..5a458b98f27 100644
--- a/sys/netiso/if_eon.c
+++ b/sys/netiso/if_eon.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_eon.c,v 1.16 2002/07/31 00:13:37 itojun Exp $ */
+/* $OpenBSD: if_eon.c,v 1.17 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: if_eon.c,v 1.15 1996/05/09 22:29:37 scottr Exp $ */
/*-
@@ -433,7 +433,7 @@ send:
}
#endif
- error = ip_output(m, (struct mbuf *) 0, ro, 0, NULL);
+ error = ip_output(m, (struct mbuf *) 0, ro, (void *)NULL, (void *)NULL);
m = 0;
if (error) {
ifp->if_oerrors++;
diff --git a/sys/netiso/tp_inet.c b/sys/netiso/tp_inet.c
index 73e9de88491..98e9a5b7151 100644
--- a/sys/netiso/tp_inet.c
+++ b/sys/netiso/tp_inet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tp_inet.c,v 1.9 2002/03/26 19:12:56 niklas Exp $ */
+/* $OpenBSD: tp_inet.c,v 1.10 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: tp_inet.c,v 1.11 1996/03/16 23:13:49 christos Exp $ */
/*-
@@ -468,7 +468,7 @@ tpip_output_dg(struct mbuf *m0, ...)
}
#endif
- error = ip_output(m, (struct mbuf *) 0, ro, IP_ALLOWBROADCAST, NULL);
+ error = ip_output(m, (struct mbuf *)0, ro, IP_ALLOWBROADCAST, (void *)NULL, (void *)NULL);
#ifdef ARGO_DEBUG
if (argo_debug[D_EMIT]) {
diff --git a/sys/netns/ns_ip.c b/sys/netns/ns_ip.c
index 47b25f59825..a8b70e1f598 100644
--- a/sys/netns/ns_ip.c
+++ b/sys/netns/ns_ip.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ns_ip.c,v 1.14 2001/06/27 03:49:55 angelos Exp $ */
+/* $OpenBSD: ns_ip.c,v 1.15 2002/08/28 15:43:03 pefo Exp $ */
/* $NetBSD: ns_ip.c,v 1.16 1996/05/09 22:29:40 scottr Exp $ */
/*
@@ -310,7 +310,7 @@ nsipoutput(ifp, m, dst, rt)
/*
* Output final datagram.
*/
- error = (ip_output(m, (struct mbuf *)0, &ro, SO_BROADCAST, NULL));
+ error = (ip_output(m, (struct mbuf *)0, &ro, SO_BROADCAST, (void *)NULL, (void *)NULL));
if (error) {
ifn->ifen_ifnet.if_oerrors++;
ifn->ifen_ifnet.if_ierrors = error;
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 15:57:10 +0000