ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

http: state machine improvement

Browse Source 
Split in two, one for rx and second for tx, which is more suitable for
http tunnels. Updated state names too, some of them were bit confusing.

Type: improvement

Change-Id: I2310deaa49196819f9d8147a5d9af188465dbd65
Signed-off-by: Matus Fabian <matfabia@cisco.com>
This commit is contained in:
Matus Fabian
2024-11-13 16:31:53 +01:00
committed by Florin Coras
parent 1fe2501702
commit 1c9d1de9bc
4 changed files with 235 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

413
src/plugins/http/http.c
View File

File diff suppressed because it is too large Load Diff

46
src/plugins/http/http.h
View File

@ -59,28 +59,38 @@ typedef struct
#define http_token_lit(s) (s), sizeof (s) - 1
#define foreach_http_conn_state \
_ (LISTEN, "listen") \
_ (CONNECTING, "connecting") \
_ (ESTABLISHED, "established") \
_ (TRANSPORT_CLOSED, "transport-closed") \
_ (APP_CLOSED, "app-closed") \
_ (CLOSED, "closed")
typedef enum http_conn_state_
{
HTTP_CONN_STATE_LISTEN,
HTTP_CONN_STATE_CONNECTING,
HTTP_CONN_STATE_ESTABLISHED,
HTTP_CONN_STATE_TUNNEL,
HTTP_CONN_STATE_TRANSPORT_CLOSED,
HTTP_CONN_STATE_APP_CLOSED,
HTTP_CONN_STATE_CLOSED
#define _(s, str) HTTP_CONN_STATE_##s,
foreach_http_conn_state
#undef _
} http_conn_state_t;
typedef enum http_state_
#define foreach_http_req_state \
_ (0, IDLE, "idle") \
_ (1, WAIT_APP_METHOD, "wait app method") \
_ (2, WAIT_TRANSPORT_REPLY, "wait transport reply") \
_ (3, TRANSPORT_IO_MORE_DATA, "transport io more data") \
_ (4, WAIT_TRANSPORT_METHOD, "wait transport method") \
_ (5, WAIT_APP_REPLY, "wait app reply") \
_ (6, APP_IO_MORE_DATA, "app io more data") \
_ (7, TUNNEL, "tunnel")
typedef enum http_req_state_
{
HTTP_STATE_IDLE = 0,
HTTP_STATE_WAIT_APP_METHOD,
HTTP_STATE_WAIT_CLIENT_METHOD,
HTTP_STATE_WAIT_SERVER_REPLY,
HTTP_STATE_WAIT_APP_REPLY,
HTTP_STATE_CLIENT_IO_MORE_DATA,
HTTP_STATE_APP_IO_MORE_DATA,
HTTP_N_STATES,
} http_state_t;
#define _(n, s, str) HTTP_REQ_STATE_##s = n,
foreach_http_req_state
#undef _
HTTP_REQ_N_STATES
} http_req_state_t;
typedef enum http_req_method_
{
@ -399,7 +409,7 @@ typedef struct http_tc_
/*
* Current request
*/
http_state_t http_state;
http_req_state_t req_state;
http_req_method_t method;
u8 *rx_buf;
u32 rx_buf_offset;

3
src/plugins/http_static/static_server.c
View File

@ -126,6 +126,9 @@ start_send_data (hss_session_t *hs, http_status_code_t status)
ASSERT (rv == sizeof (headers));
}
if (!msg.data.body_len)
goto done;
uword data = pointer_to_uword (hs->data);
rv = svm_fifo_enqueue (ts->tx_fifo, sizeof (data), (u8 *) &data);
ASSERT (rv == sizeof (data));