diff options
44 files changed, 44 insertions, 96 deletions
diff --git a/usr.sbin/tcpdump/pfctl_osfp.c b/usr.sbin/tcpdump/pfctl_osfp.c index b3347b60604..ccc7dfb3deb 100644 --- a/usr.sbin/tcpdump/pfctl_osfp.c +++ b/usr.sbin/tcpdump/pfctl_osfp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl_osfp.c,v 1.8 2013/12/22 16:50:15 deraadt Exp $ */ +/* $OpenBSD: pfctl_osfp.c,v 1.9 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 2003 Mike Frantzen <frantzen@openbsd.org> @@ -30,7 +30,6 @@ #include <stdlib.h> #include <string.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip6.h> diff --git a/usr.sbin/tcpdump/print-802_11.c b/usr.sbin/tcpdump/print-802_11.c index 06fde1191e2..e7a73af1b91 100644 --- a/usr.sbin/tcpdump/print-802_11.c +++ b/usr.sbin/tcpdump/print-802_11.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-802_11.c,v 1.14 2014/07/20 17:52:34 stsp Exp $ */ +/* $OpenBSD: print-802_11.c,v 1.15 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org> @@ -25,7 +25,6 @@ #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/if_ether.h> #include <net80211/ieee80211.h> diff --git a/usr.sbin/tcpdump/print-atalk.c b/usr.sbin/tcpdump/print-atalk.c index ceb2e1a4f1d..d8639b57ba4 100644 --- a/usr.sbin/tcpdump/print-atalk.c +++ b/usr.sbin/tcpdump/print-atalk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-atalk.c,v 1.26 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-atalk.c,v 1.27 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -32,14 +32,12 @@ struct rtentry; #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/if_ether.h> #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/tcp.h> -#include <netinet/tcpip.h> #include <inttypes.h> #include <stdio.h> diff --git a/usr.sbin/tcpdump/print-atm.c b/usr.sbin/tcpdump/print-atm.c index 73b37908f48..c13becf7fa6 100644 --- a/usr.sbin/tcpdump/print-atm.c +++ b/usr.sbin/tcpdump/print-atm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-atm.c,v 1.9 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-atm.c,v 1.10 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1994, 1995, 1996, 1997 @@ -31,7 +31,6 @@ struct rtentry; #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-domain.c b/usr.sbin/tcpdump/print-domain.c index 3ea80379581..8516e8f7fbe 100644 --- a/usr.sbin/tcpdump/print-domain.c +++ b/usr.sbin/tcpdump/print-domain.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-domain.c,v 1.19 2014/05/23 20:36:04 sthen Exp $ */ +/* $OpenBSD: print-domain.c,v 1.20 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -29,7 +29,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-dvmrp.c b/usr.sbin/tcpdump/print-dvmrp.c index 41718706113..9ea358486c6 100644 --- a/usr.sbin/tcpdump/print-dvmrp.c +++ b/usr.sbin/tcpdump/print-dvmrp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-dvmrp.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-dvmrp.c,v 1.7 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1995, 1996 @@ -26,7 +26,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-enc.c b/usr.sbin/tcpdump/print-enc.c index 994d0825c39..774857a0288 100644 --- a/usr.sbin/tcpdump/print-enc.c +++ b/usr.sbin/tcpdump/print-enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-enc.c,v 1.11 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-enc.c,v 1.12 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996 @@ -34,7 +34,6 @@ struct rtentry; #include <net/if_enc.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <ctype.h> diff --git a/usr.sbin/tcpdump/print-ether.c b/usr.sbin/tcpdump/print-ether.c index 7592ca053da..3dea6e7f810 100644 --- a/usr.sbin/tcpdump/print-ether.c +++ b/usr.sbin/tcpdump/print-ether.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ether.c,v 1.27 2010/01/14 04:57:06 jsing Exp $ */ +/* $OpenBSD: print-ether.c,v 1.28 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -31,7 +31,6 @@ struct rtentry; #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-etherip.c b/usr.sbin/tcpdump/print-etherip.c index d28268ed8d9..79327d637b7 100644 --- a/usr.sbin/tcpdump/print-etherip.c +++ b/usr.sbin/tcpdump/print-etherip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-etherip.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-etherip.c,v 1.7 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 2001 Jason L. Wright (jason@thought.net) @@ -36,13 +36,11 @@ #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/tcp.h> -#include <netinet/tcpip.h> #include <netinet/if_ether.h> #include <netinet/ip_ether.h> diff --git a/usr.sbin/tcpdump/print-fddi.c b/usr.sbin/tcpdump/print-fddi.c index a9bfb4daaeb..df80e6e1bbf 100644 --- a/usr.sbin/tcpdump/print-fddi.c +++ b/usr.sbin/tcpdump/print-fddi.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-fddi.c,v 1.14 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-fddi.c,v 1.15 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -34,7 +34,6 @@ struct rtentry; #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <ctype.h> diff --git a/usr.sbin/tcpdump/print-frag6.c b/usr.sbin/tcpdump/print-frag6.c index 5df71e3f402..074999fc8c2 100644 --- a/usr.sbin/tcpdump/print-frag6.c +++ b/usr.sbin/tcpdump/print-frag6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-frag6.c,v 1.5 2011/09/22 21:27:06 bluhm Exp $ */ +/* $OpenBSD: print-frag6.c,v 1.6 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994 @@ -32,7 +32,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-gre.c b/usr.sbin/tcpdump/print-gre.c index b4511d1f60f..b89d5baaa3b 100644 --- a/usr.sbin/tcpdump/print-gre.c +++ b/usr.sbin/tcpdump/print-gre.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-gre.c,v 1.7 2003/06/03 00:21:04 jason Exp $ */ +/* $OpenBSD: print-gre.c,v 1.8 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 2002 Jason L. Wright (jason@thought.net) @@ -37,7 +37,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <arpa/inet.h> diff --git a/usr.sbin/tcpdump/print-gtp.c b/usr.sbin/tcpdump/print-gtp.c index 62a3b6ca7fe..55882d4c439 100644 --- a/usr.sbin/tcpdump/print-gtp.c +++ b/usr.sbin/tcpdump/print-gtp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-gtp.c,v 1.5 2011/09/18 10:25:36 jsing Exp $ */ +/* $OpenBSD: print-gtp.c,v 1.6 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 2009, 2010 Joel Sing <jsing@openbsd.org> * @@ -46,7 +46,6 @@ #include <sys/types.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-iapp.c b/usr.sbin/tcpdump/print-iapp.c index 6466b95e3c9..7bafd9d990f 100644 --- a/usr.sbin/tcpdump/print-iapp.c +++ b/usr.sbin/tcpdump/print-iapp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-iapp.c,v 1.3 2006/03/10 18:13:11 reyk Exp $ */ +/* $OpenBSD: print-iapp.c,v 1.4 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 2005 Reyk Floeter <reyk@openbsd.org> @@ -25,7 +25,6 @@ #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/if_ether.h> #include <net80211/ieee80211.h> diff --git a/usr.sbin/tcpdump/print-icmp.c b/usr.sbin/tcpdump/print-icmp.c index 14849ba2a61..a693aea3c42 100644 --- a/usr.sbin/tcpdump/print-icmp.c +++ b/usr.sbin/tcpdump/print-icmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-icmp.c,v 1.23 2014/06/20 04:04:52 lteo Exp $ */ +/* $OpenBSD: print-icmp.c,v 1.24 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994, 1995, 1996 @@ -31,14 +31,12 @@ struct rtentry; #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/tcp.h> -#include <netinet/tcpip.h> #include <stdio.h> #include <string.h> diff --git a/usr.sbin/tcpdump/print-icmp6.c b/usr.sbin/tcpdump/print-icmp6.c index 56a9559d87d..7ac3e4a3aab 100644 --- a/usr.sbin/tcpdump/print-icmp6.c +++ b/usr.sbin/tcpdump/print-icmp6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-icmp6.c,v 1.13 2014/06/20 04:04:52 lteo Exp $ */ +/* $OpenBSD: print-icmp6.c,v 1.14 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1993, 1994 @@ -34,7 +34,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-igrp.c b/usr.sbin/tcpdump/print-igrp.c index ccb02f41308..c463bfbcb8c 100644 --- a/usr.sbin/tcpdump/print-igrp.c +++ b/usr.sbin/tcpdump/print-igrp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-igrp.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-igrp.c,v 1.6 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1996, 1997 @@ -28,7 +28,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-ip.c b/usr.sbin/tcpdump/print-ip.c index 4fd1e8d1394..3f4194c5ad3 100644 --- a/usr.sbin/tcpdump/print-ip.c +++ b/usr.sbin/tcpdump/print-ip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ip.c,v 1.38 2014/06/20 04:04:52 lteo Exp $ */ +/* $OpenBSD: print-ip.c,v 1.39 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -26,13 +26,11 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/tcp.h> -#include <netinet/tcpip.h> #include <inttypes.h> #include <stdio.h> diff --git a/usr.sbin/tcpdump/print-ip6.c b/usr.sbin/tcpdump/print-ip6.c index c313d9f895a..66233be8ff0 100644 --- a/usr.sbin/tcpdump/print-ip6.c +++ b/usr.sbin/tcpdump/print-ip6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ip6.c,v 1.15 2011/09/17 16:45:42 naddy Exp $ */ +/* $OpenBSD: print-ip6.c,v 1.16 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994 @@ -29,7 +29,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-ipsec.c b/usr.sbin/tcpdump/print-ipsec.c index 8be8eb42c74..51d2470638a 100644 --- a/usr.sbin/tcpdump/print-ipsec.c +++ b/usr.sbin/tcpdump/print-ipsec.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ipsec.c,v 1.18 2014/01/11 04:35:52 lteo Exp $ */ +/* $OpenBSD: print-ipsec.c,v 1.19 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999 @@ -31,13 +31,11 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/tcp.h> -#include <netinet/tcpip.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.sbin/tcpdump/print-ipx.c b/usr.sbin/tcpdump/print-ipx.c index 4ddd73bce27..6728c1ac2ed 100644 --- a/usr.sbin/tcpdump/print-ipx.c +++ b/usr.sbin/tcpdump/print-ipx.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ipx.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-ipx.c,v 1.13 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1994, 1995, 1996 @@ -29,7 +29,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-krb.c b/usr.sbin/tcpdump/print-krb.c index 99f7cd093b9..5f777834921 100644 --- a/usr.sbin/tcpdump/print-krb.c +++ b/usr.sbin/tcpdump/print-krb.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-krb.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-krb.c,v 1.9 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1995, 1996, 1997 @@ -28,7 +28,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-lldp.c b/usr.sbin/tcpdump/print-lldp.c index 9123a9202ce..18e6c8e28df 100644 --- a/usr.sbin/tcpdump/print-lldp.c +++ b/usr.sbin/tcpdump/print-lldp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-lldp.c,v 1.6 2009/11/12 00:02:16 deraadt Exp $ */ +/* $OpenBSD: print-lldp.c,v 1.7 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org> @@ -23,7 +23,6 @@ #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/if_ether.h> #include <arpa/inet.h> diff --git a/usr.sbin/tcpdump/print-mobile.c b/usr.sbin/tcpdump/print-mobile.c index 03090ece26a..cbfbaf99701 100644 --- a/usr.sbin/tcpdump/print-mobile.c +++ b/usr.sbin/tcpdump/print-mobile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-mobile.c,v 1.3 2009/10/28 23:22:47 schwarze Exp $ */ +/* $OpenBSD: print-mobile.c,v 1.4 2014/08/14 12:44:44 mpi Exp $ */ /* $NetBSD: print-mobile.c,v 1.3 1999/07/26 06:11:57 itojun Exp $ */ /* @@ -36,7 +36,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netdb.h> diff --git a/usr.sbin/tcpdump/print-netbios.c b/usr.sbin/tcpdump/print-netbios.c index 09fc475b3c2..1c1f8d8b338 100644 --- a/usr.sbin/tcpdump/print-netbios.c +++ b/usr.sbin/tcpdump/print-netbios.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-netbios.c,v 1.8 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-netbios.c,v 1.9 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1994, 1995, 1996 @@ -28,7 +28,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-nfs.c b/usr.sbin/tcpdump/print-nfs.c index 750e300dd50..2edef633d33 100644 --- a/usr.sbin/tcpdump/print-nfs.c +++ b/usr.sbin/tcpdump/print-nfs.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-nfs.c,v 1.17 2014/02/05 21:12:19 florian Exp $ */ +/* $OpenBSD: print-nfs.c,v 1.18 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -31,7 +31,6 @@ struct rtentry; #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-null.c b/usr.sbin/tcpdump/print-null.c index 3c57edc7565..95b91ef47d3 100644 --- a/usr.sbin/tcpdump/print-null.c +++ b/usr.sbin/tcpdump/print-null.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-null.c,v 1.19 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-null.c,v 1.20 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1991, 1993, 1994, 1995, 1996, 1997 @@ -32,7 +32,6 @@ struct rtentry; #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/if_ether.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-ospf.c b/usr.sbin/tcpdump/print-ospf.c index 30eda035fa2..81e83e332f5 100644 --- a/usr.sbin/tcpdump/print-ospf.c +++ b/usr.sbin/tcpdump/print-ospf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ospf.c,v 1.17 2014/07/04 08:42:38 bluhm Exp $ */ +/* $OpenBSD: print-ospf.c,v 1.18 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997 @@ -28,7 +28,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-ospf6.c b/usr.sbin/tcpdump/print-ospf6.c index 87c80c5fe5e..98e759dcd95 100644 --- a/usr.sbin/tcpdump/print-ospf6.c +++ b/usr.sbin/tcpdump/print-ospf6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ospf6.c,v 1.6 2014/07/04 08:42:38 bluhm Exp $ */ +/* $OpenBSD: print-ospf6.c,v 1.7 2014/08/14 12:44:44 mpi Exp $ */ /* @@ -31,7 +31,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-pflog.c b/usr.sbin/tcpdump/print-pflog.c index 5a273dc2bdc..2df0e7d5f29 100644 --- a/usr.sbin/tcpdump/print-pflog.c +++ b/usr.sbin/tcpdump/print-pflog.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-pflog.c,v 1.24 2011/10/13 18:32:30 claudio Exp $ */ +/* $OpenBSD: print-pflog.c,v 1.25 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996 @@ -39,7 +39,6 @@ struct rtentry; #include <net/if_pflog.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <net/pfvar.h> diff --git a/usr.sbin/tcpdump/print-pfsync.c b/usr.sbin/tcpdump/print-pfsync.c index 0bb8ca791bb..0475fc05084 100644 --- a/usr.sbin/tcpdump/print-pfsync.c +++ b/usr.sbin/tcpdump/print-pfsync.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-pfsync.c,v 1.38 2012/09/19 13:50:36 mikeb Exp $ */ +/* $OpenBSD: print-pfsync.c,v 1.39 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 2002 Michael Shalayeff @@ -39,7 +39,6 @@ struct rtentry; #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <net/pfvar.h> diff --git a/usr.sbin/tcpdump/print-pim.c b/usr.sbin/tcpdump/print-pim.c index 342d9dcb47a..d0684327ca3 100644 --- a/usr.sbin/tcpdump/print-pim.c +++ b/usr.sbin/tcpdump/print-pim.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-pim.c,v 1.5 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-pim.c,v 1.6 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1995, 1996 @@ -26,13 +26,11 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> #include <netinet/udp_var.h> #include <netinet/tcp.h> -#include <netinet/tcpip.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.sbin/tcpdump/print-ppp.c b/usr.sbin/tcpdump/print-ppp.c index d3d9ff2827c..34f66e4505f 100644 --- a/usr.sbin/tcpdump/print-ppp.c +++ b/usr.sbin/tcpdump/print-ppp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ppp.c,v 1.26 2011/12/28 22:41:55 sthen Exp $ */ +/* $OpenBSD: print-ppp.c,v 1.27 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997 @@ -33,7 +33,6 @@ struct rtentry; #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <ctype.h> diff --git a/usr.sbin/tcpdump/print-raw.c b/usr.sbin/tcpdump/print-raw.c index ba46f884d7f..53bd247e32c 100644 --- a/usr.sbin/tcpdump/print-raw.c +++ b/usr.sbin/tcpdump/print-raw.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-raw.c,v 1.6 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-raw.c,v 1.7 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1996 @@ -32,7 +32,6 @@ struct rtentry; #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/if_ether.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-rip.c b/usr.sbin/tcpdump/print-rip.c index 60e1e3c273b..6957fe95128 100644 --- a/usr.sbin/tcpdump/print-rip.c +++ b/usr.sbin/tcpdump/print-rip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-rip.c,v 1.12 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-rip.c,v 1.13 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1989, 1990, 1991, 1993, 1994, 1996 @@ -26,7 +26,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-ripng.c b/usr.sbin/tcpdump/print-ripng.c index aee45c201f4..3b845866618 100644 --- a/usr.sbin/tcpdump/print-ripng.c +++ b/usr.sbin/tcpdump/print-ripng.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-ripng.c,v 1.2 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-ripng.c,v 1.3 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1989, 1990, 1991, 1993, 1994 @@ -29,7 +29,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-rt6.c b/usr.sbin/tcpdump/print-rt6.c index 0b926e67002..cad4329ba5a 100644 --- a/usr.sbin/tcpdump/print-rt6.c +++ b/usr.sbin/tcpdump/print-rt6.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-rt6.c,v 1.3 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-rt6.c,v 1.4 2014/08/14 12:44:44 mpi Exp $ */ /* @@ -33,7 +33,6 @@ #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_icmp.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-skip.c b/usr.sbin/tcpdump/print-skip.c index d8d487a68f2..10ecd658ed9 100644 --- a/usr.sbin/tcpdump/print-skip.c +++ b/usr.sbin/tcpdump/print-skip.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-skip.c,v 1.3 2007/11/26 09:28:34 martynas Exp $ */ +/* $OpenBSD: print-skip.c,v 1.4 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1995 Sun Microsystems, Inc. @@ -29,11 +29,9 @@ #include <sys/types.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/tcp.h> -#include <netinet/tcpip.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr.sbin/tcpdump/print-sl.c b/usr.sbin/tcpdump/print-sl.c index b892e2220bc..c0879337c7e 100644 --- a/usr.sbin/tcpdump/print-sl.c +++ b/usr.sbin/tcpdump/print-sl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-sl.c,v 1.15 2013/12/03 00:21:21 deraadt Exp $ */ +/* $OpenBSD: print-sl.c,v 1.16 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1989, 1990, 1991, 1993, 1994, 1995, 1996, 1997 @@ -33,7 +33,6 @@ struct rtentry; #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/if_ether.h> #include <netinet/udp.h> diff --git a/usr.sbin/tcpdump/print-slow.c b/usr.sbin/tcpdump/print-slow.c index 17d262818f6..70b729e871f 100644 --- a/usr.sbin/tcpdump/print-slow.c +++ b/usr.sbin/tcpdump/print-slow.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-slow.c,v 1.1 2008/10/16 12:57:01 mpf Exp $ */ +/* $OpenBSD: print-slow.c,v 1.2 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1998-2005 The TCPDUMP project @@ -28,7 +28,6 @@ #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/if_ether.h> #include <stdio.h> diff --git a/usr.sbin/tcpdump/print-stp.c b/usr.sbin/tcpdump/print-stp.c index 20ba4827301..958e558466f 100644 --- a/usr.sbin/tcpdump/print-stp.c +++ b/usr.sbin/tcpdump/print-stp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-stp.c,v 1.7 2007/06/04 15:10:12 henning Exp $ */ +/* $OpenBSD: print-stp.c,v 1.8 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 2000 Jason L. Wright (jason@thought.net) @@ -41,7 +41,6 @@ struct rtentry; #include <net/if.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <ctype.h> diff --git a/usr.sbin/tcpdump/print-sunrpc.c b/usr.sbin/tcpdump/print-sunrpc.c index fdcf642b990..73eefbd8163 100644 --- a/usr.sbin/tcpdump/print-sunrpc.c +++ b/usr.sbin/tcpdump/print-sunrpc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-sunrpc.c,v 1.17 2009/10/27 23:59:55 deraadt Exp $ */ +/* $OpenBSD: print-sunrpc.c,v 1.18 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1992, 1993, 1994, 1995, 1996 @@ -31,7 +31,6 @@ struct rtentry; #include <netinet/in.h> #include <netinet/if_ether.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> diff --git a/usr.sbin/tcpdump/print-tcp.c b/usr.sbin/tcpdump/print-tcp.c index 43ee76f2c58..487241f5875 100644 --- a/usr.sbin/tcpdump/print-tcp.c +++ b/usr.sbin/tcpdump/print-tcp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-tcp.c,v 1.30 2014/06/20 04:04:52 lteo Exp $ */ +/* $OpenBSD: print-tcp.c,v 1.31 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997 @@ -26,11 +26,9 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/tcp.h> -#include <netinet/tcpip.h> #include <net/if.h> #include <net/pfvar.h> diff --git a/usr.sbin/tcpdump/print-udp.c b/usr.sbin/tcpdump/print-udp.c index dca0c68e93c..70283cf7626 100644 --- a/usr.sbin/tcpdump/print-udp.c +++ b/usr.sbin/tcpdump/print-udp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: print-udp.c,v 1.36 2014/06/20 04:04:52 lteo Exp $ */ +/* $OpenBSD: print-udp.c,v 1.37 2014/08/14 12:44:44 mpi Exp $ */ /* * Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996 @@ -26,7 +26,6 @@ #include <sys/socket.h> #include <netinet/in.h> -#include <netinet/in_systm.h> #include <netinet/ip.h> #include <netinet/ip_var.h> #include <netinet/udp.h> |