X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvconn-stream.c;h=027f48f19a4d1b97489e95f5a6f397ee7749485a;hb=2134b5ec7df738baef77214a7044fa36d5121238;hp=08ec7bf6b3fd6c2dd0f5f88345a60942d172decd;hpb=825da1c6d1c7b9bc5128d7588b8bad6efaae650e;p=sliver-openvswitch.git

diff --git a/lib/vconn-stream.c b/lib/vconn-stream.c
index 08ec7bf6b..027f48f19 100644
--- a/lib/vconn-stream.c
+++ b/lib/vconn-stream.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.
@@ -82,8 +82,7 @@ vconn_stream_open(const char *name, uint32_t allowed_versions,
     struct stream *stream;
     int error;
 
-    error = stream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
-                                           &stream, dscp);
+    error = stream_open_with_default_port(name, OFP_OLD_PORT, &stream, dscp);
     if (!error) {
         error = stream_connect(stream);
         if (!error || error == EAGAIN) {
@@ -233,7 +232,7 @@ vconn_stream_run(struct vconn *vconn)
     retval = stream_send(s->stream, s->txbuf->data, s->txbuf->size);
     if (retval < 0) {
         if (retval != -EAGAIN) {
-            VLOG_ERR_RL(&rl, "send: %s", strerror(-retval));
+            VLOG_ERR_RL(&rl, "send: %s", ovs_strerror(-retval));
             vconn_stream_clear_txbuf(s);
             return;
         }
@@ -316,8 +315,8 @@ pvconn_pstream_listen(const char *name, uint32_t allowed_versions,
     struct pstream *pstream;
     int error;
 
-    error = pstream_open_with_default_ports(name, OFP_TCP_PORT, OFP_SSL_PORT,
-                                            &pstream, dscp);
+    error = pstream_open_with_default_port(name, OFP_OLD_PORT,
+                                           &pstream, dscp);
     if (error) {
         return error;
     }
@@ -348,7 +347,7 @@ pvconn_pstream_accept(struct pvconn *pvconn, struct vconn **new_vconnp)
     if (error) {
         if (error != EAGAIN) {
             VLOG_DBG_RL(&rl, "%s: accept: %s",
-                        pstream_get_name(ps->pstream), strerror(error));
+                        pstream_get_name(ps->pstream), ovs_strerror(error));
         }
         return error;
     }