Page MenuHomeFreeBSD
Differential D2856 Diff 17172 sbin/ifconfig/af_link.c

Changeset View

Standalone View

View Options

sbin/ifconfig/af_link.c

Show First 20 Lines • Show All 52 Lines • ▼ Show 20 Lines
extern char *f_ether; extern char *f_ether;
static void static void
link_status(int s __unused, const struct ifaddrs *ifa) link_status(int s __unused, const struct ifaddrs *ifa)
{ {
/* XXX no const 'cuz LLADDR is defined wrong */ /* XXX no const 'cuz LLADDR is defined wrong */
struct sockaddr_dl *sdl = (struct sockaddr_dl *) ifa->ifa_addr; struct sockaddr_dl *sdl = (struct sockaddr_dl *) ifa->ifa_addr;
char *ether_format; char *ether_format, *format_char;
int i;
if (sdl != NULL && sdl->sdl_alen > 0) { if (sdl != NULL && sdl->sdl_alen > 0) {
if ((sdl->sdl_type == IFT_ETHER || if ((sdl->sdl_type == IFT_ETHER ||
sdl->sdl_type == IFT_L2VLAN || sdl->sdl_type == IFT_L2VLAN ||
sdl->sdl_type == IFT_BRIDGE) && sdl->sdl_type == IFT_BRIDGE) &&
sdl->sdl_alen == ETHER_ADDR_LEN) sdl->sdl_alen == ETHER_ADDR_LEN)
if (f_ether != NULL && strcmp(f_ether, "dash") == 0) { if (f_ether != NULL && strcmp(f_ether, "dash") == 0) {
ether_format = ether_ntoa((struct ether_addr *)LLADDR(sdl)); ether_format = ether_ntoa((struct ether_addr *)LLADDR(sdl));
jhbUnsubmitted
Not Done
Inline Actions

Looking at this again, it might be simpler to always use 'ether_format':

ether_format = ether_ntoa((struct ether_addr *)LLADDR(sdl));
if (f_ether != NULL && strcmp(f_ether, "dash") == 0) {
    for (format_char = strchr(ether_format, ':'); format_char != NULL;
        format_char = strchr(format_char, ':'))
        *format_char = '-';
}
printf("\tether %s\n", ether_format);
jhb: Looking at this again, it might be simpler to always use 'ether_format': ``` ether_format…
for (i = 0; i < strlen(ether_format); i++) { while ((format_char = strchr(ether_format, ':')) != NULL)
if (ether_format[i] == ':') format_char[0] = '-';
ether_format[i] = '-';
}
printf("\tether %s\n", ether_format); printf("\tether %s\n", ether_format);
} else } else
printf("\tether %s\n", printf("\tether %s\n",
ether_ntoa((struct ether_addr *)LLADDR(sdl))); ether_ntoa((struct ether_addr *)LLADDR(sdl)));
else { else {
int n = sdl->sdl_nlen > 0 ? sdl->sdl_nlen + 1 : 0; int n = sdl->sdl_nlen > 0 ? sdl->sdl_nlen + 1 : 0;
printf("\tlladdr %s\n", link_ntoa(sdl) + n); printf("\tlladdr %s\n", link_ntoa(sdl) + n);
▲ Show 20 Lines • Show All 59 Lines • Show Last 20 Lines