X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=ofproto%2Fdiscovery.c;h=ce3e7ce54cbc31c91d0e7283967a784ab185a012;hb=02059c09d4d7bc4860db9aee7f4daae43b6eab68;hp=2868db5a8599f4b895385b8ac8e0b59695497d99;hpb=4d678233e981fa319a338f6b0949e9dc625941a4;p=sliver-openvswitch.git

diff --git a/ofproto/discovery.c b/ofproto/discovery.c
index 2868db5a8..ce3e7ce54 100644
--- a/ofproto/discovery.c
+++ b/ofproto/discovery.c
@@ -29,7 +29,7 @@
 #include "openflow/openflow.h"
 #include "packets.h"
 #include "status.h"
-#include "vconn-ssl.h"
+#include "stream-ssl.h"
 
 #define THIS_MODULE VLM_discovery
 #include "vlog.h"
@@ -102,7 +102,7 @@ discovery_create(const char *re, bool update_resolv_conf,
     char local_name[IF_NAMESIZE];
     int error;
 
-    d = xcalloc(1, sizeof *d);
+    d = xzalloc(sizeof *d);
 
     /* Controller regular expression. */
     error = discovery_set_accept_controller_re(d, re);
@@ -169,7 +169,7 @@ discovery_set_accept_controller_re(struct discovery *d, const char *re_)
     int error;
     char *re;
 
-    re = (!re_ ? xstrdup(vconn_ssl_is_configured() ? "^ssl:.*" : "^tcp:.*")
+    re = (!re_ ? xstrdup(stream_ssl_is_configured() ? "^ssl:.*" : "^tcp:.*")
           : re_[0] == '^' ? xstrdup(re_) : xasprintf("^%s", re_));
     regex = xmalloc(sizeof *regex);
     error = regcomp(regex, re, REG_NOSUB | REG_EXTENDED);