X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-dummy.c;h=dabff18a92fc32a89b6aca58857516aeda4b7995;hb=f40869bdf6feca4d3ff7c59a1fb1f7ac101bc967;hp=f81b68e67ff52da5d0c6602ef34a2e30e53aacf1;hpb=305b76debf72120672a8ba81d3356b6dccb1da9a;p=sliver-openvswitch.git

diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c
index f81b68e67..dabff18a9 100644
--- a/lib/netdev-dummy.c
+++ b/lib/netdev-dummy.c
@@ -43,25 +43,31 @@ VLOG_DEFINE_THIS_MODULE(netdev_dummy);
 #endif
 
 struct netdev_dev_dummy {
-    struct netdev_dev netdev_dev;
+    struct netdev_dev up;
     uint8_t hwaddr[ETH_ADDR_LEN];
     int mtu;
     struct netdev_stats stats;
     enum netdev_flags flags;
     unsigned int change_seq;
+    int ifindex;
 
-    struct list devs;           /* List of child "netdev_dummy"s. */
+    struct list rxes;           /* List of child "netdev_rx_dummy"s. */
 };
 
 struct netdev_dummy {
-    struct netdev netdev;
-    struct list node;           /* In netdev_dev_dummy's "devs" list. */
+    struct netdev up;
+};
+
+struct netdev_rx_dummy {
+    struct netdev_rx up;
+    struct list node;           /* In netdev_dev_dummy's "rxes" list. */
     struct list recv_queue;
-    bool listening;
 };
 
 static struct shash dummy_netdev_devs = SHASH_INITIALIZER(&dummy_netdev_devs);
 
+static const struct netdev_rx_class netdev_rx_dummy_class;
+
 static unixctl_cb_func netdev_dummy_set_admin_state;
 static int netdev_dummy_create(const struct netdev_class *, const char *,
                                struct netdev_dev **);
@@ -81,7 +87,7 @@ static struct netdev_dev_dummy *
 netdev_dev_dummy_cast(const struct netdev_dev *netdev_dev)
 {
     ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev)));
-    return CONTAINER_OF(netdev_dev, struct netdev_dev_dummy, netdev_dev);
+    return CONTAINER_OF(netdev_dev, struct netdev_dev_dummy, up);
 }
 
 static struct netdev_dummy *
@@ -89,7 +95,14 @@ netdev_dummy_cast(const struct netdev *netdev)
 {
     struct netdev_dev *netdev_dev = netdev_get_dev(netdev);
     ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev)));
-    return CONTAINER_OF(netdev, struct netdev_dummy, netdev);
+    return CONTAINER_OF(netdev, struct netdev_dummy, up);
+}
+
+static struct netdev_rx_dummy *
+netdev_rx_dummy_cast(const struct netdev_rx *rx)
+{
+    netdev_rx_assert_class(rx, &netdev_rx_dummy_class);
+    return CONTAINER_OF(rx, struct netdev_rx_dummy, up);
 }
 
 static int
@@ -100,7 +113,7 @@ netdev_dummy_create(const struct netdev_class *class, const char *name,
     struct netdev_dev_dummy *netdev_dev;
 
     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] = 0xaa;
     netdev_dev->hwaddr[1] = 0x55;
     netdev_dev->hwaddr[2] = n >> 24;
@@ -110,13 +123,14 @@ netdev_dummy_create(const struct netdev_class *class, const char *name,
     netdev_dev->mtu = 1500;
     netdev_dev->flags = 0;
     netdev_dev->change_seq = 1;
-    list_init(&netdev_dev->devs);
+    netdev_dev->ifindex = -EOPNOTSUPP;
+    list_init(&netdev_dev->rxes);
 
     shash_add(&dummy_netdev_devs, name, netdev_dev);
 
     n++;
 
-    *netdev_devp = &netdev_dev->netdev_dev;
+    *netdev_devp = &netdev_dev->up;
 
     return 0;
 }
@@ -132,18 +146,35 @@ netdev_dummy_destroy(struct netdev_dev *netdev_dev_)
 }
 
 static int
-netdev_dummy_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
+netdev_dummy_get_config(struct netdev_dev *netdev_dev_, struct smap *args)
 {
     struct netdev_dev_dummy *netdev_dev = netdev_dev_dummy_cast(netdev_dev_);
+
+    if (netdev_dev->ifindex >= 0) {
+        smap_add_format(args, "ifindex", "%d", netdev_dev->ifindex);
+    }
+    return 0;
+}
+
+static int
+netdev_dummy_set_config(struct netdev_dev *netdev_dev_,
+                        const struct smap *args)
+{
+    struct netdev_dev_dummy *netdev_dev = netdev_dev_dummy_cast(netdev_dev_);
+
+    netdev_dev->ifindex = smap_get_int(args, "ifindex", -EOPNOTSUPP);
+    return 0;
+}
+
+static int
+netdev_dummy_open(struct netdev_dev *netdev_dev_, struct netdev **netdevp)
+{
     struct netdev_dummy *netdev;
 
     netdev = xmalloc(sizeof *netdev);
-    netdev_init(&netdev->netdev, netdev_dev_);
-    list_init(&netdev->recv_queue);
-    netdev->listening = false;
+    netdev_init(&netdev->up, netdev_dev_);
 
-    *netdevp = &netdev->netdev;
-    list_push_back(&netdev_dev->devs, &netdev->node);
+    *netdevp = &netdev->up;
     return 0;
 }
 
@@ -151,31 +182,37 @@ static void
 netdev_dummy_close(struct netdev *netdev_)
 {
     struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
-    list_remove(&netdev->node);
-    ofpbuf_list_delete(&netdev->recv_queue);
     free(netdev);
 }
 
 static int
-netdev_dummy_listen(struct netdev *netdev_)
+netdev_dummy_rx_open(struct netdev *netdev_, struct netdev_rx **rxp)
 {
-    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
-    netdev->listening = true;
+    struct netdev_dev_dummy *dev
+        = netdev_dev_dummy_cast(netdev_get_dev(netdev_));
+    struct netdev_rx_dummy *rx;
+
+    rx = xmalloc(sizeof *rx);
+    netdev_rx_init(&rx->up, &dev->up, &netdev_rx_dummy_class);
+    list_push_back(&dev->rxes, &rx->node);
+    list_init(&rx->recv_queue);
+
+    *rxp = &rx->up;
     return 0;
 }
 
 static int
-netdev_dummy_recv(struct netdev *netdev_, void *buffer, size_t size)
+netdev_rx_dummy_recv(struct netdev_rx *rx_, void *buffer, size_t size)
 {
-    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
+    struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
     struct ofpbuf *packet;
     size_t packet_size;
 
-    if (list_is_empty(&netdev->recv_queue)) {
+    if (list_is_empty(&rx->recv_queue)) {
         return -EAGAIN;
     }
 
-    packet = ofpbuf_from_list(list_pop_front(&netdev->recv_queue));
+    packet = ofpbuf_from_list(list_pop_front(&rx->recv_queue));
     if (packet->size > size) {
         return -EMSGSIZE;
     }
@@ -188,19 +225,41 @@ netdev_dummy_recv(struct netdev *netdev_, void *buffer, size_t size)
 }
 
 static void
-netdev_dummy_recv_wait(struct netdev *netdev_)
+netdev_rx_dummy_destroy(struct netdev_rx *rx_)
 {
-    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
-    if (!list_is_empty(&netdev->recv_queue)) {
+    struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+    list_remove(&rx->node);
+    ofpbuf_list_delete(&rx->recv_queue);
+    free(rx);
+}
+
+static void
+netdev_rx_dummy_wait(struct netdev_rx *rx_)
+{
+    struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+    if (!list_is_empty(&rx->recv_queue)) {
         poll_immediate_wake();
     }
 }
 
 static int
-netdev_dummy_drain(struct netdev *netdev_)
+netdev_rx_dummy_drain(struct netdev_rx *rx_)
 {
-    struct netdev_dummy *netdev = netdev_dummy_cast(netdev_);
-    ofpbuf_list_delete(&netdev->recv_queue);
+    struct netdev_rx_dummy *rx = netdev_rx_dummy_cast(rx_);
+    ofpbuf_list_delete(&rx->recv_queue);
+    return 0;
+}
+
+static int
+netdev_dummy_send(struct netdev *netdev, const void *buffer OVS_UNUSED,
+                  size_t size)
+{
+    struct netdev_dev_dummy *dev =
+        netdev_dev_dummy_cast(netdev_get_dev(netdev));
+
+    dev->stats.tx_packets++;
+    dev->stats.tx_bytes += size;
+
     return 0;
 }
 
@@ -271,13 +330,21 @@ netdev_dummy_set_stats(struct netdev *netdev, const struct netdev_stats *stats)
 }
 
 static int
-netdev_dummy_update_flags(struct netdev *netdev,
-                          enum netdev_flags off, enum netdev_flags on,
-                          enum netdev_flags *old_flagsp)
+netdev_dummy_get_ifindex(const struct netdev *netdev)
 {
     struct netdev_dev_dummy *dev =
         netdev_dev_dummy_cast(netdev_get_dev(netdev));
 
+    return dev->ifindex;
+}
+
+static int
+netdev_dummy_update_flags(struct netdev_dev *dev_,
+                          enum netdev_flags off, enum netdev_flags on,
+                          enum netdev_flags *old_flagsp)
+{
+    struct netdev_dev_dummy *dev = netdev_dev_dummy_cast(dev_);
+
     return netdev_dev_dummy_update_flags(dev, off, on, old_flagsp);
 }
 
@@ -324,26 +391,23 @@ static const struct netdev_class dummy_class = {
 
     netdev_dummy_create,
     netdev_dummy_destroy,
-    NULL,                       /* get_config */
-    NULL,                       /* set_config */
+    netdev_dummy_get_config,
+    netdev_dummy_set_config,
     NULL,                       /* get_tunnel_config */
 
     netdev_dummy_open,
     netdev_dummy_close,
 
-    netdev_dummy_listen,
-    netdev_dummy_recv,
-    netdev_dummy_recv_wait,
-    netdev_dummy_drain,
+    netdev_dummy_rx_open,
 
-    NULL,                       /* send */
+    netdev_dummy_send,          /* send */
     NULL,                       /* send_wait */
 
     netdev_dummy_set_etheraddr,
     netdev_dummy_get_etheraddr,
     netdev_dummy_get_mtu,
     netdev_dummy_set_mtu,
-    NULL,                       /* get_ifindex */
+    netdev_dummy_get_ifindex,
     NULL,                       /* get_carrier */
     NULL,                       /* get_carrier_resets */
     NULL,                       /* get_miimon */
@@ -378,6 +442,13 @@ static const struct netdev_class dummy_class = {
     netdev_dummy_change_seq
 };
 
+static const struct netdev_rx_class netdev_rx_dummy_class = {
+    netdev_rx_dummy_destroy,
+    netdev_rx_dummy_recv,
+    netdev_rx_dummy_wait,
+    netdev_rx_dummy_drain,
+};
+
 static struct ofpbuf *
 eth_from_packet_or_flow(const char *s)
 {
@@ -434,7 +505,7 @@ netdev_dummy_receive(struct unixctl_conn *conn,
 
     n_listeners = 0;
     for (i = 2; i < argc; i++) {
-        struct netdev_dummy *dev;
+        struct netdev_rx_dummy *rx;
         struct ofpbuf *packet;
 
         packet = eth_from_packet_or_flow(argv[i]);
@@ -443,13 +514,14 @@ netdev_dummy_receive(struct unixctl_conn *conn,
             return;
         }
 
+        dummy_dev->stats.rx_packets++;
+        dummy_dev->stats.rx_bytes += packet->size;
+
         n_listeners = 0;
-        LIST_FOR_EACH (dev, node, &dummy_dev->devs) {
-            if (dev->listening) {
-                struct ofpbuf *copy = ofpbuf_clone(packet);
-                list_push_back(&dev->recv_queue, &copy->list_node);
-                n_listeners++;
-            }
+        LIST_FOR_EACH (rx, node, &dummy_dev->rxes) {
+            struct ofpbuf *copy = ofpbuf_clone(packet);
+            list_push_back(&rx->recv_queue, &copy->list_node);
+            n_listeners++;
         }
         ofpbuf_delete(packet);
     }