/*
- * 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.
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;
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
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);
}
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);
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: