mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-21 11:13:30 +00:00
90c4b74cbe
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.
128 lines
3.7 KiB
C
128 lines
3.7 KiB
C
/*
|
|
* 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.
|
|
* 4. 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 lint
|
|
static const char rcsid[] =
|
|
"$FreeBSD$";
|
|
#endif /* not lint */
|
|
|
|
#include <sys/types.h>
|
|
#include <sys/ioctl.h>
|
|
#include <sys/socket.h>
|
|
#include <net/if.h>
|
|
#include <net/route.h> /* for RTX_IFA */
|
|
|
|
#include <err.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
|
|
#include <net/if_dl.h>
|
|
#include <net/if_types.h>
|
|
#include <net/ethernet.h>
|
|
|
|
#include "ifconfig.h"
|
|
|
|
static struct ifreq link_ridreq;
|
|
|
|
static void
|
|
link_status(int s __unused, const struct rt_addrinfo *info)
|
|
{
|
|
const struct sockaddr_dl *sdl =
|
|
(const struct sockaddr_dl *) info->rti_info[RTAX_IFA];
|
|
|
|
if (sdl != NULL && sdl->sdl_alen > 0) {
|
|
if (sdl->sdl_type == IFT_ETHER &&
|
|
sdl->sdl_alen == ETHER_ADDR_LEN)
|
|
printf("\tether %s\n",
|
|
ether_ntoa((const struct ether_addr *)LLADDR(sdl)));
|
|
else {
|
|
int n = sdl->sdl_nlen > 0 ? sdl->sdl_nlen + 1 : 0;
|
|
|
|
printf("\tlladdr %s\n", link_ntoa(sdl) + n);
|
|
}
|
|
}
|
|
}
|
|
|
|
static void
|
|
link_getaddr(const char *addr, int which)
|
|
{
|
|
char *temp;
|
|
struct sockaddr_dl sdl;
|
|
struct sockaddr *sa = &link_ridreq.ifr_addr;
|
|
|
|
if (which != ADDR)
|
|
errx(1, "can't set link-level netmask or broadcast");
|
|
if ((temp = malloc(strlen(addr) + 1)) == NULL)
|
|
errx(1, "malloc failed");
|
|
temp[0] = ':';
|
|
strcpy(temp + 1, addr);
|
|
sdl.sdl_len = sizeof(sdl);
|
|
link_addr(temp, &sdl);
|
|
free(temp);
|
|
if (sdl.sdl_alen > sizeof(sa->sa_data))
|
|
errx(1, "malformed link-level address");
|
|
sa->sa_family = AF_LINK;
|
|
sa->sa_len = sdl.sdl_alen;
|
|
bcopy(LLADDR(&sdl), sa->sa_data, sdl.sdl_alen);
|
|
}
|
|
|
|
static struct afswtch af_link = {
|
|
.af_name = "link",
|
|
.af_af = AF_LINK,
|
|
.af_status = link_status,
|
|
.af_getaddr = link_getaddr,
|
|
.af_aifaddr = SIOCSIFLLADDR,
|
|
.af_addreq = &link_ridreq,
|
|
};
|
|
static struct afswtch af_ether = {
|
|
.af_name = "ether",
|
|
.af_af = AF_LINK,
|
|
.af_status = link_status,
|
|
.af_getaddr = link_getaddr,
|
|
.af_aifaddr = SIOCSIFLLADDR,
|
|
.af_addreq = &link_ridreq,
|
|
};
|
|
static struct afswtch af_lladdr = {
|
|
.af_name = "lladdr",
|
|
.af_af = AF_LINK,
|
|
.af_status = link_status,
|
|
.af_getaddr = link_getaddr,
|
|
.af_aifaddr = SIOCSIFLLADDR,
|
|
.af_addreq = &link_ridreq,
|
|
};
|
|
|
|
static __constructor void
|
|
link_ctor(void)
|
|
{
|
|
af_register(&af_link);
|
|
af_register(&af_ether);
|
|
af_register(&af_lladdr);
|
|
}
|