Merge branch 'master' into next

[sliver-openvswitch.git] / lib / stream-ssl.h

diff --git a/lib/vconn-ssl.h b/lib/stream-ssl.h
similarity index 65%
rename from lib/vconn-ssl.h
rename to lib/stream-ssl.h
index 564d303..dd2a16e 100644 (file)
--- a/lib/vconn-ssl.h
+++ b/lib/stream-ssl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008 Nicira Networks.
+ * Copyright (c) 2008, 2009 Nicira Networks.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,47 +13,47 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#ifndef VCONN_SSL_H
-#define VCONN_SSL_H 1
+#ifndef STREAM_SSL_H
+#define STREAM_SSL_H 1
 
 #include <stdbool.h>
 
 #ifdef HAVE_OPENSSL
-bool vconn_ssl_is_configured(void);
-void vconn_ssl_set_private_key_file(const char *file_name);
-void vconn_ssl_set_certificate_file(const char *file_name);
-void vconn_ssl_set_ca_cert_file(const char *file_name, bool bootstrap);
-void vconn_ssl_set_peer_ca_cert_file(const char *file_name);
+bool stream_ssl_is_configured(void);
+void stream_ssl_set_private_key_file(const char *file_name);
+void stream_ssl_set_certificate_file(const char *file_name);
+void stream_ssl_set_ca_cert_file(const char *file_name, bool bootstrap);
+void stream_ssl_set_peer_ca_cert_file(const char *file_name);
 
 /* Define the long options for SSL support.
  *
  * Note that the definition includes a final comma, and therefore a comma 
  * must not be supplied when using the definition.  This is done so that 
  * compilation succeeds whether or not HAVE_OPENSSL is defined. */
-#define VCONN_SSL_LONG_OPTIONS                      \
+#define STREAM_SSL_LONG_OPTIONS                      \
         {"private-key", required_argument, 0, 'p'}, \
         {"certificate", required_argument, 0, 'c'}, \
         {"ca-cert",     required_argument, 0, 'C'},
 
-#define VCONN_SSL_OPTION_HANDLERS                       \
+#define STREAM_SSL_OPTION_HANDLERS                      \
         case 'p':                                       \
-            vconn_ssl_set_private_key_file(optarg);     \
+            stream_ssl_set_private_key_file(optarg);    \
             break;                                      \
                                                         \
         case 'c':                                       \
-            vconn_ssl_set_certificate_file(optarg);     \
+            stream_ssl_set_certificate_file(optarg);    \
             break;                                      \
                                                         \
         case 'C':                                       \
-            vconn_ssl_set_ca_cert_file(optarg, false);  \
+            stream_ssl_set_ca_cert_file(optarg, false); \
             break;
 #else /* !HAVE_OPENSSL */
-static inline bool vconn_ssl_is_configured(void) 
+static inline bool stream_ssl_is_configured(void) 
 {
     return false;
 }
-#define VCONN_SSL_LONG_OPTIONS
-#define VCONN_SSL_OPTION_HANDLERS
+#define STREAM_SSL_LONG_OPTIONS
+#define STREAM_SSL_OPTION_HANDLERS
 #endif /* !HAVE_OPENSSL */
 
-#endif /* vconn-ssl.h */
+#endif /* stream-ssl.h */