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 di...@apache.org on 2008/03/31 07:55:58 UTC
svn commit: r642889 - in /webservices/axis2/trunk/c: include/
src/core/transport/http/common/ src/core/transport/http/receiver/
src/core/transport/http/util/
Author: dinesh
Date: Sun Mar 30 22:55:53 2008
New Revision: 642889
URL: http://svn.apache.org/viewvc?rev=642889&view=rev
Log:
replaced strings with macros and added more descriptive log messages
Modified:
webservices/axis2/trunk/c/include/axis2_http_transport.h
webservices/axis2/trunk/c/src/core/transport/http/common/http_accept_record.c
webservices/axis2/trunk/c/src/core/transport/http/common/http_header.c
webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c
webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
Modified: webservices/axis2/trunk/c/include/axis2_http_transport.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_http_transport.h?rev=642889&r1=642888&r2=642889&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_http_transport.h (original)
+++ webservices/axis2/trunk/c/include/axis2_http_transport.h Sun Mar 30 22:55:53 2008
@@ -981,6 +981,8 @@
#define AXIS2_SEMI_COLON ";"
+#define AXIS2_COLON ':'
+
#define AXIS2_CONTENT_TYPE_ACTION ";action=\""
#define AXIS2_CONTENT_TYPE_CHARSET ";charset="
@@ -992,6 +994,20 @@
#define AXIS2_DEFAULT_SVC_PATH "/axis2/services/"
#define AXIS2_HTTP_PROTOCOL "http"
+
+#define AXIS2_COMMA " ,"
+
+#define AXIS2_Q 'q'
+
+#define AXIS2_EQ_N_SEMICOLON " =;"
+
+#define AXIS2_LEVEL "level"
+
+#define AXIS2_SPACE_SEMICOLON " ;"
+
+#define AXIS2_SPACE ' '
+
+#define AXIS2_RETURN '\r'
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_accept_record.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_accept_record.c?rev=642889&r1=642888&r2=642889&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_accept_record.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_accept_record.c Sun Mar 30 22:55:53 2008
@@ -21,6 +21,7 @@
#include <axutil_types.h>
#include <stdio.h>
#include <stdlib.h>
+#include <axis2_http_transport.h>
struct axis2_http_accept_record
{
@@ -42,12 +43,13 @@
int level = -1;
axis2_char_t *name = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, str, NULL);
tmp_accept_record = (axis2_char_t *) axutil_strdup(env, str);
if (!tmp_accept_record)
{
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
+ "unable to strdup string %s", str);
return NULL;
}
@@ -56,37 +58,39 @@
if (!accept_record)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR (env, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
+ memset ((void *)accept_record, 0, sizeof (axis2_http_accept_record_t));
+ accept_record->record = axutil_strtrim(env, tmp_accept_record, AXIS2_COMMA);
- accept_record->record = axutil_strtrim(env, tmp_accept_record, " ,");
-
- tmp = strchr(tmp_accept_record, 'q');
+ tmp = strchr(tmp_accept_record, AXIS2_Q);
if (tmp)
{
- *tmp = '\0';
+ *tmp = AXIS2_ESC_NULL;
tmp++;
- tmp = axutil_strtrim(env, tmp, " =;");
+ tmp = axutil_strtrim(env, tmp, AXIS2_EQ_N_SEMICOLON);
if (tmp)
{
sscanf(tmp, "%f", &quality);
AXIS2_FREE(env->allocator, tmp);
}
}
- tmp = strstr(tmp_accept_record, "level");
+
+ tmp = strstr(tmp_accept_record, AXIS2_LEVEL);
if (tmp)
{
- *tmp = '\0';
+ *tmp = AXIS2_ESC_NULL;
tmp++;
- tmp = axutil_strtrim(env, tmp, " =;");
+ tmp = axutil_strtrim(env, tmp, AXIS2_EQ_N_SEMICOLON);
if (tmp)
{
sscanf(tmp, "%d", &level);
AXIS2_FREE(env->allocator, tmp);
}
}
- tmp = axutil_strtrim(env, tmp_accept_record, " ;");
+
+ tmp = axutil_strtrim(env, tmp_accept_record, AXIS2_SPACE_SEMICOLON);
if (tmp)
{
name = tmp;
@@ -111,7 +115,11 @@
axis2_http_accept_record_t * accept_record,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
+
+ if (!accept_record)
+ {
+ return;
+ }
if (accept_record->name)
{
@@ -132,6 +140,7 @@
{
return accept_record->quality;
}
+
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_accept_record_get_name(
Modified: webservices/axis2/trunk/c/src/core/transport/http/common/http_header.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/common/http_header.c?rev=642889&r1=642888&r2=642889&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/common/http_header.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/common/http_header.c Sun Mar 30 22:55:53 2008
@@ -35,18 +35,16 @@
const axis2_char_t * value)
{
axis2_http_header_t *http_header = NULL;
- AXIS2_ENV_CHECK(env, NULL);
- AXIS2_ENV_CHECK(env, NULL);
- AXIS2_ENV_CHECK(env, NULL);
http_header = (axis2_http_header_t *) AXIS2_MALLOC
(env->allocator, sizeof(axis2_http_header_t));
if (!http_header)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
+ memset ((void *)http_header, 0, sizeof (axis2_http_header_t));
http_header->name = (axis2_char_t *) axutil_strdup(env, name);
http_header->value = (axis2_char_t *) axutil_strdup(env, value);
@@ -62,34 +60,37 @@
axis2_char_t *ch = NULL;
axis2_char_t *ch2 = NULL;
axis2_http_header_t *ret = NULL;
- AXIS2_ENV_CHECK(env, NULL);
- AXIS2_ENV_CHECK(env, NULL);
+
+ AXIS2_PARAM_CHECK (env->error, str, NULL);
tmp_str = axutil_strdup(env, str);
if (!tmp_str)
{
+ AXIS2_LOG_ERROR (env->log, AXIS2_LOG_SI,
+ "unable to strdup string, %s", str);
return NULL;
}
/* remove trailing \r\n */
- if ('\r' == tmp_str[axutil_strlen(tmp_str) - 2])
+ if (AXIS2_RETURN == tmp_str[axutil_strlen(tmp_str) - 2])
{
- tmp_str[axutil_strlen(tmp_str) - 2] = '\0';
+ tmp_str[axutil_strlen(tmp_str) - 2] = AXIS2_ESC_NULL;
}
- ch = strchr((const char *) tmp_str, ':');
+ ch = strchr((const char *) tmp_str, AXIS2_COLON);
if (!ch)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_HEADER, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_INVALID_HEADER, AXIS2_FAILURE);
AXIS2_FREE(env->allocator, tmp_str);
return NULL;
}
+
ch2 = ch + sizeof(axis2_char_t);
/* skip spaces */
- while (' ' == *ch2)
+ while (AXIS2_SPACE == *ch2)
{
ch2 += sizeof(axis2_char_t);
}
- *ch = '\0';
+ *ch = AXIS2_ESC_NULL;
ret = axis2_http_header_create(env, tmp_str, ch2);
AXIS2_FREE(env->allocator, tmp_str);
return ret;
@@ -100,7 +101,11 @@
axis2_http_header_t * http_header,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
+
+ if (!http_header)
+ {
+ return;
+ }
if (http_header->name)
{
@@ -122,7 +127,9 @@
{
axis2_ssize_t len = 0;
axis2_char_t *external_form = NULL;
- AXIS2_ENV_CHECK(env, NULL);
+
+ AXIS2_PARAM_CHECK(env->error, http_header, NULL);
+
len = axutil_strlen(http_header->name) +
axutil_strlen(http_header->value) + 8;
external_form = (axis2_char_t *) AXIS2_MALLOC(env->allocator, len);
Modified: webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c?rev=642889&r1=642888&r2=642889&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/receiver/http_svr_thread.c Sun Mar 30 22:55:53 2008
@@ -60,22 +60,23 @@
int port)
{
axis2_http_svr_thread_t *svr_thread = NULL;
- AXIS2_ENV_CHECK(env, NULL);
svr_thread = (axis2_http_svr_thread_t *) AXIS2_MALLOC
(env->allocator, sizeof(axis2_http_svr_thread_t));
if (!svr_thread)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_HANDLE_ERROR(env, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
+ memset ((void *)svr_thread, 0, sizeof (axis2_http_svr_thread_t));
svr_thread->worker = NULL;
svr_thread->stopped = AXIS2_FALSE;
svr_thread->port = port;
- svr_thread->listen_socket = (int)axutil_network_handler_create_server_socket
- (env, svr_thread->port);
+
+ svr_thread->listen_socket = (int)
+ axutil_network_handler_create_server_socket (env, svr_thread->port);
if (-1 == svr_thread->listen_socket)
{
axis2_http_svr_thread_free((axis2_http_svr_thread_t *) svr_thread, env);
@@ -90,7 +91,11 @@
axis2_http_svr_thread_t * svr_thread,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, void);
+
+ if (!svr_thread)
+ {
+ return;
+ }
if (svr_thread->worker)
{
@@ -113,7 +118,6 @@
axis2_http_svr_thread_t * svr_thread,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
while (AXIS2_FALSE == svr_thread->stopped)
{
@@ -131,6 +135,7 @@
axutil_network_handler_close_socket(env, socket);
continue;
}
+
arg_list = AXIS2_MALLOC(env->allocator,
sizeof(axis2_http_svr_thd_args_t));
if (!arg_list)
@@ -160,17 +165,18 @@
return AXIS2_SUCCESS;
}
+
axis2_status_t AXIS2_CALL
axis2_http_svr_thread_destroy(
axis2_http_svr_thread_t * svr_thread,
const axutil_env_t * env)
{
- AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
if (AXIS2_TRUE == svr_thread->stopped)
{
return AXIS2_SUCCESS;
}
+
svr_thread->stopped = AXIS2_TRUE;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Terminating HTTP server "
"thread.");
@@ -204,7 +210,6 @@
const axutil_env_t * env,
axis2_http_worker_t * worker)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, worker, AXIS2_FAILURE);
svr_thread->worker = worker;
return AXIS2_SUCCESS;
@@ -300,3 +305,5 @@
return NULL;
}
+
+
Modified: webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c?rev=642889&r1=642888&r2=642889&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/util/http_transport_utils.c Sun Mar 30 22:55:53 2008
@@ -178,14 +178,6 @@
const axutil_env_t * env,
axis2_msg_ctx_t * msg_ctx);
-/*AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
-axis2_http_transport_utils_handle_media_type_url_encoded(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- axutil_hash_t *param_map,
- axis2_char_t *method,
- xml_schema_element_t *schema_element);*/
-
AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
axis2_http_transport_utils_handle_media_type_url_encoded(
const axutil_env_t * env,
@@ -384,9 +376,6 @@
if (stream)
{
axutil_stream_write(stream, env, soap_body_str, soap_body_len);
- /*AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI,
- "axis2_http_transport_utils_process_http_post_request soap_body_str = %s...%d soap_body_len=%d",
- soap_body_str, strlen(soap_body_str), soap_body_len); */
callback_ctx->in_stream = stream;
callback_ctx->chunked_stream = NULL;
callback_ctx->content_length = soap_body_len;
@@ -579,29 +568,6 @@
binary_data_map);
}
- /* xml_char_set = AXIOM_DOCUMENT_GET_CHARSET_ENC(
- * axiom_stax_builder_get_document(env om_builder),
- * env);
- *
- *if(0 != axutil_strcmp(char_set, xml_char_set))
- *{
- * AXIS2_ERROR_SET(env->error, AXIS2_ERROR_CHARSET_MISMATCH,
- * AXIS2_FAILURE);
- * axiom_soap_envelope_free(envelope, env);
- * envelope = NULL;
- * axiom_xml_reader_free(xml_reader, env);
- * xml_reader = NULL;
- * axiom_stax_builder_free(om_builder, env);
- * om_builder = NULL;
- * if( soap_builder)
- * {
- * axiom_soap_builder_free(soap_builder, env);
- * soap_builder = NULL;
- * }
- * return AXIS2_FAILURE;
- *}
- */
-
axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
engine = axis2_engine_create(env, conf_ctx);
@@ -1128,14 +1094,11 @@
axiom_soap_envelope_t *soap_envelope = NULL;
axis2_engine_t *engine = NULL;
axis2_bool_t do_rest = AXIS2_TRUE;
- /*xml_schema_element_t *schema_element = NULL; */
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, in_stream, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, out_stream, AXIS2_FALSE);
- /* AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FALSE); */
AXIS2_PARAM_CHECK(env->error, request_uri, AXIS2_FALSE);
- /*AXIS2_PARAM_CHECK(env->error, request_params, AXIS2_FALSE); */
axis2_msg_ctx_set_to(msg_ctx, env, axis2_endpoint_ref_create(env,
request_uri));
@@ -1198,14 +1161,11 @@
axiom_soap_envelope_t *soap_envelope = NULL;
axis2_engine_t *engine = NULL;
axis2_bool_t do_rest = AXIS2_TRUE;
- /*xml_schema_element_t *schema_element = NULL; */
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, in_stream, AXIS2_FALSE);
AXIS2_PARAM_CHECK(env->error, out_stream, AXIS2_FALSE);
- /*AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FALSE); */
AXIS2_PARAM_CHECK(env->error, request_uri, AXIS2_FALSE);
- /*AXIS2_PARAM_CHECK(env->error, request_params, AXIS2_FALSE); */
axis2_msg_ctx_set_to(msg_ctx, env, axis2_endpoint_ref_create(env,
request_uri));
@@ -1277,7 +1237,6 @@
const axutil_env_t * env,
axis2_msg_ctx_t * msg_ctx)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
return (axis2_msg_ctx_get_doing_mtom(msg_ctx, env));
@@ -1351,7 +1310,6 @@
axis2_char_t * dest,
axis2_char_t * src)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, dest, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, src, AXIS2_FAILURE);
@@ -1528,7 +1486,6 @@
axutil_hash_index_t *hi = NULL;
axis2_bool_t svcs_exists = AXIS2_FALSE;
axis2_conf_t *conf = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
conf = axis2_conf_ctx_get_conf(conf_ctx, env);
@@ -1639,10 +1596,8 @@
axutil_stracat(env,
"<html><head><title>Axis2C :: Services</title></head>"
"<body><font face=\"courier\">", tmp2);
- /*AXIS2_FREE(env->allocator, tmp2); */
tmp2 = ret;
ret = axutil_stracat(env, tmp2, "</font></body></html>\r\n");
- /*AXIS2_FREE(env->allocator, tmp); */
return ret;
}
@@ -1759,7 +1714,6 @@
axis2_char_t *tmp2 = NULL;
axutil_string_t *str = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, content_type, NULL);
tmp_content_type = (axis2_char_t *) content_type;
@@ -1892,7 +1846,6 @@
axutil_hash_t *binary_data_map = NULL;
axiom_soap_envelope_t *soap_envelope = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
AXIS2_PARAM_CHECK(env->error, soap_ns_uri, NULL);
@@ -2157,7 +2110,6 @@
axis2_char_t *tmp_content_type = NULL;
axis2_char_t *tmp2 = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, content_type, NULL);
AXIS2_PARAM_CHECK(env->error, key, NULL);
@@ -2211,7 +2163,6 @@
axiom_node_t *body_child_node = NULL;
axiom_node_t *body_element_node = NULL;
- AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
AXIS2_PARAM_CHECK(env->error, method, NULL);
@@ -2280,7 +2231,6 @@
axis2_disp_t *req_uri_disp = NULL;
axis2_handler_t *handler = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, msg_ctx, AXIS2_FAILURE);
if (axis2_msg_ctx_get_doing_rest(msg_ctx, env))
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org