/*
- * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013 Nicira, Inc.
+ * Copyright (c) 2008, 2009, 2010, 2011, 2012, 2013, 2014 Nicira, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
COVERAGE_DEFINE(rconn_queued);
COVERAGE_DEFINE(rconn_sent);
+/* The connection states have the following meanings:
+ *
+ * - S_VOID: No connection information is configured.
+ *
+ * - S_BACKOFF: Waiting for a period of time before reconnecting.
+ *
+ * - S_CONNECTING: A connection attempt is in progress and has not yet
+ * succeeded or failed.
+ *
+ * - S_ACTIVE: A connection has been established and appears to be healthy.
+ *
+ * - S_IDLE: A connection has been established but has been idle for some
+ * time. An echo request has been sent, but no reply has yet been
+ * received.
+ *
+ * - S_DISCONNECTED: An unreliable connection has disconnected and cannot be
+ * automatically retried.
+ */
#define STATES \
STATE(VOID, 1 << 0) \
STATE(BACKOFF, 1 << 1) \
STATE(CONNECTING, 1 << 2) \
STATE(ACTIVE, 1 << 3) \
- STATE(IDLE, 1 << 4)
+ STATE(IDLE, 1 << 4) \
+ STATE(DISCONNECTED, 1 << 5)
enum state {
#define STATE(NAME, VALUE) S_##NAME = VALUE,
STATES
char *target; /* vconn name, passed to vconn_open(). */
bool reliable;
- struct list txq; /* Contains "struct ofpbuf"s. */
+ struct ovs_list txq; /* Contains "struct ofpbuf"s. */
int backoff;
int max_backoff;
int probe_interval; /* Secs of inactivity before sending probe. */
time_t last_activity; /* Last time we saw some activity. */
- /* When we create a vconn we obtain these values, to save them past the end
- * of the vconn's lifetime. Otherwise, in-band control will only allow
- * traffic when a vconn is actually open, but it is nice to allow ARP to
- * complete even between connection attempts, and it is also polite to
- * allow traffic from other switches to go through to the controller
- * whether or not we are connected.
- *
- * We don't cache the local port, because that changes from one connection
- * attempt to the next. */
- ovs_be32 local_ip, remote_ip;
- ovs_be16 remote_port;
uint8_t dscp;
/* Messages sent or received are copied to the monitor connections. */
-#define MAX_MONITORS 8
- struct vconn *monitors[8];
+#define MAXIMUM_MONITORS 8
+ struct vconn *monitors[MAXIMUM_MONITORS];
size_t n_monitors;
uint32_t allowed_versions;
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);
- rc->remote_port = vconn_get_remote_port(rc->vconn);
rc->backoff_deadline = time_now() + rc->backoff;
state_transition(rc, S_CONNECTING);
} else {
}
}
+static unsigned int
+timeout_DISCONNECTED(const struct rconn *rc OVS_UNUSED)
+ OVS_REQUIRES(rc->mutex)
+{
+ return UINT_MAX;
+}
+
+static void
+run_DISCONNECTED(struct rconn *rc OVS_UNUSED)
+ OVS_REQUIRES(rc->mutex)
+{
+ /* Nothing to do. */
+}
+
/* Performs whatever activities are necessary to maintain 'rc': if 'rc' is
* disconnected, attempts to (re)connect, backing off as necessary; if 'rc' is
* connected, attempts to send packets in the send queue, if any. */
ovs_mutex_lock(&rc->mutex);
if (rc->vconn) {
+ int error;
+
vconn_run(rc->vconn);
+
+ error = vconn_get_status(rc->vconn);
+ if (error) {
+ report_error(rc, error);
+ disconnect(rc, error);
+ }
}
for (i = 0; i < rc->n_monitors; ) {
struct ofpbuf *msg;
STATES
#undef STATE
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
} while (rc->state != old_state);
ovs_mutex_unlock(&rc->mutex);
if (rconn_is_connected(rc)) {
COVERAGE_INC(rconn_queued);
copy_to_monitor(rc, b);
- b->private_p = counter;
+
if (counter) {
- rconn_packet_counter_inc(counter, b->size);
+ rconn_packet_counter_inc(counter, ofpbuf_size(b));
}
+
+ /* Reuse 'frame' as a private pointer while 'b' is in txq. */
+ ofpbuf_set_frame(b, counter);
+
list_push_back(&rc->txq, &b->list_node);
/* If the queue was empty before we added 'b', try to send some
bool
rconn_is_alive(const struct rconn *rconn)
{
- return rconn->state != S_VOID;
+ return rconn->state != S_VOID && rconn->state != S_DISCONNECTED;
}
/* Returns true if 'rconn' is connected, false otherwise. */
return duration;
}
-/* Returns the IP address of the peer, or 0 if the peer's IP address is not
- * known. */
-ovs_be32
-rconn_get_remote_ip(const struct rconn *rconn)
-{
- return rconn->remote_ip;
-}
-
-/* Returns the transport port of the peer, or 0 if the peer's port is not
- * known. */
-ovs_be16
-rconn_get_remote_port(const struct rconn *rconn)
-{
- return rconn->remote_port;
-}
-
-/* Returns the IP address used to connect to the peer, or 0 if the
- * connection is not an IP-based protocol or if its IP address is not
- * known. */
-ovs_be32
-rconn_get_local_ip(const struct rconn *rconn)
-{
- return rconn->local_ip;
-}
-
-/* Returns the transport port used to connect to the peer, or 0 if the
- * connection does not contain a port or if the port is not known. */
-ovs_be16
-rconn_get_local_port(const struct rconn *rconn)
- OVS_EXCLUDED(rconn->mutex)
-{
- ovs_be16 port;
-
- ovs_mutex_lock(&rconn->mutex);
- port = rconn->vconn ? vconn_get_local_port(rconn->vconn) : 0;
- ovs_mutex_unlock(&rconn->mutex);
-
- return port;
-}
-
static int
rconn_get_version__(const struct rconn *rconn)
OVS_REQUIRES(rconn->mutex)
}
\f
/* Set rc->target and rc->name to 'target' and 'name', respectively. If 'name'
- * is null, 'target' is used.
- *
- * Also, clear out the cached IP address and port information, since changing
- * the target also likely changes these values. */
+ * is null, 'target' is used. */
static void
rconn_set_target__(struct rconn *rc, const char *target, const char *name)
OVS_REQUIRES(rc->mutex)
rc->name = xstrdup(name ? name : target);
free(rc->target);
rc->target = xstrdup(target);
- rc->local_ip = 0;
- rc->remote_ip = 0;
- rc->remote_port = 0;
}
/* Tries to send a packet from 'rc''s send buffer. Returns 0 if successful,
OVS_REQUIRES(rc->mutex)
{
struct ofpbuf *msg = ofpbuf_from_list(rc->txq.next);
- unsigned int n_bytes = msg->size;
- struct rconn_packet_counter *counter = msg->private_p;
+ unsigned int n_bytes = ofpbuf_size(msg);
+ struct rconn_packet_counter *counter = msg->frame;
int retval;
/* Eagerly remove 'msg' from the txq. We can't remove it from the list
* after sending, if sending is successful, because it is then owned by the
* vconn, which might have freed it already. */
list_remove(&msg->list_node);
+ ofpbuf_set_frame(msg, NULL);
retval = vconn_send(rc->vconn, msg);
if (retval) {
+ ofpbuf_set_frame(msg, counter);
list_push_front(&rc->txq, &msg->list_node);
if (retval != EAGAIN) {
report_error(rc, retval);
report_error(struct rconn *rc, int error)
OVS_REQUIRES(rc->mutex)
{
- if (error == EOF) {
+ /* On Windows, when a peer terminates without calling a closesocket()
+ * on socket fd, we get WSAECONNRESET. Don't print warning messages
+ * for that case. */
+ if (error == EOF
+#ifdef _WIN32
+ || error == WSAECONNRESET
+#endif
+ ) {
/* If 'rc' isn't reliable, then we don't really expect this connection
* to last forever anyway (probably it's a connection that we received
* via accept()), so use DBG level to avoid cluttering the logs. */
OVS_REQUIRES(rc->mutex)
{
rc->last_error = error;
+ if (rc->vconn) {
+ vconn_close(rc->vconn);
+ rc->vconn = NULL;
+ }
if (rc->reliable) {
time_t now = time_now();
if (rc->state & (S_CONNECTING | S_ACTIVE | S_IDLE)) {
rc->last_disconnected = now;
- vconn_close(rc->vconn);
- rc->vconn = NULL;
flush_queue(rc);
}
state_transition(rc, S_BACKOFF);
} else {
rc->last_disconnected = time_now();
- rconn_disconnect__(rc);
+ state_transition(rc, S_DISCONNECTED);
}
}
}
while (!list_is_empty(&rc->txq)) {
struct ofpbuf *b = ofpbuf_from_list(list_pop_front(&rc->txq));
- struct rconn_packet_counter *counter = b->private_p;
+ struct rconn_packet_counter *counter = b->frame;
if (counter) {
- rconn_packet_counter_dec(counter, b->size);
+ rconn_packet_counter_dec(counter, ofpbuf_size(b));
}
COVERAGE_INC(rconn_discarded);
ofpbuf_delete(b);
STATES
#undef STATE
default:
- NOT_REACHED();
+ OVS_NOT_REACHED();
}
}
enum ofptype type;
enum ofperr error;
- error = ofptype_decode(&type, b->data);
+ error = ofptype_decode(&type, ofpbuf_data(b));
if (error) {
return false;
}
case OFPTYPE_GROUP_FEATURES_STATS_REPLY:
case OFPTYPE_TABLE_FEATURES_STATS_REQUEST:
case OFPTYPE_TABLE_FEATURES_STATS_REPLY:
+ case OFPTYPE_BUNDLE_CONTROL:
+ case OFPTYPE_BUNDLE_ADD_MESSAGE:
return false;
case OFPTYPE_PACKET_IN:
projects / cascardo / ovs.git / blobdiff