From 56cefc89e22112071b382fbeb06be839fef1e0ed Mon Sep 17 00:00:00 2001 From: Matus Fabian Date: Mon, 26 Aug 2024 18:26:58 +0200 Subject: http: http_state_wait_app_reply improvement set http status according to whether app also sent the body Type: improvement Change-Id: Ia41603cc21b410ca6929ec3d3e7c4c6808305769 Signed-off-by: Matus Fabian --- src/plugins/hs_apps/test_builtins.c | 8 ++++++++ src/plugins/http/http.c | 22 ++++++++++++++++------ 2 files changed, 24 insertions(+), 6 deletions(-) (limited to 'src/plugins') diff --git a/src/plugins/hs_apps/test_builtins.c b/src/plugins/hs_apps/test_builtins.c index cd6b00d0251..631c1f1a8a2 100644 --- a/src/plugins/hs_apps/test_builtins.c +++ b/src/plugins/hs_apps/test_builtins.c @@ -125,6 +125,13 @@ handle_get_test_delayed (hss_url_handler_args_t *args) return HSS_URL_HANDLER_ASYNC; } +static hss_url_handler_rc_t +handle_post_test3 (hss_url_handler_args_t *args) +{ + send_data_to_hss (args->sh, 0); + return HSS_URL_HANDLER_ASYNC; +} + static void test_builtins_init (vlib_main_t *vm) { @@ -144,6 +151,7 @@ test_builtins_init (vlib_main_t *vm) (*fp) (handle_get_test1, "test1", HTTP_REQ_GET); (*fp) (handle_get_test2, "test2", HTTP_REQ_GET); (*fp) (handle_get_test_delayed, "test_delayed", HTTP_REQ_GET); + (*fp) (handle_post_test3, "test3", HTTP_REQ_POST); tbm->send_data = vlib_get_plugin_symbol ("http_static_plugin.so", "hss_session_send_data"); diff --git a/src/plugins/http/http.c b/src/plugins/http/http.c index b143893f494..b993daa8224 100644 --- a/src/plugins/http/http.c +++ b/src/plugins/http/http.c @@ -1093,6 +1093,7 @@ http_state_wait_app_reply (http_conn_t *hc, transport_send_params_t *sp) http_status_code_t sc; http_msg_t msg; int rv; + http_sm_result_t sm_result = HTTP_SM_ERROR; as = session_get_from_handle (hc->h_pa_session_handle); @@ -1159,9 +1160,6 @@ http_state_wait_app_reply (http_conn_t *hc, transport_send_params_t *sp) } HTTP_DBG (0, "%v", header); - http_buffer_init (&hc->tx_buf, msg_to_buf_type[msg.data.type], as->tx_fifo, - msg.data.body_len); - offset = http_send_data (hc, header, vec_len (header), 0); if (offset != vec_len (header)) { @@ -1172,12 +1170,24 @@ http_state_wait_app_reply (http_conn_t *hc, transport_send_params_t *sp) } vec_free (header); - /* Start sending the actual data */ - http_state_change (hc, HTTP_STATE_APP_IO_MORE_DATA); + if (msg.data.body_len) + { + /* Start sending the actual data */ + http_buffer_init (&hc->tx_buf, msg_to_buf_type[msg.data.type], + as->tx_fifo, msg.data.body_len); + http_state_change (hc, HTTP_STATE_APP_IO_MORE_DATA); + sm_result = HTTP_SM_CONTINUE; + } + else + { + /* No response body, we are done */ + http_state_change (hc, HTTP_STATE_WAIT_CLIENT_METHOD); + sm_result = HTTP_SM_STOP; + } ASSERT (sp->max_burst_size >= offset); sp->max_burst_size -= offset; - return HTTP_SM_CONTINUE; + return sm_result; error: http_send_error (hc, sc); -- cgit 1.2.3-korg