X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Frconn.c;h=67ea86c0e3f17583ec28761a66ff2c09ef9af86a;hb=f31282b9c152d5e993c8fe0068b7a4ed8c8d98c8;hp=ddf578c185aded6b2440d9b18e5b8141c46b41a8;hpb=1a126c0c6803db4e6c16ddc0a3369a6ad197d238;p=sliver-openvswitch.git diff --git a/lib/rconn.c b/lib/rconn.c index ddf578c18..67ea86c0e 100644 --- a/lib/rconn.c +++ b/lib/rconn.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira, Inc. + * 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. @@ -16,7 +16,6 @@ #include #include "rconn.h" -#include #include #include #include @@ -131,8 +130,15 @@ struct rconn { #define MAX_MONITORS 8 struct vconn *monitors[8]; size_t n_monitors; + + uint32_t allowed_versions; }; +uint32_t rconn_get_allowed_versions(const struct rconn *rconn) +{ + return rconn->allowed_versions; +} + static unsigned int elapsed_in_this_state(const struct rconn *); static unsigned int timeout(const struct rconn *); static bool timed_out(const struct rconn *); @@ -163,9 +169,17 @@ static bool rconn_logging_connection_attempts__(const struct rconn *); * 8 seconds is used. * * The new rconn is initially unconnected. Use rconn_connect() or - * rconn_connect_unreliably() to connect it. */ + * rconn_connect_unreliably() to connect it. + * + * Connections made by the rconn will automatically negotiate an OpenFlow + * protocol version acceptable to both peers on the connection. The version + * negotiated will be one of those in the 'allowed_versions' bitmap: version + * 'x' is allowed if allowed_versions & (1 << x) is nonzero. (The underlying + * vconn will treat an 'allowed_versions' of 0 as OFPUTIL_DEFAULT_VERSIONS.) + */ struct rconn * -rconn_create(int probe_interval, int max_backoff, uint8_t dscp) +rconn_create(int probe_interval, int max_backoff, uint8_t dscp, + uint32_t allowed_versions) { struct rconn *rc = xzalloc(sizeof *rc); @@ -203,6 +217,7 @@ rconn_create(int probe_interval, int max_backoff, uint8_t dscp) rconn_set_dscp(rc, dscp); rc->n_monitors = 0; + rc->allowed_versions = allowed_versions; return rc; } @@ -277,7 +292,7 @@ void rconn_connect_unreliably(struct rconn *rc, struct vconn *vconn, const char *name) { - assert(vconn != NULL); + ovs_assert(vconn != NULL); rconn_disconnect(rc); rconn_set_target__(rc, vconn_get_name(vconn), name); rc->reliable = false; @@ -354,7 +369,8 @@ reconnect(struct rconn *rc) VLOG_INFO("%s: connecting...", rc->name); } rc->n_attempted_connections++; - retval = vconn_open(rc->target, OFP10_VERSION, &rc->vconn, rc->dscp); + retval = vconn_open(rc->target, rc->allowed_versions, rc->dscp, + &rc->vconn); if (!retval) { rc->remote_ip = vconn_get_remote_ip(rc->vconn); rc->local_ip = vconn_get_local_ip(rc->vconn); @@ -452,7 +468,7 @@ run_ACTIVE(struct rconn *rc) rc->name, (unsigned int) (time_now() - base)); version = rconn_get_version(rc); - assert(version >= 0 && version <= 0xff); + ovs_assert(version >= 0 && version <= 0xff); /* Ordering is important here: rconn_send() can transition to BACKOFF, * and we don't want to transition back to IDLE if so, because then we @@ -632,14 +648,13 @@ int rconn_send_with_limit(struct rconn *rc, struct ofpbuf *b, struct rconn_packet_counter *counter, int queue_limit) { - int retval; - retval = (counter->n_packets >= queue_limit - ? EAGAIN - : rconn_send(rc, b, counter)); - if (retval) { + if (counter->n_packets < queue_limit) { + return rconn_send(rc, b, counter); + } else { COVERAGE_INC(rconn_overflow); + ofpbuf_delete(b); + return EAGAIN; } - return retval; } /* Returns the total number of packets successfully sent on the underlying @@ -657,6 +672,14 @@ void rconn_add_monitor(struct rconn *rc, struct vconn *vconn) { if (rc->n_monitors < ARRAY_SIZE(rc->monitors)) { + int version = vconn_get_version(rc->vconn); + + /* Override the allowed versions of the snoop vconn so that + * only the version of the controller connection is allowed. + * This is because the snoop will see the same messages as the + * controller */ + vconn_set_allowed_versions(vconn, 1u << version); + VLOG_INFO("new monitor connection from %s", vconn_get_name(vconn)); rc->monitors[rc->n_monitors++] = vconn; } else { @@ -840,7 +863,7 @@ void rconn_packet_counter_destroy(struct rconn_packet_counter *c) { if (c) { - assert(c->ref_cnt > 0); + ovs_assert(c->ref_cnt > 0); if (!--c->ref_cnt && !c->n_packets) { free(c); } @@ -857,13 +880,13 @@ rconn_packet_counter_inc(struct rconn_packet_counter *c, unsigned int n_bytes) void rconn_packet_counter_dec(struct rconn_packet_counter *c, unsigned int n_bytes) { - assert(c->n_packets > 0); - assert(c->n_bytes >= n_bytes); + ovs_assert(c->n_packets > 0); + ovs_assert(c->n_bytes >= n_bytes); c->n_bytes -= n_bytes; c->n_packets--; if (!c->n_packets) { - assert(!c->n_bytes); + ovs_assert(!c->n_bytes); if (!c->ref_cnt) { free(c); } @@ -1096,6 +1119,26 @@ is_admitted_msg(const struct ofpbuf *b) case OFPTYPE_GET_CONFIG_REQUEST: case OFPTYPE_GET_CONFIG_REPLY: case OFPTYPE_SET_CONFIG: + /* FIXME: Change the following once they are implemented: */ + case OFPTYPE_QUEUE_GET_CONFIG_REQUEST: + case OFPTYPE_QUEUE_GET_CONFIG_REPLY: + case OFPTYPE_GET_ASYNC_REQUEST: + case OFPTYPE_GET_ASYNC_REPLY: + case OFPTYPE_METER_MOD: + case OFPTYPE_GROUP_REQUEST: + case OFPTYPE_GROUP_REPLY: + case OFPTYPE_GROUP_DESC_REQUEST: + case OFPTYPE_GROUP_DESC_REPLY: + case OFPTYPE_GROUP_FEATURES_REQUEST: + case OFPTYPE_GROUP_FEATURES_REPLY: + case OFPTYPE_METER_REQUEST: + case OFPTYPE_METER_REPLY: + case OFPTYPE_METER_CONFIG_REQUEST: + case OFPTYPE_METER_CONFIG_REPLY: + case OFPTYPE_METER_FEATURES_REQUEST: + case OFPTYPE_METER_FEATURES_REPLY: + case OFPTYPE_TABLE_FEATURES_REQUEST: + case OFPTYPE_TABLE_FEATURES_REPLY: return false; case OFPTYPE_PACKET_IN: