Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Split the IPv4 support into its own file.

Browse Source
This commit is contained in:
thorpej 2005-03-20 02:43:50 +00:00
parent 20f1388354
commit e00adb14b6
5 changed files with 267 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sbin/ifconfig/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.25 2005/03/20 01:09:16 thorpej Exp $
# $NetBSD: Makefile,v 1.26 2005/03/20 02:43:50 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_inet.c
SRCS+= af_inet6.c
SRCS+= af_iso.c
SRCS+= af_ns.c

210
sbin/ifconfig/af_inet.c Normal file
View File

@ -0,0 +1,210 @@
/* $NetBSD: af_inet.c,v 1.1 2005/03/20 02:43:50 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.
*/
#include <sys/cdefs.h>
#ifndef lint
__RCSID("$NetBSD: af_inet.c,v 1.1 2005/03/20 02:43:50 thorpej Exp $");
#endif /* not lint */
#include <sys/param.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <net/if.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <arpa/inet.h>
#include <err.h>
#include <errno.h>
#include <ifaddrs.h>
#include <netdb.h>
#include <string.h>
#include <stdlib.h>
#include <stdio.h>
#include "extern.h"
#include "af_inet.h"
struct in_aliasreq in_addreq;
int setipdst;
void
setifipdst(const char *addr, int d)
{
in_getaddr(addr, DSTADDR);
setipdst++;
clearaddr = 0;
newaddr = 0;
}
void
in_alias(struct ifreq *creq)
{
struct sockaddr_in *iasin;
int alias;
if (lflag)
return;
alias = 1;
/* Get the non-alias address for this interface. */
getsock(AF_INET);
if (s < 0) {
if (errno == EPROTONOSUPPORT)
return;
err(EXIT_FAILURE, "socket");
}
(void) memset(&ifr, 0, sizeof(ifr));
(void) strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFADDR, &ifr) == -1) {
if (errno == EADDRNOTAVAIL || errno == EAFNOSUPPORT) {
return;
} else
warn("SIOCGIFADDR");
}
/* If creq and ifr are the same address, this is not an alias. */
if (memcmp(&ifr.ifr_addr, &creq->ifr_addr,
sizeof(creq->ifr_addr)) == 0)
alias = 0;
(void) memset(&in_addreq, 0, sizeof(in_addreq));
(void) strncpy(in_addreq.ifra_name, name, sizeof(in_addreq.ifra_name));
memcpy(&in_addreq.ifra_addr, &creq->ifr_addr,
sizeof(in_addreq.ifra_addr));
if (ioctl(s, SIOCGIFALIAS, &in_addreq) == -1) {
if (errno == EADDRNOTAVAIL || errno == EAFNOSUPPORT) {
return;
} else
warn("SIOCGIFALIAS");
}
iasin = &in_addreq.ifra_addr;
printf("\tinet %s%s", alias ? "alias " : "", inet_ntoa(iasin->sin_addr));
if (flags & IFF_POINTOPOINT) {
iasin = &in_addreq.ifra_dstaddr;
printf(" -> %s", inet_ntoa(iasin->sin_addr));
}
iasin = &in_addreq.ifra_mask;
printf(" netmask 0x%x", ntohl(iasin->sin_addr.s_addr));
if (flags & IFF_BROADCAST) {
iasin = &in_addreq.ifra_broadaddr;
printf(" broadcast %s", inet_ntoa(iasin->sin_addr));
}
printf("\n");
}
void
in_status(int force)
{
struct ifaddrs *ifap, *ifa;
struct ifreq isifr;
if (getifaddrs(&ifap) != 0)
err(EXIT_FAILURE, "getifaddrs");
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (strcmp(name, ifa->ifa_name) != 0)
continue;
if (ifa->ifa_addr->sa_family != AF_INET)
continue;
if (sizeof(isifr.ifr_addr) < ifa->ifa_addr->sa_len)
continue;
memset(&isifr, 0, sizeof(isifr));
strncpy(isifr.ifr_name, ifa->ifa_name, sizeof(isifr.ifr_name));
memcpy(&isifr.ifr_addr, ifa->ifa_addr, ifa->ifa_addr->sa_len);
in_alias(&isifr);
}
freeifaddrs(ifap);
}
#define SIN(x) ((struct sockaddr_in *) &(x))
struct sockaddr_in *sintab[] = {
SIN(ridreq.ifr_addr), SIN(in_addreq.ifra_addr),
SIN(in_addreq.ifra_mask), SIN(in_addreq.ifra_broadaddr)};
void
in_getaddr(const char *str, int which)
{
struct sockaddr_in *gasin = sintab[which];
struct hostent *hp;
struct netent *np;
gasin->sin_len = sizeof(*gasin);
if (which != MASK)
gasin->sin_family = AF_INET;
if (which == ADDR) {
char *p = NULL;
if ((p = strrchr(str, '/')) != NULL) {
*p = '\0';
in_getprefix(p + 1, MASK);
}
}
if (inet_aton(str, &gasin->sin_addr) == 0) {
if ((hp = gethostbyname(str)) != NULL)
(void) memcpy(&gasin->sin_addr, hp->h_addr, hp->h_length);
else if ((np = getnetbyname(str)) != NULL)
gasin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY);
else
errx(EXIT_FAILURE, "%s: bad value", str);
}
}
void
in_getprefix(const char *plen, int which)
{
struct sockaddr_in *igsin = sintab[which];
u_char *cp;
int len = strtol(plen, (char **)NULL, 10);
if ((len < 0) || (len > 32))
errx(EXIT_FAILURE, "%s: bad value", plen);
igsin->sin_len = sizeof(*igsin);
if (which != MASK)
igsin->sin_family = AF_INET;
if ((len == 0) || (len == 32)) {
memset(&igsin->sin_addr, 0xff, sizeof(struct in_addr));
return;
}
memset((void *)&igsin->sin_addr, 0x00, sizeof(igsin->sin_addr));
for (cp = (u_char *)&igsin->sin_addr; len > 7; len -= 8)
*cp++ = 0xff;
if (len)
*cp = 0xff << (8 - len);
}

45
sbin/ifconfig/af_inet.h Normal file
View File

@ -0,0 +1,45 @@
/* $NetBSD: af_inet.h,v 1.1 2005/03/20 02:43:50 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 */
#include <netinet/in.h>
/* XXX */
extern struct in_aliasreq in_addreq;
extern int setipdst;
void in_alias(struct ifreq *);
void in_status(int);
void in_getaddr(const char *, int);
void in_getprefix(const char *, int);
void setifipdst(const char *, int d);

5
sbin/ifconfig/extern.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: extern.h,v 1.7 2005/03/20 01:09:16 thorpej Exp $ */
/* $NetBSD: extern.h,v 1.8 2005/03/20 02:43:50 thorpej Exp $ */
/*
* Copyright (c) 1983, 1993
@ -51,9 +51,12 @@ extern const struct afswtch *afp;
extern struct ifreq ifr;
extern int s;
extern int explicit_prefix;
extern int clearaddr;
extern int newaddr;
extern char name[30];
extern u_short flags;
extern int lflag;
extern int zflag;
#ifdef INET6
extern int Lflag;

169
sbin/ifconfig/ifconfig.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: ifconfig.c,v 1.165 2005/03/20 01:10:51 thorpej Exp $ */
/* $NetBSD: ifconfig.c,v 1.166 2005/03/20 02:43:50 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.165 2005/03/20 01:10:51 thorpej Exp $");
__RCSID("$NetBSD: ifconfig.c,v 1.166 2005/03/20 02:43:50 thorpej Exp $");
#endif
#endif /* not lint */
@ -88,9 +88,8 @@ __RCSID("$NetBSD: ifconfig.c,v 1.165 2005/03/20 01:10:51 thorpej Exp $");
#include <net/if_dl.h>
#include <net/if_media.h>
#include <net/if_ether.h>
#include <netinet/in.h>
#include <netinet/in_var.h>
#include <arpa/inet.h>
#include <netinet/in.h> /* XXX */
#include <netinet/in_var.h> /* XXX */
#include <netdb.h>
@ -114,6 +113,7 @@ __RCSID("$NetBSD: ifconfig.c,v 1.165 2005/03/20 01:10:51 thorpej Exp $");
#include "af_iso.h"
#include "af_ns.h"
#endif /* ! INET_ONLY */
#include "af_inet.h"
#ifdef INET6
#include "af_inet6.h"
#endif /* INET6 */
@ -125,13 +125,10 @@ __RCSID("$NetBSD: ifconfig.c,v 1.165 2005/03/20 01:10:51 thorpej Exp $");
struct ifreq ifr, ridreq;
struct ifaliasreq addreq __attribute__((aligned(4)));
struct in_aliasreq in_addreq;
struct sockaddr_in netmask;
char name[30];
u_short flags;
int setaddr, setipdst, doalias;
int setaddr, doalias;
u_long metric, mtu;
int clearaddr, s;
int newaddr = -1;
@ -303,11 +300,6 @@ void print_media_word(int, const char *);
void process_media_commands(void);
void init_current_media(void);
void in_alias(struct ifreq *);
void in_status(int);
void in_getaddr(const char *, int);
void in_getprefix(const char *, int);
/* Known address families */
const struct afswtch afs[] = {
{ "inet", AF_INET, in_status, in_getaddr, in_getprefix,
@ -833,15 +825,6 @@ setifbroadaddr(const char *addr, int d)
(*afp->af_getaddr)(addr, DSTADDR);
}
void
setifipdst(const char *addr, int d)
{
in_getaddr(addr, DSTADDR);
setipdst++;
clearaddr = 0;
newaddr = 0;
}
#define rqtosa(x) (&(((struct ifreq *)(afp->x))->ifr_addr))
/*ARGSUSED*/
void
@ -1465,89 +1448,6 @@ status(const struct sockaddr_dl *sdl)
}
}
void
in_alias(struct ifreq *creq)
{
struct sockaddr_in *iasin;
int alias;
if (lflag)
return;
alias = 1;
/* Get the non-alias address for this interface. */
getsock(AF_INET);
if (s < 0) {
if (errno == EPROTONOSUPPORT)
return;
err(EXIT_FAILURE, "socket");
}
(void) memset(&ifr, 0, sizeof(ifr));
(void) strncpy(ifr.ifr_name, name, sizeof(ifr.ifr_name));
if (ioctl(s, SIOCGIFADDR, &ifr) == -1) {
if (errno == EADDRNOTAVAIL || errno == EAFNOSUPPORT) {
return;
} else
warn("SIOCGIFADDR");
}
/* If creq and ifr are the same address, this is not an alias. */
if (memcmp(&ifr.ifr_addr, &creq->ifr_addr,
sizeof(creq->ifr_addr)) == 0)
alias = 0;
(void) memset(&in_addreq, 0, sizeof(in_addreq));
(void) strncpy(in_addreq.ifra_name, name, sizeof(in_addreq.ifra_name));
memcpy(&in_addreq.ifra_addr, &creq->ifr_addr,
sizeof(in_addreq.ifra_addr));
if (ioctl(s, SIOCGIFALIAS, &in_addreq) == -1) {
if (errno == EADDRNOTAVAIL || errno == EAFNOSUPPORT) {
return;
} else
warn("SIOCGIFALIAS");
}
iasin = &in_addreq.ifra_addr;
printf("\tinet %s%s", alias ? "alias " : "", inet_ntoa(iasin->sin_addr));
if (flags & IFF_POINTOPOINT) {
iasin = &in_addreq.ifra_dstaddr;
printf(" -> %s", inet_ntoa(iasin->sin_addr));
}
iasin = &in_addreq.ifra_mask;
printf(" netmask 0x%x", ntohl(iasin->sin_addr.s_addr));
if (flags & IFF_BROADCAST) {
iasin = &in_addreq.ifra_broadaddr;
printf(" broadcast %s", inet_ntoa(iasin->sin_addr));
}
printf("\n");
}
void
in_status(int force)
{
struct ifaddrs *ifap, *ifa;
struct ifreq isifr;
if (getifaddrs(&ifap) != 0)
err(EXIT_FAILURE, "getifaddrs");
for (ifa = ifap; ifa; ifa = ifa->ifa_next) {
if (strcmp(name, ifa->ifa_name) != 0)
continue;
if (ifa->ifa_addr->sa_family != AF_INET)
continue;
if (sizeof(isifr.ifr_addr) < ifa->ifa_addr->sa_len)
continue;
memset(&isifr, 0, sizeof(isifr));
strncpy(isifr.ifr_name, ifa->ifa_name, sizeof(isifr.ifr_name));
memcpy(&isifr.ifr_addr, ifa->ifa_addr, ifa->ifa_addr->sa_len);
in_alias(&isifr);
}
freeifaddrs(ifap);
}
void
setifprefixlen(const char *addr, int d)
{
@ -1556,63 +1456,6 @@ setifprefixlen(const char *addr, int d)
explicit_prefix = 1;
}
#define SIN(x) ((struct sockaddr_in *) &(x))
struct sockaddr_in *sintab[] = {
SIN(ridreq.ifr_addr), SIN(in_addreq.ifra_addr),
SIN(in_addreq.ifra_mask), SIN(in_addreq.ifra_broadaddr)};
void
in_getaddr(const char *str, int which)
{
struct sockaddr_in *gasin = sintab[which];
struct hostent *hp;
struct netent *np;
gasin->sin_len = sizeof(*gasin);
if (which != MASK)
gasin->sin_family = AF_INET;
if (which == ADDR) {
char *p = NULL;
if ((p = strrchr(str, '/')) != NULL) {
*p = '\0';
in_getprefix(p + 1, MASK);
}
}
if (inet_aton(str, &gasin->sin_addr) == 0) {
if ((hp = gethostbyname(str)) != NULL)
(void) memcpy(&gasin->sin_addr, hp->h_addr, hp->h_length);
else if ((np = getnetbyname(str)) != NULL)
gasin->sin_addr = inet_makeaddr(np->n_net, INADDR_ANY);
else
errx(EXIT_FAILURE, "%s: bad value", str);
}
}
void
in_getprefix(const char *plen, int which)
{
struct sockaddr_in *igsin = sintab[which];
u_char *cp;
int len = strtol(plen, (char **)NULL, 10);
if ((len < 0) || (len > 32))
errx(EXIT_FAILURE, "%s: bad value", plen);
igsin->sin_len = sizeof(*igsin);
if (which != MASK)
igsin->sin_family = AF_INET;
if ((len == 0) || (len == 32)) {
memset(&igsin->sin_addr, 0xff, sizeof(struct in_addr));
return;
}
memset((void *)&igsin->sin_addr, 0x00, sizeof(igsin->sin_addr));
for (cp = (u_char *)&igsin->sin_addr; len > 7; len -= 8)
*cp++ = 0xff;
if (len)
*cp = 0xff << (8 - len);
}
void
usage(void)
{