Changeset View
Changeset View
Standalone View
Standalone View
head/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) { | |||||
ether_format = ether_ntoa((struct ether_addr *)LLADDR(sdl)); | ether_format = ether_ntoa((struct ether_addr *)LLADDR(sdl)); | ||||
for (i = 0; i < strlen(ether_format); i++) { | if (f_ether != NULL && strcmp(f_ether, "dash") == 0) { | ||||
if (ether_format[i] == ':') | for (format_char = strchr(ether_format, ':'); | ||||
ether_format[i] = '-'; | format_char != NULL; | ||||
hrs: Please use strchr(3). | |||||
format_char = strchr(ether_format, ':')) | |||||
*format_char = '-'; | |||||
} | } | ||||
printf("\tether %s\n", ether_format); | printf("\tether %s\n", ether_format); | ||||
} else | } else { | ||||
printf("\tether %s\n", | |||||
ether_ntoa((struct ether_addr *)LLADDR(sdl))); | |||||
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); | ||||
} | } | ||||
} | } | ||||
} | } | ||||
static void | static void | ||||
▲ Show 20 Lines • Show All 54 Lines • Show Last 20 Lines |
Please use strchr(3).