Websocket simple proxy protocol implementation #1595

ttaym · 2022-03-18T11:33:22Z

Contributes to #755

Signed-off-by: Aleksey Mikhaylov [email protected]

krizhanovsky

Looks like quite a few places should be reworked

fw/http.c

fw/http.h

fw/http.c

fw/websocket.c

fw/http.c

fw/websocket.c

krizhanovsky

Just reviewed #1594 comments in application to this PR.

fw/connection.h

fw/websocket.c

fw/http.c

fw/sock_srv.c

fw/http_sched_ratio.c

ttaym · 2022-04-07T09:41:55Z

This answers #1595 (comment)

While for backend connection state field not needed, but we use client connection as is with adapted websocket type. And we call for it for example tfw_http_conn_drop() -> tfw_http_resp_terminate() -> tfw_http_resp_cache() -> tfw_gfsm_move() that use state. I think here not safe to union with it.

Signed-off-by: Aleksey Mikhaylov <[email protected]>

krizhanovsky

There are still several issues and several cleanups are also desired.

fw/websocket.c

fw/cfg.c

fw/http.c

fw/websocket.c

fw/http_sched_hash.c

fw/server.h

Signed-off-by: Aleksey Mikhaylov <[email protected]>

fw/websocket.c

fw/cfg.c

Co-authored-by: Alexander Krizhanovsky <[email protected]>

krizhanovsky

One more race in the new design, hopefully the last one. Please carefully verify my conclusions for any other hidden issues.

fw/http.c

fw/http_sched_hash.c

fw/http.c

fw/http_sched_ratio.c

Signed-off-by: Aleksey Mikhaylov <[email protected]>

krizhanovsky

Good to merge. Just several minor cleanups/fixes are required.

krizhanovsky · 2022-05-04T18:45:49Z

fw/http_frame.h

@@ -200,7 +200,7 @@ typedef struct {
 	unsigned char	data_off;
 } TfwH2Ctx;

-typedef struct TfwConn TfwConn;
+typedef struct tfw_conn_t TfwConn;



Seems some unnecessary change

This line of code i had introduced in my earlier commits in previous PRs. It goes againts widly used practice in tempesta code. Mostly type named in snake case with _t suffix. I have just fixed style.

krizhanovsky · 2022-05-04T18:46:15Z

fw/http.c

-		? tfw_http_req_process(conn, stream, data->skb)
-		: tfw_http_resp_process(conn, stream, data->skb);
+	/* That is paired request, it may be freed after resp processing */
+	req = ((TfwHttpMsg *)stream->msg)->pair;


req is also needed under the if only

It cannot be moved inside clause because it may be freed after resp processing.

fw/http.c

fw/websocket.c

fw/http.c

Co-authored-by: Alexander Krizhanovsky <[email protected]>

Signed-off-by: Aleksey Mikhaylov <[email protected]>

ttaym changed the base branch from master to am-755-update-srv-shceduler March 18, 2022 11:34

ttaym force-pushed the am-755-update-srv-shceduler branch from baa327a to eac58dd Compare March 18, 2022 13:00

ttaym force-pushed the am-755-websocket-proxy-proto branch 5 times, most recently from f14cdf8 to 168129c Compare March 24, 2022 14:08

ttaym marked this pull request as ready for review March 24, 2022 14:08

ttaym requested a review from krizhanovsky March 24, 2022 14:09

krizhanovsky requested changes Mar 26, 2022

View reviewed changes

ttaym changed the base branch from am-755-update-srv-shceduler to master March 28, 2022 15:09

ttaym marked this pull request as draft March 29, 2022 14:15

ttaym force-pushed the am-755-websocket-proxy-proto branch from 53dc7c6 to c7e76e4 Compare March 30, 2022 17:42

ttaym marked this pull request as ready for review March 30, 2022 18:08

ttaym requested a review from krizhanovsky March 30, 2022 18:09

krizhanovsky reviewed Apr 3, 2022

View reviewed changes

krizhanovsky mentioned this pull request Apr 3, 2022

Upgrade connection to websocket and provision new connection #1594

Closed

ttaym added 2 commits April 8, 2022 12:09

Upgrade connection to websocket and provision new connection

fae14bf

Signed-off-by: Aleksey Mikhaylov <[email protected]>

Websocket simple proxy protocol implementation

8dd6b95

Signed-off-by: Aleksey Mikhaylov <[email protected]>

ttaym requested a review from krizhanovsky April 8, 2022 09:10

ttaym force-pushed the am-755-websocket-proxy-proto branch from f460505 to 8dd6b95 Compare April 8, 2022 09:11

krizhanovsky requested changes Apr 20, 2022

View reviewed changes

ttaym force-pushed the am-755-websocket-proxy-proto branch 3 times, most recently from e7eda18 to 18a1c47 Compare April 21, 2022 11:49

Revert changes of sched touching from softirq context

012c5a9

Signed-off-by: Aleksey Mikhaylov <[email protected]>

ttaym force-pushed the am-755-websocket-proxy-proto branch 2 times, most recently from a0b51d2 to 6fe99b0 Compare April 21, 2022 13:25

Websockets over http/1.1 minor fixes

6ef6324

Signed-off-by: Aleksey Mikhaylov <[email protected]>

ttaym force-pushed the am-755-websocket-proxy-proto branch from 73779c5 to 6ef6324 Compare April 21, 2022 13:56

ttaym added 2 commits April 21, 2022 17:00

Merge branch 'master' into am-755-websocket-proxy-proto

768fc05

Fixup after merging master into am-755-websocket-proxy-proto

9a014ce

Signed-off-by: Aleksey Mikhaylov <[email protected]>

ttaym requested a review from krizhanovsky April 21, 2022 14:11

Fix unsched in case of successfull upgrade

147ef9a

Signed-off-by: Aleksey Mikhaylov <[email protected]>

ttaym force-pushed the am-755-websocket-proxy-proto branch from 0d27705 to 147ef9a Compare April 22, 2022 14:03

krizhanovsky reviewed Apr 22, 2022

View reviewed changes

fw/websocket.c Outdated Show resolved Hide resolved

fw/cfg.c Show resolved Hide resolved

Update fw/websocket.c

406a052

Co-authored-by: Alexander Krizhanovsky <[email protected]>

ttaym requested a review from krizhanovsky April 23, 2022 17:49

krizhanovsky requested changes Apr 23, 2022

View reviewed changes

fw/http.c Outdated Show resolved Hide resolved

fw/http.c Outdated Show resolved Hide resolved

fw/http_sched_hash.c Outdated Show resolved Hide resolved

fw/http.c Outdated Show resolved Hide resolved

fw/http_sched_ratio.c Show resolved Hide resolved

ttaym force-pushed the am-755-websocket-proxy-proto branch 3 times, most recently from fb89d02 to 4057450 Compare April 27, 2022 14:44

Fixup after PR discussions

ac84d06

Signed-off-by: Aleksey Mikhaylov <[email protected]>

ttaym force-pushed the am-755-websocket-proxy-proto branch from 4057450 to ac84d06 Compare April 28, 2022 09:22

ttaym requested a review from krizhanovsky April 29, 2022 08:41

krizhanovsky approved these changes May 4, 2022

View reviewed changes

Apply suggestions from code review

38a694e

Co-authored-by: Alexander Krizhanovsky <[email protected]>

ttaym force-pushed the am-755-websocket-proxy-proto branch from e50dc91 to 67cdf28 Compare May 5, 2022 12:15

Fixup after PR discussions

6b4edba

Signed-off-by: Aleksey Mikhaylov <[email protected]>

ttaym force-pushed the am-755-websocket-proxy-proto branch from 67cdf28 to 6b4edba Compare May 5, 2022 12:24

ttaym merged commit f550823 into master May 5, 2022

ttaym deleted the am-755-websocket-proxy-proto branch May 9, 2022 08:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Websocket simple proxy protocol implementation #1595

Websocket simple proxy protocol implementation #1595

ttaym commented Mar 18, 2022

krizhanovsky left a comment

krizhanovsky left a comment

ttaym commented Apr 7, 2022

krizhanovsky left a comment

krizhanovsky left a comment

krizhanovsky left a comment

krizhanovsky May 4, 2022

ttaym May 5, 2022 •

edited

Loading

krizhanovsky May 4, 2022

ttaym May 5, 2022

Websocket simple proxy protocol implementation #1595

Websocket simple proxy protocol implementation #1595

Conversation

ttaym commented Mar 18, 2022

krizhanovsky left a comment

Choose a reason for hiding this comment

krizhanovsky left a comment

Choose a reason for hiding this comment

ttaym commented Apr 7, 2022

krizhanovsky left a comment

Choose a reason for hiding this comment

krizhanovsky left a comment

Choose a reason for hiding this comment

krizhanovsky left a comment

Choose a reason for hiding this comment

krizhanovsky May 4, 2022

Choose a reason for hiding this comment

ttaym May 5, 2022 • edited Loading

Choose a reason for hiding this comment

krizhanovsky May 4, 2022

Choose a reason for hiding this comment

ttaym May 5, 2022

Choose a reason for hiding this comment

ttaym May 5, 2022 •

edited

Loading