X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-bsd.c;h=689014b907966f303acdef014bf4ce12c6ebde40;hb=fe29af4c888d48cc1f16b1a247c2ffb6f0864522;hp=f6d066ba1f9216988713dc2475f1ccd4c462496b;hpb=863838160e892f625a050e0234ed638af26f106d;p=sliver-openvswitch.git diff --git a/lib/netdev-bsd.c b/lib/netdev-bsd.c index f6d066ba1..689014b90 100644 --- a/lib/netdev-bsd.c +++ b/lib/netdev-bsd.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011 Gaetano Catalli. + * Copyright (c) 2011, 2013 Gaetano Catalli. * Copyright (c) 2013 YAMAMOTO Takashi. * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -42,9 +42,12 @@ #include #if defined(__NetBSD__) #include +#include +#include #endif #include "rtbsd.h" +#include "connectivity.h" #include "coverage.h" #include "dynamic-string.h" #include "fatal-signal.h" @@ -53,8 +56,9 @@ #include "ovs-thread.h" #include "packets.h" #include "poll-loop.h" -#include "socket-util.h" +#include "seq.h" #include "shash.h" +#include "socket-util.h" #include "svec.h" #include "util.h" #include "vlog.h" @@ -84,7 +88,6 @@ struct netdev_bsd { struct ovs_mutex mutex; unsigned int cache_valid; - unsigned int change_seq; int ifindex; uint8_t etheraddr[ETH_ADDR_LEN]; @@ -133,7 +136,7 @@ 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); static int do_set_addr(struct netdev *netdev, - int ioctl_nr, const char *ioctl_name, + unsigned long ioctl_nr, const char *ioctl_name, struct in_addr addr); static int get_etheraddr(const char *netdev_name, uint8_t ea[ETH_ADDR_LEN]); static int set_etheraddr(const char *netdev_name, int hwaddr_family, @@ -144,7 +147,7 @@ static int ifr_get_flags(const struct ifreq *); static void ifr_set_flags(struct ifreq *, int flags); #ifdef __NetBSD__ -static int af_link_ioctl(int command, const void *arg); +static int af_link_ioctl(unsigned long command, const void *arg); #endif static void netdev_bsd_run(void); @@ -195,15 +198,6 @@ netdev_bsd_wait(void) rtbsd_notifier_wait(); } -static void -netdev_bsd_changed(struct netdev_bsd *dev) -{ - dev->change_seq++; - if (!dev->change_seq) { - dev->change_seq++; - } -} - /* Invalidate cache in case of interface status change. */ static void netdev_bsd_cache_cb(const struct rtbsd_change *change, @@ -221,7 +215,7 @@ netdev_bsd_cache_cb(const struct rtbsd_change *change, if (is_netdev_bsd_class(netdev_class)) { dev = netdev_bsd_cast(base_dev); dev->cache_valid = 0; - netdev_bsd_changed(dev); + seq_change(connectivity_seq_get()); } netdev_close(base_dev); } @@ -239,7 +233,7 @@ netdev_bsd_cache_cb(const struct rtbsd_change *change, struct netdev *netdev = node->data; dev = netdev_bsd_cast(netdev); dev->cache_valid = 0; - netdev_bsd_changed(dev); + seq_change(connectivity_seq_get()); netdev_close(netdev); } shash_destroy(&device_shash); @@ -291,8 +285,7 @@ netdev_bsd_construct_system(struct netdev *netdev_) return error; } - ovs_mutex_init(&netdev->mutex, PTHREAD_MUTEX_NORMAL); - netdev->change_seq = 1; + ovs_mutex_init(&netdev->mutex); netdev->tap_fd = -1; netdev->kernel_name = xstrdup(netdev_->name); @@ -325,9 +318,8 @@ netdev_bsd_construct_tap(struct netdev *netdev_) /* Create a tap device by opening /dev/tap. The TAPGIFNAME ioctl is used * to retrieve the name of the tap device. */ - ovs_mutex_init(&netdev->mutex, PTHREAD_MUTEX_NORMAL); + ovs_mutex_init(&netdev->mutex); netdev->tap_fd = open("/dev/tap", O_RDWR); - netdev->change_seq = 1; if (netdev->tap_fd < 0) { error = errno; VLOG_WARN("opening \"/dev/tap\" failed: %s", ovs_strerror(error)); @@ -504,9 +496,6 @@ netdev_bsd_rx_construct(struct netdev_rx *rx_) ovs_mutex_lock(&netdev->mutex); error = netdev_bsd_open_pcap(netdev_get_kernel_name(netdev_), &rx->pcap_handle, &rx->fd); - if (!error) { - netdev_bsd_changed(netdev); - } ovs_mutex_unlock(&netdev->mutex); } @@ -579,20 +568,21 @@ proc_pkt(u_char *args_, const struct pcap_pkthdr *hdr, const u_char *packet) * from rx->pcap. */ static int -netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, void *data, size_t size) +netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, struct ofpbuf *buffer) { struct pcap_arg arg; int ret; /* prepare the pcap argument to store the packet */ - arg.size = size; - arg.data = data; + arg.size = ofpbuf_tailroom(buffer); + arg.data = buffer->data; for (;;) { ret = pcap_dispatch(rx->pcap_handle, 1, proc_pkt, (u_char *) &arg); if (ret > 0) { - return arg.retval; /* arg.retval < 0 is handled in the caller */ + buffer->size += arg.retval; + return 0; } if (ret == -1) { if (errno == EINTR) { @@ -600,7 +590,7 @@ netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, void *data, size_t size) } } - return -EAGAIN; + return EAGAIN; } } @@ -610,30 +600,33 @@ netdev_rx_bsd_recv_pcap(struct netdev_rx_bsd *rx, void *data, size_t size) * 'rx->fd' is initialized with the tap file descriptor. */ static int -netdev_rx_bsd_recv_tap(struct netdev_rx_bsd *rx, void *data, size_t size) +netdev_rx_bsd_recv_tap(struct netdev_rx_bsd *rx, struct ofpbuf *buffer) { + size_t size = ofpbuf_tailroom(buffer); + for (;;) { - ssize_t retval = read(rx->fd, data, size); + ssize_t retval = read(rx->fd, buffer->data, size); if (retval >= 0) { - return retval; + buffer->size += retval; + return 0; } else if (errno != EINTR) { if (errno != EAGAIN) { VLOG_WARN_RL(&rl, "error receiving Ethernet packet on %s: %s", ovs_strerror(errno), netdev_rx_get_name(&rx->up)); } - return -errno; + return errno; } } } static int -netdev_bsd_rx_recv(struct netdev_rx *rx_, void *data, size_t size) +netdev_bsd_rx_recv(struct netdev_rx *rx_, struct ofpbuf *buffer) { struct netdev_rx_bsd *rx = netdev_rx_bsd_cast(rx_); return (rx->pcap_handle - ? netdev_rx_bsd_recv_pcap(rx, data, size) - : netdev_rx_bsd_recv_tap(rx, data, size)); + ? netdev_rx_bsd_recv_pcap(rx, buffer) + : netdev_rx_bsd_recv_tap(rx, buffer)); } /* @@ -700,8 +693,8 @@ netdev_bsd_send(struct netdev *netdev_, const void *data, size_t size) } } } else if (retval != size) { - VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%zd bytes of " - "%zu) on %s", retval, size, name); + VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRIuSIZE"d bytes of " + "%"PRIuSIZE") on %s", retval, size, name); error = EMSGSIZE; } else { break; @@ -754,7 +747,7 @@ netdev_bsd_set_etheraddr(struct netdev *netdev_, if (!error) { netdev->cache_valid |= VALID_ETHERADDR; memcpy(netdev->etheraddr, mac, ETH_ADDR_LEN); - netdev_bsd_changed(netdev); + seq_change(connectivity_seq_get()); } } ovs_mutex_unlock(&netdev->mutex); @@ -1163,7 +1156,7 @@ netdev_bsd_set_in4(struct netdev *netdev_, struct in_addr addr, netdev->netmask = mask; } } - netdev_bsd_changed(netdev); + seq_change(connectivity_seq_get()); } ovs_mutex_unlock(&netdev->mutex); @@ -1332,6 +1325,63 @@ netdev_bsd_get_next_hop(const struct in_addr *host OVS_UNUSED, #endif } +static int +netdev_bsd_arp_lookup(const struct netdev *netdev OVS_UNUSED, + ovs_be32 ip OVS_UNUSED, + uint8_t mac[ETH_ADDR_LEN] OVS_UNUSED) +{ +#if defined(__NetBSD__) + const struct rt_msghdr *rtm; + size_t needed; + char *buf; + const char *cp; + const char *ep; + int mib[6]; + int error; + + buf = NULL; + mib[0] = CTL_NET; + mib[1] = PF_ROUTE; + mib[2] = 0; + mib[3] = AF_INET; + mib[4] = NET_RT_FLAGS; + mib[5] = RTF_LLINFO; + if (sysctl(mib, 6, NULL, &needed, NULL, 0) == -1) { + error = errno; + goto error; + } + buf = xmalloc(needed); + if (sysctl(mib, 6, buf, &needed, NULL, 0) == -1) { + error = errno; + goto error; + } + ep = buf + needed; + for (cp = buf; cp < ep; cp += rtm->rtm_msglen) { + const struct sockaddr_inarp *sina; + const struct sockaddr_dl *sdl; + + rtm = (const void *)cp; + sina = (const void *)(rtm + 1); + if (ip != sina->sin_addr.s_addr) { + continue; + } + sdl = (const void *) + ((const char *)(const void *)sina + RT_ROUNDUP(sina->sin_len)); + if (sdl->sdl_alen == ETH_ADDR_LEN) { + memcpy(mac, &sdl->sdl_data[sdl->sdl_nlen], ETH_ADDR_LEN); + error = 0; + goto error; + } + } + error = ENXIO; +error: + free(buf); + return error; +#else + return EOPNOTSUPP; +#endif +} + static void make_in4_sockaddr(struct sockaddr *sa, struct in_addr addr) { @@ -1347,7 +1397,8 @@ make_in4_sockaddr(struct sockaddr *sa, struct in_addr addr) static int do_set_addr(struct netdev *netdev, - int ioctl_nr, const char *ioctl_name, struct in_addr addr) + unsigned long ioctl_nr, const char *ioctl_name, + struct in_addr addr) { struct ifreq ifr; make_in4_sockaddr(&ifr.ifr_addr, addr); @@ -1368,6 +1419,9 @@ nd_to_iff_flags(enum netdev_flags nd) iff |= IFF_PPROMISC; #endif } + if (nd & NETDEV_LOOPBACK) { + iff |= IFF_LOOPBACK; + } return iff; } @@ -1381,6 +1435,9 @@ iff_to_nd_flags(int iff) if (iff & IFF_PROMISC) { nd |= NETDEV_PROMISC; } + if (iff & IFF_LOOPBACK) { + nd |= NETDEV_LOOPBACK; + } return nd; } @@ -1388,7 +1445,6 @@ static int netdev_bsd_update_flags(struct netdev *netdev_, enum netdev_flags off, enum netdev_flags on, enum netdev_flags *old_flagsp) { - struct netdev_bsd *netdev = netdev_bsd_cast(netdev_); int old_flags, new_flags; int error; @@ -1398,18 +1454,12 @@ netdev_bsd_update_flags(struct netdev *netdev_, enum netdev_flags off, new_flags = (old_flags & ~nd_to_iff_flags(off)) | nd_to_iff_flags(on); if (new_flags != old_flags) { error = set_flags(netdev_get_kernel_name(netdev_), new_flags); - netdev_bsd_changed(netdev); + seq_change(connectivity_seq_get()); } } return error; } -static unsigned int -netdev_bsd_change_seq(const struct netdev *netdev) -{ - return netdev_bsd_cast(netdev)->change_seq; -} - const struct netdev_class netdev_bsd_class = { "system", @@ -1450,7 +1500,9 @@ const struct netdev_class netdev_bsd_class = { NULL, /* set_queue */ NULL, /* delete_queue */ NULL, /* get_queue_stats */ - NULL, /* dump_queue */ + NULL, /* queue_dump_start */ + NULL, /* queue_dump_next */ + NULL, /* queue_dump_done */ NULL, /* dump_queue_stats */ netdev_bsd_get_in4, @@ -1459,12 +1511,10 @@ const struct netdev_class netdev_bsd_class = { NULL, /* add_router */ netdev_bsd_get_next_hop, NULL, /* get_status */ - NULL, /* arp_lookup */ + netdev_bsd_arp_lookup, /* arp_lookup */ netdev_bsd_update_flags, - netdev_bsd_change_seq, - netdev_bsd_rx_alloc, netdev_bsd_rx_construct, netdev_bsd_rx_destruct, @@ -1513,7 +1563,9 @@ const struct netdev_class netdev_tap_class = { NULL, /* set_queue */ NULL, /* delete_queue */ NULL, /* get_queue_stats */ - NULL, /* dump_queue */ + NULL, /* queue_dump_start */ + NULL, /* queue_dump_next */ + NULL, /* queue_dump_done */ NULL, /* dump_queue_stats */ netdev_bsd_get_in4, @@ -1522,12 +1574,10 @@ const struct netdev_class netdev_tap_class = { NULL, /* add_router */ netdev_bsd_get_next_hop, NULL, /* get_status */ - NULL, /* arp_lookup */ + netdev_bsd_arp_lookup, /* arp_lookup */ netdev_bsd_update_flags, - netdev_bsd_change_seq, - netdev_bsd_rx_alloc, netdev_bsd_rx_construct, netdev_bsd_rx_destruct, @@ -1716,7 +1766,7 @@ ifr_set_flags(struct ifreq *ifr, int flags) /* Calls ioctl() on an AF_LINK sock, passing the specified 'command' and * 'arg'. Returns 0 if successful, otherwise a positive errno value. */ int -af_link_ioctl(int command, const void *arg) +af_link_ioctl(unsigned long command, const void *arg) { static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; static int sock;