Split OSI support off into its own file.
This commit is contained in:
thorpej
parent
e7c8ca2ae5
commit
4fd9a96b1d
|
|
@ -1,4 +1,4 @@
|
|||
# $NetBSD: Makefile,v 1.23 2005/03/19 23:46:03 thorpej Exp $
|
||||
# $NetBSD: Makefile,v 1.24 2005/03/20 00:02:58 thorpej Exp $
|
||||
# @(#)Makefile 8.1 (Berkeley) 6/5/93
|
||||
|
||||
.include <bsd.own.mk>
|
||||
|
|
@ -22,6 +22,7 @@ LDADD+=-lutil
|
|||
SRCS= ifconfig.c
|
||||
|
||||
SRCS+= af_atalk.c
|
||||
SRCS+= af_iso.c
|
||||
SRCS+= af_ns.c
|
||||
|
||||
SRCS+= agr.c
|
||||
|
|
|
|||
|
|
@ -0,0 +1,170 @@
|
|||
/* $NetBSD: af_iso.c,v 1.1 2005/03/20 00:02:58 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1983, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
#ifndef INET_ONLY
|
||||
|
||||
#include <sys/cdefs.h>
|
||||
#ifndef lint
|
||||
__RCSID("$NetBSD: af_iso.c,v 1.1 2005/03/20 00:02:58 thorpej Exp $");
|
||||
#endif /* not lint */
|
||||
|
||||
#include <sys/param.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/socket.h>
|
||||
|
||||
#include <net/if.h>
|
||||
|
||||
#if 0 /* XXX done in af_iso.h */
|
||||
#define EON
|
||||
#include <netiso/iso.h>
|
||||
#include <netiso/iso_var.h>
|
||||
#endif
|
||||
|
||||
#include <err.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stddef.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include "extern.h"
|
||||
#include "af_iso.h"
|
||||
|
||||
struct iso_ifreq iso_ridreq;
|
||||
struct iso_aliasreq iso_addreq;
|
||||
|
||||
static int nsellength = 1;
|
||||
|
||||
#define SISO(x) ((struct sockaddr_iso *) &(x))
|
||||
struct sockaddr_iso *sisotab[] = {
|
||||
SISO(iso_ridreq.ifr_Addr), SISO(iso_addreq.ifra_addr),
|
||||
SISO(iso_addreq.ifra_mask), SISO(iso_addreq.ifra_dstaddr)};
|
||||
|
||||
void
|
||||
iso_getaddr(const char *addr, int which)
|
||||
{
|
||||
struct sockaddr_iso *siso = sisotab[which];
|
||||
siso->siso_addr = *iso_addr(addr);
|
||||
|
||||
if (which == MASK) {
|
||||
siso->siso_len = TSEL(siso) - (char *)(siso);
|
||||
siso->siso_nlen = 0;
|
||||
} else {
|
||||
siso->siso_len = sizeof(*siso);
|
||||
siso->siso_family = AF_ISO;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
setsnpaoffset(const char *val, int d)
|
||||
{
|
||||
iso_addreq.ifra_snpaoffset = atoi(val);
|
||||
}
|
||||
|
||||
void
|
||||
setnsellength(const char *val, int d)
|
||||
{
|
||||
nsellength = atoi(val);
|
||||
if (nsellength < 0)
|
||||
errx(EXIT_FAILURE, "Negative NSEL length is absurd");
|
||||
if (afp == 0 || afp->af_af != AF_ISO)
|
||||
errx(EXIT_FAILURE, "Setting NSEL length valid only for iso");
|
||||
}
|
||||
|
||||
static void
|
||||
fixnsel(struct sockaddr_iso *siso)
|
||||
{
|
||||
if (siso->siso_family == 0)
|
||||
return;
|
||||
siso->siso_tlen = nsellength;
|
||||
}
|
||||
|
||||
void
|
||||
adjust_nsellength(void)
|
||||
{
|
||||
fixnsel(sisotab[RIDADDR]);
|
||||
fixnsel(sisotab[ADDR]);
|
||||
fixnsel(sisotab[DSTADDR]);
|
||||
}
|
||||
|
||||
void
|
||||
iso_status(int force)
|
||||
{
|
||||
struct sockaddr_iso *siso;
|
||||
struct iso_ifreq isoifr;
|
||||
|
||||
getsock(AF_ISO);
|
||||
if (s < 0) {
|
||||
if (errno == EPROTONOSUPPORT)
|
||||
return;
|
||||
err(EXIT_FAILURE, "socket");
|
||||
}
|
||||
(void) memset(&isoifr, 0, sizeof(isoifr));
|
||||
(void) strncpy(isoifr.ifr_name, name, sizeof(isoifr.ifr_name));
|
||||
if (ioctl(s, SIOCGIFADDR_ISO, &isoifr) == -1) {
|
||||
if (errno == EADDRNOTAVAIL || errno == EAFNOSUPPORT) {
|
||||
if (!force)
|
||||
return;
|
||||
(void) memset(&isoifr.ifr_Addr, 0,
|
||||
sizeof(isoifr.ifr_Addr));
|
||||
} else
|
||||
warn("SIOCGIFADDR_ISO");
|
||||
}
|
||||
(void) strncpy(isoifr.ifr_name, name, sizeof isoifr.ifr_name);
|
||||
siso = &isoifr.ifr_Addr;
|
||||
printf("\tiso %s ", iso_ntoa(&siso->siso_addr));
|
||||
if (ioctl(s, SIOCGIFNETMASK_ISO, &isoifr) == -1) {
|
||||
if (errno == EADDRNOTAVAIL)
|
||||
memset(&isoifr.ifr_Addr, 0, sizeof(isoifr.ifr_Addr));
|
||||
else
|
||||
warn("SIOCGIFNETMASK_ISO");
|
||||
} else {
|
||||
if (siso->siso_len > offsetof(struct sockaddr_iso, siso_addr))
|
||||
siso->siso_addr.isoa_len = siso->siso_len
|
||||
- offsetof(struct sockaddr_iso, siso_addr);
|
||||
printf("\n\t\tnetmask %s ", iso_ntoa(&siso->siso_addr));
|
||||
}
|
||||
if (flags & IFF_POINTOPOINT) {
|
||||
if (ioctl(s, SIOCGIFDSTADDR_ISO, &isoifr) == -1) {
|
||||
if (errno == EADDRNOTAVAIL)
|
||||
memset(&isoifr.ifr_Addr, 0,
|
||||
sizeof(isoifr.ifr_Addr));
|
||||
else
|
||||
warn("SIOCGIFDSTADDR_ISO");
|
||||
}
|
||||
(void) strncpy(isoifr.ifr_name, name, sizeof (isoifr.ifr_name));
|
||||
siso = &isoifr.ifr_Addr;
|
||||
printf("--> %s ", iso_ntoa(&siso->siso_addr));
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
#endif /* ! INET_ONLY */
|
||||
|
|
@ -0,0 +1,46 @@
|
|||
/* $NetBSD: af_iso.h,v 1.1 2005/03/20 00:02:58 thorpej Exp $ */
|
||||
|
||||
/*
|
||||
* Copyright (c) 1983, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, this list of conditions and the following disclaimer.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. Neither the name of the University nor the names of its contributors
|
||||
* may be used to endorse or promote products derived from this software
|
||||
* without specific prior written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
|
||||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
||||
* ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
|
||||
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
||||
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
||||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
||||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
||||
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
||||
* SUCH DAMAGE.
|
||||
*/
|
||||
|
||||
/* XXX */
|
||||
#define EON
|
||||
#include <netiso/iso.h>
|
||||
#include <netiso/iso_var.h>
|
||||
|
||||
/* XXX */
|
||||
extern struct iso_ifreq iso_ridreq;
|
||||
extern struct iso_aliasreq iso_addreq;
|
||||
|
||||
void setsnpaoffset(const char *, int);
|
||||
void setnsellength(const char *, int);
|
||||
void adjust_nsellength(void);
|
||||
|
||||
void iso_status(int);
|
||||
void iso_getaddr(const char *, int);
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
/* $NetBSD: ifconfig.c,v 1.162 2005/03/19 23:46:03 thorpej Exp $ */
|
||||
/* $NetBSD: ifconfig.c,v 1.163 2005/03/20 00:02:58 thorpej Exp $ */
|
||||
|
||||
/*-
|
||||
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
|
||||
|
|
@ -76,7 +76,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1993\n\
|
|||
#if 0
|
||||
static char sccsid[] = "@(#)ifconfig.c 8.2 (Berkeley) 2/16/94";
|
||||
#else
|
||||
__RCSID("$NetBSD: ifconfig.c,v 1.162 2005/03/19 23:46:03 thorpej Exp $");
|
||||
__RCSID("$NetBSD: ifconfig.c,v 1.163 2005/03/20 00:02:58 thorpej Exp $");
|
||||
#endif
|
||||
#endif /* not lint */
|
||||
|
||||
|
|
@ -97,9 +97,6 @@ __RCSID("$NetBSD: ifconfig.c,v 1.162 2005/03/19 23:46:03 thorpej Exp $");
|
|||
|
||||
#include <netdb.h>
|
||||
|
||||
#define EON
|
||||
#include <netiso/iso.h>
|
||||
#include <netiso/iso_var.h>
|
||||
#include <sys/protosw.h>
|
||||
|
||||
#include <ctype.h>
|
||||
|
|
@ -117,6 +114,7 @@ __RCSID("$NetBSD: ifconfig.c,v 1.162 2005/03/19 23:46:03 thorpej Exp $");
|
|||
|
||||
#ifndef INET_ONLY
|
||||
#include "af_atalk.h"
|
||||
#include "af_iso.h"
|
||||
#include "af_ns.h"
|
||||
#endif /* ! INET_ONLY */
|
||||
|
||||
|
|
@ -133,8 +131,6 @@ struct in6_ifreq ifr6;
|
|||
struct in6_ifreq in6_ridreq;
|
||||
struct in6_aliasreq in6_addreq;
|
||||
#endif
|
||||
struct iso_ifreq iso_ridreq;
|
||||
struct iso_aliasreq iso_addreq;
|
||||
struct sockaddr_in netmask;
|
||||
|
||||
char name[30];
|
||||
|
|
@ -144,7 +140,6 @@ u_long metric, mtu;
|
|||
int clearaddr, s;
|
||||
int newaddr = -1;
|
||||
int conflicting = 0;
|
||||
int nsellength = 1;
|
||||
int af;
|
||||
int aflag, bflag, Cflag, dflag, lflag, mflag, sflag, uflag, vflag, zflag;
|
||||
#ifdef INET6
|
||||
|
|
@ -167,8 +162,6 @@ void setifmetric(const char *, int);
|
|||
void setifmtu(const char *, int);
|
||||
void setifnetmask(const char *, int);
|
||||
void setifprefixlen(const char *, int);
|
||||
void setnsellength(const char *, int);
|
||||
void setsnpaoffset(const char *, int);
|
||||
#ifdef INET6
|
||||
void setia6flags(const char *, int);
|
||||
void setia6pltime(const char *, int);
|
||||
|
|
@ -183,7 +176,6 @@ void unsetmediaopt(const char *, int);
|
|||
void setmediainst(const char *, int);
|
||||
void clone_create(const char *, int);
|
||||
void clone_destroy(const char *, int);
|
||||
void fixnsel(struct sockaddr_iso *);
|
||||
int main(int, char *[]);
|
||||
|
||||
/*
|
||||
|
|
@ -311,7 +303,6 @@ const struct cmd {
|
|||
{ 0, 0, 0, setifdstaddr },
|
||||
};
|
||||
|
||||
void adjust_nsellength(void);
|
||||
int getinfo(struct ifreq *);
|
||||
int carrier(void);
|
||||
void printall(const char *);
|
||||
|
|
@ -340,8 +331,6 @@ void in6_status(int);
|
|||
void in6_getaddr(const char *, int);
|
||||
void in6_getprefix(const char *, int);
|
||||
#endif
|
||||
void iso_status(int);
|
||||
void iso_getaddr(const char *, int);
|
||||
|
||||
/* Known address families */
|
||||
const struct afswtch afs[] = {
|
||||
|
|
@ -1824,62 +1813,6 @@ in6_status(int force)
|
|||
}
|
||||
#endif /*INET6*/
|
||||
|
||||
#ifndef INET_ONLY
|
||||
|
||||
void
|
||||
iso_status(int force)
|
||||
{
|
||||
struct sockaddr_iso *siso;
|
||||
struct iso_ifreq isoifr;
|
||||
|
||||
getsock(AF_ISO);
|
||||
if (s < 0) {
|
||||
if (errno == EPROTONOSUPPORT)
|
||||
return;
|
||||
err(EXIT_FAILURE, "socket");
|
||||
}
|
||||
(void) memset(&isoifr, 0, sizeof(isoifr));
|
||||
(void) strncpy(isoifr.ifr_name, name, sizeof(isoifr.ifr_name));
|
||||
if (ioctl(s, SIOCGIFADDR_ISO, &isoifr) == -1) {
|
||||
if (errno == EADDRNOTAVAIL || errno == EAFNOSUPPORT) {
|
||||
if (!force)
|
||||
return;
|
||||
(void) memset(&isoifr.ifr_Addr, 0,
|
||||
sizeof(isoifr.ifr_Addr));
|
||||
} else
|
||||
warn("SIOCGIFADDR_ISO");
|
||||
}
|
||||
(void) strncpy(isoifr.ifr_name, name, sizeof isoifr.ifr_name);
|
||||
siso = &isoifr.ifr_Addr;
|
||||
printf("\tiso %s ", iso_ntoa(&siso->siso_addr));
|
||||
if (ioctl(s, SIOCGIFNETMASK_ISO, &isoifr) == -1) {
|
||||
if (errno == EADDRNOTAVAIL)
|
||||
memset(&isoifr.ifr_Addr, 0, sizeof(isoifr.ifr_Addr));
|
||||
else
|
||||
warn("SIOCGIFNETMASK_ISO");
|
||||
} else {
|
||||
if (siso->siso_len > offsetof(struct sockaddr_iso, siso_addr))
|
||||
siso->siso_addr.isoa_len = siso->siso_len
|
||||
- offsetof(struct sockaddr_iso, siso_addr);
|
||||
printf("\n\t\tnetmask %s ", iso_ntoa(&siso->siso_addr));
|
||||
}
|
||||
if (flags & IFF_POINTOPOINT) {
|
||||
if (ioctl(s, SIOCGIFDSTADDR_ISO, &isoifr) == -1) {
|
||||
if (errno == EADDRNOTAVAIL)
|
||||
memset(&isoifr.ifr_Addr, 0,
|
||||
sizeof(isoifr.ifr_Addr));
|
||||
else
|
||||
warn("SIOCGIFDSTADDR_ISO");
|
||||
}
|
||||
(void) strncpy(isoifr.ifr_name, name, sizeof (isoifr.ifr_name));
|
||||
siso = &isoifr.ifr_Addr;
|
||||
printf("--> %s ", iso_ntoa(&siso->siso_addr));
|
||||
}
|
||||
printf("\n");
|
||||
}
|
||||
|
||||
#endif /* INET_ONLY */
|
||||
|
||||
#define SIN(x) ((struct sockaddr_in *) &(x))
|
||||
struct sockaddr_in *sintab[] = {
|
||||
SIN(ridreq.ifr_addr), SIN(in_addreq.ifra_addr),
|
||||
|
|
@ -2056,61 +1989,6 @@ prefix(void *val, int size)
|
|||
}
|
||||
#endif /*INET6*/
|
||||
|
||||
#ifndef INET_ONLY
|
||||
#define SISO(x) ((struct sockaddr_iso *) &(x))
|
||||
struct sockaddr_iso *sisotab[] = {
|
||||
SISO(iso_ridreq.ifr_Addr), SISO(iso_addreq.ifra_addr),
|
||||
SISO(iso_addreq.ifra_mask), SISO(iso_addreq.ifra_dstaddr)};
|
||||
|
||||
void
|
||||
iso_getaddr(const char *addr, int which)
|
||||
{
|
||||
struct sockaddr_iso *siso = sisotab[which];
|
||||
siso->siso_addr = *iso_addr(addr);
|
||||
|
||||
if (which == MASK) {
|
||||
siso->siso_len = TSEL(siso) - (char *)(siso);
|
||||
siso->siso_nlen = 0;
|
||||
} else {
|
||||
siso->siso_len = sizeof(*siso);
|
||||
siso->siso_family = AF_ISO;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
setsnpaoffset(const char *val, int d)
|
||||
{
|
||||
iso_addreq.ifra_snpaoffset = atoi(val);
|
||||
}
|
||||
|
||||
void
|
||||
setnsellength(const char *val, int d)
|
||||
{
|
||||
nsellength = atoi(val);
|
||||
if (nsellength < 0)
|
||||
errx(EXIT_FAILURE, "Negative NSEL length is absurd");
|
||||
if (afp == 0 || afp->af_af != AF_ISO)
|
||||
errx(EXIT_FAILURE, "Setting NSEL length valid only for iso");
|
||||
}
|
||||
|
||||
void
|
||||
fixnsel(struct sockaddr_iso *siso)
|
||||
{
|
||||
if (siso->siso_family == 0)
|
||||
return;
|
||||
siso->siso_tlen = nsellength;
|
||||
}
|
||||
|
||||
void
|
||||
adjust_nsellength(void)
|
||||
{
|
||||
fixnsel(sisotab[RIDADDR]);
|
||||
fixnsel(sisotab[ADDR]);
|
||||
fixnsel(sisotab[DSTADDR]);
|
||||
}
|
||||
|
||||
#endif /* INET_ONLY */
|
||||
|
||||
void
|
||||
usage(void)
|
||||
{
|
||||
|
|
|
|||
Loading…
Reference in New Issue