X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev-dummy.c;h=bdb3ea12ef0cb26ecf0d20c2be208cd41b1d07c3;hb=2c57a420432de88b8a6f9ee54642c3841577ad7b;hp=083a4ddb518e26822d7f238cea1bf1b73202e605;hpb=2c2ea5a88a12ea3bfb003a37f7ec2c2446539a7c;p=sliver-openvswitch.git diff --git a/lib/netdev-dummy.c b/lib/netdev-dummy.c index 083a4ddb5..bdb3ea12e 100644 --- a/lib/netdev-dummy.c +++ b/lib/netdev-dummy.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,6 +23,7 @@ #include "flow.h" #include "list.h" #include "netdev-provider.h" +#include "netdev-vport.h" #include "odp-util.h" #include "ofp-print.h" #include "ofpbuf.h" @@ -35,6 +36,12 @@ VLOG_DEFINE_THIS_MODULE(netdev_dummy); +#ifdef __FreeBSD__ +#define FREE_BSD 1 +#else +#define FREE_BSD 0 +#endif + struct netdev_dev_dummy { struct netdev_dev netdev_dev; uint8_t hwaddr[ETH_ADDR_LEN]; @@ -44,6 +51,7 @@ struct netdev_dev_dummy { unsigned int change_seq; struct list devs; /* List of child "netdev_dummy"s. */ + int ifindex; }; struct netdev_dummy { @@ -55,9 +63,14 @@ struct netdev_dummy { static struct shash dummy_netdev_devs = SHASH_INITIALIZER(&dummy_netdev_devs); +static unixctl_cb_func netdev_dummy_set_admin_state; static int netdev_dummy_create(const struct netdev_class *, const char *, struct netdev_dev **); -static void netdev_dummy_poll_notify(const struct netdev *); +static void netdev_dev_dummy_poll_notify(struct netdev_dev_dummy *); +static int netdev_dev_dummy_update_flags(struct netdev_dev_dummy *, + enum netdev_flags off, + enum netdev_flags on, + enum netdev_flags *old_flagsp); static bool is_dummy_class(const struct netdev_class *class) @@ -68,7 +81,7 @@ is_dummy_class(const struct netdev_class *class) static struct netdev_dev_dummy * netdev_dev_dummy_cast(const struct netdev_dev *netdev_dev) { - assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev_dev, struct netdev_dev_dummy, netdev_dev); } @@ -76,7 +89,7 @@ static struct netdev_dummy * netdev_dummy_cast(const struct netdev *netdev) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); + ovs_assert(is_dummy_class(netdev_dev_get_class(netdev_dev))); return CONTAINER_OF(netdev, struct netdev_dummy, netdev); } @@ -98,6 +111,7 @@ netdev_dummy_create(const struct netdev_class *class, const char *name, netdev_dev->mtu = 1500; netdev_dev->flags = 0; netdev_dev->change_seq = 1; + netdev_dev->ifindex = -EOPNOTSUPP; list_init(&netdev_dev->devs); shash_add(&dummy_netdev_devs, name, netdev_dev); @@ -119,6 +133,27 @@ netdev_dummy_destroy(struct netdev_dev *netdev_dev_) free(netdev_dev); } +static int +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) { @@ -192,6 +227,19 @@ netdev_dummy_drain(struct netdev *netdev_) 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; +} + static int netdev_dummy_set_etheraddr(struct netdev *netdev, const uint8_t mac[ETH_ADDR_LEN]) @@ -201,7 +249,7 @@ netdev_dummy_set_etheraddr(struct netdev *netdev, if (!eth_addr_equals(dev->hwaddr, mac)) { memcpy(dev->hwaddr, mac, ETH_ADDR_LEN); - netdev_dummy_poll_notify(netdev); + netdev_dev_dummy_poll_notify(dev); } return 0; @@ -258,6 +306,15 @@ netdev_dummy_set_stats(struct netdev *netdev, const struct netdev_stats *stats) return 0; } +static int +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 *netdev, enum netdev_flags off, enum netdev_flags on, @@ -266,6 +323,14 @@ netdev_dummy_update_flags(struct netdev *netdev, struct netdev_dev_dummy *dev = netdev_dev_dummy_cast(netdev_get_dev(netdev)); + return netdev_dev_dummy_update_flags(dev, off, on, old_flagsp); +} + +static int +netdev_dev_dummy_update_flags(struct netdev_dev_dummy *dev, + enum netdev_flags off, enum netdev_flags on, + enum netdev_flags *old_flagsp) +{ if ((off | on) & ~(NETDEV_UP | NETDEV_PROMISC)) { return EINVAL; } @@ -274,7 +339,7 @@ netdev_dummy_update_flags(struct netdev *netdev, dev->flags |= on; dev->flags &= ~off; if (*old_flagsp != dev->flags) { - netdev_dummy_poll_notify(netdev); + netdev_dev_dummy_poll_notify(dev); } return 0; } @@ -288,11 +353,8 @@ netdev_dummy_change_seq(const struct netdev *netdev) /* Helper functions. */ static void -netdev_dummy_poll_notify(const struct netdev *netdev) +netdev_dev_dummy_poll_notify(struct netdev_dev_dummy *dev) { - struct netdev_dev_dummy *dev = - netdev_dev_dummy_cast(netdev_get_dev(netdev)); - dev->change_seq++; if (!dev->change_seq) { dev->change_seq++; @@ -307,8 +369,9 @@ 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, @@ -318,14 +381,14 @@ static const struct netdev_class dummy_class = { netdev_dummy_recv_wait, netdev_dummy_drain, - 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 */ @@ -352,7 +415,7 @@ static const struct netdev_class dummy_class = { NULL, /* get_in6 */ NULL, /* add_router */ NULL, /* get_next_hop */ - NULL, /* get_drv_info */ + NULL, /* get_status */ NULL, /* arp_lookup */ netdev_dummy_update_flags, @@ -425,6 +488,9 @@ 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) { @@ -443,11 +509,62 @@ netdev_dummy_receive(struct unixctl_conn *conn, } } +static void +netdev_dev_dummy_set_admin_state(struct netdev_dev_dummy *dev, + bool admin_state) +{ + enum netdev_flags old_flags; + + if (admin_state) { + netdev_dev_dummy_update_flags(dev, 0, NETDEV_UP, &old_flags); + } else { + netdev_dev_dummy_update_flags(dev, NETDEV_UP, 0, &old_flags); + } +} + +static void +netdev_dummy_set_admin_state(struct unixctl_conn *conn, int argc, + const char *argv[], void *aux OVS_UNUSED) +{ + bool up; + + if (!strcasecmp(argv[argc - 1], "up")) { + up = true; + } else if ( !strcasecmp(argv[argc - 1], "down")) { + up = false; + } else { + unixctl_command_reply_error(conn, "Invalid Admin State"); + return; + } + + if (argc > 2) { + struct netdev_dev_dummy *dummy_dev; + + dummy_dev = shash_find_data(&dummy_netdev_devs, argv[1]); + if (dummy_dev) { + netdev_dev_dummy_set_admin_state(dummy_dev, up); + } else { + unixctl_command_reply_error(conn, "Unknown Dummy Interface"); + return; + } + } else { + struct shash_node *node; + + SHASH_FOR_EACH (node, &dummy_netdev_devs) { + netdev_dev_dummy_set_admin_state(node->data, up); + } + } + unixctl_command_reply(conn, "OK"); +} + void netdev_dummy_register(bool override) { unixctl_command_register("netdev-dummy/receive", "NAME PACKET|FLOW...", 2, INT_MAX, netdev_dummy_receive, NULL); + unixctl_command_register("netdev-dummy/set-admin-state", + "[netdev] up|down", 1, 2, + netdev_dummy_set_admin_state, NULL); if (override) { struct sset types; @@ -468,4 +585,8 @@ netdev_dummy_register(bool override) sset_destroy(&types); } netdev_register_provider(&dummy_class); + + if (FREE_BSD) { + netdev_vport_tunnel_register(); + } }