From: Dennis Flynn <drfl...@avaya.com> Signed-off-by: Ludovic Beliveau <ludovic.beliv...@windriver.com> Signed-off-by: Dennis Flynn <drfl...@avaya.com>
diff --git a/lib/odp-util.h b/lib/odp-util.h index 11b54dd..61b71b1 100644 --- a/lib/odp-util.h +++ b/lib/odp-util.h @@ -40,6 +40,7 @@ struct pkt_metadata; SPR(SLOW_BFD, "bfd", "Consists of BFD packets") \ SPR(SLOW_LACP, "lacp", "Consists of LACP packets") \ SPR(SLOW_STP, "stp", "Consists of STP packets") \ + SPR(SLOW_LLDP, "lldp", "Consists of LLDP packets") \ SPR(SLOW_CONTROLLER, "controller", \ "Sends \"packet-in\" messages to the OpenFlow controller") \ SPR(SLOW_ACTION, "action", \ diff --git a/ofproto/ofproto-dpif-monitor.c b/ofproto/ofproto-dpif-monitor.c index 764c7b1..2210f19 100644 --- a/ofproto/ofproto-dpif-monitor.c +++ b/ofproto/ofproto-dpif-monitor.c @@ -33,6 +33,7 @@ #include "seq.h" #include "timeval.h" #include "util.h" +#include "ovs-lldp.h" #include "vlog.h" VLOG_DEFINE_THIS_MODULE(ofproto_dpif_monitor); @@ -42,7 +43,7 @@ VLOG_DEFINE_THIS_MODULE(ofproto_dpif_monitor); /* Converts the heap priority to time in millisecond. */ #define PRIO_TO_MSEC(PRIO) (LLONG_MAX - (PRIO)) -/* Monitored port. It owns references to ofport, bfd, cfm structs. */ +/* Monitored port. It owns references to ofport, bfd, cfm, and lldp structs. */ struct mport { struct hmap_node hmap_node; /* In monitor_hmap. */ struct heap_node heap_node; /* In monitor_heap. */ @@ -50,6 +51,7 @@ struct mport { struct cfm *cfm; /* Reference to cfm. */ struct bfd *bfd; /* Reference to bfd. */ + struct lldp *lldp; /* Reference to lldp. */ uint8_t hw_addr[OFP_ETH_ALEN]; /* Hardware address. */ }; @@ -85,12 +87,13 @@ static void monitor_run(void); static void monitor_mport_run(struct mport *, struct ofpbuf *); static void mport_register(const struct ofport_dpif *, struct bfd *, - struct cfm *, uint8_t[ETH_ADDR_LEN]) + struct cfm *, struct lldp *, uint8_t[ETH_ADDR_LEN]) OVS_REQUIRES(monitor_mutex); static void mport_unregister(const struct ofport_dpif *) OVS_REQUIRES(monitor_mutex); static void mport_update(struct mport *, struct bfd *, struct cfm *, - uint8_t[ETH_ADDR_LEN]) OVS_REQUIRES(monitor_mutex); + struct lldp *, uint8_t[ETH_ADDR_LEN]) + OVS_REQUIRES(monitor_mutex); static struct mport *mport_find(const struct ofport_dpif *) OVS_REQUIRES(monitor_mutex); @@ -114,7 +117,7 @@ mport_find(const struct ofport_dpif *ofport) OVS_REQUIRES(monitor_mutex) * if it doesn't exist. Otherwise, just updates its fields. */ static void mport_register(const struct ofport_dpif *ofport, struct bfd *bfd, - struct cfm *cfm, uint8_t *hw_addr) + struct cfm *cfm, struct lldp *lldp, uint8_t *hw_addr) OVS_REQUIRES(monitor_mutex) { struct mport *mport = mport_find(ofport); @@ -125,7 +128,7 @@ mport_register(const struct ofport_dpif *ofport, struct bfd *bfd, hmap_insert(&monitor_hmap, &mport->hmap_node, hash_pointer(ofport, 0)); heap_insert(&monitor_heap, &mport->heap_node, 0); } - mport_update(mport, bfd, cfm, hw_addr); + mport_update(mport, bfd, cfm, lldp, hw_addr); } /* Removes mport from monitor_hmap and monitor_heap and frees it. */ @@ -136,7 +139,7 @@ mport_unregister(const struct ofport_dpif *ofport) struct mport *mport = mport_find(ofport); if (mport) { - mport_update(mport, NULL, NULL, NULL); + mport_update(mport, NULL, NULL, NULL, NULL); hmap_remove(&monitor_hmap, &mport->hmap_node); heap_remove(&monitor_heap, &mport->heap_node); free(mport); @@ -146,7 +149,8 @@ mport_unregister(const struct ofport_dpif *ofport) /* Updates the fields of an existing mport struct. */ static void mport_update(struct mport *mport, struct bfd *bfd, struct cfm *cfm, - uint8_t hw_addr[ETH_ADDR_LEN]) OVS_REQUIRES(monitor_mutex) + struct lldp *lldp, uint8_t hw_addr[ETH_ADDR_LEN]) + OVS_REQUIRES(monitor_mutex) { ovs_assert(mport); @@ -158,12 +162,16 @@ mport_update(struct mport *mport, struct bfd *bfd, struct cfm *cfm, bfd_unref(mport->bfd); mport->bfd = bfd_ref(bfd); } + if (mport->lldp != lldp) { + lldp_unref(mport->lldp); + mport->lldp = lldp_ref(lldp); + } if (hw_addr && memcmp(mport->hw_addr, hw_addr, ETH_ADDR_LEN)) { memcpy(mport->hw_addr, hw_addr, ETH_ADDR_LEN); } - /* If bfd/cfm is added or reconfigured, move the mport on top of the heap + /* If bfd/cfm/lldp is added or reconfigured, move the mport on top of the heap * so that the monitor thread can run the mport next time it wakes up. */ - if (mport->bfd || mport->cfm) { + if (mport->bfd || mport->cfm || mport->lldp) { heap_change(&monitor_heap, &mport->heap_node, LLONG_MAX); } } @@ -270,6 +278,12 @@ monitor_mport_run(struct mport *mport, struct ofpbuf *packet) bfd_put_packet(mport->bfd, packet, mport->hw_addr); ofproto_dpif_send_packet(mport->ofport, packet); } + if (mport->lldp && lldp_should_send_packet(mport->lldp)) { + ofpbuf_clear(packet); + lldp_put_packet(mport->lldp, packet, mport->hw_addr); + ofproto_dpif_send_packet(mport->ofport, packet); + } + if (mport->cfm) { cfm_run(mport->cfm); cfm_wait(mport->cfm); @@ -278,9 +292,13 @@ monitor_mport_run(struct mport *mport, struct ofpbuf *packet) bfd_run(mport->bfd); bfd_wait(mport->bfd); } + if (mport->lldp) { + lldp_wait(mport->lldp); + } /* Computes the next wakeup time for this mport. */ next_wake_time = MIN(bfd_wake_time(mport->bfd), cfm_wake_time(mport->cfm)); + next_wake_time = MIN(next_wake_time,lldp_wake_time(mport->lldp)); heap_change(&monitor_heap, &mport->heap_node, MSEC_TO_PRIO(next_wake_time)); } @@ -293,13 +311,14 @@ monitor_mport_run(struct mport *mport, struct ofpbuf *packet) void ofproto_dpif_monitor_port_update(const struct ofport_dpif *ofport, struct bfd *bfd, struct cfm *cfm, + struct lldp *lldp, uint8_t hw_addr[ETH_ADDR_LEN]) { ovs_mutex_lock(&monitor_mutex); - if (!cfm && !bfd) { + if (!cfm && !bfd && !lldp) { mport_unregister(ofport); } else { - mport_register(ofport, bfd, cfm, hw_addr); + mport_register(ofport, bfd, cfm, lldp, hw_addr); } ovs_mutex_unlock(&monitor_mutex); diff --git a/ofproto/ofproto-dpif-monitor.h b/ofproto/ofproto-dpif-monitor.h index 2c466c2..b65d70b 100644 --- a/ofproto/ofproto-dpif-monitor.h +++ b/ofproto/ofproto-dpif-monitor.h @@ -22,12 +22,13 @@ struct bfd; struct cfm; +struct lldp; struct ofport_dpif; void ofproto_dpif_monitor_port_send_soon(const struct ofport_dpif *); void ofproto_dpif_monitor_port_update(const struct ofport_dpif *, struct bfd *, struct cfm *, - uint8_t[OFP_ETH_ALEN]); + struct lldp *, uint8_t[OFP_ETH_ALEN]); #endif /* ofproto-dpif-monitor.h */ diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index e9bb4ff..75eca14 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -32,6 +32,7 @@ #include "lacp.h" #include "learn.h" #include "list.h" +#include "ovs-lldp.h" #include "mac-learning.h" #include "mcast-snooping.h" #include "meta-flow.h" @@ -164,6 +165,7 @@ struct xport { struct cfm *cfm; /* CFM handle or null. */ struct bfd *bfd; /* BFD handle or null. */ + struct lldp *lldp; /* LLDP handle or null. */ }; struct xlate_ctx { @@ -382,8 +384,8 @@ static void xlate_xbundle_set(struct xbundle *xbundle, bool floodable); static void xlate_xport_set(struct xport *xport, odp_port_t odp_port, const struct netdev *netdev, const struct cfm *cfm, - const struct bfd *bfd, int stp_port_no, - const struct rstp_port *rstp_port, + const struct bfd *bfd, const struct lldp *lldp, + int stp_port_no, const struct rstp_port *rstp_port, enum ofputil_port_config config, enum ofputil_port_state state, bool is_tunnel, bool may_enable); @@ -523,7 +525,7 @@ xlate_xbundle_set(struct xbundle *xbundle, static void xlate_xport_set(struct xport *xport, odp_port_t odp_port, const struct netdev *netdev, const struct cfm *cfm, - const struct bfd *bfd, int stp_port_no, + const struct bfd *bfd, const struct lldp *lldp, int stp_port_no, const struct rstp_port* rstp_port, enum ofputil_port_config config, enum ofputil_port_state state, bool is_tunnel, bool may_enable) @@ -550,6 +552,11 @@ xlate_xport_set(struct xport *xport, odp_port_t odp_port, xport->bfd = bfd_ref(bfd); } + if (xport->lldp != lldp) { + lldp_unref(xport->lldp); + xport->lldp = lldp_ref(lldp); + } + if (xport->netdev != netdev) { netdev_close(xport->netdev); xport->netdev = netdev_ref(netdev); @@ -618,9 +625,9 @@ xlate_xport_copy(struct xbridge *xbridge, struct xbundle *xbundle, xlate_xport_init(new_xcfg, new_xport); xlate_xport_set(new_xport, xport->odp_port, xport->netdev, xport->cfm, - xport->bfd, xport->stp_port_no, xport->rstp_port, - xport->config, xport->state, xport->is_tunnel, - xport->may_enable); + xport->bfd, xport->lldp, xport->stp_port_no, + xport->rstp_port, xport->config, xport->state, + xport->is_tunnel, xport->may_enable); if (xport->peer) { struct xport *peer = xport_lookup(new_xcfg, xport->peer->ofport); @@ -859,8 +866,8 @@ xlate_ofport_set(struct ofproto_dpif *ofproto, struct ofbundle *ofbundle, struct ofport_dpif *ofport, ofp_port_t ofp_port, odp_port_t odp_port, const struct netdev *netdev, const struct cfm *cfm, const struct bfd *bfd, - struct ofport_dpif *peer, int stp_port_no, - const struct rstp_port *rstp_port, + const struct lldp *lldp, struct ofport_dpif *peer, + int stp_port_no, const struct rstp_port *rstp_port, const struct ofproto_port_queue *qdscp_list, size_t n_qdscp, enum ofputil_port_config config, enum ofputil_port_state state, bool is_tunnel, @@ -883,8 +890,9 @@ xlate_ofport_set(struct ofproto_dpif *ofproto, struct ofbundle *ofbundle, ovs_assert(xport->ofp_port == ofp_port); - xlate_xport_set(xport, odp_port, netdev, cfm, bfd, stp_port_no, - rstp_port, config, state, is_tunnel, may_enable); + xlate_xport_set(xport, odp_port, netdev, cfm, bfd, lldp, + stp_port_no, rstp_port, config, state, is_tunnel, + may_enable); if (xport->peer) { xport->peer->peer = NULL; @@ -946,6 +954,7 @@ xlate_xport_remove(struct xlate_cfg *xcfg, struct xport *xport) rstp_port_unref(xport->rstp_port); cfm_unref(xport->cfm); bfd_unref(xport->bfd); + lldp_unref(xport->lldp); free(xport); } @@ -2457,6 +2466,11 @@ process_special(struct xlate_ctx *ctx, const struct flow *flow, : rstp_process_packet(xport, packet); } return SLOW_STP; + } else if (xport->lldp && lldp_should_process_flow(flow, wc)) { + if (packet) { + lldp_process_packet(xport->lldp, packet); + } + return SLOW_LLDP; } else { return 0; } diff --git a/ofproto/ofproto-dpif-xlate.h b/ofproto/ofproto-dpif-xlate.h index 5ef20b1..25fb08a 100644 --- a/ofproto/ofproto-dpif-xlate.h +++ b/ofproto/ofproto-dpif-xlate.h @@ -23,6 +23,7 @@ #include "ofproto-dpif.h" #include "ofproto.h" #include "stp.h" +#include "ovs-lldp.h" struct bfd; struct bond; @@ -166,10 +167,9 @@ void xlate_bundle_remove(struct ofbundle *); void xlate_ofport_set(struct ofproto_dpif *, struct ofbundle *, struct ofport_dpif *, ofp_port_t, odp_port_t, - const struct netdev *, const struct cfm *, - const struct bfd *, struct ofport_dpif *peer, - int stp_port_no, - const struct rstp_port *rstp_port, + const struct netdev *, const struct cfm *, const struct bfd *, + const struct lldp *, struct ofport_dpif *peer, + int stp_port_no, const struct rstp_port *rstp_port, const struct ofproto_port_queue *qdscp, size_t n_qdscp, enum ofputil_port_config, enum ofputil_port_state, bool is_tunnel, diff --git a/ofproto/ofproto-dpif.c b/ofproto/ofproto-dpif.c index d965d38..f6a24cc 100644 --- a/ofproto/ofproto-dpif.c +++ b/ofproto/ofproto-dpif.c @@ -29,6 +29,7 @@ #include "connmgr.h" #include "coverage.h" #include "cfm.h" +#include "ovs-lldp.h" #include "dpif.h" #include "dynamic-string.h" #include "fail-open.h" @@ -158,6 +159,7 @@ struct ofport_dpif { struct list bundle_node; /* In struct ofbundle's "ports" list. */ struct cfm *cfm; /* Connectivity Fault Management, if any. */ struct bfd *bfd; /* BFD, if any. */ + struct lldp *lldp; /* lldp, if any. */ bool may_enable; /* May be enabled in bonds. */ bool is_tunnel; /* This port is a tunnel. */ bool is_layer3; /* This is a layer 3 port. */ @@ -219,6 +221,7 @@ ofport_dpif_cast(const struct ofport *ofport) static void port_run(struct ofport_dpif *); static int set_bfd(struct ofport *, const struct smap *); static int set_cfm(struct ofport *, const struct cfm_settings *); +static int set_lldp(struct ofport *ofport_, const struct smap *cfg); static void ofport_update_peer(struct ofport_dpif *); /* Reasons that we might need to revalidate every datapath flow, and @@ -640,8 +643,8 @@ type_run(const char *type) : -1; xlate_ofport_set(ofproto, ofport->bundle, ofport, ofport->up.ofp_port, ofport->odp_port, - ofport->up.netdev, ofport->cfm, - ofport->bfd, ofport->peer, stp_port, + ofport->up.netdev, ofport->cfm, ofport->bfd, + ofport->lldp, ofport->peer, stp_port, ofport->rstp_port, ofport->qdscp, ofport->n_qdscp, ofport->up.pp.config, ofport->up.pp.state, ofport->is_tunnel, @@ -1632,6 +1635,7 @@ port_construct(struct ofport *port_) port->bundle = NULL; port->cfm = NULL; port->bfd = NULL; + port->lldp = NULL; port->may_enable = false; port->stp_port = NULL; port->stp_state = STP_DISABLED; @@ -1744,6 +1748,7 @@ port_destruct(struct ofport *port_) bundle_remove(port_); set_cfm(port_, NULL); set_bfd(port_, NULL); + set_lldp(port_, NULL); if (port->stp_port) { stp_port_disable(port->stp_port); } @@ -1773,7 +1778,7 @@ port_modified(struct ofport *port_) } ofproto_dpif_monitor_port_update(port, port->bfd, port->cfm, - port->up.pp.hw_addr); + port->lldp, port->up.pp.hw_addr); if (port->is_tunnel && tnl_port_reconfigure(port, port->up.netdev, port->odp_port)) { @@ -1899,7 +1904,7 @@ set_cfm(struct ofport *ofport_, const struct cfm_settings *s) ofport->cfm = NULL; out: ofproto_dpif_monitor_port_update(ofport, ofport->bfd, ofport->cfm, - ofport->up.pp.hw_addr); + ofport->lldp, ofport->up.pp.hw_addr); return error; } @@ -1941,7 +1946,7 @@ set_bfd(struct ofport *ofport_, const struct smap *cfg) ofproto->backer->need_revalidate = REV_RECONFIGURE; } ofproto_dpif_monitor_port_update(ofport, ofport->bfd, ofport->cfm, - ofport->up.pp.hw_addr); + ofport->lldp, ofport->up.pp.hw_addr); return 0; } @@ -1967,6 +1972,82 @@ get_bfd_status(struct ofport *ofport_, struct smap *smap) return ret; } + +static int +set_lldp(struct ofport *ofport_, + const struct smap *cfg) +{ + struct ofport_dpif *ofport = ofport_dpif_cast(ofport_); + int error = 0; + + if (cfg) { + if (!ofport->lldp) { + struct ofproto_dpif *ofproto; + + ofproto = ofproto_dpif_cast(ofport->up.ofproto); + ofproto->backer->need_revalidate = REV_RECONFIGURE; + ofport->lldp = lldp_create(ofport->up.netdev, ofport_->mtu, cfg); + } + + if (lldp_configure(ofport->lldp)) { + error = 0; + goto out; + } + + error = EINVAL; + } + lldp_unref(ofport->lldp); + ofport->lldp = NULL; +out: + ofproto_dpif_monitor_port_update(ofport, + ofport->bfd, + ofport->cfm, + ofport->lldp, + ofport->up.pp.hw_addr); + return error; +} + +static bool +get_lldp_status(const struct ofport *ofport_, + struct lldp_status *status OVS_UNUSED) +{ + struct ofport_dpif *ofport = ofport_dpif_cast(ofport_); + + return ofport->lldp ? true : false; +} + +static int +set_aa(struct ofproto *ofproto OVS_UNUSED, + const struct aa_settings *s) +{ + return aa_configure(s); +} + +static int +aa_mapping_set(struct ofproto *ofproto_ OVS_UNUSED, void *aux, + const struct aa_mapping_settings *s) +{ + return aa_mapping_register(aux, s); +} + +static int +aa_mapping_unset(struct ofproto *ofproto OVS_UNUSED, void *aux) +{ + return aa_mapping_unregister(aux); +} + +static int +aa_vlan_get_queued(struct ofproto *ofproto OVS_UNUSED, struct list **list) +{ + return aa_get_vlan_queued(list); +} + +static unsigned int +aa_vlan_get_queue_size(struct ofproto *ofproto OVS_UNUSED) +{ + return aa_get_vlan_queue_size(); +} + /* Spanning Tree. */ @@ -5418,6 +5499,13 @@ const struct ofproto_class ofproto_dpif_class = { set_cfm, cfm_status_changed, get_cfm_status, + set_lldp, + get_lldp_status, + set_aa, + aa_mapping_set, + aa_mapping_unset, + aa_vlan_get_queued, + aa_vlan_get_queue_size, set_bfd, bfd_status_changed, get_bfd_status, diff --git a/ofproto/ofproto-provider.h b/ofproto/ofproto-provider.h index 158f86e..45c5175 100644 --- a/ofproto/ofproto-provider.h +++ b/ofproto/ofproto-provider.h @@ -1347,6 +1347,67 @@ struct ofproto_class { int (*get_cfm_status)(const struct ofport *ofport, struct cfm_status *status); + /* Configures LLDP on 'ofport'. + * + * EOPNOTSUPP as a return value indicates that this ofproto_class does not + * support LLDP, as does a null pointer. */ + int (*set_lldp)(struct ofport *ofport, const struct smap *cfg); + + /* Checks the status of LLDP configured on 'ofport'. Returns true if the + * port's LLDP status was successfully stored into '*status'. Returns false + * if the port did not have LLDP configured, in which case '*status' is + * indeterminate. + * + * The caller must provide and owns '*status', but it does not own and must + * not modify or free the array returned in 'status->rmps'. */ + bool (*get_lldp_status)(const struct ofport *ofport, + struct lldp_status *status); + + /* Configures Auto Attach. + * + * If 'ofproto_aa_settings' is nonnull, configures Auto Attach according + * to its members. + * + * If 'ofproto_aa_settings' is null, removes any Auto Attach configuration. + */ + int (*set_aa)(struct ofproto *ofproto, + const struct aa_settings *s); + + /* If 's' is nonnull, this function registers a mapping associated with + * client data pointer 'aux' in 'ofproto'. If 'aux' is already registered + * then this function updates its configuration to 's'. Otherwise, this + * function registers a new mapping. + * + * An implementation that does not support mapping at all may set + * it to NULL or return EOPNOTSUPP. An implementation that supports + * only a subset of the functionality should implement what it can + * and return 0. + */ + int (*aa_mapping_set)(struct ofproto *ofproto, void *aux, + const struct aa_mapping_settings *s); + + /* If 's' is nonnull, this function unregisters a mapping associated with + * client data pointer 'aux' in 'ofproto'. If 'aux' is already registered + * then this function updates its configuration to 's'. Otherwise, this + * function unregisters a new mapping. + * + * An implementation that does not support mapping at all may set + * it to NULL or return EOPNOTSUPP. An implementation that supports + * only a subset of the functionality should implement what it can + * and return 0. + */ + int (*aa_mapping_unset)(struct ofproto *ofproto, void *aux); + + /* + * Returns the VLAN that has been added by Auto Attach. + */ + int (*aa_vlan_get_queued)(struct ofproto *ofproto, struct list **list); + + /* + * Returns the number of VLAN that have been changed by Auto Attach. + */ + unsigned int (*aa_vlan_get_queue_size)(struct ofproto *ofproto); + /* Configures BFD on 'ofport'. * * If 'cfg' is NULL, or 'cfg' does not contain the key value pair diff --git a/ofproto/ofproto.c b/ofproto/ofproto.c index b8f0e62..9cfa41e 100644 --- a/ofproto/ofproto.c +++ b/ofproto/ofproto.c @@ -1037,6 +1037,83 @@ ofproto_port_set_queues(struct ofproto *ofproto, ofp_port_t ofp_port, : EOPNOTSUPP); } +/* LLDP configuration. */ +void +ofproto_port_set_lldp(struct ofproto *ofproto, + ofp_port_t ofp_port, + const struct smap *cfg) +{ + struct ofport *ofport; + int error; + + ofport = ofproto_get_port(ofproto, ofp_port); + if (!ofport) { + VLOG_WARN("%s: cannot configure LLDP on nonexistent port %"PRIu16, + ofproto->name, ofp_port); + return; + } + error = (ofproto->ofproto_class->set_lldp + ? ofproto->ofproto_class->set_lldp(ofport, cfg) + : EOPNOTSUPP); + if (error) { + VLOG_WARN("%s: lldp configuration on port %"PRIu16" (%s) failed (%s)", + ofproto->name, ofp_port, netdev_get_name(ofport->netdev), + ovs_strerror(error)); + } +} + +int +ofproto_set_aa(struct ofproto *ofproto, void *aux OVS_UNUSED, + const struct aa_settings *s) +{ + if (!ofproto->ofproto_class->set_aa) { + return EOPNOTSUPP; + } + ofproto->ofproto_class->set_aa(ofproto, s); + return 0; +} + +int +ofproto_aa_mapping_register(struct ofproto *ofproto, void *aux, + const struct aa_mapping_settings *s) +{ + if (!ofproto->ofproto_class->aa_mapping_set) { + return EOPNOTSUPP; + } + ofproto->ofproto_class->aa_mapping_set(ofproto, aux, s); + return 0; +} + +int +ofproto_aa_mapping_unregister(struct ofproto *ofproto, void *aux) +{ + if (!ofproto->ofproto_class->aa_mapping_unset) { + return EOPNOTSUPP; + } + ofproto->ofproto_class->aa_mapping_unset(ofproto, aux); + return 0; +} + +int +ofproto_aa_vlan_get_queued(struct ofproto *ofproto, + struct list **list) +{ + if (!ofproto->ofproto_class->aa_vlan_get_queued) { + return EOPNOTSUPP; + } + ofproto->ofproto_class->aa_vlan_get_queued(ofproto, list); + return 0; +} + +unsigned int +ofproto_aa_vlan_get_queue_size(struct ofproto *ofproto) +{ + if (!ofproto->ofproto_class->aa_vlan_get_queue_size) { + return EOPNOTSUPP; + } + return ofproto->ofproto_class->aa_vlan_get_queue_size(ofproto); +} + /* Connectivity Fault Management configuration. */ /* Clears the CFM configuration from 'ofp_port' on 'ofproto'. */ @@ -1202,7 +1279,8 @@ ofproto_mirror_unregister(struct ofproto *ofproto, void *aux) /* Retrieves statistics from mirror associated with client data pointer * 'aux' in 'ofproto'. Stores packet and byte counts in 'packets' and * 'bytes', respectively. If a particular counters is not supported, - * the appropriate argument is set to UINT64_MAX. */ + * the appropriate argument is set to UINT64_MAX. + */ int ofproto_mirror_get_stats(struct ofproto *ofproto, void *aux, uint64_t *packets, uint64_t *bytes) diff --git a/ofproto/ofproto.h b/ofproto/ofproto.h index 40bb3b7..42bad16 100644 --- a/ofproto/ofproto.h +++ b/ofproto/ofproto.h @@ -45,6 +45,12 @@ struct ofport; struct ofproto; struct shash; struct simap; +struct smap; +struct netdev_stats; +struct list; +struct lldp_status; +struct aa_settings; +struct aa_mapping_settings; /* Needed for the lock annotations. */ extern struct ovs_mutex ofproto_mutex; @@ -423,6 +429,17 @@ int ofproto_mirror_unregister(struct ofproto *, void *aux); int ofproto_mirror_get_stats(struct ofproto *, void *aux, uint64_t *packets, uint64_t *bytes); +void ofproto_port_set_lldp(struct ofproto *ofproto, ofp_port_t ofp_port, + const struct smap *cfg); +int ofproto_set_aa(struct ofproto *ofproto, void *aux, + const struct aa_settings *s); +int ofproto_aa_mapping_register(struct ofproto *ofproto, void *aux, + const struct aa_mapping_settings *s); +int ofproto_aa_mapping_unregister(struct ofproto *ofproto, void *aux); +int ofproto_aa_vlan_get_queued(struct ofproto *ofproto, + struct list **list); +unsigned int ofproto_aa_vlan_get_queue_size(struct ofproto *ofproto); + int ofproto_set_flood_vlans(struct ofproto *, unsigned long *flood_vlans); bool ofproto_is_mirror_output_bundle(const struct ofproto *, void *aux); -- 1.7.12.4 _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev