X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvconn-ssl.c;h=58c54f87772da00933b03888c5e747631a6b98c9;hb=16f5f39c5db116b8ce90cbb8250cd9716dd04ce7;hp=9bb2df8a048486114f5893ed11aef420e7615f4a;hpb=baa905d36b831881ceb20686f567dead3ec0bf14;p=sliver-openvswitch.git diff --git a/lib/vconn-ssl.c b/lib/vconn-ssl.c index 9bb2df8a0..58c54f877 100644 --- a/lib/vconn-ssl.c +++ b/lib/vconn-ssl.c @@ -246,7 +246,7 @@ new_ssl_vconn(const char *name, int fd, enum session_type type, /* Create and return the ssl_vconn. */ sslv = xmalloc(sizeof *sslv); - vconn_init(&sslv->vconn, &ssl_vconn_class, EAGAIN, name, true); + vconn_init(&sslv->vconn, &ssl_vconn_class, EAGAIN, name); vconn_set_remote_ip(&sslv->vconn, remote->sin_addr.s_addr); vconn_set_remote_port(&sslv->vconn, remote->sin_port); vconn_set_local_ip(&sslv->vconn, local.sin_addr.s_addr); @@ -288,7 +288,7 @@ ssl_open(const char *name, char *suffix, struct vconn **vconnp) return error; } - error = tcp_open_active(suffix, OFP_SSL_PORT, &sin, &fd); + error = inet_open_active(SOCK_STREAM, suffix, OFP_SSL_PORT, &sin, &fd); if (fd >= 0) { int state = error ? STATE_TCP_CONNECTING : STATE_SSL_CONNECTING; return new_ssl_vconn(name, fd, CLIENT, state, &sin, vconnp); @@ -776,7 +776,7 @@ pssl_open(const char *name, char *suffix, struct pvconn **pvconnp) return retval; } - fd = tcp_open_passive(suffix, OFP_SSL_PORT); + fd = inet_open_passive(SOCK_STREAM, suffix, OFP_SSL_PORT); if (fd < 0) { return -fd; }