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 sa...@apache.org on 2007/09/28 11:53:04 UTC
svn commit: r580276 [23/26] - in /webservices/axis2/trunk/c/src: core/addr/
core/clientapi/ core/context/ core/deployment/ core/description/
core/engine/ core/phaseresolver/ core/receivers/ core/transport/
core/transport/http/common/ core/transport/htt...
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=580276&r1=580275&r2=580276&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 Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -49,110 +50,104 @@
#define AXIS2_CHUNKED_CONTENT_LENGTH 100000000
#endif
-const axis2_char_t * AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING = AXIS2_HTTP_HEADER_DEFAULT_CHAR_ENCODING;
+const axis2_char_t *AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING =
+ AXIS2_HTTP_HEADER_DEFAULT_CHAR_ENCODING;
/***************************** Function headers *******************************/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_transport_utils_process_http_post_request(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- axutil_stream_t *in_stream,
- axutil_stream_t *out_stream,
- const axis2_char_t *content_type,
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx,
+ axutil_stream_t * in_stream,
+ axutil_stream_t * out_stream,
+ const axis2_char_t * content_type,
const int content_length,
- axutil_string_t *soap_action_header,
- const axis2_char_t *request_uri);
+ axutil_string_t * soap_action_header,
+ const axis2_char_t * request_uri);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_transport_utils_process_http_get_request(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- axutil_stream_t *in_stream,
- axutil_stream_t *out_stream,
- const axis2_char_t *content_type,
- axutil_string_t *soap_action_header,
- const axis2_char_t *request_uri,
- axis2_conf_ctx_t *conf_ctx,
- axutil_hash_t *request_params);
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx,
+ axutil_stream_t * in_stream,
+ axutil_stream_t * out_stream,
+ const axis2_char_t * content_type,
+ axutil_string_t * soap_action_header,
+ const axis2_char_t * request_uri,
+ axis2_conf_ctx_t * conf_ctx,
+ axutil_hash_t * request_params);
AXIS2_EXTERN axiom_stax_builder_t *AXIS2_CALL
axis2_http_transport_utils_select_builder_for_mime(
- const axutil_env_t *env,
- axis2_char_t *request_uri,
- axis2_msg_ctx_t *msg_ctx,
- axutil_stream_t *in_stream,
- axis2_char_t *content_type);
-
-AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_http_transport_utils_is_optimized(
- const axutil_env_t *env,
- axiom_element_t *om_element);
-
-AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_http_transport_utils_do_write_mtom(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
-
-AXIS2_EXTERN axis2_bool_t AXIS2_CALL
-axis2_http_transport_utils_is_doing_rest(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+ const axutil_env_t * env,
+ axis2_char_t * request_uri,
+ axis2_msg_ctx_t * msg_ctx,
+ axutil_stream_t * in_stream,
+ axis2_char_t * content_type);
+
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL axis2_http_transport_utils_is_optimized(
+ const axutil_env_t * env,
+ axiom_element_t * om_element);
+
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL axis2_http_transport_utils_do_write_mtom(
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx);
+
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL axis2_http_transport_utils_is_doing_rest(
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx);
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_transport_utils_is_doing_rest_through_post(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx);
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-axis2_http_transport_utils_strdecode(
- const axutil_env_t *env,
- axis2_char_t *dest,
- axis2_char_t *src);
+AXIS2_EXTERN axis2_status_t AXIS2_CALL axis2_http_transport_utils_strdecode(
+ const axutil_env_t * env,
+ axis2_char_t * dest,
+ axis2_char_t * src);
-AXIS2_EXTERN int AXIS2_CALL
-axis2_http_transport_utils_hexit(
+AXIS2_EXTERN int AXIS2_CALL axis2_http_transport_utils_hexit(
axis2_char_t c);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_transport_utils_get_services_html(
- const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
+ const axutil_env_t * env,
+ axis2_conf_ctx_t * conf_ctx);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_transport_utils_get_services_static_wsdl(
- const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *request_url);
-
+ const axutil_env_t * env,
+ axis2_conf_ctx_t * conf_ctx,
+ axis2_char_t * request_url);
AXIS2_EXTERN axutil_string_t *AXIS2_CALL
axis2_http_transport_utils_get_charset_enc(
- const axutil_env_t *env,
- const axis2_char_t *content_type);
+ const axutil_env_t * env,
+ const axis2_char_t * content_type);
-int AXIS2_CALL
-axis2_http_transport_utils_on_data_request(
+int AXIS2_CALL axis2_http_transport_utils_on_data_request(
char *buffer,
int size,
void *ctx);
AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
axis2_http_transport_utils_create_soap_msg(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- const axis2_char_t *soap_ns_uri);
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx,
+ const axis2_char_t * soap_ns_uri);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_transport_utils_get_value_from_content_type(
- const axutil_env_t *env,
- const axis2_char_t *content_type,
- const axis2_char_t *key);
+ const axutil_env_t * env,
+ const axis2_char_t * content_type,
+ const axis2_char_t * key);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_transport_utils_dispatch_and_verify(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx);
+ 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(
@@ -164,23 +159,23 @@
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);
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx,
+ axutil_hash_t * param_map,
+ axis2_char_t * method);
/***************************** End of function headers ************************/
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_transport_utils_process_http_post_request(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- axutil_stream_t *in_stream,
- axutil_stream_t *out_stream,
- const axis2_char_t *content_type,
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx,
+ axutil_stream_t * in_stream,
+ axutil_stream_t * out_stream,
+ const axis2_char_t * content_type,
const int content_length,
- axutil_string_t *soap_action_header,
- const axis2_char_t *request_uri)
+ axutil_string_t * soap_action_header,
+ const axis2_char_t * request_uri)
{
axiom_soap_envelope_t *soap_envelope = NULL;
axiom_soap_builder_t *soap_builder = NULL;
@@ -188,7 +183,7 @@
axis2_bool_t is_soap11 = AXIS2_FALSE;
axiom_xml_reader_t *xml_reader = NULL;
axutil_string_t *char_set_str = NULL;
- /*axis2_char_t *xml_char_set = NULL;*/
+ /*axis2_char_t *xml_char_set = NULL; */
axis2_conf_ctx_t *conf_ctx = NULL;
axis2_callback_info_t *callback_ctx;
axutil_hash_t *headers = NULL;
@@ -209,7 +204,7 @@
AXIS2_PARAM_CHECK(env->error, content_type, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, request_uri, AXIS2_FAILURE);
- conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
+ conf_ctx = axis2_msg_ctx_get_conf_ctx(msg_ctx, env);
callback_ctx = AXIS2_MALLOC(env->allocator, sizeof(axis2_callback_info_t));
/* Note: the memory created above is freed in xml reader free function
@@ -220,9 +215,10 @@
callback_ctx->unread_len = content_length;
callback_ctx->chunked_stream = NULL;
- soap_action = (axis2_char_t*)axutil_string_get_buffer(soap_action_header, env);
+ soap_action =
+ (axis2_char_t *) axutil_string_get_buffer(soap_action_header, env);
soap_action_len = axutil_string_get_length(soap_action_header, env);
-
+
if (soap_action && (soap_action_len > 0))
{
/* remove leading and trailing " s */
@@ -236,31 +232,31 @@
soap_action[soap_action_len - 2] = '\0';
}
}
-
+
headers = axis2_msg_ctx_get_transport_headers(msg_ctx, env);
if (headers)
{
axis2_http_header_t *encoding_header = NULL;
- encoding_header = (axis2_http_header_t *)axutil_hash_get(headers,
- AXIS2_HTTP_HEADER_TRANSFER_ENCODING,
- AXIS2_HASH_KEY_STRING);
+ encoding_header = (axis2_http_header_t *) axutil_hash_get(headers,
+ AXIS2_HTTP_HEADER_TRANSFER_ENCODING,
+ AXIS2_HASH_KEY_STRING);
if (encoding_header)
{
axis2_char_t *encoding_value = NULL;
encoding_value = axis2_http_header_get_value(encoding_header, env);
if (encoding_value && 0 == axutil_strcasecmp(encoding_value,
- AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
+ AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
- callback_ctx->chunked_stream = axis2_http_chunked_stream_create(
- env, in_stream);
- if (! callback_ctx->chunked_stream)
+ callback_ctx->chunked_stream =
+ axis2_http_chunked_stream_create(env, in_stream);
+ if (!callback_ctx->chunked_stream)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Error occured in"
- " creating in chunked stream.");
+ " creating in chunked stream.");
return AXIS2_FAILURE;
}
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "HTTP"
- " stream chunked");
+ " stream chunked");
}
}
}
@@ -269,13 +265,14 @@
/* check content encoding from msg ctx property */
axis2_char_t *value = axis2_msg_ctx_get_transfer_encoding(msg_ctx, env);
- if (value && axutil_strstr(value, AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
+ if (value &&
+ axutil_strstr(value, AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
/* this is an UGLY hack to get some of the trnaports working
- e.g. PHP transport where it strips the chunking info in case of chunking
- and also gives out a content lenght of 0.
- We need to fix the transport design to fix sutuations like this.
- */
+ e.g. PHP transport where it strips the chunking info in case of chunking
+ and also gives out a content lenght of 0.
+ We need to fix the transport design to fix sutuations like this.
+ */
callback_ctx->content_length = AXIS2_CHUNKED_CONTENT_LENGTH;
callback_ctx->unread_len = callback_ctx->content_length;
}
@@ -286,7 +283,8 @@
/* get mime boundry */
axis2_char_t *mime_boundary =
axis2_http_transport_utils_get_value_from_content_type(env,
- content_type, AXIS2_HTTP_HEADER_CONTENT_TYPE_MIME_BOUNDARY);
+ content_type,
+ AXIS2_HTTP_HEADER_CONTENT_TYPE_MIME_BOUNDARY);
if (mime_boundary)
{
@@ -297,13 +295,14 @@
if (mime_parser)
{
binary_data_map = axiom_mime_parser_parse(mime_parser, env,
- axis2_http_transport_utils_on_data_request,
- (void *) callback_ctx, mime_boundary);
-
- soap_body_len = axiom_mime_parser_get_soap_body_len(
- mime_parser, env);
- soap_body_str = axiom_mime_parser_get_soap_body_str(
- mime_parser, env);
+ axis2_http_transport_utils_on_data_request,
+ (void *) callback_ctx,
+ mime_boundary);
+
+ soap_body_len =
+ axiom_mime_parser_get_soap_body_len(mime_parser, env);
+ soap_body_str =
+ axiom_mime_parser_get_soap_body_str(mime_parser, env);
}
stream = axutil_stream_create_basic(env);
@@ -311,8 +310,8 @@
{
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);*/
+ "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;
@@ -324,18 +323,22 @@
AXIS2_FREE(env->allocator, mime_boundary);
}
- axis2_msg_ctx_set_soap_action(msg_ctx, env, soap_action_header);
- axis2_msg_ctx_set_to(msg_ctx, env, axis2_endpoint_ref_create(env,
- request_uri));
-
- axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
-
- char_set_str = axis2_http_transport_utils_get_charset_enc(env, content_type);
- xml_reader = axiom_xml_reader_create_for_io(env,
- axis2_http_transport_utils_on_data_request, NULL,
- (void *) callback_ctx, axutil_string_get_buffer(char_set_str, env));
+ axis2_msg_ctx_set_soap_action(msg_ctx, env, soap_action_header);
+ axis2_msg_ctx_set_to(msg_ctx, env, axis2_endpoint_ref_create(env,
+ request_uri));
+
+ axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
+
+ char_set_str =
+ axis2_http_transport_utils_get_charset_enc(env, content_type);
+ xml_reader =
+ axiom_xml_reader_create_for_io(env,
+ axis2_http_transport_utils_on_data_request,
+ NULL, (void *) callback_ctx,
+ axutil_string_get_buffer(char_set_str,
+ env));
- if (! xml_reader)
+ if (!xml_reader)
{
return AXIS2_FAILURE;
}
@@ -343,7 +346,7 @@
axis2_msg_ctx_set_charset_encoding(msg_ctx, env, char_set_str);
om_builder = axiom_stax_builder_create(env, xml_reader);
- if (! om_builder)
+ if (!om_builder)
{
axiom_xml_reader_free(xml_reader, env);
xml_reader = NULL;
@@ -354,20 +357,19 @@
{
is_soap11 = AXIS2_FALSE;
soap_builder = axiom_soap_builder_create(env, om_builder,
- AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI);
- if (! soap_builder)
+ AXIOM_SOAP12_SOAP_ENVELOPE_NAMESPACE_URI);
+ if (!soap_builder)
{
/* We should not be freeing om_builder here as it is done by
- axiom_soap_builder_create in case of error - Samisa*/
- /*axiom_stax_builder_free(om_builder, env);*/
+ axiom_soap_builder_create in case of error - Samisa */
+ /*axiom_stax_builder_free(om_builder, env); */
om_builder = NULL;
xml_reader = NULL;
axis2_msg_ctx_set_is_soap_11(msg_ctx, env, is_soap11);
return AXIS2_FAILURE;
}
- soap_envelope = axiom_soap_builder_get_soap_envelope(soap_builder,
- env);
+ soap_envelope = axiom_soap_builder_get_soap_envelope(soap_builder, env);
if (!soap_envelope)
{
axiom_stax_builder_free(om_builder, env);
@@ -385,22 +387,22 @@
if (soap_action_header)
{
soap_builder = axiom_soap_builder_create(env, om_builder,
- AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI);
- if (! soap_builder)
+ AXIOM_SOAP11_SOAP_ENVELOPE_NAMESPACE_URI);
+ if (!soap_builder)
{
/* We should not be freeing om_builder here as it is done by
- axiom_soap_builder_create in case of error - Samisa*/
- /*axiom_stax_builder_free(om_builder, env);*/
+ axiom_soap_builder_create in case of error - Samisa */
+ /*axiom_stax_builder_free(om_builder, env); */
om_builder = NULL;
xml_reader = NULL;
axis2_msg_ctx_set_is_soap_11(msg_ctx, env, is_soap11);
return AXIS2_FAILURE;
}
- soap_envelope = axiom_soap_builder_get_soap_envelope(
- soap_builder, env);
- if (! soap_envelope)
- {
- axiom_soap_builder_free(soap_builder, env);
+ soap_envelope =
+ axiom_soap_builder_get_soap_envelope(soap_builder, env);
+ if (!soap_envelope)
+ {
+ axiom_soap_builder_free(soap_builder, env);
om_builder = NULL;
xml_reader = NULL;
soap_builder = NULL;
@@ -414,7 +416,8 @@
do_rest = AXIS2_TRUE;
}
}
- else if (strstr(content_type, AXIS2_HTTP_HEADER_ACCEPT_X_WWW_FROM_URLENCODED))
+ else if (strstr
+ (content_type, AXIS2_HTTP_HEADER_ACCEPT_X_WWW_FROM_URLENCODED))
{
/* REST support */
do_rest = AXIS2_TRUE;
@@ -422,36 +425,38 @@
else
{
http_error_property = axutil_property_create(env);
- axutil_property_set_value(http_error_property, env, AXIS2_HTTP_UNSUPPORTED_MEDIA_TYPE);
- axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_TRANSPORT_ERROR, http_error_property);
+ axutil_property_set_value(http_error_property, env,
+ AXIS2_HTTP_UNSUPPORTED_MEDIA_TYPE);
+ axis2_msg_ctx_set_property(msg_ctx, env, AXIS2_HTTP_TRANSPORT_ERROR,
+ http_error_property);
}
if (do_rest)
{
/* REST support */
- axutil_param_t *rest_param = axis2_msg_ctx_get_parameter(msg_ctx, env
- , AXIS2_ENABLE_REST);
- if (rest_param && 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
- axutil_param_get_value(rest_param, env)))
+ axutil_param_t *rest_param =
+ axis2_msg_ctx_get_parameter(msg_ctx, env, AXIS2_ENABLE_REST);
+ if (rest_param &&
+ 0 == axutil_strcmp(AXIS2_VALUE_TRUE,
+ axutil_param_get_value(rest_param, env)))
{
axiom_soap_body_t *def_body = NULL;
axiom_document_t *om_doc = NULL;
axiom_node_t *root_node = NULL;
soap_envelope = axiom_soap_envelope_create_default_soap_envelope
- (env, AXIOM_SOAP11);
+ (env, AXIOM_SOAP11);
def_body = axiom_soap_envelope_get_body(soap_envelope, env);
om_doc = axiom_stax_builder_get_document(om_builder, env);
root_node = axiom_document_build_all(om_doc, env);
axiom_soap_body_add_child(def_body, env, root_node);
- axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
}
}
-
if (binary_data_map)
{
axiom_soap_builder_set_mime_body_parts(soap_builder, env,
- binary_data_map);
+ binary_data_map);
}
/* xml_char_set = AXIOM_DOCUMENT_GET_CHARSET_ENC(
@@ -477,39 +482,38 @@
*}
*/
- axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
+ axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
engine = axis2_engine_create(env, conf_ctx);
if (!soap_envelope)
return AXIS2_FAILURE;
- soap_body = axiom_soap_envelope_get_body(soap_envelope,
- env);
+ soap_body = axiom_soap_envelope_get_body(soap_envelope, env);
- if (! soap_body)
+ if (!soap_body)
return AXIS2_FAILURE;
if (AXIS2_TRUE == axiom_soap_body_has_fault(soap_body, env))
{
- status = axis2_engine_receive_fault(engine, env, msg_ctx);
+ status = axis2_engine_receive_fault(engine, env, msg_ctx);
}
else
{
- status = axis2_engine_receive(engine, env, msg_ctx);
+ status = axis2_engine_receive(engine, env, msg_ctx);
}
- if (! axis2_msg_ctx_get_soap_envelope(msg_ctx, env) &&
- AXIS2_FALSE == is_soap11)
+ if (!axis2_msg_ctx_get_soap_envelope(msg_ctx, env) &&
+ AXIS2_FALSE == is_soap11)
{
axiom_soap_envelope_t *def_envelope =
axiom_soap_envelope_create_default_soap_envelope(env,
- AXIOM_SOAP12);
- axis2_msg_ctx_set_soap_envelope(msg_ctx, env, def_envelope);
+ AXIOM_SOAP12);
+ axis2_msg_ctx_set_soap_envelope(msg_ctx, env, def_envelope);
}
if (engine)
{
- axis2_engine_free(engine, env);
+ axis2_engine_free(engine, env);
}
if (soap_body_str)
@@ -522,63 +526,63 @@
axutil_stream_free(stream, env);
}
- if(char_set_str)
+ if (char_set_str)
{
axutil_string_free(char_set_str, env);
}
-
+
return status;
}
-
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_transport_utils_process_http_get_request(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- axutil_stream_t *in_stream,
- axutil_stream_t *out_stream,
- const axis2_char_t *content_type,
- axutil_string_t *soap_action_header,
- const axis2_char_t *request_uri,
- axis2_conf_ctx_t *conf_ctx,
- axutil_hash_t *request_params)
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx,
+ axutil_stream_t * in_stream,
+ axutil_stream_t * out_stream,
+ const axis2_char_t * content_type,
+ axutil_string_t * soap_action_header,
+ const axis2_char_t * request_uri,
+ axis2_conf_ctx_t * conf_ctx,
+ axutil_hash_t * request_params)
{
axiom_soap_envelope_t *soap_envelope = NULL;
axis2_engine_t *engine = NULL;
axis2_op_t *op = NULL;
- /*xml_schema_element_t *schema_element = NULL;*/
+ /*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, 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));
- axis2_msg_ctx_set_to(msg_ctx, env, axis2_endpoint_ref_create(env,
- request_uri));
-
- axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_server_side(msg_ctx, env, AXIS2_TRUE);
if (AXIS2_SUCCESS != axis2_http_transport_utils_dispatch_and_verify(env,
- msg_ctx))
+ msg_ctx))
{
return AXIS2_FALSE;
}
- op = axis2_msg_ctx_get_op(msg_ctx, env);
+ op = axis2_msg_ctx_get_op(msg_ctx, env);
- soap_envelope = axis2_http_transport_utils_handle_media_type_url_encoded(
- env, msg_ctx, request_params, AXIS2_HTTP_GET);
- if (! soap_envelope)
+ soap_envelope =
+ axis2_http_transport_utils_handle_media_type_url_encoded(env, msg_ctx,
+ request_params,
+ AXIS2_HTTP_GET);
+ if (!soap_envelope)
{
return AXIS2_FALSE;
}
else
{
- axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
- axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
+ axis2_msg_ctx_set_doing_rest(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_soap_envelope(msg_ctx, env, soap_envelope);
engine = axis2_engine_create(env, conf_ctx);
- axis2_engine_receive(engine, env, msg_ctx);
+ axis2_engine_receive(engine, env, msg_ctx);
return AXIS2_TRUE;
}
return AXIS2_FALSE;
@@ -586,27 +590,27 @@
AXIS2_EXTERN axiom_stax_builder_t *AXIS2_CALL
axis2_http_transport_utils_select_builder_for_mime(
- const axutil_env_t *env,
- axis2_char_t *request_uri,
- axis2_msg_ctx_t *msg_ctx,
- axutil_stream_t *in_stream,
- axis2_char_t *content_type)
+ const axutil_env_t * env,
+ axis2_char_t * request_uri,
+ axis2_msg_ctx_t * msg_ctx,
+ axutil_stream_t * in_stream,
+ axis2_char_t * content_type)
{
return NULL;
}
-AXIS2_EXTERN axis2_bool_t AXIS2_CALL
+AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_transport_utils_is_optimized(
- const axutil_env_t *env,
- axiom_element_t *om_element)
+ const axutil_env_t * env,
+ axiom_element_t * om_element)
{
return AXIS2_FALSE;
}
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_transport_utils_do_write_mtom(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
+ 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);
@@ -614,31 +618,28 @@
return (axis2_msg_ctx_get_doing_mtom(msg_ctx, env));
}
-
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_transport_utils_is_doing_rest(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx)
{
return AXIS2_FALSE;
}
-
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_http_transport_utils_is_doing_rest_through_post(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx)
{
return AXIS2_FALSE;
}
AXIS2_EXTERN axutil_hash_t *AXIS2_CALL
axis2_http_transport_utils_get_request_params(
- const axutil_env_t *env,
- axis2_char_t *request_uri)
+ const axutil_env_t * env,
+ axis2_char_t * request_uri)
{
-
axis2_char_t *query_str = NULL;
axis2_char_t *tmp = strchr(request_uri, '?');
axis2_char_t *tmp2 = NULL;
@@ -648,7 +649,7 @@
AXIS2_PARAM_CHECK(env->error, request_uri, AXIS2_FAILURE);
- if (! tmp || '\0' == *(tmp + 1))
+ if (!tmp || '\0' == *(tmp + 1))
{
return NULL;
}
@@ -672,7 +673,7 @@
}
if (tmp_name && NULL != tmp_value)
{
- if (! ret)
+ if (!ret)
{
ret = axutil_hash_make(env);
}
@@ -683,7 +684,7 @@
}
if (tmp_name && '\0' != *tmp2)
{
- if (! ret)
+ if (!ret)
{
ret = axutil_hash_make(env);
}
@@ -695,12 +696,11 @@
return ret;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_transport_utils_strdecode(
- const axutil_env_t *env,
- axis2_char_t *dest,
- axis2_char_t *src)
+ const axutil_env_t * env,
+ axis2_char_t * dest,
+ axis2_char_t * src)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, dest, AXIS2_FAILURE);
@@ -711,7 +711,7 @@
if (src[0] == '%' && isxdigit(src[1]) && isxdigit(src[2]))
{
*dest = axis2_http_transport_utils_hexit(src[1]) * 16 +
- axis2_http_transport_utils_hexit(src[2]);
+ axis2_http_transport_utils_hexit(src[2]);
src += 2;
}
else
@@ -724,8 +724,7 @@
return AXIS2_SUCCESS;
}
-
-AXIS2_EXTERN int AXIS2_CALL
+AXIS2_EXTERN int AXIS2_CALL
axis2_http_transport_utils_hexit(
axis2_char_t c)
{
@@ -741,27 +740,27 @@
{
return c - 'A' + 10;
}
- return 0; /* shouldn't happen, we're guarded by isxdigit() */
+ return 0; /* shouldn't happen, we're guarded by isxdigit() */
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_transport_utils_get_services_html(
- const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx)
+ const axutil_env_t * env,
+ axis2_conf_ctx_t * conf_ctx)
{
axutil_hash_t *services_map = NULL;
axutil_hash_t *errorneous_svc_map = NULL;
axis2_char_t *ret = NULL;
- axis2_char_t *tmp2 = (axis2_char_t *)"<h2>Deployed Services</h2>";
+ axis2_char_t *tmp2 = (axis2_char_t *) "<h2>Deployed Services</h2>";
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);
- services_map = axis2_conf_get_all_svcs(conf, env);
- errorneous_svc_map = axis2_conf_get_all_faulty_svcs(conf, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
+ services_map = axis2_conf_get_all_svcs(conf, env);
+ errorneous_svc_map = axis2_conf_get_all_faulty_svcs(conf, env);
if (services_map && 0 != axutil_hash_count(services_map))
{
void *service = NULL;
@@ -770,43 +769,48 @@
svcs_exists = AXIS2_TRUE;
for (hi = axutil_hash_first(services_map, env);
- hi; hi = axutil_hash_next(env, hi))
+ hi; hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, NULL, NULL, &service);
- sname = axutil_qname_get_localpart(axis2_svc_get_qname(
- ((axis2_svc_t *)service), env), env);
+ sname = axutil_qname_get_localpart(axis2_svc_get_qname(((axis2_svc_t
+ *)
+ service),
+ env), env);
ret = axutil_stracat(env, tmp2, "<h3><u>");
tmp2 = ret;
- ret = axutil_stracat(env,tmp2, sname);
+ ret = axutil_stracat(env, tmp2, sname);
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- ret = axutil_stracat(env, tmp2, "</u></h3>");
- tmp2 = ret;
- ret = axutil_stracat (env, tmp2, "<p>");
- tmp2 = ret;
- /**
+ ret = axutil_stracat(env, tmp2, "</u></h3>");
+ tmp2 = ret;
+ ret = axutil_stracat(env, tmp2, "<p>");
+ tmp2 = ret;
+
+ /**
*setting services description */
- ret = axutil_stracat (env, tmp2, axis2_svc_get_svc_desc(
- (axis2_svc_t *)service, env));
- tmp2 = ret;
- ret = axutil_stracat (env, tmp2, "</p>");
- tmp2 = ret;
- ops = axis2_svc_get_all_ops(((axis2_svc_t *)service), env);
+ ret = axutil_stracat(env, tmp2, axis2_svc_get_svc_desc((axis2_svc_t
+ *) service,
+ env));
+ tmp2 = ret;
+ ret = axutil_stracat(env, tmp2, "</p>");
+ tmp2 = ret;
+ ops = axis2_svc_get_all_ops(((axis2_svc_t *) service), env);
if (ops && 0 != axutil_hash_count(ops))
{
axutil_hash_index_t *hi2 = NULL;
void *op = NULL;
axis2_char_t *oname = NULL;
- ret = axutil_stracat(env, tmp2, "<i>Available Operations</i> <ul>");
+ ret =
+ axutil_stracat(env, tmp2,
+ "<i>Available Operations</i> <ul>");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- for (hi2 = axutil_hash_first(ops, env); hi2;
- hi2 = axutil_hash_next(env, hi2))
+ for (hi2 = axutil_hash_first(ops, env); hi2;
+ hi2 = axutil_hash_next(env, hi2))
{
axutil_hash_this(hi2, NULL, NULL, &op);
- oname = axutil_qname_get_localpart(axis2_op_get_qname(
- ((axis2_op_t *)op), env), env);
+ oname = axutil_qname_get_localpart(axis2_op_get_qname(((axis2_op_t *) op), env), env);
ret = axutil_stracat(env, tmp2, "<li>");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
@@ -825,7 +829,7 @@
else
{
ret = axutil_stracat(env, tmp2, "No operations Available");
- /*AXIS2_FREE(env->allocator, tmp);*/
+ /*AXIS2_FREE(env->allocator, tmp); */
tmp2 = ret;
}
}
@@ -839,14 +843,14 @@
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- for (hi = axutil_hash_first(errorneous_svc_map, env); hi;
- axutil_hash_next(env, hi))
+ for (hi = axutil_hash_first(errorneous_svc_map, env); hi;
+ axutil_hash_next(env, hi))
{
- axutil_hash_this(hi, (const void **)&fsname, NULL, NULL);
+ axutil_hash_this(hi, (const void **) &fsname, NULL, NULL);
ret = axutil_stracat(env, tmp2, "<h3><font color=\"red\">");
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
- ret = axutil_stracat(env, tmp2, (axis2_char_t *)fsname);
+ ret = axutil_stracat(env, tmp2, (axis2_char_t *) fsname);
AXIS2_FREE(env->allocator, tmp2);
tmp2 = ret;
ret = axutil_stracat(env, tmp2, "</font></h3>");
@@ -858,23 +862,23 @@
{
ret = axutil_strdup(env, "<h2>There are no services deployed</h2>");
}
- ret = axutil_stracat(env, "<html><head><title>Axis2C :: Services</title></head>"
- "<body><font face=\"courier\">"
- , tmp2);
- /*AXIS2_FREE(env->allocator, tmp2);*/
+ ret =
+ 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);*/
+ /*AXIS2_FREE(env->allocator, tmp); */
return ret;
}
-
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_transport_utils_get_services_static_wsdl(
- const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx,
- axis2_char_t *request_url)
+ const axutil_env_t * env,
+ axis2_conf_ctx_t * conf_ctx,
+ axis2_char_t * request_url)
{
axis2_char_t *wsdl_string = NULL;
axis2_char_t *wsdl_path = NULL;
@@ -888,28 +892,32 @@
AXIS2_PARAM_CHECK(env->error, conf_ctx, NULL);
AXIS2_PARAM_CHECK(env->error, request_url, NULL);
- url_tok = axutil_parse_request_url_for_svc_and_op (env, request_url);
- len = strlen (url_tok[0]);
- url_tok[0][len - 5] = 0;
+ url_tok = axutil_parse_request_url_for_svc_and_op(env, request_url);
+ len = strlen(url_tok[0]);
+ url_tok[0][len - 5] = 0;
svc_name = url_tok[0];
- conf = axis2_conf_ctx_get_conf (conf_ctx, env);
- services_map = axis2_conf_get_all_svcs(conf, env);
+ conf = axis2_conf_ctx_get_conf(conf_ctx, env);
+ services_map = axis2_conf_get_all_svcs(conf, env);
if (services_map && 0 != axutil_hash_count(services_map))
{
void *service = NULL;
axis2_char_t *sname = NULL;
-
+
for (hi = axutil_hash_first(services_map, env);
- hi; hi = axutil_hash_next(env, hi))
+ hi; hi = axutil_hash_next(env, hi))
{
axutil_hash_this(hi, NULL, NULL, &service);
- sname = axutil_qname_get_localpart(axis2_svc_get_qname(
- ((axis2_svc_t *)service), env), env);
- if (!axutil_strcmp (svc_name, sname))
+ sname = axutil_qname_get_localpart(axis2_svc_get_qname(((axis2_svc_t
+ *)
+ service),
+ env), env);
+ if (!axutil_strcmp(svc_name, sname))
{
- wsdl_path = (axis2_char_t *)axis2_svc_get_svc_wsdl_path ((axis2_svc_t *)service, env);
+ wsdl_path =
+ (axis2_char_t *) axis2_svc_get_svc_wsdl_path((axis2_svc_t *)
+ service, env);
break;
}
@@ -924,29 +932,29 @@
int size = AXIS2_FILE_READ_SIZE;
axis2_char_t *tmp;
int i = 0;
-
- content = (axis2_char_t *)AXIS2_MALLOC (env->allocator, size);
- wsdl_file = fopen (wsdl_path, "r");
+
+ content = (axis2_char_t *) AXIS2_MALLOC(env->allocator, size);
+ wsdl_file = fopen(wsdl_path, "r");
if (wsdl_file)
{
- c = fgetc (wsdl_file);
+ c = fgetc(wsdl_file);
while (c != EOF)
{
if (i > size)
{
size *= size * 3;
- tmp = (axis2_char_t *)AXIS2_MALLOC (env->allocator, size);
- memcpy (tmp, content, i);
- AXIS2_FREE (env->allocator, content);
+ tmp = (axis2_char_t *) AXIS2_MALLOC(env->allocator, size);
+ memcpy(tmp, content, i);
+ AXIS2_FREE(env->allocator, content);
content = tmp;
}
- sprintf (&content[i++], "%c", c);
- c = fgetc (wsdl_file);
+ sprintf(&content[i++], "%c", c);
+ c = fgetc(wsdl_file);
}
wsdl_string = content;
}
}
- else
+ else
{
wsdl_string = "Unable to retreive wsdl for this service";
}
@@ -956,8 +964,8 @@
AXIS2_EXTERN axutil_string_t *AXIS2_CALL
axis2_http_transport_utils_get_charset_enc(
- const axutil_env_t *env,
- const axis2_char_t *content_type)
+ const axutil_env_t * env,
+ const axis2_char_t * content_type)
{
axis2_char_t *tmp = NULL;
axis2_char_t *tmp_content_type = NULL;
@@ -967,10 +975,12 @@
AXIS2_ENV_CHECK(env, NULL);
AXIS2_PARAM_CHECK(env->error, content_type, NULL);
- tmp_content_type = (axis2_char_t *)content_type;
+ tmp_content_type = (axis2_char_t *) content_type;
if (!tmp_content_type)
{
- return axutil_string_create_const(env, (axis2_char_t**)&AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING);
+ return axutil_string_create_const(env,
+ (axis2_char_t **) &
+ AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING);
}
tmp = strstr(tmp_content_type, AXIS2_HTTP_CHAR_SET_ENCODING);
@@ -978,22 +988,22 @@
if (tmp)
{
tmp = strchr(tmp, '=');
- if (tmp)
- {
- tmp2 = strchr(tmp, ';');
- }
+ if (tmp)
+ {
+ tmp2 = strchr(tmp, ';');
+ }
if (tmp2)
{
if ('\'' == *(tmp2 - sizeof(axis2_char_t)) ||
- '\"' == *(tmp2 - sizeof(axis2_char_t)))
+ '\"' == *(tmp2 - sizeof(axis2_char_t)))
{
tmp2 -= sizeof(axis2_char_t);
}
*tmp2 = '\0';
}
}
-
+
if (tmp)
{
/* Following formats are acceptable
@@ -1003,7 +1013,8 @@
* But for our requirements charset we get should be UTF-8
*/
if ('\'' == *(tmp + sizeof(axis2_char_t)) || '\"' == *(tmp +
- sizeof(axis2_char_t)))
+ sizeof
+ (axis2_char_t)))
{
tmp += 2 * sizeof(axis2_char_t);
}
@@ -1013,14 +1024,16 @@
}
}
-
if (tmp)
{
str = axutil_string_create(env, tmp);
}
else
{
- str = axutil_string_create_const(env, (axis2_char_t**)&AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING);
+ str =
+ axutil_string_create_const(env,
+ (axis2_char_t **) &
+ AXIS2_TRANS_UTIL_DEFAULT_CHAR_ENCODING);
}
return str;
}
@@ -1033,13 +1046,13 @@
{
const axutil_env_t *env = NULL;
int len = -1;
- axis2_callback_info_t *cb_ctx = (axis2_callback_info_t *)ctx;
+ axis2_callback_info_t *cb_ctx = (axis2_callback_info_t *) ctx;
- if (! buffer || ! ctx)
+ if (!buffer || !ctx)
{
return 0;
}
- env = ((axis2_callback_info_t *)ctx)->env;
+ env = ((axis2_callback_info_t *) ctx)->env;
if (cb_ctx->unread_len <= 0 && -1 != cb_ctx->content_length)
{
return 0;
@@ -1047,7 +1060,7 @@
if (cb_ctx->chunked_stream)
{
len = axis2_http_chunked_stream_read(cb_ctx->chunked_stream, env,
- buffer, size);
+ buffer, size);
buffer[len] = '\0';
return len;
}
@@ -1055,12 +1068,13 @@
{
axutil_stream_t *in_stream = NULL;
int read_len = size;
- in_stream = (axutil_stream_t *)((axis2_callback_info_t *)ctx)->in_stream;
+ in_stream =
+ (axutil_stream_t *) ((axis2_callback_info_t *) ctx)->in_stream;
len = axutil_stream_read(in_stream, env, buffer, read_len);
if (len > 0)
{
buffer[len] = '\0';
- ((axis2_callback_info_t *)ctx)->unread_len -= len;
+ ((axis2_callback_info_t *) ctx)->unread_len -= len;
}
return len;
}
@@ -1069,9 +1083,9 @@
AXIS2_EXTERN axiom_soap_envelope_t *AXIS2_CALL
axis2_http_transport_utils_create_soap_msg(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx,
- const axis2_char_t *soap_ns_uri)
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx,
+ const axis2_char_t * soap_ns_uri)
{
axis2_op_ctx_t *op_ctx = NULL;
const axis2_char_t *char_set_enc = NULL;
@@ -1087,9 +1101,7 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
AXIS2_PARAM_CHECK(env->error, soap_ns_uri, NULL);
-
- property = axis2_msg_ctx_get_property(msg_ctx, env,
- AXIS2_TRANSPORT_IN);
+ property = axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_TRANSPORT_IN);
if (property)
{
in_stream = axutil_property_get_value(property, env);
@@ -1098,7 +1110,7 @@
callback_ctx = AXIS2_MALLOC(env->allocator, sizeof(axis2_callback_info_t));
/* Note: the memory created above is freed in xml reader free function
as this is passed on to the reader */
- if (! callback_ctx)
+ if (!callback_ctx)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
@@ -1109,8 +1121,8 @@
callback_ctx->unread_len = -1;
callback_ctx->chunked_stream = NULL;
- property = axis2_msg_ctx_get_property(msg_ctx, env,
- AXIS2_HTTP_HEADER_CONTENT_LENGTH);
+ property = axis2_msg_ctx_get_property(msg_ctx, env,
+ AXIS2_HTTP_HEADER_CONTENT_LENGTH);
if (property)
{
content_length = axutil_property_get_value(property, env);
@@ -1121,43 +1133,42 @@
callback_ctx->content_length = *content_length;
callback_ctx->unread_len = *content_length;
}
- if (! in_stream)
+ if (!in_stream)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NULL_IN_STREAM_IN_MSG_CTX,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
AXIS2_FREE(env->allocator, callback_ctx);
return NULL;
}
trans_enc = axis2_msg_ctx_get_transfer_encoding(msg_ctx, env);
-
+
if (trans_enc && 0 == axutil_strcmp(trans_enc,
- AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
+ AXIS2_HTTP_HEADER_TRANSFER_ENCODING_CHUNKED))
{
callback_ctx->chunked_stream = axis2_http_chunked_stream_create(env,
- in_stream);
- if (! callback_ctx->chunked_stream)
+ in_stream);
+ if (!callback_ctx->chunked_stream)
{
return NULL;
}
}
-
- op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
+ op_ctx = axis2_msg_ctx_get_op_ctx(msg_ctx, env);
if (op_ctx)
{
axis2_ctx_t *ctx = axis2_op_ctx_get_base(op_ctx, env);
if (ctx)
{
- property = axis2_ctx_get_property(ctx, env,
- AXIS2_CHARACTER_SET_ENCODING);
+ property = axis2_ctx_get_property(ctx, env,
+ AXIS2_CHARACTER_SET_ENCODING);
if (property)
{
char_set_enc = axutil_property_get_value(property, env);
property = NULL;
}
- property = axis2_ctx_get_property(ctx, env,
- MTOM_RECIVED_CONTENT_TYPE);
+ property = axis2_ctx_get_property(ctx, env,
+ MTOM_RECIVED_CONTENT_TYPE);
if (property)
{
content_type = axutil_property_get_value(property, env);
@@ -1166,18 +1177,19 @@
}
}
- if (! char_set_enc)
+ if (!char_set_enc)
{
char_set_enc = AXIS2_DEFAULT_CHAR_SET_ENCODING;
}
if (content_type)
{
axis2_char_t *mime_boundary = NULL;
- axis2_msg_ctx_set_doing_mtom(msg_ctx, env, AXIS2_TRUE);
+ axis2_msg_ctx_set_doing_mtom(msg_ctx, env, AXIS2_TRUE);
/* get mime boundry */
- mime_boundary = axis2_http_transport_utils_get_value_from_content_type(
- env, content_type,
- AXIS2_HTTP_HEADER_CONTENT_TYPE_MIME_BOUNDARY);
+ mime_boundary =
+ axis2_http_transport_utils_get_value_from_content_type(env,
+ content_type,
+ AXIS2_HTTP_HEADER_CONTENT_TYPE_MIME_BOUNDARY);
if (mime_boundary)
{
@@ -1190,13 +1202,14 @@
if (mime_parser)
{
binary_data_map = axiom_mime_parser_parse(mime_parser, env,
- axis2_http_transport_utils_on_data_request,
- (void *)callback_ctx, mime_boundary);
-
- soap_body_len = axiom_mime_parser_get_soap_body_len(
- mime_parser, env);
- soap_body_str = axiom_mime_parser_get_soap_body_str(
- mime_parser, env);
+ axis2_http_transport_utils_on_data_request,
+ (void *) callback_ctx,
+ mime_boundary);
+
+ soap_body_len =
+ axiom_mime_parser_get_soap_body_len(mime_parser, env);
+ soap_body_str =
+ axiom_mime_parser_get_soap_body_str(mime_parser, env);
}
stream = axutil_stream_create_basic(env);
@@ -1214,7 +1227,7 @@
}
}
- if (AXIS2_TRUE != axis2_msg_ctx_get_doing_rest(msg_ctx, env))
+ if (AXIS2_TRUE != axis2_msg_ctx_get_doing_rest(msg_ctx, env))
{
axiom_xml_reader_t *xml_reader = NULL;
axiom_stax_builder_t *om_builder = NULL;
@@ -1222,26 +1235,26 @@
axiom_soap_envelope_t *soap_envelope = NULL;
xml_reader = axiom_xml_reader_create_for_io(env,
- axis2_http_transport_utils_on_data_request, NULL,
- (void *)callback_ctx, char_set_enc);
- if (! xml_reader)
+ axis2_http_transport_utils_on_data_request,
+ NULL, (void *) callback_ctx,
+ char_set_enc);
+ if (!xml_reader)
{
return NULL;
}
om_builder = axiom_stax_builder_create(env, xml_reader);
- if (! om_builder)
+ if (!om_builder)
{
axiom_xml_reader_free(xml_reader, env);
xml_reader = NULL;
return NULL;
}
- soap_builder = axiom_soap_builder_create(env, om_builder,
- soap_ns_uri);
- if (! soap_builder)
+ soap_builder = axiom_soap_builder_create(env, om_builder, soap_ns_uri);
+ if (!soap_builder)
{
/* We should not be freeing om_builder here as it is done by
- axiom_soap_builder_create in case of error - Samisa*/
- /*axiom_stax_builder_free(om_builder, env);*/
+ axiom_soap_builder_create in case of error - Samisa */
+ /*axiom_stax_builder_free(om_builder, env); */
om_builder = NULL;
xml_reader = NULL;
return NULL;
@@ -1252,7 +1265,7 @@
if (binary_data_map)
{
axiom_soap_builder_set_mime_body_parts(soap_builder, env,
- binary_data_map);
+ binary_data_map);
}
if (soap_envelope)
@@ -1279,21 +1292,22 @@
axiom_node_t *root_node = NULL;
xml_reader = axiom_xml_reader_create_for_io(env,
- axis2_http_transport_utils_on_data_request, NULL,
- (void *)callback_ctx, char_set_enc);
- if (! xml_reader)
+ axis2_http_transport_utils_on_data_request,
+ NULL, (void *) callback_ctx,
+ char_set_enc);
+ if (!xml_reader)
{
return NULL;
}
om_builder = axiom_stax_builder_create(env, xml_reader);
- if (! om_builder)
+ if (!om_builder)
{
axiom_xml_reader_free(xml_reader, env);
xml_reader = NULL;
return NULL;
}
soap_envelope = axiom_soap_envelope_create_default_soap_envelope
- (env, AXIOM_SOAP11);
+ (env, AXIOM_SOAP11);
def_body = axiom_soap_envelope_get_body(soap_envelope, env);
om_doc = axiom_stax_builder_get_document(om_builder, env);
root_node = axiom_document_build_all(om_doc, env);
@@ -1304,12 +1318,11 @@
return NULL;
}
-
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_http_transport_utils_get_value_from_content_type(
- const axutil_env_t *env,
- const axis2_char_t *content_type,
- const axis2_char_t *key)
+ const axutil_env_t * env,
+ const axis2_char_t * content_type,
+ const axis2_char_t * key)
{
axis2_char_t *tmp = NULL;
axis2_char_t *tmp_content_type = NULL;
@@ -1320,12 +1333,12 @@
AXIS2_PARAM_CHECK(env->error, key, NULL);
tmp_content_type = axutil_strdup(env, content_type);
- if (! tmp_content_type)
+ if (!tmp_content_type)
{
return NULL;
}
tmp = strstr(tmp_content_type, key);
- if (! tmp)
+ if (!tmp)
{
AXIS2_FREE(env->allocator, tmp_content_type);
return NULL;
@@ -1338,18 +1351,18 @@
{
*tmp2 = '\0';
}
- if (! tmp)
+ if (!tmp)
{
AXIS2_FREE(env->allocator, tmp_content_type);
return NULL;
}
- tmp2 = axutil_strdup(env, tmp + 1);
-
+ tmp2 = axutil_strdup(env, tmp + 1);
+
AXIS2_FREE(env->allocator, tmp_content_type);
if (*tmp2 == '"')
{
tmp = tmp2;
- tmp2 = axutil_strdup(env, tmp + 1);
+ tmp2 = axutil_strdup(env, tmp + 1);
tmp2[strlen(tmp2) - 1] = '\0';
}
return tmp2;
@@ -1370,7 +1383,6 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
AXIS2_PARAM_CHECK(env->error, method, NULL);
-
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
AXIOM_SOAP11);
soap_body = axiom_soap_envelope_get_body(soap_env, env);
@@ -1487,10 +1499,10 @@
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)
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx,
+ axutil_hash_t * param_map,
+ axis2_char_t * method)
{
axiom_soap_envelope_t *soap_env = NULL;
axiom_soap_body_t *soap_body = NULL;
@@ -1501,47 +1513,47 @@
AXIS2_PARAM_CHECK(env->error, msg_ctx, NULL);
AXIS2_PARAM_CHECK(env->error, method, NULL);
-
soap_env = axiom_soap_envelope_create_default_soap_envelope(env,
- AXIOM_SOAP11);
+ AXIOM_SOAP11);
soap_body = axiom_soap_envelope_get_body(soap_env, env);
- if (! soap_body)
+ if (!soap_body)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SOAP_ENVELOPE_OR_SOAP_BODY_NULL,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return NULL;
}
body_child = axiom_element_create_with_qname(env, NULL,
- axis2_op_get_qname( axis2_msg_ctx_get_op(msg_ctx, env),
- env), &body_child_node);
+ axis2_op_get_qname
+ (axis2_msg_ctx_get_op
+ (msg_ctx, env), env),
+ &body_child_node);
axiom_soap_body_add_child(soap_body, env, body_child_node);
if (param_map)
{
axutil_hash_index_t *hi = NULL;
- for (hi = axutil_hash_first(param_map, env); hi ;
- hi = axutil_hash_next(env, hi))
+ for (hi = axutil_hash_first(param_map, env); hi;
+ hi = axutil_hash_next(env, hi))
{
void *name = NULL;
void *value = NULL;
axiom_node_t *node = NULL;
axiom_element_t *element = NULL;
- axutil_hash_this(hi, (const void **)&name, NULL, (void **)&value);
- element = axiom_element_create(env, NULL, (axis2_char_t *)name,
- NULL, &node);
- axiom_element_set_text(element, env, (axis2_char_t *)value, node);
+ axutil_hash_this(hi, (const void **) &name, NULL, (void **) &value);
+ element = axiom_element_create(env, NULL, (axis2_char_t *) name,
+ NULL, &node);
+ axiom_element_set_text(element, env, (axis2_char_t *) value, node);
axiom_node_add_child(body_child_node, env, node);
}
}
return soap_env;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_http_transport_utils_dispatch_and_verify(
- const axutil_env_t *env,
- axis2_msg_ctx_t *msg_ctx)
+ const axutil_env_t * env,
+ axis2_msg_ctx_t * msg_ctx)
{
axis2_disp_t *req_uri_disp = NULL;
axis2_handler_t *handler = NULL;
@@ -1553,11 +1565,11 @@
handler = axis2_disp_get_base(req_uri_disp, env);
axis2_handler_invoke(handler, env, msg_ctx);
- if (! axis2_msg_ctx_get_svc(msg_ctx, env) || !
- axis2_msg_ctx_get_op(msg_ctx, env))
+ if (!axis2_msg_ctx_get_svc(msg_ctx, env) ||
+ !axis2_msg_ctx_get_op(msg_ctx, env))
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_SVC_OR_OP_NOT_FOUND,
- AXIS2_FAILURE);
+ AXIS2_FAILURE);
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
Modified: webservices/axis2/trunk/c/src/core/transport/tcp/axis2_simple_tcp_svr_conn.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/axis2_simple_tcp_svr_conn.h?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/axis2_simple_tcp_svr_conn.h (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/axis2_simple_tcp_svr_conn.h Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -23,7 +24,6 @@
* @{
*/
-
/**
* @file axis2_simple_tcp_svr_conn.h
* @brief Axis2 simple tcp server connection
@@ -47,33 +47,39 @@
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_simple_tcp_svr_conn_close(axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env);
+ axis2_simple_tcp_svr_conn_close(
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env);
/**
* @param svr_conn pointer to server connection struct
* @param env pointer to environment struct
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- axis2_simple_tcp_svr_conn_is_open(axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env);
+ axis2_simple_tcp_svr_conn_is_open(
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env);
/**
* @param svr_conn pointer to server connection struct
* @param env pointer to environment struct
*/
-
- AXIS2_EXTERN axutil_stream_t* AXIS2_CALL
- axis2_simple_tcp_svr_conn_get_stream(const axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env);
+
+ AXIS2_EXTERN axutil_stream_t *AXIS2_CALL
+
+ axis2_simple_tcp_svr_conn_get_stream(
+ const axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env);
/**
* @param svr_conn pointer to server connection struct
* @param env pointer to environment struct
*/
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- axis2_simple_tcp_svr_conn_read_request(axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env);
+
+ axis2_simple_tcp_svr_conn_read_request(
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env);
/**
* @param svr_conn pointer to server connection struct
@@ -82,8 +88,10 @@
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_simple_tcp_svr_conn_set_rcv_timeout(axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env,
+
+ axis2_simple_tcp_svr_conn_set_rcv_timeout(
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env,
int timeout);
/**
@@ -93,8 +101,10 @@
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_simple_tcp_svr_conn_set_snd_timeout(axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env,
+
+ axis2_simple_tcp_svr_conn_set_snd_timeout(
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env,
int timeout);
/**
@@ -102,16 +112,20 @@
* @param env pointer to environment struct
*/
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- axis2_simple_tcp_svr_conn_get_svr_ip(const axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env);
+
+ axis2_simple_tcp_svr_conn_get_svr_ip(
+ const axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env);
/**
* @param svr_conn pointer to server connection struct
* @param env pointer to environment struct
*/
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- axis2_simple_tcp_svr_conn_get_peer_ip(const axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env);
+
+ axis2_simple_tcp_svr_conn_get_peer_ip(
+ const axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env);
/**
* @param svr_conn pointer to server connection struct
@@ -119,9 +133,9 @@
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN void AXIS2_CALL
- axis2_simple_tcp_svr_conn_free(axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env);
-
+ axis2_simple_tcp_svr_conn_free(
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env);
/**
* creates axis2_simple_tcp_svr_conn struct
@@ -129,12 +143,13 @@
* @param sockfd sockfd
*/
AXIS2_EXTERN axis2_simple_tcp_svr_conn_t *AXIS2_CALL
+
axis2_simple_tcp_svr_conn_create(
- const axutil_env_t *env,
+ const axutil_env_t * env,
int sockfd);
#ifdef __cplusplus
}
#endif
-#endif /* AXIS2_SIMPLE_HTTP_SVR_CONN_H */
+#endif /* AXIS2_SIMPLE_HTTP_SVR_CONN_H */
Modified: webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_server.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_server.h?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_server.h (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_server.h Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -40,21 +41,18 @@
{
#endif
-
-
axis2_transport_receiver_t *AXIS2_CALL
- axis2_tcp_server_create (
- const axutil_env_t *env,
- const axis2_char_t *repo,
+ axis2_tcp_server_create(
+ const axutil_env_t * env,
+ const axis2_char_t * repo,
const int port);
axis2_status_t AXIS2_CALL
axis2_tcp_server_stop(
- axis2_transport_receiver_t *server,
- const axutil_env_t *env);
-
+ axis2_transport_receiver_t * server,
+ const axutil_env_t * env);
-/** @} */
+ /** @} */
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_svr_thread.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_svr_thread.h?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_svr_thread.h (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_svr_thread.h Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -19,7 +20,7 @@
#define AXIS2_TCP_SVR_THREAD_H
/**
- * @defgroup axis2_tcp_svr_thread tcp server thread
+ * @defgroup axis2_tcp_svr_thread tcp server thread
* @ingroup axis2_core_trans_tcp
* @{
*/
@@ -47,32 +48,36 @@
* @param env pointer to environment struct
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_tcp_svr_thread_run(axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env);
+ axis2_tcp_svr_thread_run(
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env);
/**
* @param svr_thread pointer to server thread
* @param env pointer to environment struct
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_tcp_svr_thread_destroy(axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env);
+ axis2_tcp_svr_thread_destroy(
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env);
/**
* @param svr_thread pointer to server thread
* @param env pointer to environment struct
*/
AXIS2_EXTERN int AXIS2_CALL
- axis2_tcp_svr_thread_get_local_port(const axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env);
+ axis2_tcp_svr_thread_get_local_port(
+ const axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env);
/**
* @param svr_thread pointer to server thread
* @param env pointer to environment struct
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- axis2_tcp_svr_thread_is_running(axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env);
+ axis2_tcp_svr_thread_is_running(
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env);
/**
* @param svr_thread pointer to server thread
@@ -80,28 +85,31 @@
* @param worker pointer to worker
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_tcp_svr_thread_set_worker(axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env,
- axis2_tcp_worker_t *worker);
+ axis2_tcp_svr_thread_set_worker(
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env,
+ axis2_tcp_worker_t * worker);
/**
* @param svr_thread pointer to server thread
* @param env pointer to environment struct
*/
AXIS2_EXTERN void AXIS2_CALL
- axis2_tcp_svr_thread_free(axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env);
+ axis2_tcp_svr_thread_free(
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env);
/**
* @param env pointer to environment struct
* @param port
*/
AXIS2_EXTERN axis2_tcp_svr_thread_t *AXIS2_CALL
- axis2_tcp_svr_thread_create (
- const axutil_env_t *env,
+
+ axis2_tcp_svr_thread_create(
+ const axutil_env_t * env,
int port);
-/** @} */
+ /** @} */
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_transport.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_transport.h?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_transport.h (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_transport.h Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Copyright 2004,2005 The Apache Software Foundation.
*
@@ -24,59 +25,62 @@
{
#endif
-/** @defgroup axis2_core_trans_tcp tcp transport
- * @ingroup axis2_transport
- * Description.
- * @{
- */
-
-/**
- * @defgroup axis2_core_transport_tcp core tcp transport
- * @ingroup axis2_core_trans_tcp
- * @{
- */
-
-/**
- * @brief TCP protocol and message context constants.
- *
- */
+ /** @defgroup axis2_core_trans_tcp tcp transport
+ * @ingroup axis2_transport
+ * Description.
+ * @{
+ */
+
+ /**
+ * @defgroup axis2_core_transport_tcp core tcp transport
+ * @ingroup axis2_core_trans_tcp
+ * @{
+ */
+
+ /**
+ * @brief TCP protocol and message context constants.
+ *
+ */
#define AXIS2_TCP_OUT_TRANSPORT_INFO "TCPOutTransportInfo"
-/**
- * PROTOCOL_VERSION
- */
+
+ /**
+ * PROTOCOL_VERSION
+ */
#define AXIS2_TCP_PROTOCOL_VERSION "PROTOCOL"
-/**
- * SOCKET
- */
+
+ /**
+ * SOCKET
+ */
#define AXIS2_SOCKET "SOCKET"
-/**
- * HEADER_HOST
- */
+ /**
+ * HEADER_HOST
+ */
#define AXIS2_TCP_HOST "Host"
-/**
- * SO_TIMEOUT
- */
+
+ /**
+ * SO_TIMEOUT
+ */
#define AXIS2_TCP_SO_TIMEOUT "SO_TIMEOUT"
-/**
- * CONNECTION_TIMEOUT
- */
+ /**
+ * CONNECTION_TIMEOUT
+ */
#define AXIS2_TCP_CONNECTION_TIMEOUT "CONNECTION_TIMEOUT"
-/**
- * DEFAULT_SO_TIMEOUT
- */
+ /**
+ * DEFAULT_SO_TIMEOUT
+ */
#define AXIS2_TCP_DEFAULT_SO_TIMEOUT 60000
-/**
- * DEFAULT_CONNECTION_TIMEOUT
- */
+ /**
+ * DEFAULT_CONNECTION_TIMEOUT
+ */
#define AXIS2_TCP_DEFAULT_CONNECTION_TIMEOUT 60000
-/**
- * Field TRANSPORT_TCP
- */
+ /**
+ * Field TRANSPORT_TCP
+ */
#define AXIS2_TRANSPORT_TCP "tcp"
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_transport_sender.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_transport_sender.h?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_transport_sender.h (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_transport_sender.h Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -46,9 +47,9 @@
* @param env pointer to environment struct
*/
AXIS2_EXTERN axis2_transport_sender_t *AXIS2_CALL
- axis2_tcp_transport_sender_create(
- const axutil_env_t *env);
+ axis2_tcp_transport_sender_create(
+ const axutil_env_t * env);
/** @} */
#ifdef __cplusplus
Modified: webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_worker.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_worker.h?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_worker.h (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/axis2_tcp_worker.h Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -35,11 +36,11 @@
#include <axis2_simple_tcp_svr_conn.h>
#include <axis2_conf_ctx.h>
-
#ifdef __cplusplus
extern "C"
{
#endif
+
/** Type name for struct axis2_tcp_worker */
typedef struct axis2_tcp_worker axis2_tcp_worker_t;
@@ -50,10 +51,11 @@
* @param simple_request pointer to simple request
*/
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
- axis2_tcp_worker_process_request(axis2_tcp_worker_t *tcp_worker,
- const axutil_env_t *env,
- axis2_simple_tcp_svr_conn_t *svr_conn,
- axis2_char_t *simple_request);
+ axis2_tcp_worker_process_request(
+ axis2_tcp_worker_t * tcp_worker,
+ const axutil_env_t * env,
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ axis2_char_t * simple_request);
/**
* @param tcp_worker pointer to tcp worker
@@ -62,8 +64,9 @@
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- axis2_tcp_worker_set_svr_port(axis2_tcp_worker_t *tcp_worker,
- const axutil_env_t *env,
+ axis2_tcp_worker_set_svr_port(
+ axis2_tcp_worker_t * tcp_worker,
+ const axutil_env_t * env,
int port);
/**
@@ -72,16 +75,18 @@
* @return void
*/
AXIS2_EXTERN void AXIS2_CALL
- axis2_tcp_worker_free(axis2_tcp_worker_t *tcp_worker,
- const axutil_env_t *env);
+ axis2_tcp_worker_free(
+ axis2_tcp_worker_t * tcp_worker,
+ const axutil_env_t * env);
/**
* @param env pointer to environment struct
* @param conf_ctx pointer to configuration context
*/
- AXIS2_EXTERN axis2_tcp_worker_t * AXIS2_CALL
- axis2_tcp_worker_create (const axutil_env_t *env,
- axis2_conf_ctx_t *conf_ctx);
+ AXIS2_EXTERN axis2_tcp_worker_t *AXIS2_CALL
+ axis2_tcp_worker_create(
+ const axutil_env_t * env,
+ axis2_conf_ctx_t * conf_ctx);
#ifdef __cplusplus
}
Modified: webservices/axis2/trunk/c/src/core/transport/tcp/receiver/simple_tcp_svr_conn.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/receiver/simple_tcp_svr_conn.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/receiver/simple_tcp_svr_conn.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/receiver/simple_tcp_svr_conn.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -28,17 +29,15 @@
axis2_char_t *buffer;
};
-
AXIS2_EXTERN axis2_simple_tcp_svr_conn_t *AXIS2_CALL
axis2_simple_tcp_svr_conn_create(
- const axutil_env_t *env,
+ const axutil_env_t * env,
int sockfd)
{
axis2_simple_tcp_svr_conn_t *svr_conn = NULL;
AXIS2_ENV_CHECK(env, NULL);
svr_conn = (axis2_simple_tcp_svr_conn_t *)
- AXIS2_MALLOC(env->allocator,
- sizeof(axis2_simple_tcp_svr_conn_t));
+ AXIS2_MALLOC(env->allocator, sizeof(axis2_simple_tcp_svr_conn_t));
if (!svr_conn)
{
@@ -51,12 +50,11 @@
if (-1 != svr_conn->socket)
{
- svr_conn->stream = axutil_stream_create_socket(env,
- svr_conn->socket);
+ svr_conn->stream = axutil_stream_create_socket(env, svr_conn->socket);
if (!svr_conn->stream)
{
axis2_simple_tcp_svr_conn_free((axis2_simple_tcp_svr_conn_t *)
- svr_conn, env);
+ svr_conn, env);
return NULL;
}
}
@@ -65,8 +63,8 @@
AXIS2_EXTERN void AXIS2_CALL
axis2_simple_tcp_svr_conn_free(
- axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env)
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env)
{
axis2_simple_tcp_svr_conn_close(svr_conn, env);
@@ -75,11 +73,10 @@
return;
}
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_simple_tcp_svr_conn_close(
- axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env)
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -92,11 +89,10 @@
return AXIS2_SUCCESS;
}
-
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axis2_simple_tcp_svr_conn_is_open(
- axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env)
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
if (-1 != svr_conn->socket)
@@ -110,34 +106,33 @@
return AXIS2_FALSE;
}
-
AXIS2_EXTERN axutil_stream_t *AXIS2_CALL
axis2_simple_tcp_svr_conn_get_stream(
- const axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env)
+ const axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env)
{
return svr_conn->stream;
}
-
-
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_simple_tcp_svr_conn_read_request(
- axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env)
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env)
{
int size = 32000;
axis2_char_t str_line[32000];
axis2_char_t tmp_buf[32000];
int read = -1;
-
+
AXIS2_ENV_CHECK(env, NULL);
memset(str_line, 0, size);
- while ((read = axutil_stream_peek_socket(svr_conn->stream, env, tmp_buf, size - 1)) > 0)
+ while ((read =
+ axutil_stream_peek_socket(svr_conn->stream, env, tmp_buf,
+ size - 1)) > 0)
{
tmp_buf[read] = '\0';
- if (read >0)
+ if (read > 0)
{
read = axutil_stream_read(svr_conn->stream, env, tmp_buf, size - 1);
if (read > 0)
@@ -159,40 +154,38 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_simple_tcp_svr_conn_set_rcv_timeout(
- axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env,
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env,
int timeout)
{
return axutil_network_handler_set_sock_option(env,
- svr_conn->socket, SO_RCVTIMEO,
- timeout);
+ svr_conn->socket, SO_RCVTIMEO,
+ timeout);
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_simple_tcp_svr_conn_set_snd_timeout(
- axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env,
+ axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env,
int timeout)
{
return axutil_network_handler_set_sock_option(env,
- svr_conn->socket, SO_SNDTIMEO,
- timeout);
+ svr_conn->socket, SO_SNDTIMEO,
+ timeout);
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_simple_tcp_svr_conn_get_svr_ip(
- const axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env)
+ const axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env)
{
- return axutil_network_handler_get_svr_ip(env,
- svr_conn->socket);
+ return axutil_network_handler_get_svr_ip(env, svr_conn->socket);
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axis2_simple_tcp_svr_conn_get_peer_ip(
- const axis2_simple_tcp_svr_conn_t *svr_conn,
- const axutil_env_t *env)
+ const axis2_simple_tcp_svr_conn_t * svr_conn,
+ const axutil_env_t * env)
{
- return axutil_network_handler_get_peer_ip(env,
- svr_conn->socket);
+ return axutil_network_handler_get_peer_ip(env, svr_conn->socket);
}
Modified: webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_svr_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_svr_thread.c?rev=580276&r1=580275&r2=580276&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_svr_thread.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/tcp/receiver/tcp_svr_thread.c Fri Sep 28 02:52:58 2007
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -44,29 +45,25 @@
axis2_socket_t socket;
axis2_tcp_worker_t *worker;
axutil_thread_t *thread;
-}axis2_tcp_svr_thd_args_t;
-
+} axis2_tcp_svr_thd_args_t;
-AXIS2_EXTERN const axutil_env_t *AXIS2_CALL
-init_thread_env(
- const axutil_env_t **system_env);
+AXIS2_EXTERN const axutil_env_t *AXIS2_CALL init_thread_env(
+ const axutil_env_t ** system_env);
-void *AXIS2_THREAD_FUNC
-axis2_svr_thread_worker_func(
- axutil_thread_t *thd,
+void *AXIS2_THREAD_FUNC axis2_svr_thread_worker_func(
+ axutil_thread_t * thd,
void *data);
axis2_tcp_svr_thread_t *AXIS2_CALL
axis2_tcp_svr_thread_create(
- const axutil_env_t *env,
+ const axutil_env_t * env,
int port)
{
axis2_tcp_svr_thread_t *svr_thread = NULL;
AXIS2_ENV_CHECK(env, NULL);
- svr_thread = (axis2_tcp_svr_thread_t *)AXIS2_MALLOC
- (env->allocator, sizeof(
- axis2_tcp_svr_thread_t));
+ svr_thread = (axis2_tcp_svr_thread_t *) AXIS2_MALLOC
+ (env->allocator, sizeof(axis2_tcp_svr_thread_t));
if (!svr_thread)
{
@@ -78,22 +75,20 @@
svr_thread->stopped = AXIS2_FALSE;
svr_thread->port = port;
svr_thread->listen_socket = axutil_network_handler_create_server_socket
- (env, svr_thread->port);
+ (env, svr_thread->port);
if (-1 == svr_thread->listen_socket)
{
- axis2_tcp_svr_thread_free((axis2_tcp_svr_thread_t *) svr_thread,
- env);
+ axis2_tcp_svr_thread_free((axis2_tcp_svr_thread_t *) svr_thread, env);
return NULL;
}
return svr_thread;
}
-
void AXIS2_CALL
axis2_tcp_svr_thread_free(
- axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env)
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, void);
@@ -108,16 +103,15 @@
svr_thread->listen_socket = -1;
}
svr_thread->stopped = AXIS2_TRUE;
-
+
AXIS2_FREE(env->allocator, svr_thread);
return;
}
-
axis2_status_t AXIS2_CALL
axis2_tcp_svr_thread_run(
- axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env)
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -128,37 +122,39 @@
axutil_thread_t *worker_thread = NULL;
socket = axutil_network_handler_svr_socket_accept(env,
- svr_thread->listen_socket);
- if (! svr_thread->worker)
+ svr_thread->
+ listen_socket);
+ if (!svr_thread->worker)
{
AXIS2_LOG_WARNING(env->log, AXIS2_LOG_SI, "Worker not ready yet."
- " Cannot serve the request");
+ " Cannot serve the request");
axutil_network_handler_close_socket(env, socket);
continue;
}
arg_list = AXIS2_MALLOC(env->allocator,
- sizeof(axis2_tcp_svr_thd_args_t));
- if (! arg_list)
+ sizeof(axis2_tcp_svr_thd_args_t));
+ if (!arg_list)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
- "Memory allocation error in the svr thread loop");
+ "Memory allocation error in the svr thread loop");
continue;
}
- arg_list->env = (axutil_env_t *)env;
+ arg_list->env = (axutil_env_t *) env;
arg_list->socket = socket;
arg_list->worker = svr_thread->worker;
#ifdef AXIS2_SVR_MULTI_THREADED
worker_thread = axutil_thread_pool_get_thread(env->thread_pool,
- axis2_svr_thread_worker_func, (void *)arg_list);
- if (! worker_thread)
+ axis2_svr_thread_worker_func,
+ (void *) arg_list);
+ if (!worker_thread)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Thread creation failed"
- "server thread loop");
+ "server thread loop");
continue;
}
axutil_thread_pool_thread_detach(env->thread_pool, worker_thread);
#else
- axis2_svr_thread_worker_func(NULL, (void *)arg_list);
+ axis2_svr_thread_worker_func(NULL, (void *) arg_list);
#endif
}
return AXIS2_SUCCESS;
@@ -166,8 +162,8 @@
axis2_status_t AXIS2_CALL
axis2_tcp_svr_thread_destroy(
- axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env)
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env)
{
AXIS2_ENV_CHECK(env, AXIS2_CRITICAL_FAILURE);
@@ -177,7 +173,7 @@
}
svr_thread->stopped = AXIS2_TRUE;
AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "Terminating TCP server "
- "thread.");
+ "thread.");
if (svr_thread->listen_socket)
{
axutil_network_handler_close_socket(env, svr_thread->listen_socket);
@@ -188,25 +184,25 @@
int AXIS2_CALL
axis2_tcp_svr_thread_get_local_port(
- const axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env)
+ const axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env)
{
return svr_thread->port;
}
axis2_bool_t AXIS2_CALL
axis2_tcp_svr_thread_is_running(
- axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env)
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env)
{
return svr_thread->port;
}
axis2_status_t AXIS2_CALL
axis2_tcp_svr_thread_set_worker(
- axis2_tcp_svr_thread_t *svr_thread,
- const axutil_env_t *env,
- axis2_tcp_worker_t *worker)
+ axis2_tcp_svr_thread_t * svr_thread,
+ const axutil_env_t * env,
+ axis2_tcp_worker_t * worker)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error, worker, AXIS2_FAILURE);
@@ -214,16 +210,16 @@
return AXIS2_SUCCESS;
}
-
/**
* Thread worker function.
*/
void *AXIS2_THREAD_FUNC
-axis2_svr_thread_worker_func (
- axutil_thread_t *thd,
+axis2_svr_thread_worker_func(
+ axutil_thread_t * thd,
void *data)
{
- struct AXIS2_PLATFORM_TIMEB t1, t2;
+ struct AXIS2_PLATFORM_TIMEB t1,
+ t2;
axis2_simple_tcp_svr_conn_t *svr_conn = NULL;
axis2_char_t *request = NULL;
int millisecs = 0;
@@ -241,8 +237,8 @@
#endif
#endif
- arg_list = (axis2_tcp_svr_thd_args_t *)data;
- if (! arg_list)
+ arg_list = (axis2_tcp_svr_thd_args_t *) data;
+ if (!arg_list)
{
return NULL;
}
@@ -252,12 +248,12 @@
socket = arg_list->socket;
svr_conn = axis2_simple_tcp_svr_conn_create(thread_env, socket);
axis2_simple_tcp_svr_conn_set_rcv_timeout(svr_conn, thread_env,
- axis2_tcp_socket_read_timeout);
+ axis2_tcp_socket_read_timeout);
request = axis2_simple_tcp_svr_conn_read_request(svr_conn, thread_env);
- AXIS2_LOG_DEBUG (env->log, AXIS2_LOG_SI, "tcp request %s", request);
+ AXIS2_LOG_DEBUG(env->log, AXIS2_LOG_SI, "tcp request %s", request);
tmp = arg_list->worker;
status = axis2_tcp_worker_process_request(tmp, thread_env, svr_conn,
- request);
+ request);
axis2_simple_tcp_svr_conn_free(svr_conn, thread_env);
AXIS2_PLATFORM_GET_TIME_IN_MILLIS(&t2);
@@ -282,11 +278,11 @@
{
#if defined(WIN32)
AXIS2_LOG_WARNING(thread_env->log, AXIS2_LOG_SI,
- "Error occured in processing request ");
+ "Error occured in processing request ");
#else
AXIS2_LOG_WARNING(thread_env->log, AXIS2_LOG_SI,
- "Error occured in processing request (%.3f seconds)",
- secs);
+ "Error occured in processing request (%.3f seconds)",
+ secs);
#endif
}
@@ -296,7 +292,7 @@
{
/* There is a persistant problem: Uncomment this after fix
* the issue */
- /* axutil_free_thread_env(thread_env); */
+ /* axutil_free_thread_env(thread_env); */
thread_env = NULL;
}
#ifdef AXIS2_SVR_MULTI_THREADED
@@ -305,4 +301,3 @@
return NULL;
}
-
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org