X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-bsd.c;h=b799cb589865cbe983ffc423611abcaf676f6458;hb=bd3ad2c3508aaf7283f3ee041ecd3e5108471b21;hp=a5b7c9350eb2807396a2b668e1253af8ea1c2ba7;hpb=87ad1c07628558ba25083fefc8141b930fb6f96c;p=sliver-openvswitch.git diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index a5b7c9350..b799cb589 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -1,5 +1,6 @@ /* * Copyright (c) 2011 Gaetano Catalli. + * Copyright (c) 2013 YAMAMOTO Takashi. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -39,6 +40,9 @@ #include #include #include +#if defined(__NetBSD__) +#include +#endif #include "rtbsd.h" #include "coverage.h" @@ -79,6 +83,7 @@ struct netdev_bsd { int ifindex; uint8_t etheraddr[ETH_ADDR_LEN]; struct in_addr in4; + struct in_addr netmask; struct in6_addr in6; int mtu; int carrier; @@ -102,8 +107,10 @@ enum { VALID_CARRIER = 1 << 5 }; -/* An AF_INET socket (used for ioctl operations). */ -static int af_inet_sock = -1; +#if defined(__NetBSD__) +/* AF_LINK socket used for netdev_bsd_get_stats and set_etheraddr */ +static int af_link_sock = -1; +#endif /* defined(__NetBSD__) */ #define PCAP_SNAPLEN 2048 @@ -123,8 +130,6 @@ static int cache_notifier_refcount; static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); -static int netdev_bsd_do_ioctl(const char *, struct ifreq *, unsigned long cmd, - const char *cmd_name); static void destroy_tap(int fd, const char *name); static int get_flags(const struct netdev *, int *flagsp); static int set_flags(const char *, int flags); @@ -171,20 +176,23 @@ netdev_get_kernel_name(const struct netdev *netdev) static int netdev_bsd_init(void) { +#if defined(__NetBSD__) static int status = -1; if (status >= 0) { /* already initialized */ return status; } - af_inet_sock = socket(AF_INET, SOCK_DGRAM, 0); - status = af_inet_sock >= 0 ? 0 : errno; - + af_link_sock = socket(AF_LINK, SOCK_DGRAM, 0); + status = af_link_sock >= 0 ? 0 : errno; if (status) { - VLOG_ERR("failed to create inet socket: %s", strerror(status)); + VLOG_ERR("failed to create link socket: %s", ovs_strerror(status)); } return status; +#else + return 0; +#endif /* defined(__NetBSD__) */ } /* @@ -235,6 +243,7 @@ netdev_bsd_cache_cb(const struct rtbsd_change *change, dev->cache_valid = 0; netdev_bsd_changed(dev); } + netdev_close(base_dev); } } else { /* @@ -247,9 +256,11 @@ netdev_bsd_cache_cb(const struct rtbsd_change *change, shash_init(&device_shash); netdev_get_devices(&netdev_bsd_class, &device_shash); SHASH_FOR_EACH (node, &device_shash) { - dev = node->data; + struct netdev *netdev = node->data; + dev = netdev_bsd_cast(netdev); dev->cache_valid = 0; netdev_bsd_changed(dev); + netdev_close(netdev); } shash_destroy(&device_shash); } @@ -304,6 +315,7 @@ netdev_bsd_create_system(const struct netdev_class *class, const char *name, /* Verify that the netdev really exists by attempting to read its flags */ error = netdev_get_flags(&netdev->up, &flags); if (error == ENXIO) { + free(netdev->kernel_name); netdev_uninit(&netdev->up, false); free(netdev); cache_notifier_unref(); @@ -342,24 +354,25 @@ netdev_bsd_create_tap(const struct netdev_class *class, const char *name, netdev->change_seq = 1; if (netdev->tap_fd < 0) { error = errno; - VLOG_WARN("opening \"/dev/tap\" failed: %s", strerror(error)); - goto error_undef_notifier; + VLOG_WARN("opening \"/dev/tap\" failed: %s", ovs_strerror(error)); + goto error_unref_notifier; } /* Retrieve tap name (e.g. tap0) */ if (ioctl(netdev->tap_fd, TAPGIFNAME, &ifr) == -1) { /* XXX Need to destroy the device? */ error = errno; - goto error_undef_notifier; + close(netdev->tap_fd); + goto error_unref_notifier; } /* Change the name of the tap device */ #if defined(SIOCSIFNAME) ifr.ifr_data = (void *)name; - if (ioctl(af_inet_sock, SIOCSIFNAME, &ifr) == -1) { - error = errno; + error = af_inet_ioctl(SIOCSIFNAME, &ifr); + if (error) { destroy_tap(netdev->tap_fd, ifr.ifr_name); - goto error_undef_notifier; + goto error_unref_notifier; } kernel_name = xstrdup(name); #else @@ -374,16 +387,16 @@ netdev_bsd_create_tap(const struct netdev_class *class, const char *name, error = set_nonblocking(netdev->tap_fd); if (error) { destroy_tap(netdev->tap_fd, kernel_name); - goto error_undef_notifier; + goto error_unref_notifier; } /* Turn device UP */ ifr_set_flags(&ifr, IFF_UP); strncpy(ifr.ifr_name, kernel_name, sizeof ifr.ifr_name); - if (ioctl(af_inet_sock, SIOCSIFFLAGS, &ifr) == -1) { - error = errno; + error = af_inet_ioctl(SIOCSIFFLAGS, &ifr); + if (error) { destroy_tap(netdev->tap_fd, kernel_name); - goto error_undef_notifier; + goto error_unref_notifier; } /* initialize the device structure and @@ -394,7 +407,7 @@ netdev_bsd_create_tap(const struct netdev_class *class, const char *name, return 0; -error_undef_notifier: +error_unref_notifier: cache_notifier_unref(); error: free(netdev); @@ -463,7 +476,7 @@ netdev_bsd_open_pcap(const char *name, pcap_t **pcapp, int *fdp) * buffer becomes full or a timeout occurs. */ if (ioctl(fd, BIOCIMMEDIATE, &one) < 0 ) { VLOG_ERR_RL(&rl, "ioctl(BIOCIMMEDIATE) on %s device failed: %s", - name, strerror(errno)); + name, ovs_strerror(errno)); error = errno; goto error; } @@ -618,7 +631,7 @@ netdev_rx_bsd_recv_tap(struct netdev_rx_bsd *rx, void *data, size_t size) } else if (errno != EINTR) { if (errno != EAGAIN) { VLOG_WARN_RL(&rl, "error receiving Ethernet packet on %s: %s", - strerror(errno), netdev_rx_get_name(&rx->up)); + ovs_strerror(errno), netdev_rx_get_name(&rx->up)); } return -errno; } @@ -658,7 +671,7 @@ netdev_rx_bsd_drain(struct netdev_rx *rx_) strcpy(ifr.ifr_name, netdev_get_kernel_name(netdev_rx_get_netdev(rx_))); if (ioctl(rx->fd, BIOCFLUSH, &ifr) == -1) { VLOG_DBG_RL(&rl, "%s: ioctl(BIOCFLUSH) failed: %s", - netdev_rx_get_name(rx_), strerror(errno)); + netdev_rx_get_name(rx_), ovs_strerror(errno)); return errno; } return 0; @@ -693,7 +706,7 @@ netdev_bsd_send(struct netdev *netdev_, const void *data, size_t size) continue; } else if (errno != EAGAIN) { VLOG_WARN_RL(&rl, "error sending Ethernet packet on %s: %s", - name, strerror(errno)); + name, ovs_strerror(errno)); } return errno; } else if (retval != size) { @@ -790,7 +803,7 @@ netdev_bsd_get_mtu(const struct netdev *netdev_, int *mtup) struct ifreq ifr; int error; - error = netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev_), &ifr, + error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev_), &ifr, SIOCGIFMTU, "SIOCGIFMTU"); if (error) { return error; @@ -819,15 +832,17 @@ netdev_bsd_get_carrier(const struct netdev *netdev_, bool *carrier) if (!(netdev->cache_valid & VALID_CARRIER)) { struct ifmediareq ifmr; + int error; memset(&ifmr, 0, sizeof(ifmr)); strncpy(ifmr.ifm_name, netdev_get_kernel_name(netdev_), sizeof ifmr.ifm_name); - if (ioctl(af_inet_sock, SIOCGIFMEDIA, &ifmr) == -1) { + error = af_inet_ioctl(SIOCGIFMEDIA, &ifmr); + if (error) { VLOG_DBG_RL(&rl, "%s: ioctl(SIOCGIFMEDIA) failed: %s", - netdev_get_name(netdev_), strerror(errno)); - return errno; + netdev_get_name(netdev_), ovs_strerror(error)); + return error; } netdev->carrier = (ifmr.ifm_status & IFM_ACTIVE) == IFM_ACTIVE; @@ -844,10 +859,38 @@ netdev_bsd_get_carrier(const struct netdev *netdev_, bool *carrier) return 0; } +static void +convert_stats(struct netdev_stats *stats, const struct if_data *ifd) +{ + /* + * note: UINT64_MAX means unsupported + */ + stats->rx_packets = ifd->ifi_ipackets; + stats->tx_packets = ifd->ifi_opackets; + stats->rx_bytes = ifd->ifi_obytes; + stats->tx_bytes = ifd->ifi_ibytes; + stats->rx_errors = ifd->ifi_ierrors; + stats->tx_errors = ifd->ifi_oerrors; + stats->rx_dropped = ifd->ifi_iqdrops; + stats->tx_dropped = UINT64_MAX; + stats->multicast = ifd->ifi_imcasts; + stats->collisions = ifd->ifi_collisions; + stats->rx_length_errors = UINT64_MAX; + stats->rx_over_errors = UINT64_MAX; + stats->rx_crc_errors = UINT64_MAX; + stats->rx_frame_errors = UINT64_MAX; + stats->rx_fifo_errors = UINT64_MAX; + stats->rx_missed_errors = UINT64_MAX; + stats->tx_aborted_errors = UINT64_MAX; + stats->tx_carrier_errors = UINT64_MAX; + stats->tx_fifo_errors = UINT64_MAX; + stats->tx_heartbeat_errors = UINT64_MAX; + stats->tx_window_errors = UINT64_MAX; +} + /* Retrieves current device stats for 'netdev'. */ static int -netdev_bsd_get_stats(const struct netdev *netdev_ OVS_UNUSED, - struct netdev_stats *stats) +netdev_bsd_get_stats(const struct netdev *netdev_, struct netdev_stats *stats) { #if defined(__FreeBSD__) int if_count, i; @@ -866,7 +909,7 @@ netdev_bsd_get_stats(const struct netdev *netdev_ OVS_UNUSED, if (sysctl(mib, 5, &if_count, &len, (void *)0, 0) == -1) { VLOG_DBG_RL(&rl, "%s: sysctl failed: %s", - netdev_get_name(netdev_), strerror(errno)); + netdev_get_name(netdev_), ovs_strerror(errno)); return errno; } @@ -877,41 +920,32 @@ netdev_bsd_get_stats(const struct netdev *netdev_ OVS_UNUSED, mib[4] = i; //row if (sysctl(mib, 6, &ifmd, &len, (void *)0, 0) == -1) { VLOG_DBG_RL(&rl, "%s: sysctl failed: %s", - netdev_get_name(netdev_), strerror(errno)); + netdev_get_name(netdev_), ovs_strerror(errno)); return errno; } else if (!strcmp(ifmd.ifmd_name, netdev_get_name(netdev_))) { - stats->rx_packets = ifmd.ifmd_data.ifi_ipackets; - stats->tx_packets = ifmd.ifmd_data.ifi_opackets; - stats->rx_bytes = ifmd.ifmd_data.ifi_ibytes; - stats->tx_bytes = ifmd.ifmd_data.ifi_obytes; - stats->rx_errors = ifmd.ifmd_data.ifi_ierrors; - stats->tx_errors = ifmd.ifmd_data.ifi_oerrors; - stats->rx_dropped = ifmd.ifmd_data.ifi_iqdrops; - stats->tx_dropped = UINT64_MAX; - stats->multicast = ifmd.ifmd_data.ifi_imcasts; - stats->collisions = ifmd.ifmd_data.ifi_collisions; - - stats->rx_length_errors = UINT64_MAX; - stats->rx_over_errors = UINT64_MAX; - stats->rx_crc_errors = UINT64_MAX; - stats->rx_frame_errors = UINT64_MAX; - stats->rx_fifo_errors = UINT64_MAX; - stats->rx_missed_errors = UINT64_MAX; - - stats->tx_aborted_errors = UINT64_MAX; - stats->tx_carrier_errors = UINT64_MAX; - stats->tx_fifo_errors = UINT64_MAX; - stats->tx_heartbeat_errors = UINT64_MAX; - stats->tx_window_errors = UINT64_MAX; + convert_stats(stats, &ifmd.ifmd_data); break; } } return 0; -#else - /* XXXnotyet */ - memset(stats, 0, sizeof(*stats)); +#elif defined(__NetBSD__) + struct ifdatareq ifdr; + int saved_errno; + int ret; + + memset(&ifdr, 0, sizeof(ifdr)); + strncpy(ifdr.ifdr_name, netdev_get_kernel_name(netdev_), + sizeof(ifdr.ifdr_name)); + ret = ioctl(af_link_sock, SIOCGIFDATA, &ifdr); + saved_errno = errno; + if (ret == -1) { + return saved_errno; + } + convert_stats(stats, &ifdr.ifdr_data); return 0; +#else +#error not implemented #endif } @@ -1013,10 +1047,11 @@ netdev_bsd_get_features(const struct netdev *netdev, /* We make two SIOCGIFMEDIA ioctl calls. The first to determine the * number of supported modes, and a second with a buffer to retrieve * them. */ - if (ioctl(af_inet_sock, SIOCGIFMEDIA, &ifmr) == -1) { + error = af_inet_ioctl(SIOCGIFMEDIA, &ifmr); + if (error) { VLOG_DBG_RL(&rl, "%s: ioctl(SIOCGIFMEDIA) failed: %s", - netdev_get_name(netdev), strerror(errno)); - return errno; + netdev_get_name(netdev), ovs_strerror(error)); + return error; } media_list = xcalloc(ifmr.ifm_count, sizeof(int)); @@ -1029,10 +1064,10 @@ netdev_bsd_get_features(const struct netdev *netdev, goto cleanup; } - if (ioctl(af_inet_sock, SIOCGIFMEDIA, &ifmr) == -1) { + error = af_inet_ioctl(SIOCGIFMEDIA, &ifmr); + if (error) { VLOG_DBG_RL(&rl, "%s: ioctl(SIOCGIFMEDIA) failed: %s", - netdev_get_name(netdev), strerror(errno)); - error = errno; + netdev_get_name(netdev), ovs_strerror(error)); goto cleanup; } @@ -1058,8 +1093,8 @@ cleanup: } /* - * If 'netdev' has an assigned IPv4 address, sets '*in4' to that address (if - * 'in4' is non-null) and returns true. Otherwise, returns false. + * If 'netdev' has an assigned IPv4 address, sets '*in4' to that address and + * '*netmask' to its netmask and returns true. Otherwise, returns false. */ static int netdev_bsd_get_in4(const struct netdev *netdev_, struct in_addr *in4, @@ -1073,7 +1108,7 @@ netdev_bsd_get_in4(const struct netdev *netdev_, struct in_addr *in4, int error; ifr.ifr_addr.sa_family = AF_INET; - error = netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev_), &ifr, + error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev_), &ifr, SIOCGIFADDR, "SIOCGIFADDR"); if (error) { return error; @@ -1081,15 +1116,16 @@ netdev_bsd_get_in4(const struct netdev *netdev_, struct in_addr *in4, sin = (struct sockaddr_in *) &ifr.ifr_addr; netdev->in4 = sin->sin_addr; - netdev->cache_valid |= VALID_IN4; - error = netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev_), &ifr, + error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev_), &ifr, SIOCGIFNETMASK, "SIOCGIFNETMASK"); if (error) { return error; } - *netmask = ((struct sockaddr_in*)&ifr.ifr_addr)->sin_addr; + netdev->netmask = sin->sin_addr; + netdev->cache_valid |= VALID_IN4; } *in4 = netdev->in4; + *netmask = netdev->netmask; return in4->s_addr == INADDR_ANY ? EADDRNOTAVAIL : 0; } @@ -1108,11 +1144,14 @@ netdev_bsd_set_in4(struct netdev *netdev_, struct in_addr addr, error = do_set_addr(netdev_, SIOCSIFADDR, "SIOCSIFADDR", addr); if (!error) { - netdev->cache_valid |= VALID_IN4; - netdev->in4 = addr; if (addr.s_addr != INADDR_ANY) { error = do_set_addr(netdev_, SIOCSIFNETMASK, "SIOCSIFNETMASK", mask); + if (!error) { + netdev->cache_valid |= VALID_IN4; + netdev->in4 = addr; + netdev->netmask = mask; + } } netdev_bsd_changed(netdev); } @@ -1130,7 +1169,7 @@ netdev_bsd_get_in6(const struct netdev *netdev_, struct in6_addr *in6) if (getifaddrs(&head) != 0) { VLOG_ERR("getifaddrs on %s device failed: %s", netdev_name, - strerror(errno)); + ovs_strerror(errno)); return errno; } @@ -1153,6 +1192,134 @@ netdev_bsd_get_in6(const struct netdev *netdev_, struct in6_addr *in6) return 0; } +#if defined(__NetBSD__) +static char * +netdev_bsd_kernel_name_to_ovs_name(const char *kernel_name) +{ + char *ovs_name = NULL; + struct shash device_shash; + struct shash_node *node; + + shash_init(&device_shash); + netdev_get_devices(&netdev_tap_class, &device_shash); + SHASH_FOR_EACH(node, &device_shash) { + struct netdev *netdev = node->data; + struct netdev_bsd * const dev = netdev_bsd_cast(netdev); + + if (!strcmp(dev->kernel_name, kernel_name)) { + free(ovs_name); + ovs_name = xstrdup(netdev_get_name(&dev->up)); + } + netdev_close(netdev); + } + shash_destroy(&device_shash); + + return ovs_name ? ovs_name : xstrdup(kernel_name); +} +#endif + +static int +netdev_bsd_get_next_hop(const struct in_addr *host OVS_UNUSED, + struct in_addr *next_hop OVS_UNUSED, + char **netdev_name OVS_UNUSED) +{ +#if defined(__NetBSD__) + static int seq = 0; + struct sockaddr_in sin; + struct sockaddr_dl sdl; + int s; + int i; + struct { + struct rt_msghdr h; + char space[512]; + } buf; + struct rt_msghdr *rtm = &buf.h; + const pid_t pid = getpid(); + char *cp; + ssize_t ssz; + bool gateway = false; + char *ifname = NULL; + int saved_errno; + + memset(next_hop, 0, sizeof(*next_hop)); + *netdev_name = NULL; + + memset(&sin, 0, sizeof(sin)); + sin.sin_len = sizeof(sin); + sin.sin_family = AF_INET; + sin.sin_port = 0; + sin.sin_addr = *host; + + memset(&sdl, 0, sizeof(sdl)); + sdl.sdl_len = sizeof(sdl); + sdl.sdl_family = AF_LINK; + + s = socket(PF_ROUTE, SOCK_RAW, 0); + memset(&buf, 0, sizeof(buf)); + rtm->rtm_flags = RTF_HOST|RTF_UP; + rtm->rtm_version = RTM_VERSION; + rtm->rtm_addrs = RTA_DST|RTA_IFP; + cp = (void *)&buf.space; + memcpy(cp, &sin, sizeof(sin)); + RT_ADVANCE(cp, (struct sockaddr *)(void *)&sin); + memcpy(cp, &sdl, sizeof(sdl)); + RT_ADVANCE(cp, (struct sockaddr *)(void *)&sdl); + rtm->rtm_msglen = cp - (char *)(void *)rtm; + rtm->rtm_seq = ++seq; + rtm->rtm_type = RTM_GET; + rtm->rtm_pid = pid; + write(s, rtm, rtm->rtm_msglen); + memset(&buf, 0, sizeof(buf)); + do { + ssz = read(s, &buf, sizeof(buf)); + } while (ssz > 0 && (rtm->rtm_seq != seq || rtm->rtm_pid != pid)); + saved_errno = errno; + close(s); + if (ssz <= 0) { + if (ssz < 0) { + return saved_errno; + } + return EPIPE; /* XXX */ + } + cp = (void *)&buf.space; + for (i = 1; i; i <<= 1) { + if ((rtm->rtm_addrs & i) != 0) { + const struct sockaddr *sa = (const void *)cp; + + if ((i == RTA_GATEWAY) && sa->sa_family == AF_INET) { + const struct sockaddr_in * const sin = + (const struct sockaddr_in *)sa; + + *next_hop = sin->sin_addr; + gateway = true; + } + if ((i == RTA_IFP) && sa->sa_family == AF_LINK) { + const struct sockaddr_dl * const sdl = + (const struct sockaddr_dl *)sa; + char *kernel_name; + + kernel_name = xmemdup0(sdl->sdl_data, sdl->sdl_nlen); + ifname = netdev_bsd_kernel_name_to_ovs_name(kernel_name); + free(kernel_name); + } + RT_ADVANCE(cp, sa); + } + } + if (ifname == NULL) { + return ENXIO; + } + if (!gateway) { + *next_hop = *host; + } + *netdev_name = ifname; + VLOG_DBG("host " IP_FMT " next-hop " IP_FMT " if %s", + IP_ARGS(host->s_addr), IP_ARGS(next_hop->s_addr), *netdev_name); + return 0; +#else + return EOPNOTSUPP; +#endif +} + static void make_in4_sockaddr(struct sockaddr *sa, struct in_addr addr) { @@ -1172,7 +1339,7 @@ do_set_addr(struct netdev *netdev, { struct ifreq ifr; make_in4_sockaddr(&ifr.ifr_addr, addr); - return netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev), &ifr, ioctl_nr, + return af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev), &ifr, ioctl_nr, ioctl_name); } @@ -1278,7 +1445,7 @@ const struct netdev_class netdev_bsd_class = { netdev_bsd_set_in4, netdev_bsd_get_in6, NULL, /* add_router */ - NULL, /* get_next_hop */ + netdev_bsd_get_next_hop, NULL, /* get_status */ NULL, /* arp_lookup */ @@ -1333,7 +1500,7 @@ const struct netdev_class netdev_tap_class = { netdev_bsd_set_in4, netdev_bsd_get_in6, NULL, /* add_router */ - NULL, /* get_next_hop */ + netdev_bsd_get_next_hop, NULL, /* get_status */ NULL, /* arp_lookup */ @@ -1358,7 +1525,7 @@ destroy_tap(int fd, const char *name) close(fd); strcpy(ifr.ifr_name, name); /* XXX What to do if this call fails? */ - ioctl(af_inet_sock, SIOCIFDESTROY, &ifr); + af_inet_ioctl(SIOCIFDESTROY, &ifr); } static int @@ -1367,7 +1534,7 @@ get_flags(const struct netdev *netdev, int *flags) struct ifreq ifr; int error; - error = netdev_bsd_do_ioctl(netdev_get_kernel_name(netdev), &ifr, + error = af_inet_ifreq_ioctl(netdev_get_kernel_name(netdev), &ifr, SIOCGIFFLAGS, "SIOCGIFFLAGS"); *flags = ifr_get_flags(&ifr); @@ -1382,7 +1549,7 @@ set_flags(const char *name, int flags) ifr_set_flags(&ifr, flags); - return netdev_bsd_do_ioctl(name, &ifr, SIOCSIFFLAGS, "SIOCSIFFLAGS"); + return af_inet_ifreq_ioctl(name, &ifr, SIOCSIFFLAGS, "SIOCSIFFLAGS"); } static int @@ -1411,7 +1578,7 @@ get_etheraddr(const char *netdev_name, uint8_t ea[ETH_ADDR_LEN]) if (getifaddrs(&head) != 0) { VLOG_ERR("getifaddrs on %s device failed: %s", netdev_name, - strerror(errno)); + ovs_strerror(errno)); return errno; } @@ -1438,45 +1605,84 @@ set_etheraddr(const char *netdev_name OVS_UNUSED, int hwaddr_family OVS_UNUSED, int hwaddr_len OVS_UNUSED, const uint8_t mac[ETH_ADDR_LEN] OVS_UNUSED) { -#if defined(__NetBSD__) - return ENOTSUP; /* XXX */ -#else +#if defined(__FreeBSD__) struct ifreq ifr; + int error; memset(&ifr, 0, sizeof ifr); strncpy(ifr.ifr_name, netdev_name, sizeof ifr.ifr_name); ifr.ifr_addr.sa_family = hwaddr_family; ifr.ifr_addr.sa_len = hwaddr_len; memcpy(ifr.ifr_addr.sa_data, mac, hwaddr_len); - if (ioctl(af_inet_sock, SIOCSIFLLADDR, &ifr) < 0) { + error = af_inet_ioctl(SIOCSIFLLADDR, &ifr); + if (error) { VLOG_ERR("ioctl(SIOCSIFLLADDR) on %s device failed: %s", - netdev_name, strerror(errno)); - return errno; + netdev_name, ovs_strerror(error)); + return error; } return 0; -#endif -} +#elif defined(__NetBSD__) + struct if_laddrreq req; + struct sockaddr_dl *sdl; + struct sockaddr_storage oldaddr; + int ret; -static int -netdev_bsd_do_ioctl(const char *name, struct ifreq *ifr, unsigned long cmd, - const char *cmd_name) -{ - strncpy(ifr->ifr_name, name, sizeof ifr->ifr_name); - if (ioctl(af_inet_sock, cmd, ifr) == -1) { - VLOG_DBG_RL(&rl, "%s: ioctl(%s) failed: %s", name, cmd_name, - strerror(errno)); + /* + * get the old address, add new one, and then remove old one. + */ + + if (hwaddr_len != ETH_ADDR_LEN) { + /* just to be safe about sockaddr storage size */ + return EOPNOTSUPP; + } + memset(&req, 0, sizeof(req)); + strncpy(req.iflr_name, netdev_name, sizeof(req.iflr_name)); + req.addr.ss_len = sizeof(req.addr); + req.addr.ss_family = hwaddr_family; + sdl = (struct sockaddr_dl *)&req.addr; + sdl->sdl_alen = hwaddr_len; + ret = ioctl(af_link_sock, SIOCGLIFADDR, &req); + if (ret == -1) { + return errno; + } + if (!memcmp(&sdl->sdl_data[sdl->sdl_nlen], mac, hwaddr_len)) { + return 0; + } + oldaddr = req.addr; + + memset(&req, 0, sizeof(req)); + strncpy(req.iflr_name, netdev_name, sizeof(req.iflr_name)); + req.flags = IFLR_ACTIVE; + sdl = (struct sockaddr_dl *)&req.addr; + sdl->sdl_len = offsetof(struct sockaddr_dl, sdl_data) + hwaddr_len; + sdl->sdl_alen = hwaddr_len; + sdl->sdl_family = hwaddr_family; + memcpy(sdl->sdl_data, mac, hwaddr_len); + ret = ioctl(af_link_sock, SIOCALIFADDR, &req); + if (ret == -1) { + return errno; + } + + memset(&req, 0, sizeof(req)); + strncpy(req.iflr_name, netdev_name, sizeof(req.iflr_name)); + req.addr = oldaddr; + ret = ioctl(af_link_sock, SIOCDLIFADDR, &req); + if (ret == -1) { return errno; } return 0; +#else +#error not implemented +#endif } static int ifr_get_flags(const struct ifreq *ifr) { #ifdef HAVE_STRUCT_IFREQ_IFR_FLAGSHIGH - return (ifr.ifr_flagshigh << 16) | ifr.ifr_flags; + return (ifr->ifr_flagshigh << 16) | ifr->ifr_flags; #else - return ifr.ifr_flags; + return ifr->ifr_flags; #endif }