X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-tunnel.c;h=b6a2506590d97f56e5c106cf859640ad8976a5f2;hb=f40869bdf6feca4d3ff7c59a1fb1f7ac101bc967;hp=797813b05d94cdfb985e4ac129ce545628be67c8;hpb=85b20fd6ee585f462e012fbcc7f966a81edab2ed;p=sliver-openvswitch.git diff --git a/lib/netdev-tunnel.c b/lib/netdev-tunnel.c index 797813b05..b6a250659 100644 --- a/lib/netdev-tunnel.c +++ b/lib/netdev-tunnel.c @@ -39,7 +39,7 @@ VLOG_DEFINE_THIS_MODULE(netdev_tunnel); struct netdev_dev_tunnel { - struct netdev_dev netdev_dev; + struct netdev_dev up; uint8_t hwaddr[ETH_ADDR_LEN]; struct netdev_stats stats; enum netdev_flags flags; @@ -53,8 +53,15 @@ struct netdev_dev_tunnel { }; struct netdev_tunnel { - struct netdev netdev; -} ; + struct netdev up; +}; + +struct netdev_rx_tunnel { + struct netdev_rx up; + int fd; +}; + +static const struct netdev_rx_class netdev_rx_tunnel_class; static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(5, 20); @@ -65,7 +72,7 @@ static int netdev_tunnel_create(const struct netdev_class *, const char *, static void netdev_tunnel_update_seq(struct netdev_dev_tunnel *); static bool -is_tunnel_class(const struct netdev_class *class) +is_netdev_tunnel_class(const struct netdev_class *class) { return class->create == netdev_tunnel_create; } @@ -73,16 +80,23 @@ is_tunnel_class(const struct netdev_class *class) static struct netdev_dev_tunnel * netdev_dev_tunnel_cast(const struct netdev_dev *netdev_dev) { - assert(is_tunnel_class(netdev_dev_get_class(netdev_dev))); - return CONTAINER_OF(netdev_dev, struct netdev_dev_tunnel, netdev_dev); + ovs_assert(is_netdev_tunnel_class(netdev_dev_get_class(netdev_dev))); + return CONTAINER_OF(netdev_dev, struct netdev_dev_tunnel, up); } static struct netdev_tunnel * netdev_tunnel_cast(const struct netdev *netdev) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - assert(is_tunnel_class(netdev_dev_get_class(netdev_dev))); - return CONTAINER_OF(netdev, struct netdev_tunnel, netdev); + ovs_assert(is_netdev_tunnel_class(netdev_dev_get_class(netdev_dev))); + return CONTAINER_OF(netdev, struct netdev_tunnel, up); +} + +static struct netdev_rx_tunnel * +netdev_rx_tunnel_cast(const struct netdev_rx *rx) +{ + netdev_rx_assert_class(rx, &netdev_rx_tunnel_class); + return CONTAINER_OF(rx, struct netdev_rx_tunnel, up); } static int @@ -94,7 +108,7 @@ netdev_tunnel_create(const struct netdev_class *class, const char *name, int error; netdev_dev = xzalloc(sizeof *netdev_dev); - netdev_dev_init(&netdev_dev->netdev_dev, name, class); + netdev_dev_init(&netdev_dev->up, name, class); netdev_dev->hwaddr[0] = 0xfe; netdev_dev->hwaddr[1] = 0xff; netdev_dev->hwaddr[2] = 0xff; @@ -120,7 +134,7 @@ netdev_tunnel_create(const struct netdev_class *class, const char *name, n++; - *netdev_devp = &netdev_dev->netdev_dev; + *netdev_devp = &netdev_dev->up; VLOG_DBG("tunnel_create: name=%s, fd=%d, port=%d", name, netdev_dev->sockfd, netdev_dev->local_addr.sin_port); @@ -150,9 +164,9 @@ netdev_tunnel_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp) struct netdev_tunnel *netdev; netdev = xmalloc(sizeof *netdev); - netdev_init(&netdev->netdev, netdev_dev_); + netdev_init(&netdev->up, netdev_dev_); - *netdevp = &netdev->netdev; + *netdevp = &netdev->up; return 0; } @@ -170,7 +184,7 @@ netdev_tunnel_get_config(struct netdev_dev *dev_, struct smap *args) if (netdev_dev->valid_remote_ip) smap_add_format(args, "remote_ip", IP_FMT, - IP_ARGS(&netdev_dev->remote_addr.sin_addr)); + IP_ARGS(netdev_dev->remote_addr.sin_addr.s_addr)); if (netdev_dev->valid_remote_port) smap_add_format(args, "remote_port", "%"PRIu16, ntohs(netdev_dev->remote_addr.sin_port)); @@ -190,7 +204,7 @@ netdev_tunnel_connect(struct netdev_dev_tunnel *dev) } dev->connected = true; netdev_tunnel_update_seq(dev); - VLOG_DBG("%s: connected to (%s, %d)", netdev_dev_get_name(&dev->netdev_dev), + VLOG_DBG("%s: connected to (%s, %d)", netdev_dev_get_name(&dev->up), inet_ntoa(dev->remote_addr.sin_addr), ntohs(dev->remote_addr.sin_port)); return 0; } @@ -224,38 +238,53 @@ netdev_tunnel_set_config(struct netdev_dev *dev_, const struct smap *args) } static int -netdev_tunnel_listen(struct netdev *netdev_ OVS_UNUSED) -{ +netdev_tunnel_rx_open(struct netdev *netdev_, struct netdev_rx **rxp) +{ + struct netdev_dev_tunnel *netdev_dev = + netdev_dev_tunnel_cast(netdev_get_dev(netdev_)); + struct netdev_rx_tunnel *rx; + rx = xmalloc(sizeof *rx); + netdev_rx_init(&rx->up, netdev_get_dev(netdev_), &netdev_rx_tunnel_class); + rx->fd = netdev_dev->sockfd; + *rxp = &rx->up; return 0; } +static void +netdev_rx_tunnel_destroy(struct netdev_rx *rx_) +{ + struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_); + free(rx); +} + static int -netdev_tunnel_recv(struct netdev *netdev_, void *buffer, size_t size) +netdev_rx_tunnel_recv(struct netdev_rx *rx_, void *buffer, size_t size) { - struct netdev_dev_tunnel *dev = - netdev_dev_tunnel_cast(netdev_get_dev(netdev_)); - if (!dev->connected) + struct netdev_rx_tunnel *rx = netdev_rx_tunnel_cast(rx_); + struct netdev_dev_tunnel *netdev_dev = + netdev_dev_tunnel_cast(rx_->netdev_dev); + if (!netdev_dev->connected) return -EAGAIN; for (;;) { ssize_t retval; - retval = recv(dev->sockfd, buffer, size, MSG_TRUNC); - VLOG_DBG("%s: recv(%"PRIxPTR", %"PRIu64", MSG_TRUNC) = %"PRId64, - netdev_get_name(netdev_), (uintptr_t)buffer, size, retval); + retval = recv(rx->fd, buffer, size, MSG_TRUNC); + VLOG_DBG("%s: recv(%"PRIxPTR", %zu, MSG_TRUNC) = %zd", + netdev_rx_get_name(rx_), (uintptr_t)buffer, size, retval); if (retval >= 0) { - dev->stats.rx_packets++; - dev->stats.rx_bytes += retval; + netdev_dev->stats.rx_packets++; + netdev_dev->stats.rx_bytes += retval; if (retval <= size) { - return retval; - } else { - dev->stats.rx_errors++; - dev->stats.rx_length_errors++; - return -EMSGSIZE; - } + return retval; + } else { + netdev_dev->stats.rx_errors++; + netdev_dev->stats.rx_length_errors++; + return -EMSGSIZE; + } } else if (errno != EINTR) { if (errno != EAGAIN) { VLOG_WARN_RL(&rl, "error receiveing Ethernet packet on %s: %s", - netdev_get_name(netdev_), strerror(errno)); - dev->stats.rx_errors++; + netdev_rx_get_name(rx_), strerror(errno)); + netdev_dev->stats.rx_errors++; } return -errno; } @@ -263,12 +292,12 @@ netdev_tunnel_recv(struct netdev *netdev_, void *buffer, size_t size) } static void -netdev_tunnel_recv_wait(struct netdev *netdev_) +netdev_rx_tunnel_wait(struct netdev_rx *rx_) { - struct netdev_dev_tunnel *dev = - netdev_dev_tunnel_cast(netdev_get_dev(netdev_)); - if (dev->sockfd >= 0) { - poll_fd_wait(dev->sockfd, POLLIN); + struct netdev_rx_tunnel *rx = + netdev_rx_tunnel_cast(rx_); + if (rx->fd >= 0) { + poll_fd_wait(rx->fd, POLLIN); } } @@ -282,14 +311,14 @@ netdev_tunnel_send(struct netdev *netdev_, const void *buffer, size_t size) for (;;) { ssize_t retval; retval = send(dev->sockfd, buffer, size, 0); - VLOG_DBG("%s: send(%"PRIxPTR", %"PRIu64") = %"PRId64, + VLOG_DBG("%s: send(%"PRIxPTR", %zu) = %zd", netdev_get_name(netdev_), (uintptr_t)buffer, size, retval); if (retval >= 0) { dev->stats.tx_packets++; dev->stats.tx_bytes += retval; if (retval != size) { - VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%"PRId64" bytes of " - "%"PRIu64") on %s", retval, size, netdev_get_name(netdev_)); + VLOG_WARN_RL(&rl, "sent partial Ethernet packet (%zd bytes of " + "%zu) on %s", retval, size, netdev_get_name(netdev_)); dev->stats.tx_errors++; } return 0; @@ -315,17 +344,19 @@ netdev_tunnel_send_wait(struct netdev *netdev_) } static int -netdev_tunnel_drain(struct netdev *netdev_) +netdev_rx_tunnel_drain(struct netdev_rx *rx_) { - struct netdev_dev_tunnel *dev = - netdev_dev_tunnel_cast(netdev_get_dev(netdev_)); + struct netdev_dev_tunnel *netdev_dev = + netdev_dev_tunnel_cast(rx_->netdev_dev); + struct netdev_rx_tunnel *rx = + netdev_rx_tunnel_cast(rx_); char buffer[128]; int error; - if (!dev->connected) + if (!netdev_dev->connected) return 0; for (;;) { - error = recv(dev->sockfd, buffer, 128, MSG_TRUNC); + error = recv(rx->fd, buffer, 128, MSG_TRUNC); if (error) { if (error == -EAGAIN) break; @@ -384,23 +415,23 @@ netdev_tunnel_set_stats(struct netdev *netdev, const struct netdev_stats *stats) } static int -netdev_tunnel_update_flags(struct netdev *netdev, +netdev_tunnel_update_flags(struct netdev_dev *dev_, enum netdev_flags off, enum netdev_flags on, enum netdev_flags *old_flagsp) { - struct netdev_dev_tunnel *dev = - netdev_dev_tunnel_cast(netdev_get_dev(netdev)); + struct netdev_dev_tunnel *netdev_dev = + netdev_dev_tunnel_cast(dev_); if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) { return EINVAL; } - // XXX should we actually do something with this flags? - *old_flagsp = dev->flags; - dev->flags |= on; - dev->flags &= ~off; - if (*old_flagsp != dev->flags) { - netdev_tunnel_update_seq(dev); + // XXX should we actually do something with these flags? + *old_flagsp = netdev_dev->flags; + netdev_dev->flags |= on; + netdev_dev->flags &= ~off; + if (*old_flagsp != netdev_dev->flags) { + netdev_tunnel_update_seq(netdev_dev); } return 0; } @@ -496,24 +527,22 @@ const struct netdev_class netdev_tunnel_class = { netdev_tunnel_destroy, netdev_tunnel_get_config, netdev_tunnel_set_config, + NULL, /* get_tunnel_config */ netdev_tunnel_open, netdev_tunnel_close, - netdev_tunnel_listen, - netdev_tunnel_recv, - netdev_tunnel_recv_wait, - netdev_tunnel_drain, + netdev_tunnel_rx_open, netdev_tunnel_send, netdev_tunnel_send_wait, netdev_tunnel_set_etheraddr, netdev_tunnel_get_etheraddr, - NULL, /* get_mtu */ - NULL, /* set_mtu */ + NULL, /* get_mtu */ + NULL, /* set_mtu */ NULL, /* get_ifindex */ - NULL, /* get_carrier */ + NULL, /* get_carrier */ NULL, /* get_carrier_resets */ NULL, /* get_miimon */ netdev_tunnel_get_stats, @@ -546,3 +575,12 @@ const struct netdev_class netdev_tunnel_class = { netdev_tunnel_change_seq }; + + +static const struct netdev_rx_class netdev_rx_tunnel_class = { + netdev_rx_tunnel_destroy, + netdev_rx_tunnel_recv, + netdev_rx_tunnel_wait, + netdev_rx_tunnel_drain, +}; +