You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kg...@apache.org on 2012/09/18 15:08:32 UTC
svn commit: r1387127 - in /qpid/proton/branches/driver_abstraction/proton-c:
./ src/ src/pollers/ src/ssl/
Author: kgiusti
Date: Tue Sep 18 13:08:31 2012
New Revision: 1387127
URL: http://svn.apache.org/viewvc?rev=1387127&view=rev
Log:
PROTON-2: checkpoint current work - does not compile
Added:
qpid/proton/branches/driver_abstraction/proton-c/src/ssl/
qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c (contents, props changed)
- copied, changed from r1387125, qpid/proton/branches/driver_abstraction/proton-c/src/pollers/openssl.c
qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h (contents, props changed)
- copied, changed from r1387125, qpid/proton/branches/driver_abstraction/proton-c/src/pollers/ssl.h
qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c (contents, props changed)
- copied, changed from r1387125, qpid/proton/branches/driver_abstraction/proton-c/src/pollers/ssl_stub.c
Removed:
qpid/proton/branches/driver_abstraction/proton-c/src/pollers/openssl.c
qpid/proton/branches/driver_abstraction/proton-c/src/pollers/ssl.h
qpid/proton/branches/driver_abstraction/proton-c/src/pollers/ssl_stub.c
Modified:
qpid/proton/branches/driver_abstraction/proton-c/CMakeLists.txt
qpid/proton/branches/driver_abstraction/proton-c/src/driver.c
qpid/proton/branches/driver_abstraction/proton-c/src/pollers/select.c
Modified: qpid/proton/branches/driver_abstraction/proton-c/CMakeLists.txt
URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/CMakeLists.txt?rev=1387127&r1=1387126&r2=1387127&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/CMakeLists.txt (original)
+++ qpid/proton/branches/driver_abstraction/proton-c/CMakeLists.txt Tue Sep 18 13:08:31 2012
@@ -18,14 +18,14 @@ endif (HAVE_SYS_SELECT_H)
if (HAVE_POLL_H)
set(poller_default poll)
endif (HAVE_POLL_H)
-set(POLLER ${poller_default} CACHE STRING "Poller implementation (poll/select)")
+set(POLLER ${poller_default} CACHE STRING "Poller implementation to use. Valid values: 'poll','select'")
# Set the default SSL/TLS implementation
set(ssl_impl, NONE)
if (HAVE_OPENSSL_H)
set(ssl_impl openssl)
endif(HAVE_OPENSSL_H)
-set(SSL_IMPL ${ssl_impl} CACHE STRING "SSL/TLS support library")
+set(SSL_IMPL ${ssl_impl} CACHE STRING "Library to use for SSL/TLS support. Valid values: 'none','openssl'")
configure_file (
"${PROJECT_SOURCE_DIR}/pn_config.h.in"
@@ -50,20 +50,20 @@ add_custom_command (
# Configure the poller
if (POLLER STREQUAL poll)
set (pn_driver_impl
- src/drivers/poll.c
+ src/pollers/poll.c
)
elseif (POLLER STREQUAL select)
set (pn_driver_impl
- src/drivers/select.c
+ src/pollers/select.c
)
endif (POLLER STREQUAL poll)
# Link in openssl if present
if (SSL_IMPL STREQUAL openssl)
- set (pn_driver_ssl_impl src/drivers/openssl.c)
+ set (pn_driver_ssl_impl src/ssl/openssl.c)
set (SSL_LIB ssl crypto)
else (SSL_IMPL STREQUAL openssl)
- set (pn_driver_ssl_impl src/drivers/ssl_stub.c)
+ set (pn_driver_ssl_impl src/ssl/ssl_stub.c)
endif (SSL_IMPL STREQUAL openssl)
find_package(SWIG)
Modified: qpid/proton/branches/driver_abstraction/proton-c/src/driver.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/driver.c?rev=1387127&r1=1387126&r2=1387127&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/src/driver.c (original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/driver.c Tue Sep 18 13:08:31 2012
@@ -26,7 +26,6 @@
#include <proton/ssl.h>
#include "util.h"
#include "driver-internal.h"
-#include "drivers/ssl.h"
#include <stdio.h>
#include <time.h>
Modified: qpid/proton/branches/driver_abstraction/proton-c/src/pollers/select.c
URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/pollers/select.c?rev=1387127&r1=1387126&r2=1387127&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/src/pollers/select.c (original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/pollers/select.c Tue Sep 18 13:08:31 2012
@@ -23,7 +23,7 @@
#include <proton/driver.h>
#include "../util.h"
-#include "../driver_impl.h"
+#include "../driver-internal.h"
#include <sys/select.h>
#include <unistd.h>
Copied: qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c (from r1387125, qpid/proton/branches/driver_abstraction/proton-c/src/pollers/openssl.c)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c?p2=qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c&p1=qpid/proton/branches/driver_abstraction/proton-c/src/pollers/openssl.c&r1=1387125&r2=1387127&rev=1387127&view=diff
==============================================================================
(empty)
Propchange: qpid/proton/branches/driver_abstraction/proton-c/src/ssl/openssl.c
------------------------------------------------------------------------------
svn:eol-style = native
Copied: qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h (from r1387125, qpid/proton/branches/driver_abstraction/proton-c/src/pollers/ssl.h)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h?p2=qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h&p1=qpid/proton/branches/driver_abstraction/proton-c/src/pollers/ssl.h&r1=1387125&r2=1387127&rev=1387127&view=diff
==============================================================================
(empty)
Propchange: qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl-internal.h
------------------------------------------------------------------------------
svn:eol-style = native
Copied: qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c (from r1387125, qpid/proton/branches/driver_abstraction/proton-c/src/pollers/ssl_stub.c)
URL: http://svn.apache.org/viewvc/qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c?p2=qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c&p1=qpid/proton/branches/driver_abstraction/proton-c/src/pollers/ssl_stub.c&r1=1387125&r2=1387127&rev=1387127&view=diff
==============================================================================
--- qpid/proton/branches/driver_abstraction/proton-c/src/pollers/ssl_stub.c (original)
+++ qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c Tue Sep 18 13:08:31 2012
@@ -22,7 +22,7 @@
#define _POSIX_C_SOURCE 1
#include <proton/ssl.h>
-#include "ssl.h"
+#include "ssl-internal.h"
/** @file
Propchange: qpid/proton/branches/driver_abstraction/proton-c/src/ssl/ssl_stub.c
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org