Update to match changes in <net/if.h>.
This commit is contained in:
parent
8766942543
commit
702a1d0148
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=21264
@ -1,7 +1,7 @@
|
|||||||
/*
|
/*
|
||||||
* lookup.c - Lookup IP address, HW address, netmask
|
* lookup.c - Lookup IP address, HW address, netmask
|
||||||
*
|
*
|
||||||
* $Id: lookup.c,v 1.2 1996/09/22 21:52:21 wosch Exp $
|
* $Id: lookup.c,v 1.3 1996/12/10 17:05:33 wollman Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/types.h>
|
#include <sys/types.h>
|
||||||
@ -12,7 +12,7 @@
|
|||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
|
||||||
#ifdef ETC_ETHERS
|
#ifdef ETC_ETHERS
|
||||||
#include <netinet/if_ether.h>
|
#include <net/ethernet.h>
|
||||||
extern int ether_hostton();
|
extern int ether_hostton();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
* from arp.c 8.2 (Berkeley) 1/2/94
|
* from arp.c 8.2 (Berkeley) 1/2/94
|
||||||
* $Id: rtmsg.c,v 1.4 1995/05/30 05:45:49 rgrimes Exp $
|
* $Id: rtmsg.c,v 1.5 1996/12/10 17:05:35 wollman Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -54,6 +54,7 @@
|
|||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h> /* needed for if_ether.h XXX */
|
||||||
#include <net/if_dl.h>
|
#include <net/if_dl.h>
|
||||||
#include <net/if_types.h>
|
#include <net/if_types.h>
|
||||||
#include <net/route.h>
|
#include <net/route.h>
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
#ifndef lint
|
#ifndef lint
|
||||||
/*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/
|
/*static char sccsid[] = "from: @(#)rpc.rstatd.c 1.1 86/09/25 Copyr 1984 Sun Micro";*/
|
||||||
/*static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";*/
|
/*static char sccsid[] = "from: @(#)rstat_proc.c 2.2 88/08/01 4.0 RPCSRC";*/
|
||||||
static char rcsid[] = "$Id: rstat_proc.c,v 1.3 1995/05/30 05:46:28 rgrimes Exp $";
|
static char rcsid[] = "$Id: rstat_proc.c,v 1.4 1996/12/11 19:11:52 wollman Exp $";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -299,7 +299,6 @@ updatestat()
|
|||||||
|
|
||||||
setup()
|
setup()
|
||||||
{
|
{
|
||||||
struct ifnet ifnet;
|
|
||||||
int off;
|
int off;
|
||||||
char errbuf[_POSIX2_LINE_MAX];
|
char errbuf[_POSIX2_LINE_MAX];
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ static const char copyright[] =
|
|||||||
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
|
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
|
||||||
*/
|
*/
|
||||||
static const char rcsid[] =
|
static const char rcsid[] =
|
||||||
"$Id: ifconfig.c,v 1.20 1996/11/21 19:36:09 wollman Exp $";
|
"$Id: ifconfig.c,v 1.21 1996/12/10 17:07:17 wollman Exp $";
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -52,6 +52,7 @@ static const char rcsid[] =
|
|||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h>
|
||||||
#include <net/if_dl.h>
|
#include <net/if_dl.h>
|
||||||
#include <net/if_types.h>
|
#include <net/if_types.h>
|
||||||
#include <net/route.h>
|
#include <net/route.h>
|
||||||
|
@ -42,7 +42,7 @@ static char copyright[] =
|
|||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
/*static char sccsid[] = "from: @(#)slattach.c 4.6 (Berkeley) 6/1/90";*/
|
/*static char sccsid[] = "from: @(#)slattach.c 4.6 (Berkeley) 6/1/90";*/
|
||||||
static char rcsid[] = "$Id: slattach.c,v 1.21 1996/12/10 17:07:44 wollman Exp $";
|
static char rcsid[] = "$Id: slattach.c,v 1.22 1996/12/10 21:25:42 wollman Exp $";
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -64,6 +64,7 @@ static char rcsid[] = "$Id: slattach.c,v 1.21 1996/12/10 17:07:44 wollman Exp $"
|
|||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h>
|
||||||
#include <net/slip.h>
|
#include <net/slip.h>
|
||||||
#include <net/if_slvar.h>
|
#include <net/if_slvar.h>
|
||||||
|
|
||||||
|
@ -30,7 +30,7 @@
|
|||||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||||
* SUCH DAMAGE.
|
* SUCH DAMAGE.
|
||||||
*
|
*
|
||||||
* $Id: startslip.c,v 1.18 1995/09/27 17:15:37 ache Exp $
|
* $Id: startslip.c,v 1.19 1996/12/10 17:07:48 wollman Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
@ -63,6 +63,7 @@ static char sccsid[] = "@(#)startslip.c 8.1 (Berkeley) 6/5/93";
|
|||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h>
|
||||||
#include <net/if_slvar.h>
|
#include <net/if_slvar.h>
|
||||||
#include <net/slip.h>
|
#include <net/slip.h>
|
||||||
|
|
||||||
|
@ -37,7 +37,7 @@
|
|||||||
*
|
*
|
||||||
* @(#)fsinfo.h 8.1 (Berkeley) 6/6/93
|
* @(#)fsinfo.h 8.1 (Berkeley) 6/6/93
|
||||||
*
|
*
|
||||||
* $Id: fsinfo.h,v 1.1.1.1 1994/05/26 05:22:18 rgrimes Exp $
|
* $Id: fsinfo.h,v 1.2 1996/12/10 17:00:31 wollman Exp $
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -83,7 +83,7 @@ typedef char *voidp;
|
|||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
#include <netinet/if_ether.h>
|
#include <net/ethernet.h>
|
||||||
|
|
||||||
#include "fsi_data.h"
|
#include "fsi_data.h"
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@ static char const copyright[] =
|
|||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static char const sccsid[] = "@(#)from: arp.c 8.2 (Berkeley) 1/2/94";
|
static char const sccsid[] = "@(#)from: arp.c 8.2 (Berkeley) 1/2/94";
|
||||||
static char const freebsdid[] = "$Id: arp.c,v 1.5 1996/12/10 17:00:34 wollman Exp $";
|
static char const freebsdid[] = "$Id: arp.c,v 1.6 1996/12/19 19:33:10 nate Exp $";
|
||||||
#endif /* not lint */
|
#endif /* not lint */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -59,6 +59,7 @@ static char const freebsdid[] = "$Id: arp.c,v 1.5 1996/12/10 17:00:34 wollman Ex
|
|||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h>
|
||||||
#include <net/if_dl.h>
|
#include <net/if_dl.h>
|
||||||
#include <net/if_types.h>
|
#include <net/if_types.h>
|
||||||
#include <net/route.h>
|
#include <net/route.h>
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
* Leland Stanford Junior University.
|
* Leland Stanford Junior University.
|
||||||
*
|
*
|
||||||
*
|
*
|
||||||
* $Id: defs.h,v 3.8.1.2 1996/09/05 19:00:20 fenner Exp $
|
* $Id: defs.h,v 1.7 1996/11/11 03:49:57 fenner Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
@ -28,6 +28,9 @@
|
|||||||
#endif
|
#endif
|
||||||
#include <sys/time.h>
|
#include <sys/time.h>
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#define rtentry kern_rtentry /* XXX !!! UGH */
|
||||||
|
#include <net/route.h>
|
||||||
|
#undef rtentry
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <netinet/in_systm.h>
|
#include <netinet/in_systm.h>
|
||||||
#include <netinet/ip.h>
|
#include <netinet/ip.h>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
*
|
*
|
||||||
* $Id: arp.c,v 1.4 1996/01/11 17:48:34 phk Exp $
|
* $Id: arp.c,v 1.5 1996/05/11 20:48:09 phk Exp $
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
@ -35,6 +35,7 @@
|
|||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h>
|
||||||
#include <net/route.h>
|
#include <net/route.h>
|
||||||
#include <net/if_dl.h>
|
#include <net/if_dl.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
@ -17,7 +17,7 @@
|
|||||||
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
* IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
|
||||||
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
* WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
||||||
*
|
*
|
||||||
* $Id: os.c,v 1.7 1996/06/03 21:35:21 gpalmer Exp $
|
* $Id: os.c,v 1.8 1996/12/10 17:00:38 wollman Exp $
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#include "fsm.h"
|
#include "fsm.h"
|
||||||
@ -33,6 +33,7 @@
|
|||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h>
|
||||||
#include <net/if_tun.h>
|
#include <net/if_tun.h>
|
||||||
#include <net/route.h>
|
#include <net/route.h>
|
||||||
#include <arpa/inet.h>
|
#include <arpa/inet.h>
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static char rcsid[] = "$Id: sys-bsd.c,v 1.6 1996/03/01 19:29:44 phk Exp $";
|
static char rcsid[] = "$Id: sys-bsd.c,v 1.7 1996/08/13 09:16:49 peter Exp $";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -41,6 +41,7 @@ static char rcsid[] = "$Id: sys-bsd.c,v 1.6 1996/03/01 19:29:44 phk Exp $";
|
|||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h>
|
||||||
#include <net/ppp_defs.h>
|
#include <net/ppp_defs.h>
|
||||||
#include <net/if_ppp.h>
|
#include <net/if_ppp.h>
|
||||||
#include <net/route.h>
|
#include <net/route.h>
|
||||||
|
@ -26,7 +26,7 @@ The Regents of the University of California. All rights reserved.\n";
|
|||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] =
|
static const char rcsid[] =
|
||||||
"@(#) $Header: /home/ncvs/src/usr.sbin/rarpd/rarpd.c,v 1.10 1996/11/19 23:57:06 wpaul Exp $ (LBL)";
|
"$Id: /home/ncvs/src/usr.sbin/rarpd/rarpd.c,v 1.12 1996/11/27 20:45:10 fenner Exp $";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
@ -46,14 +46,10 @@ static const char rcsid[] =
|
|||||||
|
|
||||||
#include <net/bpf.h>
|
#include <net/bpf.h>
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h>
|
||||||
#if BSD >= 199100
|
|
||||||
#include <net/if_types.h>
|
#include <net/if_types.h>
|
||||||
#include <net/if_dl.h>
|
#include <net/if_dl.h>
|
||||||
#if BSD >= 199200
|
|
||||||
#include <net/route.h>
|
#include <net/route.h>
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
#include <netinet/if_ether.h>
|
#include <netinet/if_ether.h>
|
||||||
@ -65,16 +61,8 @@ static const char rcsid[] =
|
|||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <syslog.h>
|
#include <syslog.h>
|
||||||
#if BSD >= 199200
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#else
|
|
||||||
|
|
||||||
extern char *optarg;
|
|
||||||
extern int optind, opterr;
|
|
||||||
|
|
||||||
extern int errno;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(SUNOS4) || defined(__FreeBSD__) /* XXX */
|
#if defined(SUNOS4) || defined(__FreeBSD__) /* XXX */
|
||||||
#define HAVE_DIRENT_H
|
#define HAVE_DIRENT_H
|
||||||
|
@ -23,7 +23,7 @@
|
|||||||
|
|
||||||
#ifndef lint
|
#ifndef lint
|
||||||
static const char rcsid[] =
|
static const char rcsid[] =
|
||||||
"$Id: slstat.c,v 1.7 1996/11/04 17:14:43 bde Exp $";
|
"$Id: slstat.c,v 1.8 1996/12/10 17:00:45 wollman Exp $";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <sys/param.h>
|
#include <sys/param.h>
|
||||||
@ -44,6 +44,7 @@ static const char rcsid[] =
|
|||||||
#define INET
|
#define INET
|
||||||
|
|
||||||
#include <net/if.h>
|
#include <net/if.h>
|
||||||
|
#include <net/if_var.h>
|
||||||
#include <net/if_mib.h>
|
#include <net/if_mib.h>
|
||||||
#include <net/if_types.h>
|
#include <net/if_types.h>
|
||||||
#include <netinet/in.h>
|
#include <netinet/in.h>
|
||||||
|
Loading…
Reference in New Issue
Block a user