diff options
Diffstat (limited to 'tinyHTTP/src/thttp.c')
| -rwxr-xr-x | tinyHTTP/src/thttp.c | 770 |
1 files changed, 383 insertions, 387 deletions
diff --git a/tinyHTTP/src/thttp.c b/tinyHTTP/src/thttp.c index 4cdbf1a..3769e82 100755 --- a/tinyHTTP/src/thttp.c +++ b/tinyHTTP/src/thttp.c @@ -7,12 +7,12 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. -* +* * DOUBANGO is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. -* +* * You should have received a copy of the GNU General Public License * along with DOUBANGO. * @@ -47,7 +47,7 @@ /** @mainpage TinyHTTP API Overview * <h1>15 HTTP/HTTPS</h1> * <p> -* The HTTP/HTTPS stack is a basic thread-safe client API and is used in conjunction with the XCAP protocol. +* The HTTP/HTTPS stack is a basic thread-safe client API and is used in conjunction with the XCAP protocol. * Almost all HTTP methods such as OPTIONS, HEAD, GET, DELETE, POST, CONNET, TRACE or PUT … are supported for outgoing requests. Only response messages will be correctly handled by the stack. Requests will be passed to the application layer “as is” and no new connection will be opened. * </p> * <p> @@ -59,10 +59,10 @@ * * * -* +* * <h2>15.1 Initialization</h2> * <p> -* As the HTTP/HTTPS stack depends on the network library (tinyNET), you MUST call @ref tnet_startup() before using any HTTP/Network function (thttp_*). +* As the HTTP/HTTPS stack depends on the network library (tinyNET), you MUST call @ref tnet_startup() before using any HTTP/Network function (thttp_*). * @ref tnet_cleanup() is used to terminate use of network functions. * </p> * @@ -87,7 +87,7 @@ int test_stack_callback(const thttp_event_t *httpevent) if(THTTP_MESSAGE_IS_RESPONSE(httpevent->message)){ const thttp_header_ETag_t* etag; TSK_DEBUG_INFO("=== %d ==> %s", THTTP_RESPONSE_CODE(httpevent->message), THTTP_MESSAGE_CONTENT(httpevent->message)); - // You can use + // You can use if((etag = (const thttp_header_ETag_t*)thttp_message_get_header(httpevent->message, thttp_htype_ETag))){ TSK_DEBUG_INFO("Etag=%s", etag->value); } @@ -113,7 +113,7 @@ int test_stack_callback(const thttp_event_t *httpevent) break; } } - + return 0; } @@ -168,9 +168,9 @@ THTTP_SESSION_SET_CRED("ali baba", "open sesame"), THTTP_SESSION_SET_HEADER("Pragma", "No-Cache"), THTTP_SESSION_SET_HEADER("Connection", "Keep-Alive"), THTTP_SESSION_SET_HEADER("User-Agent", "doubango 1.0"), - + THTTP_SESSION_SET_NULL());// MUST always be present - + * @endcode * * A session is a well-defined object and must be destroyed by using @a TSK_OBJECT_SAFE_FREE() macro. @@ -182,18 +182,18 @@ THTTP_SESSION_SET_CRED("ali baba", "open sesame"), * Both HTTP digest and Basic authentication (RFC 2617) are supported in this version (1.0). The credentials (username and password) should be set when the session is created (@ref thttp_session_create()) or later, by using @ref thttp_session_set(). As credentials are configured at session level, you can use one stack to authenticate against multiple HTTP servers with different domains. * </p> * <p> -* The stack will automatically add authorizations (as per RFC 2617) when it is challenged (401/407 responses), this is why you should set credentials before sending any requests which is susceptible to be challenged. +* The stack will automatically add authorizations (as per RFC 2617) when it is challenged (401/407 responses), this is why you should set credentials before sending any requests which is susceptible to be challenged. * </p> -* -* -* +* +* +* * <h3>15.2.2 Options</h3> * <p> * All options shall be set by using @ref THTTP_SESSION_SET_OPTION(id, value) macro. Session-level options will be applied to all underlying requests, unless the request redefines this option. * </p> * -* -* +* +* * <h3>15.2.3 Headers</h3> * <p> * All headers shall be set by using @ref THTTP_SESSION_SET_HEADER(name, value) macro. Session-level headers will be added to all underlying requests even if a request redefines this header. This means that if both the request and the session have the same header, then it will be duplicated.<br> @@ -202,7 +202,7 @@ THTTP_SESSION_SET_CRED("ali baba", "open sesame"), * <p> * @ref THTTP_SESSION_UNSET_HEADER() and @ref THTTP_SESSION_SET_HEADER() macros are used to remove or update a previously added session-level header, respectively. * </p> -* +* * <h2>15.3 Requests</h2> * <p> * A HTTP request is referred to as an “action” and is always associated to a session. There are nine well-know actions you can perform: <b>CONNET</b>, <b>DELETE</b>, <b>GET</b>, <b>HEAD</b>, <b>OPTIONS</b>, <b>PATCH</b>, <b>POST</b>, <b>PUT</b> and <b>TRACE</b>. You can use @ref thttp_action_perform(session, url, method, …) function to send a custom request. All <i>thttp_action_*()</i> functions are non-blocking.<br> @@ -217,14 +217,14 @@ THTTP_SESSION_SET_CRED("ali baba", "open sesame"), int ret = thttp_action_PUT(session, "http://www.doubango.org", // action-level options THTTP_ACTION_SET_OPTION(THTTP_ACTION_OPTION_TIMEOUT, "2500"), - + // payload THTTP_ACTION_SET_PAYLOAD("Comment allez-vous?", tsk_strlen("Comment allez-vous?")), // action-level headers THTTP_ACTION_SET_HEADER("Content-Type", "text/plain"), THTTP_ACTION_SET_HEADER("Expect", "100-continue"), - + THTTP_ACTION_SET_NULL()); * @endcode @@ -235,7 +235,7 @@ int ret = thttp_action_PUT(session, "http://www.doubango.org", int ret = thttp_action_GET(session, "http://ipv6.google.com", // action-level options THTTP_ACTION_SET_OPTION(THTTP_ACTION_OPTION_TIMEOUT, "4500"), - + THTTP_ACTION_SET_NULL()); * @endcode @@ -246,8 +246,8 @@ int ret = thttp_action_GET(session, "http://ipv6.google.com", * * <h3>15.3.1 Options</h3> * <p> -* All options shall be set by using @ref THTTP_ACTION_SET_OPTION(id, value) macro. -* Action-level options and headers are only applied to the current request. +* All options shall be set by using @ref THTTP_ACTION_SET_OPTION(id, value) macro. +* Action-level options and headers are only applied to the current request. * In the code, the timeout previously defined by the session has been redefined (from 6000ms to 2500ms). * </p> * @@ -257,7 +257,7 @@ int ret = thttp_action_GET(session, "http://ipv6.google.com", * * <h3>15.3.2 Headers</h3> * <p> -* All headers shall be set by using @ref THTTP_ACTION_SET_HEADER(name, value) macro. +* All headers shall be set by using @ref THTTP_ACTION_SET_HEADER(name, value) macro. * Action-level headers will only be added to the current request. <i>Host</i> and <i>Content-Length</i> headers are automatically added by the stack. * </p> @@ -301,252 +301,249 @@ int thttp_cleanup() /** Callback function used by the transport layer to alert the stack when new messages come. */ static int thttp_transport_layer_stream_cb(const tnet_transport_event_t* e) { - int ret = -1; - tsk_ragel_state_t state; - thttp_message_t *message = tsk_null; - int endOfheaders = -1; - const thttp_stack_t *stack = e->callback_data; - thttp_dialog_t* dialog = tsk_null; - thttp_session_t* session = tsk_null; - tsk_bool_t have_all_content = tsk_false; - - tsk_safeobj_lock(stack); - - switch(e->type){ - case event_data: { - break; - } - case event_closed: - // alert all dialogs - if((session = thttp_session_get_by_fd(stack->sessions, e->local_fd))){ - ret = thttp_session_signal_closed(session); - } - goto bail; + int ret = -1; + tsk_ragel_state_t state; + thttp_message_t *message = tsk_null; + int endOfheaders = -1; + const thttp_stack_t *stack = e->callback_data; + thttp_dialog_t* dialog = tsk_null; + thttp_session_t* session = tsk_null; + tsk_bool_t have_all_content = tsk_false; + + tsk_safeobj_lock(stack); + + switch(e->type) { + case event_data: { + break; + } + case event_closed: + // alert all dialogs + if((session = thttp_session_get_by_fd(stack->sessions, e->local_fd))) { + ret = thttp_session_signal_closed(session); + } + goto bail; - case event_error: - // alert all dialogs - if((session = thttp_session_get_by_fd(stack->sessions, e->local_fd))){ - ret = thttp_session_signal_error(session); - } - goto bail; - case event_connected: - default:{ - tsk_safeobj_unlock(stack); - return 0; - } - } - - /* Gets the associated dialog */ - if(!(session = thttp_session_get_by_fd(stack->sessions, e->local_fd))){ - if ((stack->mode & thttp_stack_mode_server)) { - // server mode -> add new session - session = thttp_session_create(stack, - THTTP_SESSION_SET_HEADER("User-Agent", "doubango 2.0"), - THTTP_SESSION_SET_NULL()); - if (!session) { - TSK_DEBUG_ERROR("Failed to create new session."); - ret = -5; - goto bail; - } - } - else { - // client mode -> session *must* exist - TSK_DEBUG_ERROR("Failed to found associated session."); - ret = -4; - goto bail; - } - } - - // Get dialog associated to this session - if(!(dialog = thttp_dialog_get_oldest(session->dialogs))){ - TSK_DEBUG_ERROR("Failed to found associated dialog."); - ret = -5; - goto bail; - } + case event_error: + // alert all dialogs + if((session = thttp_session_get_by_fd(stack->sessions, e->local_fd))) { + ret = thttp_session_signal_error(session); + } + goto bail; + case event_connected: + default: { + tsk_safeobj_unlock(stack); + return 0; + } + } - /* Check if buffer is too big to be valid (have we missed some chuncks?) */ - //if(TSK_BUFFER_SIZE(buf) >= THTTP_MAX_CONTENT_SIZE){ - // tsk_buffer_cleanup(dialog->buf); - //} + /* Gets the associated dialog */ + if(!(session = thttp_session_get_by_fd(stack->sessions, e->local_fd))) { + if ((stack->mode & thttp_stack_mode_server)) { + // server mode -> add new session + session = thttp_session_create(stack, + THTTP_SESSION_SET_HEADER("User-Agent", "doubango 2.0"), + THTTP_SESSION_SET_NULL()); + if (!session) { + TSK_DEBUG_ERROR("Failed to create new session."); + ret = -5; + goto bail; + } + } + else { + // client mode -> session *must* exist + TSK_DEBUG_ERROR("Failed to found associated session."); + ret = -4; + goto bail; + } + } - /* Append new content. */ - tsk_buffer_append(dialog->buf, e->data, e->size); - - /* Check if we have all HTTP headers. */ + // Get dialog associated to this session + if(!(dialog = thttp_dialog_get_oldest(session->dialogs))) { + TSK_DEBUG_ERROR("Failed to found associated dialog."); + ret = -5; + goto bail; + } + + /* Check if buffer is too big to be valid (have we missed some chuncks?) */ + //if(TSK_BUFFER_SIZE(buf) >= THTTP_MAX_CONTENT_SIZE){ + // tsk_buffer_cleanup(dialog->buf); + //} + + /* Append new content. */ + tsk_buffer_append(dialog->buf, e->data, e->size); + + /* Check if we have all HTTP headers. */ parse_buffer: - if((endOfheaders = tsk_strindexOf(TSK_BUFFER_DATA(dialog->buf), TSK_BUFFER_SIZE(dialog->buf), "\r\n\r\n"/*2CRLF*/)) < 0){ - TSK_DEBUG_INFO("No all HTTP headers in the TCP buffer."); - goto bail; - } - - /* If we are here this mean that we have all HTTP headers. - * ==> Parse the HTTP message without the content. - */ - tsk_ragel_state_init(&state, TSK_BUFFER_DATA(dialog->buf), endOfheaders + 4/*2CRLF*/); - if(!(ret = thttp_message_parse(&state, &message, tsk_false/* do not extract the content */))){ - const thttp_header_Transfer_Encoding_t* transfer_Encoding; - - /* chunked? */ - if((transfer_Encoding = (const thttp_header_Transfer_Encoding_t*)thttp_message_get_header(message, thttp_htype_Transfer_Encoding)) && tsk_striequals(transfer_Encoding->encoding, "chunked")){ - const char* start = (const char*)(TSK_BUFFER_TO_U8(dialog->buf) + (endOfheaders + 4/*2CRLF*/)); - const char* end = (const char*)(TSK_BUFFER_TO_U8(dialog->buf) + TSK_BUFFER_SIZE(dialog->buf)); - int index; - - TSK_DEBUG_INFO("CHUNKED transfer."); - while(start < end){ - /* RFC 2616 - 19.4.6 Introduction of Transfer-Encoding */ - // read chunk-size, chunk-extension (if any) and CRLF - tsk_size_t chunk_size = (tsk_size_t)tsk_atox(start); - if((index = tsk_strindexOf(start, (tsk_size_t)(end-start), "\r\n")) >=0){ - start += index + 2/*CRLF*/; - } - else{ - TSK_DEBUG_INFO("Parsing chunked data has failed."); - break; - } + if((endOfheaders = tsk_strindexOf(TSK_BUFFER_DATA(dialog->buf), TSK_BUFFER_SIZE(dialog->buf), "\r\n\r\n"/*2CRLF*/)) < 0) { + TSK_DEBUG_INFO("No all HTTP headers in the TCP buffer."); + goto bail; + } - if(chunk_size == 0 && ((start + 2) <= end) && *start == '\r' && *(start+ 1) == '\n'){ - int parsed_len = (int)(start - (const char*)(TSK_BUFFER_TO_U8(dialog->buf))) + 2/*CRLF*/; - tsk_buffer_remove(dialog->buf, 0, parsed_len); - have_all_content = tsk_true; - break; - } - - thttp_message_append_content(message, start, chunk_size); - start += chunk_size + 2/*CRLF*/; - } - } - else{ - tsk_size_t clen = THTTP_MESSAGE_CONTENT_LENGTH(message); /* MUST have content-length header. */ - if(clen == 0){ /* No content */ - tsk_buffer_remove(dialog->buf, 0, (endOfheaders + 4/*2CRLF*/)); /* Remove HTTP headers and CRLF ==> must never happen */ - have_all_content = tsk_true; - } - else{ /* There is a content */ - if((endOfheaders + 4/*2CRLF*/ + clen) > TSK_BUFFER_SIZE(dialog->buf)){ /* There is content but not all the content. */ - TSK_DEBUG_INFO("No all HTTP content in the TCP buffer."); - goto bail; - } - else{ - /* Add the content to the message. */ - thttp_message_add_content(message, tsk_null, TSK_BUFFER_TO_U8(dialog->buf) + endOfheaders + 4/*2CRLF*/, clen); - /* Remove HTTP headers, CRLF and the content. */ - tsk_buffer_remove(dialog->buf, 0, (endOfheaders + 4/*2CRLF*/ + clen)); - have_all_content = tsk_true; - } - } - } - } - - /* Alert the dialog (FSM) */ - if(message){ - if(have_all_content){ /* only if we have all data */ - ret = thttp_dialog_fsm_act(dialog, thttp_atype_i_message, message, tsk_null); - /* Parse next chunck */ - if(TSK_BUFFER_SIZE(dialog->buf) >= THTTP_MIN_STREAM_CHUNCK_SIZE){ - TSK_OBJECT_SAFE_FREE(message); - goto parse_buffer; - } - } - } + /* If we are here this mean that we have all HTTP headers. + * ==> Parse the HTTP message without the content. + */ + tsk_ragel_state_init(&state, TSK_BUFFER_DATA(dialog->buf), endOfheaders + 4/*2CRLF*/); + if(!(ret = thttp_message_parse(&state, &message, tsk_false/* do not extract the content */))) { + const thttp_header_Transfer_Encoding_t* transfer_Encoding; + + /* chunked? */ + if((transfer_Encoding = (const thttp_header_Transfer_Encoding_t*)thttp_message_get_header(message, thttp_htype_Transfer_Encoding)) && tsk_striequals(transfer_Encoding->encoding, "chunked")) { + const char* start = (const char*)(TSK_BUFFER_TO_U8(dialog->buf) + (endOfheaders + 4/*2CRLF*/)); + const char* end = (const char*)(TSK_BUFFER_TO_U8(dialog->buf) + TSK_BUFFER_SIZE(dialog->buf)); + int index; + + TSK_DEBUG_INFO("CHUNKED transfer."); + while(start < end) { + /* RFC 2616 - 19.4.6 Introduction of Transfer-Encoding */ + // read chunk-size, chunk-extension (if any) and CRLF + tsk_size_t chunk_size = (tsk_size_t)tsk_atox(start); + if((index = tsk_strindexOf(start, (tsk_size_t)(end-start), "\r\n")) >=0) { + start += index + 2/*CRLF*/; + } + else { + TSK_DEBUG_INFO("Parsing chunked data has failed."); + break; + } + + if(chunk_size == 0 && ((start + 2) <= end) && *start == '\r' && *(start+ 1) == '\n') { + int parsed_len = (int)(start - (const char*)(TSK_BUFFER_TO_U8(dialog->buf))) + 2/*CRLF*/; + tsk_buffer_remove(dialog->buf, 0, parsed_len); + have_all_content = tsk_true; + break; + } + + thttp_message_append_content(message, start, chunk_size); + start += chunk_size + 2/*CRLF*/; + } + } + else { + tsk_size_t clen = THTTP_MESSAGE_CONTENT_LENGTH(message); /* MUST have content-length header. */ + if(clen == 0) { /* No content */ + tsk_buffer_remove(dialog->buf, 0, (endOfheaders + 4/*2CRLF*/)); /* Remove HTTP headers and CRLF ==> must never happen */ + have_all_content = tsk_true; + } + else { /* There is a content */ + if((endOfheaders + 4/*2CRLF*/ + clen) > TSK_BUFFER_SIZE(dialog->buf)) { /* There is content but not all the content. */ + TSK_DEBUG_INFO("No all HTTP content in the TCP buffer."); + goto bail; + } + else { + /* Add the content to the message. */ + thttp_message_add_content(message, tsk_null, TSK_BUFFER_TO_U8(dialog->buf) + endOfheaders + 4/*2CRLF*/, clen); + /* Remove HTTP headers, CRLF and the content. */ + tsk_buffer_remove(dialog->buf, 0, (endOfheaders + 4/*2CRLF*/ + clen)); + have_all_content = tsk_true; + } + } + } + } + + /* Alert the dialog (FSM) */ + if(message) { + if(have_all_content) { /* only if we have all data */ + ret = thttp_dialog_fsm_act(dialog, thttp_atype_i_message, message, tsk_null); + /* Parse next chunck */ + if(TSK_BUFFER_SIZE(dialog->buf) >= THTTP_MIN_STREAM_CHUNCK_SIZE) { + TSK_OBJECT_SAFE_FREE(message); + goto parse_buffer; + } + } + } bail: - TSK_OBJECT_SAFE_FREE(dialog); - TSK_OBJECT_SAFE_FREE(session); - TSK_OBJECT_SAFE_FREE(message); + TSK_OBJECT_SAFE_FREE(dialog); + TSK_OBJECT_SAFE_FREE(session); + TSK_OBJECT_SAFE_FREE(message); - tsk_safeobj_unlock(stack); + tsk_safeobj_unlock(stack); - return ret; + return ret; } /** Internal function used to set values. */ int __thttp_stack_set(thttp_stack_t *self, va_list* app) { - thttp_stack_param_type_t curr; - - while((curr = va_arg(*app, thttp_stack_param_type_t)) != thttp_pname_null) - { - switch(curr) - { - // - // Network - // - case thttp_pname_local_ip: - { /* STR */ - tsk_strupdate(&self->local_ip, va_arg(*app, const char*)); - break; - } - case thttp_pname_local_port: - { /* INT */ - self->local_port = va_arg(*app, int); - break; - } - case thttp_pname_proxy: - { /* (const char*)IP_STR, (int)PORT_INT */ - tsk_strupdate(&self->proxy_ip, va_arg(*app, const char*)); - self->proxy_port = va_arg(*app, int); - break; - } + thttp_stack_param_type_t curr; + + while((curr = va_arg(*app, thttp_stack_param_type_t)) != thttp_pname_null) { + switch(curr) { + // + // Network + // + case thttp_pname_local_ip: { + /* STR */ + tsk_strupdate(&self->local_ip, va_arg(*app, const char*)); + break; + } + case thttp_pname_local_port: { + /* INT */ + self->local_port = va_arg(*app, int); + break; + } + case thttp_pname_proxy: { + /* (const char*)IP_STR, (int)PORT_INT */ + tsk_strupdate(&self->proxy_ip, va_arg(*app, const char*)); + self->proxy_port = va_arg(*app, int); + break; + } - // - // Modes - // - case thttp_pname_mode_client: - { /* VOID */ - self->mode = thttp_stack_mode_client; - break; - } - case thttp_pname_mode_server: - { /* VOID */ - self->mode = thttp_stack_mode_server; - break; - } - - // - // TLS - // - case thttp_pname_tls_enabled: - { /* (tsk_bool_t)ENABLED_BOOL */ - self->tls.enabled = va_arg(*app, tsk_bool_t); - break; - } - case thttp_pname_tls_certs_verify: - { /* (tsk_bool_t)CERTS_VERIFY_BOOL */ - self->tls.verify = va_arg(*app, tsk_bool_t); - break; - } - case thttp_pname_tls_certs: - { /* A_FILE_STR, PUB_FILE_STR, PRIV_FILE_STR */ - tsk_strupdate(&self->tls.ca, va_arg(*app, const char*)); - tsk_strupdate(&self->tls.pbk, va_arg(*app, const char*)); - tsk_strupdate(&self->tls.pvk, va_arg(*app, const char*)); - break; - } + // + // Modes + // + case thttp_pname_mode_client: { + /* VOID */ + self->mode = thttp_stack_mode_client; + break; + } + case thttp_pname_mode_server: { + /* VOID */ + self->mode = thttp_stack_mode_server; + break; + } - // - // Userdata - // - case thttp_pname_userdata: - { /* (const void*)USERDATA_PTR */ - self->userdata = va_arg(*app, const void*); - break; - } + // + // TLS + // + case thttp_pname_tls_enabled: { + /* (tsk_bool_t)ENABLED_BOOL */ + self->tls.enabled = va_arg(*app, tsk_bool_t); + break; + } + case thttp_pname_tls_certs_verify: { + /* (tsk_bool_t)CERTS_VERIFY_BOOL */ + self->tls.verify = va_arg(*app, tsk_bool_t); + break; + } + case thttp_pname_tls_certs: { + /* A_FILE_STR, PUB_FILE_STR, PRIV_FILE_STR */ + tsk_strupdate(&self->tls.ca, va_arg(*app, const char*)); + tsk_strupdate(&self->tls.pbk, va_arg(*app, const char*)); + tsk_strupdate(&self->tls.pvk, va_arg(*app, const char*)); + break; + } - default: - { - TSK_DEBUG_WARN("Found unknown pname."); - goto bail; - } + // + // Userdata + // + case thttp_pname_userdata: { + /* (const void*)USERDATA_PTR */ + self->userdata = va_arg(*app, const void*); + break; + } - }/* switch */ - }/* while */ - return 0; + default: { + TSK_DEBUG_WARN("Found unknown pname."); + goto bail; + } + + }/* switch */ + }/* while */ + return 0; bail: - return -2; + return -2; } /**@ingroup thttp_stack_group @@ -568,26 +565,26 @@ bail: */ thttp_stack_handle_t *thttp_stack_create(thttp_stack_callback_f callback, ...) { - thttp_stack_t* stack = tsk_null; - va_list ap; + thttp_stack_t* stack = tsk_null; + va_list ap; - if(!(stack = tsk_object_new(thttp_stack_def_t))){ /* should never happen */ - TSK_DEBUG_ERROR("Failed to create new HTTP/HTTPS stack."); - return tsk_null; - } - stack->local_ip = TNET_SOCKET_HOST_ANY; - stack->local_port = TNET_SOCKET_PORT_ANY; - stack->mode = thttp_stack_mode_client; // default mode - - stack->callback = callback; - va_start(ap, callback); - if(__thttp_stack_set(stack, &ap)){ - TSK_DEBUG_ERROR("Failed to set user's parameters."); - TSK_OBJECT_SAFE_FREE(stack); - } - va_end(ap); + if(!(stack = tsk_object_new(thttp_stack_def_t))) { /* should never happen */ + TSK_DEBUG_ERROR("Failed to create new HTTP/HTTPS stack."); + return tsk_null; + } + stack->local_ip = TNET_SOCKET_HOST_ANY; + stack->local_port = TNET_SOCKET_PORT_ANY; + stack->mode = thttp_stack_mode_client; // default mode + + stack->callback = callback; + va_start(ap, callback); + if(__thttp_stack_set(stack, &ap)) { + TSK_DEBUG_ERROR("Failed to set user's parameters."); + TSK_OBJECT_SAFE_FREE(stack); + } + va_end(ap); - return stack; + return stack; } /**@ingroup thttp_stack_group @@ -598,43 +595,43 @@ thttp_stack_handle_t *thttp_stack_create(thttp_stack_callback_f callback, ...) */ int thttp_stack_start(thttp_stack_handle_t *self) { - int ret = -1; - thttp_stack_t *stack = self; + int ret = -1; + thttp_stack_t *stack = self; - if(!stack){ - TSK_DEBUG_ERROR("Invalid parameter"); - return ret; - } + if(!stack) { + TSK_DEBUG_ERROR("Invalid parameter"); + return ret; + } - if(stack->started){ - TSK_DEBUG_WARN("Stack already started"); - return ret; - } + if(stack->started) { + TSK_DEBUG_WARN("Stack already started"); + return ret; + } - if(!stack->transport){ - const char* transport_desc = stack->tls.enabled ? "HTTPS transport" : "HTTP transport"; - tnet_socket_type_t transport_type = stack->tls.enabled ? tnet_socket_type_tls_ipv46 : tnet_socket_type_tcp_ipv46; - stack->transport = tnet_transport_create(stack->local_ip, stack->local_port, transport_type, transport_desc); - tnet_transport_set_callback(stack->transport, TNET_TRANSPORT_CB_F(thttp_transport_layer_stream_cb), self); - } + if(!stack->transport) { + const char* transport_desc = stack->tls.enabled ? "HTTPS transport" : "HTTP transport"; + tnet_socket_type_t transport_type = stack->tls.enabled ? tnet_socket_type_tls_ipv46 : tnet_socket_type_tcp_ipv46; + stack->transport = tnet_transport_create(stack->local_ip, stack->local_port, transport_type, transport_desc); + tnet_transport_set_callback(stack->transport, TNET_TRANSPORT_CB_F(thttp_transport_layer_stream_cb), self); + } - // Sets TLS certificates - if((ret = tnet_transport_tls_set_certs(stack->transport, stack->tls.ca, stack->tls.pbk, stack->tls.pvk, stack->tls.verify))){ - goto bail; - } + // Sets TLS certificates + if((ret = tnet_transport_tls_set_certs(stack->transport, stack->tls.ca, stack->tls.pbk, stack->tls.pvk, stack->tls.verify))) { + goto bail; + } - if((ret = tnet_transport_start(stack->transport))){ - goto bail; - } + if((ret = tnet_transport_start(stack->transport))) { + goto bail; + } + + stack->started = tsk_true; - stack->started = tsk_true; - bail: - if(ret){ - TSK_OBJECT_SAFE_FREE(stack->transport); - } + if(ret) { + TSK_OBJECT_SAFE_FREE(stack->transport); + } - return ret; + return ret; } /**@ingroup thttp_stack_group @@ -645,41 +642,41 @@ bail: * @retval A Pointer to the newly created stack if succeed and @a Null otherwise. * * @code -* thttp_stack_set(stack, +* thttp_stack_set(stack, * THTTP_STACK_SET_*(), * THTTP_STACK_SET_NULL()); * @endcode */ int thttp_stack_set(thttp_stack_handle_t *self, ...) { - if(self){ - int ret; - thttp_stack_t *stack = self; - - va_list ap; - va_start(ap, self); - ret = __thttp_stack_set(stack, &ap); - va_end(ap); - return ret; - } - else{ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } + if(self) { + int ret; + thttp_stack_t *stack = self; + + va_list ap; + va_start(ap, self); + ret = __thttp_stack_set(stack, &ap); + va_end(ap); + return ret; + } + else { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } } /**@ingroup thttp_stack_group */ const void* thttp_stack_get_userdata(thttp_stack_handle_t *self) { - thttp_stack_t *stack = self; - if(stack){ - return stack->userdata; - } - else{ - TSK_DEBUG_ERROR("Invalid parameter"); - return tsk_null; - } + thttp_stack_t *stack = self; + if(stack) { + return stack->userdata; + } + else { + TSK_DEBUG_ERROR("Invalid parameter"); + return tsk_null; + } } /**@ingroup thttp_stack_group @@ -690,54 +687,54 @@ const void* thttp_stack_get_userdata(thttp_stack_handle_t *self) */ int thttp_stack_stop(thttp_stack_handle_t *self) { - int ret; - thttp_stack_t *stack = self; + int ret; + thttp_stack_t *stack = self; - if(!stack){ - TSK_DEBUG_ERROR("Invalid parameter"); - return -1; - } + if(!stack) { + TSK_DEBUG_ERROR("Invalid parameter"); + return -1; + } - if(!stack->started){ - TSK_DEBUG_WARN("Stack already stopped"); - return -2; - } + if(!stack->started) { + TSK_DEBUG_WARN("Stack already stopped"); + return -2; + } - // FIXME: stop = destroy transport - if(1){ - tsk_list_item_t* item; - tsk_list_foreach(item, stack->sessions){ - thttp_session_closefd((thttp_session_handle_t*)item->data); - } - - TSK_OBJECT_SAFE_FREE(stack->transport); - stack->started = tsk_false; - } - else{ - if(!(ret = tnet_transport_shutdown(stack->transport))){ - stack->started = tsk_false; - } - else{ - TSK_DEBUG_ERROR("Failed to stop the stack"); - } - } - return 0; + // FIXME: stop = destroy transport + if(1) { + tsk_list_item_t* item; + tsk_list_foreach(item, stack->sessions) { + thttp_session_closefd((thttp_session_handle_t*)item->data); + } + + TSK_OBJECT_SAFE_FREE(stack->transport); + stack->started = tsk_false; + } + else { + if(!(ret = tnet_transport_shutdown(stack->transport))) { + stack->started = tsk_false; + } + else { + TSK_DEBUG_ERROR("Failed to stop the stack"); + } + } + return 0; } /** Alerts the user. */ int thttp_stack_alert(const thttp_stack_t *self, const thttp_event_t* e) { - if(!self || !e){ - return -1; - } + if(!self || !e) { + return -1; + } - if(self->callback){ - return self->callback(e); - } - else{ - return 0; - } + if(self->callback) { + return self->callback(e); + } + else { + return 0; + } } @@ -769,44 +766,43 @@ int thttp_stack_alert(const thttp_stack_t *self, const thttp_event_t* e) // static tsk_object_t* thttp_stack_ctor(tsk_object_t * self, va_list * app) { - thttp_stack_t *stack = self; - if(stack){ - tsk_safeobj_init(stack); + thttp_stack_t *stack = self; + if(stack) { + tsk_safeobj_init(stack); - stack->sessions = tsk_list_create(); - } - return self; + stack->sessions = tsk_list_create(); + } + return self; } static tsk_object_t* thttp_stack_dtor(tsk_object_t * self) -{ - thttp_stack_t *stack = self; - if(stack){ - /* TLS */ - TSK_FREE(stack->tls.ca); - TSK_FREE(stack->tls.pbk); - TSK_FREE(stack->tls.pvk); - - /* Sessions */ - tsk_safeobj_lock(stack); - TSK_OBJECT_SAFE_FREE(stack->sessions); - tsk_safeobj_unlock(stack); - - /* Network */ - TSK_FREE(stack->local_ip); - TSK_FREE(stack->proxy_ip); - TSK_OBJECT_SAFE_FREE(stack->transport); - - tsk_safeobj_deinit(stack); - } - return self; +{ + thttp_stack_t *stack = self; + if(stack) { + /* TLS */ + TSK_FREE(stack->tls.ca); + TSK_FREE(stack->tls.pbk); + TSK_FREE(stack->tls.pvk); + + /* Sessions */ + tsk_safeobj_lock(stack); + TSK_OBJECT_SAFE_FREE(stack->sessions); + tsk_safeobj_unlock(stack); + + /* Network */ + TSK_FREE(stack->local_ip); + TSK_FREE(stack->proxy_ip); + TSK_OBJECT_SAFE_FREE(stack->transport); + + tsk_safeobj_deinit(stack); + } + return self; } -static const tsk_object_def_t thttp_stack_def_s = -{ - sizeof(thttp_stack_t), - thttp_stack_ctor, - thttp_stack_dtor, - tsk_null, +static const tsk_object_def_t thttp_stack_def_s = { + sizeof(thttp_stack_t), + thttp_stack_ctor, + thttp_stack_dtor, + tsk_null, }; const tsk_object_def_t *thttp_stack_def_t = &thttp_stack_def_s; |
