X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Frconn.c;h=9b6cd8638223c1ff44d78ad6277973a066cfb1c1;hb=305b76debf72120672a8ba81d3356b6dccb1da9a;hp=002f3676b088a686585e7e232464710929f496a9;hpb=b8dddecfcc418ac4dcf01f6c57d976895e549c49;p=sliver-openvswitch.git

diff --git a/lib/rconn.c b/lib/rconn.c
index 002f3676b..9b6cd8638 100644
--- a/lib/rconn.c
+++ b/lib/rconn.c
@@ -16,7 +16,6 @@
 
 #include <config.h>
 #include "rconn.h"
-#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -293,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;
@@ -469,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
@@ -673,14 +672,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 {
@@ -864,7 +855,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);
         }
@@ -881,13 +872,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);
         }