X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fnetdev.c;h=3c528a8d6a515232e41b3dc386801c678fddea6b;hb=d1673b006d53fdea72c0744e835362ed1917f879;hp=165009a5b338357890a6cae94904ff5d8958593a;hpb=dcc2e50ad4e263ffbbac6f22043e8ccfb949bdd3;p=sliver-openvswitch.git diff --git a/lib/netdev.c b/lib/netdev.c index 165009a5b..3c528a8d6 100644 --- a/lib/netdev.c +++ b/lib/netdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2008, 2009, 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. @@ -17,7 +17,6 @@ #include #include "netdev.h" -#include #include #include #include @@ -37,6 +36,7 @@ #include "packets.h" #include "poll-loop.h" #include "shash.h" +#include "smap.h" #include "sset.h" #include "svec.h" #include "vlog.h" @@ -74,13 +74,18 @@ netdev_initialize(void) fatal_signal_add_hook(close_all_netdevs, NULL, NULL, true); -#ifdef HAVE_NETLINK +#ifdef LINUX_DATAPATH netdev_register_provider(&netdev_linux_class); netdev_register_provider(&netdev_internal_class); netdev_register_provider(&netdev_tap_class); netdev_vport_register(); +#endif +#ifdef __FreeBSD__ + netdev_register_provider(&netdev_tap_class); + netdev_register_provider(&netdev_bsd_class); #endif netdev_register_provider(&netdev_tunnel_class); + netdev_register_provider(&netdev_pltap_class); } } @@ -224,7 +229,7 @@ netdev_open(const char *name, const char *type, struct netdev **netdevp) if (error) { return error; } - assert(netdev_dev->netdev_class == class); + ovs_assert(netdev_dev->netdev_class == class); } @@ -244,15 +249,15 @@ netdev_open(const char *name, const char *type, struct netdev **netdevp) /* Reconfigures the device 'netdev' with 'args'. 'args' may be empty * or NULL if none are needed. */ int -netdev_set_config(struct netdev *netdev, const struct shash *args) +netdev_set_config(struct netdev *netdev, const struct smap *args) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); if (netdev_dev->netdev_class->set_config) { - struct shash no_args = SHASH_INITIALIZER(&no_args); + struct smap no_args = SMAP_INITIALIZER(&no_args); return netdev_dev->netdev_class->set_config(netdev_dev, args ? args : &no_args); - } else if (args && !shash_is_empty(args)) { + } else if (args && !smap_is_empty(args)) { VLOG_WARN("%s: arguments provided to device that is not configurable", netdev_get_name(netdev)); } @@ -261,23 +266,23 @@ netdev_set_config(struct netdev *netdev, const struct shash *args) } /* Returns the current configuration for 'netdev' in 'args'. The caller must - * have already initialized 'args' with shash_init(). Returns 0 on success, in + * have already initialized 'args' with smap_init(). Returns 0 on success, in * which case 'args' will be filled with 'netdev''s configuration. On failure * returns a positive errno value, in which case 'args' will be empty. * * The caller owns 'args' and its contents and must eventually free them with - * shash_destroy_free_data(). */ + * smap_destroy(). */ int -netdev_get_config(const struct netdev *netdev, struct shash *args) +netdev_get_config(const struct netdev *netdev, struct smap *args) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); int error; - shash_clear_free_data(args); + smap_clear(args); if (netdev_dev->netdev_class->get_config) { error = netdev_dev->netdev_class->get_config(netdev_dev, args); if (error) { - shash_clear_free_data(args); + smap_clear(args); } } else { error = 0; @@ -286,6 +291,18 @@ netdev_get_config(const struct netdev *netdev, struct shash *args) return error; } +const struct netdev_tunnel_config * +netdev_get_tunnel_config(const struct netdev *netdev) +{ + struct netdev_dev *netdev_dev = netdev_get_dev(netdev); + + if (netdev_dev->netdev_class->get_tunnel_config) { + return netdev_dev->netdev_class->get_tunnel_config(netdev_dev); + } else { + return NULL; + } +} + /* Closes and destroys 'netdev'. */ void netdev_close(struct netdev *netdev) @@ -293,7 +310,7 @@ netdev_close(struct netdev *netdev) if (netdev) { struct netdev_dev *netdev_dev = netdev_get_dev(netdev); - assert(netdev_dev->ref_cnt); + ovs_assert(netdev_dev->ref_cnt); netdev_dev->ref_cnt--; netdev_uninit(netdev, true); @@ -388,8 +405,8 @@ netdev_recv(struct netdev *netdev, struct ofpbuf *buffer) int (*recv)(struct netdev *, void *, size_t); int retval; - assert(buffer->size == 0); - assert(ofpbuf_tailroom(buffer) >= ETH_TOTAL_MIN); + ovs_assert(buffer->size == 0); + ovs_assert(ofpbuf_tailroom(buffer) >= ETH_TOTAL_MIN); recv = netdev_get_dev(netdev)->netdev_class->recv; retval = (recv @@ -616,9 +633,10 @@ netdev_get_features(const struct netdev *netdev, /* Returns the maximum speed of a network connection that has the NETDEV_F_* * bits in 'features', in bits per second. If no bits that indicate a speed - * are set in 'features', assumes 100Mbps. */ + * are set in 'features', returns 'default_bps'. */ uint64_t -netdev_features_to_bps(enum netdev_features features) +netdev_features_to_bps(enum netdev_features features, + uint64_t default_bps) { enum { F_1000000MB = NETDEV_F_1TB_FD, @@ -637,7 +655,7 @@ netdev_features_to_bps(enum netdev_features features) : features & F_1000MB ? UINT64_C(1000000000) : features & F_100MB ? UINT64_C(100000000) : features & F_10MB ? UINT64_C(10000000) - : UINT64_C(100000000)); + : default_bps); } /* Returns true if any of the NETDEV_F_* bits that indicate a full-duplex link @@ -760,18 +778,18 @@ netdev_get_next_hop(const struct netdev *netdev, return error; } -/* Populates 'sh' with status information. +/* Populates 'smap' with status information. * - * Populates 'sh' with 'netdev' specific status information. This information - * may be used to populate the status column of the Interface table as defined - * in ovs-vswitchd.conf.db(5). */ + * Populates 'smap' with 'netdev' specific status information. This + * information may be used to populate the status column of the Interface table + * as defined in ovs-vswitchd.conf.db(5). */ int -netdev_get_drv_info(const struct netdev *netdev, struct shash *sh) +netdev_get_status(const struct netdev *netdev, struct smap *smap) { struct netdev_dev *dev = netdev_get_dev(netdev); - return (dev->netdev_class->get_drv_info - ? dev->netdev_class->get_drv_info(netdev, sh) + return (dev->netdev_class->get_status + ? dev->netdev_class->get_status(netdev, smap) : EOPNOTSUPP); } @@ -843,7 +861,7 @@ do_update_flags(struct netdev *netdev, enum netdev_flags off, int netdev_get_flags(const struct netdev *netdev_, enum netdev_flags *flagsp) { - struct netdev *netdev = (struct netdev *) netdev_; + struct netdev *netdev = CONST_CAST(struct netdev *, netdev_); return do_update_flags(netdev, 0, 0, flagsp, false); } @@ -1066,10 +1084,9 @@ netdev_get_n_queues(const struct netdev *netdev, * * A '*typep' of "" indicates that QoS is currently disabled on 'netdev'. * - * The caller must initialize 'details' as an empty shash (e.g. with - * shash_init()) before calling this function. The caller must free 'details', - * including 'data' members, when it is no longer needed (e.g. with - * shash_destroy_free_data()). + * The caller must initialize 'details' as an empty smap (e.g. with + * smap_init()) before calling this function. The caller must free 'details' + * when it is no longer needed (e.g. with smap_destroy()). * * The caller must not modify or free '*typep'. * @@ -1079,7 +1096,7 @@ netdev_get_n_queues(const struct netdev *netdev, * vswitchd/vswitch.xml (which is built as ovs-vswitchd.conf.db(8)). */ int netdev_get_qos(const struct netdev *netdev, - const char **typep, struct shash *details) + const char **typep, struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; int retval; @@ -1088,7 +1105,7 @@ netdev_get_qos(const struct netdev *netdev, retval = class->get_qos(netdev, typep, details); if (retval) { *typep = NULL; - shash_clear_free_data(details); + smap_clear(details); } return retval; } else { @@ -1118,7 +1135,7 @@ netdev_get_qos(const struct netdev *netdev, * details. */ int netdev_set_qos(struct netdev *netdev, - const char *type, const struct shash *details) + const char *type, const struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; @@ -1128,7 +1145,7 @@ netdev_set_qos(struct netdev *netdev, if (class->set_qos) { if (!details) { - static struct shash empty = SHASH_INITIALIZER(&empty); + static struct smap empty = SMAP_INITIALIZER(&empty); details = ∅ } return class->set_qos(netdev, type, details); @@ -1148,12 +1165,12 @@ netdev_set_qos(struct netdev *netdev, * given 'type' in the "other_config" column in the "Queue" table in * vswitchd/vswitch.xml (which is built as ovs-vswitchd.conf.db(8)). * - * The caller must initialize 'details' (e.g. with shash_init()) before calling - * this function. The caller must free 'details', including 'data' members, - * when it is no longer needed (e.g. with shash_destroy_free_data()). */ + * The caller must initialize 'details' (e.g. with smap_init()) before calling + * this function. The caller must free 'details' when it is no longer needed + * (e.g. with smap_destroy()). */ int netdev_get_queue(const struct netdev *netdev, - unsigned int queue_id, struct shash *details) + unsigned int queue_id, struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; int retval; @@ -1162,7 +1179,7 @@ netdev_get_queue(const struct netdev *netdev, ? class->get_queue(netdev, queue_id, details) : EOPNOTSUPP); if (retval) { - shash_clear_free_data(details); + smap_clear(details); } return retval; } @@ -1181,7 +1198,7 @@ netdev_get_queue(const struct netdev *netdev, * it. */ int netdev_set_queue(struct netdev *netdev, - unsigned int queue_id, const struct shash *details) + unsigned int queue_id, const struct smap *details) { const struct netdev_class *class = netdev_get_dev(netdev)->netdev_class; return (class->set_queue @@ -1300,7 +1317,7 @@ void netdev_dev_init(struct netdev_dev *netdev_dev, const char *name, const struct netdev_class *netdev_class) { - assert(!shash_find(&netdev_dev_shash, name)); + ovs_assert(!shash_find(&netdev_dev_shash, name)); memset(netdev_dev, 0, sizeof *netdev_dev); netdev_dev->netdev_class = netdev_class; @@ -1320,7 +1337,7 @@ netdev_dev_uninit(struct netdev_dev *netdev_dev, bool destroy) { char *name = netdev_dev->name; - assert(!netdev_dev->ref_cnt); + ovs_assert(!netdev_dev->ref_cnt); shash_delete(&netdev_dev_shash, netdev_dev->node);