X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=ofproto%2Fdiscovery.c;h=ce3e7ce54cbc31c91d0e7283967a784ab185a012;hb=629cd2f17fedf8d922f61ffd13365d1f4f9b34fe;hp=c76250664cd9aa8dee9cfb82a37fe3b1f00f4d3c;hpb=ec6fde61c85ff6a57b05d422a9d8b5ef679ad928;p=openvswitch diff --git a/ofproto/discovery.c b/ofproto/discovery.c index c7625066..ce3e7ce5 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" @@ -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);