diff options
29 files changed, 114 insertions, 81 deletions
diff --git a/contrib/libpcap/nametoaddr.c b/contrib/libpcap/nametoaddr.c index 7e67063..6e50138 100644 --- a/contrib/libpcap/nametoaddr.c +++ b/contrib/libpcap/nametoaddr.c @@ -30,6 +30,7 @@ static char rcsid[] = #include <sys/param.h> #include <sys/types.h> /* concession to AIX */ #include <sys/socket.h> +#include <sys/time.h> #if __STDC__ struct mbuf; diff --git a/libexec/bootpd/getether.c b/libexec/bootpd/getether.c index c396c81..dc3a88c 100644 --- a/libexec/bootpd/getether.c +++ b/libexec/bootpd/getether.c @@ -7,7 +7,7 @@ * If you figure out how to do this on another system, * please let me know. <gwr@mc.com> * - * $Id$ + * $Id: getether.c,v 1.4 1996/09/22 21:52:09 wosch Exp $ */ #include <sys/types.h> @@ -111,6 +111,7 @@ getether(ifname, eap) #if defined(__FreeBSD__) || defined(__NetBSD__) /* Thanks to John Brezak <brezak@ch.hp.com> for this code. */ #include <sys/ioctl.h> +#include <sys/time.h> #include <net/if.h> #include <net/if_dl.h> #include <net/if_types.h> diff --git a/libexec/bootpd/getif.c b/libexec/bootpd/getif.c index eeff50f..2d72909 100644 --- a/libexec/bootpd/getif.c +++ b/libexec/bootpd/getif.c @@ -1,7 +1,7 @@ /* * getif.c : get an interface structure * - * $Id$ + * $Id: getif.c,v 1.3 1996/09/22 21:52:12 wosch Exp $ */ #include <sys/types.h> @@ -15,9 +15,7 @@ #include <sys/stropts.h> #endif -#ifdef _AIX32 #include <sys/time.h> /* for struct timeval in net/if.h */ -#endif #include <net/if.h> /* for struct ifreq */ #include <netinet/in.h> diff --git a/libexec/bootpd/lookup.c b/libexec/bootpd/lookup.c index ed1a27c..b5b51b5 100644 --- a/libexec/bootpd/lookup.c +++ b/libexec/bootpd/lookup.c @@ -1,15 +1,13 @@ /* * lookup.c - Lookup IP address, HW address, netmask * - * $Id$ + * $Id: lookup.c,v 1.2 1996/09/22 21:52:21 wosch Exp $ */ #include <sys/types.h> #include <sys/socket.h> -#ifdef _AIX32 #include <sys/time.h> /* for struct timeval in net/if.h */ -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/libexec/bootpd/rtmsg.c b/libexec/bootpd/rtmsg.c index 5942b22..0338a95 100644 --- a/libexec/bootpd/rtmsg.c +++ b/libexec/bootpd/rtmsg.c @@ -39,7 +39,7 @@ /* * from arp.c 8.2 (Berkeley) 1/2/94 - * $Id: rtmsg.c,v 1.3 1995/01/30 11:11:43 dfr Exp $ + * $Id: rtmsg.c,v 1.4 1995/05/30 05:45:49 rgrimes Exp $ */ #include <sys/param.h> @@ -51,6 +51,7 @@ #include <sys/socket.h> #include <sys/filio.h> +#include <sys/time.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/libexec/bootpd/tools/bootptest/print-bootp.c b/libexec/bootpd/tools/bootptest/print-bootp.c index 8390321..b51f42c 100644 --- a/libexec/bootpd/tools/bootptest/print-bootp.c +++ b/libexec/bootpd/tools/bootptest/print-bootp.c @@ -23,7 +23,7 @@ * This file was copied from tcpdump-2.1.1 and modified. * There is an e-mail list for tcpdump: <tcpdump@ee.lbl.gov> * - * $Id$ + * $Id: print-bootp.c,v 1.2 1996/09/22 21:52:58 wosch Exp $ */ #include <stdio.h> @@ -32,9 +32,7 @@ #include <sys/types.h> #include <sys/socket.h> -#ifdef _AIX32 #include <sys/time.h> /* for struct timeval in net/if.h */ -#endif #include <net/if.h> #include <netinet/in.h> diff --git a/libexec/rbootd/bpf.c b/libexec/rbootd/bpf.c index c39150c..4b24aa4 100644 --- a/libexec/rbootd/bpf.c +++ b/libexec/rbootd/bpf.c @@ -39,7 +39,7 @@ * SUCH DAMAGE. * * @(#)bpf.c 8.1 (Berkeley) 6/4/93 - * $Id$ + * $Id: bpf.c,v 1.3 1996/09/22 21:54:25 wosch Exp $ * * Utah $Hdr: bpf.c 3.1 92/07/06$ * Author: Jeff Forys, University of Utah CSS @@ -52,6 +52,7 @@ static char sccsid[] = "@(#)bpf.c 8.1 (Berkeley) 6/4/93"; #include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> +#include <sys/time.h> #include <net/if.h> #include <net/bpf.h> diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index f23e66d..0bd94ea 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -42,13 +42,14 @@ static const char copyright[] = static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94"; */ static const char rcsid[] = - "$Id$"; + "$Id: ifconfig.c,v 1.20 1996/11/21 19:36:09 wollman Exp $"; #endif /* not lint */ #include <sys/param.h> #include <sys/ioctl.h> #include <sys/socket.h> #include <sys/sysctl.h> +#include <sys/time.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/sbin/ipfw/ipfw.c b/sbin/ipfw/ipfw.c index b97d38f..7487b21 100644 --- a/sbin/ipfw/ipfw.c +++ b/sbin/ipfw/ipfw.c @@ -16,22 +16,26 @@ * * NEW command line interface for IP firewall facility * - * $Id: ipfw.c,v 1.33 1996/08/31 17:58:23 nate Exp $ + * $Id: ipfw.c,v 1.34 1996/10/17 01:05:03 alex Exp $ * */ -#include <stdio.h> +#include <sys/types.h> +#include <sys/queue.h> +#include <sys/socket.h> +#include <sys/sockio.h> +#include <sys/time.h> + #include <ctype.h> #include <err.h> -#include <unistd.h> -#include <string.h> -#include <stdlib.h> -#include <netdb.h> #include <limits.h> +#include <netdb.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> #include <time.h> -#include <sys/queue.h> -#include <sys/socket.h> -#include <sys/sockio.h> +#include <unistd.h> + #include <net/if.h> #include <netinet/in.h> #include <netinet/ip_fw.h> diff --git a/sbin/route/route.c b/sbin/route/route.c index 84dee1d..339d841 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -43,7 +43,7 @@ static const char copyright[] = static char sccsid[] = "@(#)route.c 8.3 (Berkeley) 3/19/94"; */ static const char rcsid[] = - "$Id: route.c,v 1.16 1996/10/27 17:42:14 fenner Exp $"; + "$Id: route.c,v 1.17 1996/11/01 20:30:37 wollman Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -51,6 +51,7 @@ static const char rcsid[] = #include <sys/socket.h> #include <sys/ioctl.h> #include <sys/sysctl.h> +#include <sys/time.h> #include <net/if.h> #include <net/route.h> @@ -69,15 +70,16 @@ static const char rcsid[] = #include <arpa/inet.h> #include <netdb.h> +#include <ctype.h> +#include <err.h> #include <errno.h> -#include <unistd.h> +#include <paths.h> #include <stdio.h> -#include <ctype.h> #include <stdlib.h> #include <string.h> -#include <paths.h> -#include <err.h> #include <sysexits.h> +#include <time.h> +#include <unistd.h> struct keytab { char *kt_cp; diff --git a/sbin/routed/defs.h b/sbin/routed/defs.h index 5dd0b8b..d87029d 100644 --- a/sbin/routed/defs.h +++ b/sbin/routed/defs.h @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)defs.h 8.1 (Berkeley) 6/5/93 - * $Id: defs.h,v 1.2 1996/09/16 17:03:29 wollman Exp $ + * $Id: defs.h,v 1.3 1996/11/19 20:42:11 wollman Exp $ */ /* Definitions for RIPv2 routing process. @@ -77,6 +77,7 @@ #include <sys/ioctl.h> #include <sys/sysctl.h> #include <sys/socket.h> +#include <sys/time.h> #ifdef sgi #include <net/radix.h> #else diff --git a/sbin/slattach/slattach.c b/sbin/slattach/slattach.c index be4bf1a..b500a4b 100644 --- a/sbin/slattach/slattach.c +++ b/sbin/slattach/slattach.c @@ -42,26 +42,29 @@ static char copyright[] = #ifndef lint /*static char sccsid[] = "from: @(#)slattach.c 4.6 (Berkeley) 6/1/90";*/ -static char rcsid[] = "$Id"; +static char rcsid[] = "$Id$"; #endif /* not lint */ #include <sys/param.h> #include <sys/ioctl.h> -#include <termios.h> #include <sys/socket.h> -#include <netinet/in.h> -#include <net/if.h> -#include <net/slip.h> -#include <net/if_slvar.h> -#include <netdb.h> +#include <sys/types.h> + #include <fcntl.h> -#include <stdlib.h> -#include <stdio.h> -#include <unistd.h> +#include <netdb.h> #include <paths.h> -#include <syslog.h> #include <signal.h> +#include <stdio.h> +#include <stdlib.h> #include <strings.h> +#include <syslog.h> +#include <termios.h> +#include <unistd.h> + +#include <netinet/in.h> +#include <net/if.h> +#include <net/slip.h> +#include <net/if_slvar.h> #define DEFAULT_BAUD 9600 diff --git a/sbin/startslip/startslip.c b/sbin/startslip/startslip.c index f5d121b..222d163 100644 --- a/sbin/startslip/startslip.c +++ b/sbin/startslip/startslip.c @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: startslip.c,v 1.17 1995/09/20 04:56:09 ache Exp $ + * $Id: startslip.c,v 1.18 1995/09/27 17:15:37 ache Exp $ */ #ifndef lint @@ -43,25 +43,28 @@ static char copyright[] = static char sccsid[] = "@(#)startslip.c 8.1 (Berkeley) 6/5/93"; #endif /* not lint */ -#include <termios.h> -#include <time.h> -#include <sys/ioctl.h> #include <sys/types.h> +#include <sys/ioctl.h> #include <sys/socket.h> -#include <syslog.h> -#include <netinet/in.h> -#include <net/if.h> -#include <net/if_slvar.h> -#include <net/slip.h> -#include <netdb.h> +#include <sys/time.h> + #include <errno.h> #include <fcntl.h> +#include <paths.h> +#include <netdb.h> +#include <signal.h> #include <stdio.h> #include <stdlib.h> -#include <signal.h> #include <string.h> +#include <syslog.h> +#include <termios.h> +#include <time.h> #include <unistd.h> -#include <paths.h> + +#include <netinet/in.h> +#include <net/if.h> +#include <net/if_slvar.h> +#include <net/slip.h> #define DEFAULT_BAUD B9600 int speed = DEFAULT_BAUD; diff --git a/usr.bin/kdump/mkioctls b/usr.bin/kdump/mkioctls index 61e173e..8ff0cd6 100644 --- a/usr.bin/kdump/mkioctls +++ b/usr.bin/kdump/mkioctls @@ -8,6 +8,7 @@ BEGIN { print "#include <sys/queue.h>" print "#include <sys/socket.h>" print "#include <sys/socketvar.h>" + print "#include <sys/time.h>" print "#include <net/route.h>" print "#include <net/if.h>" print "#include <netinet/in.h>" diff --git a/usr.bin/netstat/atalk.c b/usr.bin/netstat/atalk.c index 3087426..575ac87 100644 --- a/usr.bin/netstat/atalk.c +++ b/usr.bin/netstat/atalk.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)atalk.c 1.1 (Whistle) 6/6/96"; */ static const char rcsid[] = - "$Id$"; + "$Id: atalk.c,v 1.6 1996/10/28 18:56:31 wollman Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -46,9 +46,6 @@ static const char rcsid[] = #include <sys/protosw.h> #include <net/route.h> -#include <net/if.h> - -#include <netinet/tcp_fsm.h> #include <netatalk/at.h> #include <netatalk/ddp_var.h> diff --git a/usr.bin/netstat/if.c b/usr.bin/netstat/if.c index 6c9db22..fb7ef44 100644 --- a/usr.bin/netstat/if.c +++ b/usr.bin/netstat/if.c @@ -38,6 +38,7 @@ static char sccsid[] = "@(#)if.c 8.3 (Berkeley) 4/28/95"; #include <sys/types.h> #include <sys/protosw.h> #include <sys/socket.h> +#include <sys/time.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/usr.bin/netstat/ipx.c b/usr.bin/netstat/ipx.c index fb55788..c6346d6 100644 --- a/usr.bin/netstat/ipx.c +++ b/usr.bin/netstat/ipx.c @@ -36,7 +36,7 @@ static char sccsid[] = "@(#)ns.c 8.1 (Berkeley) 6/6/93"; */ static const char rcsid[] = - "$Id$"; + "$Id: ipx.c,v 1.4 1996/10/28 18:56:39 wollman Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -46,7 +46,6 @@ static const char rcsid[] = #include <sys/protosw.h> #include <net/route.h> -#include <net/if.h> #include <netinet/tcp_fsm.h> diff --git a/usr.bin/netstat/mroute.c b/usr.bin/netstat/mroute.c index 45c47b5..68a15f5 100644 --- a/usr.bin/netstat/mroute.c +++ b/usr.bin/netstat/mroute.c @@ -49,6 +49,7 @@ #include <sys/socketvar.h> #include <sys/protosw.h> #include <sys/mbuf.h> +#include <sys/time.h> #include <net/if.h> #include <netinet/in.h> diff --git a/usr.bin/netstat/route.c b/usr.bin/netstat/route.c index 74bbdde..2da464f 100644 --- a/usr.bin/netstat/route.c +++ b/usr.bin/netstat/route.c @@ -36,12 +36,13 @@ static char sccsid[] = "From: @(#)route.c 8.6 (Berkeley) 4/28/95"; #endif static const char rcsid[] = - "$Id: route.c,v 1.20 1996/10/09 18:19:07 wollman Exp $"; + "$Id: route.c,v 1.21 1996/10/28 18:56:44 wollman Exp $"; #endif /* not lint */ #include <sys/param.h> #include <sys/protosw.h> #include <sys/socket.h> +#include <sys/time.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/usr.sbin/IPXrouted/startup.c b/usr.sbin/IPXrouted/startup.c index 66f6113..a711de3 100644 --- a/usr.sbin/IPXrouted/startup.c +++ b/usr.sbin/IPXrouted/startup.c @@ -35,7 +35,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: startup.c,v 1.2 1995/11/13 21:01:36 julian Exp $ + * $Id: startup.c,v 1.3 1996/02/20 23:11:24 julian Exp $ */ #ifndef lint @@ -50,6 +50,7 @@ static char sccsid[] = "@(#)startup.c 8.1 (Berkeley) 6/5/93"; #include <sys/param.h> #include <sys/ioctl.h> #include <sys/sysctl.h> +#include <sys/time.h> #include <net/if.h> #include <net/if_dl.h> diff --git a/usr.sbin/amd/fsinfo/fsinfo.h b/usr.sbin/amd/fsinfo/fsinfo.h index 0d07e21..1483337 100644 --- a/usr.sbin/amd/fsinfo/fsinfo.h +++ b/usr.sbin/amd/fsinfo/fsinfo.h @@ -37,7 +37,7 @@ * * @(#)fsinfo.h 8.1 (Berkeley) 6/6/93 * - * $Id: fsinfo.h,v 5.2.2.1 1992/02/09 15:09:51 jsp beta $ + * $Id: fsinfo.h,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $ * */ @@ -80,6 +80,7 @@ typedef char *voidp; * Bogosity to deal with ether { ... } */ #include <sys/socket.h> +#include <sys/time.h> #include <netinet/in.h> #include <net/if.h> #include <netinet/if_ether.h> diff --git a/usr.sbin/arp/arp.c b/usr.sbin/arp/arp.c index 218f43a..9b31c6a 100644 --- a/usr.sbin/arp/arp.c +++ b/usr.sbin/arp/arp.c @@ -42,7 +42,7 @@ static char const copyright[] = #ifndef lint static char const sccsid[] = "@(#)from: arp.c 8.2 (Berkeley) 1/2/94"; -static char const freebsdid[] = "$Id$"; +static char const freebsdid[] = "$Id: arp.c,v 1.4 1996/02/08 21:05:52 phk Exp $"; #endif /* not lint */ /* @@ -56,6 +56,7 @@ static char const freebsdid[] = "$Id$"; #include <sys/sockio.h> #include <sys/sysctl.h> #include <sys/ioctl.h> +#include <sys/time.h> #include <net/if.h> #include <net/if_dl.h> @@ -89,7 +90,6 @@ int rtmsg(int cmd); void quit(char *msg); int get_ether_addr(u_long ipaddr, u_char *hwaddr); -extern int errno; static int pid; static int nflag; static int s = -1; diff --git a/usr.sbin/portmap/from_local.c b/usr.sbin/portmap/from_local.c index 9daacba..c1d1570 100644 --- a/usr.sbin/portmap/from_local.c +++ b/usr.sbin/portmap/from_local.c @@ -44,13 +44,16 @@ static char sccsid[] = "@(#) from_local.c 1.2 93/11/16 21:50:02"; #endif #include <sys/types.h> +#include <sys/ioctl.h> #include <sys/socket.h> +#include <sys/time.h> + #include <netdb.h> -#include <netinet/in.h> -#include <net/if.h> -#include <sys/ioctl.h> #include <syslog.h> +#include <net/if.h> +#include <netinet/in.h> + #ifndef TRUE #define TRUE 1 #define FALSE 0 diff --git a/usr.sbin/ppp/os.c b/usr.sbin/ppp/os.c index e67a6a2..f7e7057 100644 --- a/usr.sbin/ppp/os.c +++ b/usr.sbin/ppp/os.c @@ -17,22 +17,26 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: os.c,v 1.6 1996/05/13 07:20:11 phk Exp $ + * $Id: os.c,v 1.7 1996/06/03 21:35:21 gpalmer Exp $ * */ #include "fsm.h" #include <sys/param.h> #include <sys/socket.h> -#include <net/route.h> #if BSD >= 199206 || _BSDI_VERSION >= 199312 #include <sys/select.h> #endif #include <sys/ioctl.h> +#include <sys/time.h> + #include <fcntl.h> +#include <errno.h> + #include <net/if.h> #include <net/if_tun.h> +#include <net/route.h> #include <arpa/inet.h> -#include <errno.h> + #include "ipcp.h" #include "os.h" #include "vars.h" diff --git a/usr.sbin/ppp/route.c b/usr.sbin/ppp/route.c index 9416836..51f6615c 100644 --- a/usr.sbin/ppp/route.c +++ b/usr.sbin/ppp/route.c @@ -17,29 +17,33 @@ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE. * - * $Id: route.c,v 1.8 1996/10/06 13:32:35 jkh Exp $ + * $Id: route.c,v 1.9 1996/10/12 16:20:34 jkh Exp $ * */ #include <sys/types.h> #include <machine/endian.h> +#include <sys/ioctl.h> #include <sys/param.h> #include <sys/socket.h> -#include <net/route.h> -#include <sys/ioctl.h> -#include <net/if.h> -#include <errno.h> -#include <netinet/in_systm.h> -#include <netinet/in.h> -#include <arpa/inet.h> #if (BSD >= 199306) #include <sys/sysctl.h> #else #include <sys/kinfo.h> #endif +#include <sys/time.h> + +#include <errno.h> #include <stdlib.h> #include <stdio.h> #include <string.h> #include <unistd.h> + +#include <net/route.h> +#include <net/if.h> +#include <netinet/in_systm.h> +#include <netinet/in.h> +#include <arpa/inet.h> + #include "log.h" static int IfIndex; diff --git a/usr.sbin/pppstats/pppstats.c b/usr.sbin/pppstats/pppstats.c index 18bb7e6..5ae1809 100644 --- a/usr.sbin/pppstats/pppstats.c +++ b/usr.sbin/pppstats/pppstats.c @@ -37,18 +37,20 @@ */ #ifndef lint -static char rcsid[] = "$Id: pppstats.c,v 1.11 1995/07/11 06:41:45 paulus Exp $"; +static char rcsid[] = "$Id: pppstats.c,v 1.6 1995/10/31 21:41:59 peter Exp $"; #endif +#include <sys/param.h> +#include <sys/types.h> +#include <sys/ioctl.h> +#include <sys/time.h> + #include <ctype.h> #include <errno.h> #include <nlist.h> #include <stdio.h> #include <signal.h> #include <fcntl.h> -#include <sys/param.h> -#include <sys/types.h> -#include <sys/ioctl.h> #include <net/ppp_defs.h> diff --git a/usr.sbin/slstat/slstat.c b/usr.sbin/slstat/slstat.c index 5665bce..54d344d 100644 --- a/usr.sbin/slstat/slstat.c +++ b/usr.sbin/slstat/slstat.c @@ -23,13 +23,14 @@ #ifndef lint static const char rcsid[] = - "$Id: slstat.c,v 1.6 1996/10/11 18:47:10 wollman Exp $"; + "$Id: slstat.c,v 1.7 1996/11/04 17:14:43 bde Exp $"; #endif #include <sys/param.h> #include <sys/mbuf.h> #include <sys/socket.h> #include <sys/sysctl.h> +#include <sys/time.h> #include <ctype.h> #include <err.h> diff --git a/usr.sbin/trpt/trpt.c b/usr.sbin/trpt/trpt.c index 6fe933d0..5e351fa 100644 --- a/usr.sbin/trpt/trpt.c +++ b/usr.sbin/trpt/trpt.c @@ -55,6 +55,7 @@ static char sccsid[] = "@(#)trpt.c 8.1 (Berkeley) 6/6/93"; #define PRUREQUESTS #include <sys/protosw.h> #include <sys/file.h> +#include <sys/time.h> #include <net/route.h> #include <net/if.h> diff --git a/usr.sbin/xntpd/include/ntp_if.h b/usr.sbin/xntpd/include/ntp_if.h index bc842fb..340481a 100644 --- a/usr.sbin/xntpd/include/ntp_if.h +++ b/usr.sbin/xntpd/include/ntp_if.h @@ -44,4 +44,8 @@ #endif /* SYS_SVR4 */ +#if defined(SYS_FREEBSD) +#include <sys/time.h> +#endif + #include <net/if.h> |
