65cf57f523
special-purpose code to display status for an interface for state that was not address-oriented. This status reporting was merged in to the address-oriented status reporting but did not work for link address reporting (as discovered with fwip interfaces). Correct this mis-merge and eliminate the bogus kludge that was used for link-level address reporting. o add an af_other_status method for an address family for reporting status of things like media, vlan, etc. o call the af_other_status methods after reporting address status for an interface o special-case link address status; when reporting all status for an interface invoke it specially prior to reporting af_other_status methods (since it requires the sockaddr_dl that is passed in to status separately from the rtmsg address state) o correct the calling convention for link address status; don't cast types, construct the proper parameter This fixes ifconfig on fwip interfaces.
174 lines
4.6 KiB
C
174 lines
4.6 KiB
C
/*
|
|
* Copyright (c) 1999
|
|
* Bill Paul <wpaul@ctr.columbia.edu>. 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. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by Bill Paul.
|
|
* 4. Neither the name of the author nor the names of any co-contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY Bill Paul 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 Bill Paul OR THE VOICES IN HIS HEAD
|
|
* 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/param.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/sockio.h>
|
|
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
|
|
#include <net/ethernet.h>
|
|
#include <net/if.h>
|
|
#include <net/if_var.h>
|
|
#include <net/if_vlan_var.h>
|
|
#include <net/route.h>
|
|
|
|
#include <ctype.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <err.h>
|
|
#include <errno.h>
|
|
|
|
#include "ifconfig.h"
|
|
|
|
#ifndef lint
|
|
static const char rcsid[] =
|
|
"$FreeBSD$";
|
|
#endif
|
|
static int __tag = 0;
|
|
static int __have_tag = 0;
|
|
|
|
static void
|
|
vlan_status(int s)
|
|
{
|
|
struct vlanreq vreq;
|
|
|
|
bzero((char *)&vreq, sizeof(struct vlanreq));
|
|
ifr.ifr_data = (caddr_t)&vreq;
|
|
|
|
if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
|
|
return;
|
|
|
|
printf("\tvlan: %d parent interface: %s\n",
|
|
vreq.vlr_tag, vreq.vlr_parent[0] == '\0' ?
|
|
"<none>" : vreq.vlr_parent);
|
|
|
|
return;
|
|
}
|
|
|
|
static void
|
|
setvlantag(const char *val, int d, int s, const struct afswtch *afp)
|
|
{
|
|
u_int16_t tag;
|
|
struct vlanreq vreq;
|
|
|
|
__tag = tag = atoi(val);
|
|
__have_tag = 1;
|
|
|
|
bzero((char *)&vreq, sizeof(struct vlanreq));
|
|
ifr.ifr_data = (caddr_t)&vreq;
|
|
|
|
if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
|
|
err(1, "SIOCGETVLAN");
|
|
|
|
vreq.vlr_tag = tag;
|
|
|
|
if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1)
|
|
err(1, "SIOCSETVLAN");
|
|
|
|
return;
|
|
}
|
|
|
|
static void
|
|
setvlandev(const char *val, int d, int s, const struct afswtch *afp)
|
|
{
|
|
struct vlanreq vreq;
|
|
|
|
if (!__have_tag)
|
|
errx(1, "must specify both vlan tag and device");
|
|
|
|
bzero((char *)&vreq, sizeof(struct vlanreq));
|
|
ifr.ifr_data = (caddr_t)&vreq;
|
|
|
|
if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
|
|
err(1, "SIOCGETVLAN");
|
|
|
|
strncpy(vreq.vlr_parent, val, sizeof(vreq.vlr_parent));
|
|
vreq.vlr_tag = __tag;
|
|
|
|
if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1)
|
|
err(1, "SIOCSETVLAN");
|
|
|
|
return;
|
|
}
|
|
|
|
static void
|
|
unsetvlandev(const char *val, int d, int s, const struct afswtch *afp)
|
|
{
|
|
struct vlanreq vreq;
|
|
|
|
bzero((char *)&vreq, sizeof(struct vlanreq));
|
|
ifr.ifr_data = (caddr_t)&vreq;
|
|
|
|
if (ioctl(s, SIOCGETVLAN, (caddr_t)&ifr) == -1)
|
|
err(1, "SIOCGETVLAN");
|
|
|
|
bzero((char *)&vreq.vlr_parent, sizeof(vreq.vlr_parent));
|
|
vreq.vlr_tag = 0;
|
|
|
|
if (ioctl(s, SIOCSETVLAN, (caddr_t)&ifr) == -1)
|
|
err(1, "SIOCSETVLAN");
|
|
|
|
return;
|
|
}
|
|
|
|
static struct cmd vlan_cmds[] = {
|
|
DEF_CMD_ARG("vlan", setvlantag),
|
|
DEF_CMD_ARG("vlandev", setvlandev),
|
|
DEF_CMD_ARG("-vlandev", unsetvlandev),
|
|
DEF_CMD("vlanmtu", IFCAP_VLAN_MTU, setifcap),
|
|
DEF_CMD("-vlanmtu", -IFCAP_VLAN_MTU, setifcap),
|
|
DEF_CMD("vlanhwtag", IFCAP_VLAN_HWTAGGING, setifcap),
|
|
DEF_CMD("-vlanhwtag", -IFCAP_VLAN_HWTAGGING, setifcap),
|
|
};
|
|
static struct afswtch af_vlan = {
|
|
.af_name = "af_vlan",
|
|
.af_af = AF_UNSPEC,
|
|
.af_other_status = vlan_status,
|
|
};
|
|
|
|
static __constructor void
|
|
vlan_ctor(void)
|
|
{
|
|
#define N(a) (sizeof(a) / sizeof(a[0]))
|
|
int i;
|
|
|
|
for (i = 0; i < N(vlan_cmds); i++)
|
|
cmd_register(&vlan_cmds[i]);
|
|
af_register(&af_vlan);
|
|
#undef N
|
|
}
|