You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by na...@apache.org on 2006/06/07 08:37:20 UTC
svn commit: r412305 - in
/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl:
ssl_stream.c ssl_utils.c ssl_utils.h
Author: nandika
Date: Tue Jun 6 23:37:20 2006
New Revision: 412305
URL: http://svn.apache.org/viewvc?rev=412305&view=rev
Log:
AXIS2_DECLARE macro changed to AXIS2_EXTERN
Modified:
webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c?rev=412305&r1=412304&r2=412305&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_stream.c Tue Jun 6 23:37:20 2006
@@ -17,6 +17,7 @@
#include <string.h>
#include <stdlib.h>
#include "ssl_stream.h"
+#include "ssl_utils.h"
/**
@@ -132,9 +133,10 @@
void *buffer, size_t count)
{
ssl_stream_impl_t *stream_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
int read = -1;
int len = -1;
+
+ AXIS2_ENV_CHECK(env, AXIS2_CRTICAL_FAILURE);
stream_impl = AXIS2_INTF_TO_IMPL(stream);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c?rev=412305&r1=412304&r2=412305&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.c Tue Jun 6 23:37:20 2006
@@ -14,9 +14,9 @@
* limitations under the License.
*/
#include "ssl_utils.h"
+BIO *bio_err = 0;
-
-AXIS2_DECLARE (SSL_CTX *)
+AXIS2_EXTERN SSL_CTX* AXIS2_CALL
axis2_ssl_utils_initialize_ctx(const axis2_env_t *env)
{
SSL_METHOD *meth = NULL;
@@ -69,7 +69,7 @@
return ctx;
}
-AXIS2_DECLARE (SSL *)
+AXIS2_EXTERN SSL* AXIS2_CALL
axis2_ssl_utils_initialize_ssl(const axis2_env_t *env, SSL_CTX *ctx,
axis2_socket_t socket)
{
@@ -99,7 +99,7 @@
return ssl;
}
-AXIS2_DECLARE (axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_ssl_utils_cleanup_ssl(const axis2_env_t *env, SSL_CTX *ctx, SSL *ssl)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h?rev=412305&r1=412304&r2=412305&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/ssl/ssl_utils.h Tue Jun 6 23:37:20 2006
@@ -27,16 +27,16 @@
extern "C"
{
#endif
-BIO *bio_err = 0;
-AXIS2_DECLARE (SSL_CTX *)
+
+AXIS2_EXTERN SSL_CTX* AXIS2_CALL
axis2_ssl_utils_initialize_ctx(const axis2_env_t *env);
-AXIS2_DECLARE (SSL *)
+AXIS2_EXTERN SSL* AXIS2_CALL
axis2_ssl_utils_initialize_ssl(const axis2_env_t *env, SSL_CTX *ctx,
axis2_socket_t socket);
-AXIS2_DECLARE (axis2_status_t)
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_ssl_utils_cleanup_ssl(const axis2_env_t *env, SSL_CTX *ctx, SSL *ssl);
#ifdef __cplusplus
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org