axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From din...@apache.org
Subject svn commit: r511723 - in /webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl: Makefile.in libcurl_stream.c libcurl_stream.c~ libcurl_stream.h libcurl_stream.h~
Date Mon, 26 Feb 2007 04:33:39 GMT
Author: dinesh
Date: Sun Feb 25 20:33:38 2007
New Revision: 511723

URL: http://svn.apache.org/viewvc?view=rev&rev=511723
Log:
axis2c-532: transport sender refactoring and axis2c-487:libcurl base transport

Added:
    webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c
    webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c~
    webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h
    webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h~
Removed:
    webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/Makefile.in

Added: webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c?view=auto&rev=511723
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c
(added)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c
Sun Feb 25 20:33:38 2007
@@ -0,0 +1,178 @@
+#include "libcurl_stream.h"
+#include <string.h>
+
+typedef struct libcurl_stream_impl
+{
+    axis2_stream_t stream;
+    axis2_stream_type_t stream_type;
+    axis2_char_t *buffer;
+	int size;
+	int read_len;
+}
+libcurl_stream_impl_t;
+
+#define AXIS2_INTF_TO_IMPL(stream) ((libcurl_stream_impl_t *)(stream))
+
+/********************************Function headers******************************/
+axis2_status_t AXIS2_CALL
+libcurl_stream_free(
+    axis2_stream_t *stream,
+    const axis2_env_t *env);
+
+axis2_stream_type_t AXIS2_CALL
+libcurl_stream_get_type(
+    axis2_stream_t *stream,
+    const axis2_env_t *env);
+
+int AXIS2_CALL
+libcurl_stream_write(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    const void *buffer,
+    size_t count);
+
+int AXIS2_CALL
+libcurl_stream_read(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    void *buffer,
+    size_t count);
+
+int AXIS2_CALL
+libcurl_stream_skip(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    int count);
+
+int AXIS2_CALL
+libcurl_stream_get_char(
+    axis2_stream_t *stream,
+    const axis2_env_t *env);
+
+/************************* End of function headers ****************************/
+/*
+ * Internal function. Not exposed to outside
+ */
+AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
+axis2_stream_create_libcurl(
+    const axis2_env_t *env,
+    axis2_char_t *buffer,
+	unsigned int size)
+{
+    libcurl_stream_impl_t *stream_impl = NULL;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK(env->error, buffer, NULL);
+
+    stream_impl = (libcurl_stream_impl_t *)AXIS2_MALLOC(
+                env->allocator, sizeof(libcurl_stream_impl_t));
+
+    if (NULL == stream_impl)
+    {
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+
+    stream_impl->buffer = buffer;
+	stream_impl->size = size;
+	stream_impl->read_len = 0;
+    stream_impl->stream_type = AXIS2_STREAM_MANAGED;
+    stream_impl->stream.ops = (axis2_stream_ops_t *) AXIS2_MALLOC(
+                env->allocator, sizeof(axis2_stream_ops_t));
+    if (NULL == stream_impl->stream.ops)
+    {
+        libcurl_stream_free(&(stream_impl->stream), env);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+
+    stream_impl->stream.ops->free_fn = libcurl_stream_free;
+    stream_impl->stream.ops->read = libcurl_stream_read;
+    stream_impl->stream.ops->write = libcurl_stream_write;
+    stream_impl->stream.ops->skip = libcurl_stream_skip;
+
+    return &(stream_impl->stream);
+}
+
+
+axis2_status_t AXIS2_CALL
+libcurl_stream_free(
+    axis2_stream_t *stream,
+    const axis2_env_t *env)
+{
+    libcurl_stream_impl_t *stream_impl = NULL;
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+    stream_impl = AXIS2_INTF_TO_IMPL(stream);
+    if (stream_impl->stream.ops)
+    {
+        AXIS2_FREE(env->allocator, stream_impl->stream.ops);
+    }
+    AXIS2_FREE(env->allocator, stream_impl);
+
+    return AXIS2_SUCCESS;
+}
+
+int AXIS2_CALL
+libcurl_stream_read(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    void *buffer,
+    size_t count)
+{
+    libcurl_stream_impl_t *stream_impl = NULL;
+	int read = 0;
+    AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
+
+    stream_impl = AXIS2_INTF_TO_IMPL(stream);
+	if (stream_impl->size >= count)
+	{
+		if (buffer && (stream_impl->size > stream_impl->read_len))
+		{
+			memcpy (buffer, &stream_impl->buffer[stream_impl->read_len], count);
+			read = count;
+			stream_impl->read_len += read;
+		}
+		else
+			read = 0;
+	}
+	else
+	{
+		if (buffer && (stream_impl->size > stream_impl->read_len))
+		{
+			memcpy (buffer, &stream_impl->buffer[stream_impl->read_len], stream_impl->size
- stream_impl->read_len);
+			read = stream_impl->size - stream_impl->read_len;
+			stream_impl->read_len += read;
+		}
+		else
+			read = 0;
+	}
+    return read;
+}
+
+int AXIS2_CALL
+libcurl_stream_write(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    const void *buffer,
+    size_t count)
+{
+	return count;
+}
+
+
+int AXIS2_CALL
+libcurl_stream_skip(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    int count)
+{
+	return 0;
+}
+
+int AXIS2_CALL
+libcurl_stream_get_char(
+    axis2_stream_t *stream,
+    const axis2_env_t *env)
+{
+	return 0;
+}

Added: webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c~
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c%7E?view=auto&rev=511723
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c~
(added)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.c~
Sun Feb 25 20:33:38 2007
@@ -0,0 +1,163 @@
+#include "libcurl_stream.h"
+#include <string.h>
+
+typedef struct libcurl_stream_impl
+{
+    axis2_stream_t stream;
+    axis2_stream_type_t stream_type;
+    axis2_char_t *buffer;
+	int size;
+	int read_len;
+}
+libcurl_stream_impl_t;
+
+#define AXIS2_INTF_TO_IMPL(stream) ((libcurl_stream_impl_t *)(stream))
+
+/********************************Function headers******************************/
+axis2_status_t AXIS2_CALL
+libcurl_stream_free(
+    axis2_stream_t *stream,
+    const axis2_env_t *env);
+
+axis2_stream_type_t AXIS2_CALL
+libcurl_stream_get_type(
+    axis2_stream_t *stream,
+    const axis2_env_t *env);
+
+int AXIS2_CALL
+libcurl_stream_write(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    const void *buffer,
+    size_t count);
+
+int AXIS2_CALL
+libcurl_stream_read(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    void *buffer,
+    size_t count);
+
+int AXIS2_CALL
+libcurl_stream_skip(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    int count);
+
+int AXIS2_CALL
+libcurl_stream_get_char(
+    axis2_stream_t *stream,
+    const axis2_env_t *env);
+
+/************************* End of function headers ****************************/
+/*
+ * Internal function. Not exposed to outside
+ */
+AXIS2_EXTERN axis2_stream_t * AXIS2_CALL
+axis2_stream_create_libcurl(
+    const axis2_env_t *env,
+    axis2_char_t *buffer,
+	unsigned int size)
+{
+    libcurl_stream_impl_t *stream_impl = NULL;
+    AXIS2_ENV_CHECK(env, NULL);
+    AXIS2_PARAM_CHECK(env->error, buffer, NULL);
+
+    stream_impl = (libcurl_stream_impl_t *)AXIS2_MALLOC(
+                env->allocator, sizeof(libcurl_stream_impl_t));
+
+    if (NULL == stream_impl)
+    {
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+
+    stream_impl->buffer = buffer;
+	stream_impl->size = size;
+	stream_impl->read_len = 0;
+    stream_impl->stream_type = AXIS2_STREAM_MANAGED;
+    stream_impl->stream.ops = (axis2_stream_ops_t *) AXIS2_MALLOC(
+                env->allocator, sizeof(axis2_stream_ops_t));
+    if (NULL == stream_impl->stream.ops)
+    {
+        libcurl_stream_free(&(stream_impl->stream), env);
+        AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+
+    stream_impl->stream.ops->free_fn = libcurl_stream_free;
+    stream_impl->stream.ops->read = libcurl_stream_read;
+    stream_impl->stream.ops->write = libcurl_stream_write;
+    stream_impl->stream.ops->skip = libcurl_stream_skip;
+
+    return &(stream_impl->stream);
+}
+
+
+axis2_status_t AXIS2_CALL
+libcurl_stream_free(
+    axis2_stream_t *stream,
+    const axis2_env_t *env)
+{
+    libcurl_stream_impl_t *stream_impl = NULL;
+    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+    stream_impl = AXIS2_INTF_TO_IMPL(stream);
+    if (stream_impl->stream.ops)
+    {
+        AXIS2_FREE(env->allocator, stream_impl->stream.ops);
+    }
+    AXIS2_FREE(env->allocator, stream_impl);
+
+    return AXIS2_SUCCESS;
+}
+
+int AXIS2_CALL
+libcurl_stream_read(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    void *buffer,
+    size_t count)
+{
+    libcurl_stream_impl_t *stream_impl = NULL;
+    AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
+
+    stream_impl = AXIS2_INTF_TO_IMPL(stream);
+	if (buffer && (stream_impl->size > stream_impl->read_len))
+	{
+		memcpy (buffer, &stream_impl->buffer[stream_impl->read_len], count);
+		stream_impl->read_len += count;
+	}
+	else
+		count = 0;
+
+    return count;
+}
+
+int AXIS2_CALL
+libcurl_stream_write(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    const void *buffer,
+    size_t count)
+{
+	return count;
+}
+
+
+int AXIS2_CALL
+libcurl_stream_skip(
+    axis2_stream_t *stream,
+    const axis2_env_t *env,
+    int count)
+{
+	return 0;
+}
+
+int AXIS2_CALL
+libcurl_stream_get_char(
+    axis2_stream_t *stream,
+    const axis2_env_t *env)
+{
+	return 0;
+}

Added: webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h?view=auto&rev=511723
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h
(added)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h
Sun Feb 25 20:33:38 2007
@@ -0,0 +1,27 @@
+#ifndef LIBCURL_STREAM_H
+#define LIBCURL_STREAM_H
+
+#include <axis2_const.h>
+#include <axis2_defines.h>
+#include <axis2_env.h>
+#include <axis2_stream.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+/** brief Constructor for creating apche2 stream
+  * @return axis2_stream (libcurl)
+  */
+	AXIS2_EXTERN axis2_stream_t * AXIS2_CALL axis2_stream_create_libcurl
+	(const axis2_env_t *env, axis2_char_t *buffer, unsigned int size);
+
+/** @} */
+    
+#ifdef __cplusplus
+}
+#endif
+
+#endif                          /* LIBCURL_STREAM_H */

Added: webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h~
URL: http://svn.apache.org/viewvc/webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h%7E?view=auto&rev=511723
==============================================================================
--- webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h~
(added)
+++ webservices/axis2/scratch/c/dinesh/532/c/modules/core/transport/http/sender/libcurl/libcurl_stream.h~
Sun Feb 25 20:33:38 2007
@@ -0,0 +1,28 @@
+#ifndef LIBCURL_STREAM_H
+#define LIBCURL_STREAM_H
+
+#include <axis2_const.h>
+#include <axis2_defines.h>
+#include <axis2_env.h>
+#include <axis2_stream.h>
+#include <httpd.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+/** brief Constructor for creating apche2 stream
+  * @return axis2_stream (libcurl)
+  */
+AXIS2_EXTERN axis2_stream_t * AXIS2_CALL axis2_stream_create_libcurl
+                        (const axis2_env_t *env, request_rec *req);
+
+/** @} */
+    
+#ifdef __cplusplus
+}
+#endif
+
+#endif                          /* LIBCURL_STREAM_H */



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message