X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Frconn.c;h=17cbd82d253241d1d61fc9d4251e7e618120ca14;hb=3442636d01d2a73a557952ad9140de07418c28c2;hp=45a0acd61c4f235829592b68cf4f788ea6d9ffd1;hpb=2e1ae2005ed347d2dfebd23fff40c54a1a2a6716;p=sliver-openvswitch.git diff --git a/lib/rconn.c b/lib/rconn.c index 45a0acd61..17cbd82d2 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 @@ -151,6 +150,7 @@ static void reconnect(struct rconn *); static void report_error(struct rconn *, int error); static void disconnect(struct rconn *, int error); static void flush_queue(struct rconn *); +static void close_monitor(struct rconn *, size_t idx, int retval); static void copy_to_monitor(struct rconn *, const struct ofpbuf *); static bool is_connected_state(enum state); static bool is_admitted_msg(const struct ofpbuf *); @@ -174,10 +174,10 @@ static bool rconn_logging_connection_attempts__(const struct rconn *); * * 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. If - * 'allowed_versions' is zero, then OFPUTIL_DEFAULT_VERSIONS are allowed. - **/ + * 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, uint32_t allowed_versions) @@ -218,9 +218,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 - ? allowed_versions - : OFPUTIL_DEFAULT_VERSIONS; + rc->allowed_versions = allowed_versions; return rc; } @@ -295,7 +293,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; @@ -372,8 +370,8 @@ reconnect(struct rconn *rc) VLOG_INFO("%s: connecting...", rc->name); } rc->n_attempted_connections++; - retval = vconn_open(rc->target, rc->allowed_versions, - &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); @@ -381,7 +379,8 @@ reconnect(struct rconn *rc) rc->backoff_deadline = time_now() + rc->backoff; state_transition(rc, S_CONNECTING); } else { - VLOG_WARN("%s: connection failed (%s)", rc->name, strerror(retval)); + VLOG_WARN("%s: connection failed (%s)", + rc->name, ovs_strerror(retval)); rc->backoff_deadline = TIME_MAX; /* Prevent resetting backoff. */ disconnect(rc, retval); } @@ -419,7 +418,7 @@ run_CONNECTING(struct rconn *rc) } else if (retval != EAGAIN) { if (rconn_logging_connection_attempts__(rc)) { VLOG_INFO("%s: connection failed (%s)", - rc->name, strerror(retval)); + rc->name, ovs_strerror(retval)); } disconnect(rc, retval); } else if (timed_out(rc)) { @@ -471,7 +470,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 @@ -515,8 +514,21 @@ rconn_run(struct rconn *rc) if (rc->vconn) { vconn_run(rc->vconn); } - for (i = 0; i < rc->n_monitors; i++) { + for (i = 0; i < rc->n_monitors; ) { + struct ofpbuf *msg; + int retval; + vconn_run(rc->monitors[i]); + + /* Drain any stray message that came in on the monitor connection. */ + retval = vconn_recv(rc->monitors[i], &msg); + if (!retval) { + ofpbuf_delete(msg); + } else if (retval != EAGAIN) { + close_monitor(rc, i, retval); + continue; + } + i++; } do { @@ -547,6 +559,7 @@ rconn_run_wait(struct rconn *rc) } for (i = 0; i < rc->n_monitors; i++) { vconn_run_wait(rc->monitors[i]); + vconn_recv_wait(rc->monitors[i]); } timeo = timeout(rc); @@ -651,14 +664,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 @@ -676,14 +688,6 @@ 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 { @@ -867,7 +871,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); } @@ -884,13 +888,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); } @@ -959,7 +963,8 @@ report_error(struct rconn *rc, int error) enum vlog_level level = rc->reliable ? VLL_INFO : VLL_DBG; VLOG(level, "%s: connection closed by peer", rc->name); } else { - VLOG_WARN("%s: connection dropped (%s)", rc->name, strerror(error)); + VLOG_WARN("%s: connection dropped (%s)", + rc->name, ovs_strerror(error)); } } @@ -1068,6 +1073,15 @@ state_transition(struct rconn *rc, enum state state) rc->state_entered = time_now(); } +static void +close_monitor(struct rconn *rc, size_t idx, int retval) +{ + VLOG_DBG("%s: closing monitor connection to %s: %s", + rconn_get_name(rc), vconn_get_name(rc->monitors[idx]), + ovs_retval_to_string(retval)); + rc->monitors[idx] = rc->monitors[--rc->n_monitors]; +} + static void copy_to_monitor(struct rconn *rc, const struct ofpbuf *b) { @@ -1085,10 +1099,7 @@ copy_to_monitor(struct rconn *rc, const struct ofpbuf *b) if (!retval) { clone = NULL; } else if (retval != EAGAIN) { - VLOG_DBG("%s: closing monitor connection to %s: %s", - rconn_get_name(rc), vconn_get_name(vconn), - strerror(retval)); - rc->monitors[i] = rc->monitors[--rc->n_monitors]; + close_monitor(rc, i, retval); continue; } i++; @@ -1124,23 +1135,18 @@ is_admitted_msg(const struct ofpbuf *b) 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: + case OFPTYPE_GROUP_STATS_REQUEST: + case OFPTYPE_GROUP_STATS_REPLY: + case OFPTYPE_GROUP_DESC_STATS_REQUEST: + case OFPTYPE_GROUP_DESC_STATS_REPLY: + case OFPTYPE_GROUP_FEATURES_STATS_REQUEST: + case OFPTYPE_GROUP_FEATURES_STATS_REPLY: + case OFPTYPE_TABLE_FEATURES_STATS_REQUEST: + case OFPTYPE_TABLE_FEATURES_STATS_REPLY: return false; case OFPTYPE_PACKET_IN: @@ -1148,7 +1154,9 @@ is_admitted_msg(const struct ofpbuf *b) case OFPTYPE_PORT_STATUS: case OFPTYPE_PACKET_OUT: case OFPTYPE_FLOW_MOD: + case OFPTYPE_GROUP_MOD: case OFPTYPE_PORT_MOD: + case OFPTYPE_METER_MOD: case OFPTYPE_BARRIER_REQUEST: case OFPTYPE_BARRIER_REPLY: case OFPTYPE_DESC_STATS_REQUEST: @@ -1165,6 +1173,12 @@ is_admitted_msg(const struct ofpbuf *b) case OFPTYPE_QUEUE_STATS_REPLY: case OFPTYPE_PORT_DESC_STATS_REQUEST: case OFPTYPE_PORT_DESC_STATS_REPLY: + case OFPTYPE_METER_STATS_REQUEST: + case OFPTYPE_METER_STATS_REPLY: + case OFPTYPE_METER_CONFIG_STATS_REQUEST: + case OFPTYPE_METER_CONFIG_STATS_REPLY: + case OFPTYPE_METER_FEATURES_STATS_REQUEST: + case OFPTYPE_METER_FEATURES_STATS_REPLY: case OFPTYPE_ROLE_REQUEST: case OFPTYPE_ROLE_REPLY: case OFPTYPE_SET_FLOW_FORMAT: