X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fvconn-ssl.c;h=286c0aaae62724feff6e7245fafb31ecdf82bc78;hb=da0603cf278a9f505dc2988602ec0071c771dd2e;hp=9bb2df8a048486114f5893ed11aef420e7615f4a;hpb=00908dc27a4d93bd1c5bda3bcdc84ec351e9a09a;p=openvswitch

diff --git a/lib/vconn-ssl.c b/lib/vconn-ssl.c
index 9bb2df8a..286c0aaa 100644
--- a/lib/vconn-ssl.c
+++ b/lib/vconn-ssl.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008, 2009 Nicira Networks.
+ * Copyright (c) 2008, 2009, 2010 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -158,7 +158,7 @@ static void ssl_clear_txbuf(struct ssl_vconn *);
 static int interpret_ssl_error(const char *function, int ret, int error,
                                int *want);
 static void ssl_tx_poll_callback(int fd, short int revents, void *vconn_);
-static DH *tmp_dh_callback(SSL *ssl, int is_export UNUSED, int keylength);
+static DH *tmp_dh_callback(SSL *ssl, int is_export OVS_UNUSED, int keylength);
 static void log_ca_cert(const char *file_name, X509 *cert);
 
 static short int
@@ -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);
@@ -648,7 +648,8 @@ ssl_do_tx(struct vconn *vconn)
 }
 
 static void
-ssl_tx_poll_callback(int fd UNUSED, short int revents UNUSED, void *vconn_)
+ssl_tx_poll_callback(int fd OVS_UNUSED, short int revents OVS_UNUSED,
+                     void *vconn_)
 {
     struct vconn *vconn = vconn_;
     struct ssl_vconn *sslv = ssl_vconn_cast(vconn);
@@ -776,7 +777,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;
     }
@@ -897,7 +898,7 @@ do_ssl_init(void)
 }
 
 static DH *
-tmp_dh_callback(SSL *ssl UNUSED, int is_export UNUSED, int keylength)
+tmp_dh_callback(SSL *ssl OVS_UNUSED, int is_export OVS_UNUSED, int keylength)
 {
     struct dh {
         int keylength;