X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvconn-stream.c;h=82854e91125822112d450efd404246f48320a2c6;hb=b5d97350cdb4559fbce80057574e66daa1ac68df;hp=3d0887463ac87d8854a3342e857d74970425a22c;hpb=1e3c004749e1e0498dac6240b6edda472718dde2;p=openvswitch

diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c
index 3d088746..82854e91 100644
--- a/lib/vconn-stream.c
+++ b/lib/vconn-stream.c
@@ -32,9 +32,9 @@
 #include "util.h"
 #include "vconn-provider.h"
 #include "vconn.h"
-
 #include "vlog.h"
-#define THIS_MODULE VLM_vconn_stream
+
+VLOG_DEFINE_THIS_MODULE(vconn_stream);
 
 /* Active stream socket vconn. */
 
@@ -85,13 +85,16 @@ vconn_stream_open(const char *name, char *suffix OVS_UNUSED,
 
     error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
                                            &stream);
-
-    if (error && error != EAGAIN) {
-        return error;
+    if (!error) {
+        error = stream_connect(stream);
+        if (!error || error == EAGAIN) {
+            *vconnp = vconn_stream_new(stream, error);
+            return 0;
+        }
     }
 
-    *vconnp = vconn_stream_new(stream, error);
-    return 0;
+    stream_close(stream);
+    return error;
 }
 
 static struct vconn_stream *
@@ -170,8 +173,7 @@ vconn_stream_recv(struct vconn *vconn, struct ofpbuf **bufferp)
     oh = s->rxbuf->data;
     rx_len = ntohs(oh->length);
     if (rx_len < sizeof(struct ofp_header)) {
-        VLOG_ERR_RL(&rl, "received too-short ofp_header (%zu bytes)",
-                    rx_len);
+        VLOG_ERR_RL(&rl, "received too-short ofp_header (%d bytes)", rx_len);
         return EPROTO;
     } else if (s->rxbuf->size < rx_len) {
         int retval = vconn_stream_recv__(s, rx_len);