romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-05-30 06:57:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

sws: fix typo, indentation add more ws logging

Browse source
This commit is contained in:
Daniel Stenberg 2023-02-08 14:34:42 +01:00
parent f2fa4112ad
commit 8360d58ac7
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
1 changed files with 31 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

57
tests/server/sws.c
View file

@ -872,7 +872,7 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
if(req->upgrade_request) {
/* upgraded connection, work it differently until end of connection */
logmsg("Upgraded connection, this is a no longer HTTP/1");
logmsg("Upgraded connection, this is no longer HTTP/1");
send_doc(sock, req);
/* dump the request received so far to the external file */
@ -881,34 +881,39 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
req->offset = 0;
/* read websocket traffic */
if(req->open)
if(req->open) {
logmsg("wait for websocket traffic");
do {
got = sread(sock, reqbuf + req->offset, REQBUFSIZ - req->offset);
if(got > 0) {
req->offset += got;
logmsg("Got %zu bytes from client", got);
}
got = sread(sock, reqbuf + req->offset, REQBUFSIZ - req->offset);
if(got > 0)
req->offset += got;
if((got == -1) && ((EAGAIN == errno) || (EWOULDBLOCK == errno))) {
int rc;
fd_set input;
fd_set output;
struct timeval timeout = {1, 0}; /* 1000 ms */
logmsg("Got EAGAIN from sread");
FD_ZERO(&input);
FD_ZERO(&output);
got = 0;
FD_SET(sock, &input);
do {
logmsg("Wait until readable");
rc = select((int)sock + 1, &input, &output, NULL, &timeout);
} while(rc < 0 && errno == EINTR && !got_exit_signal);
logmsg("readable %d", rc);
if(rc)
got = 1;
}
} while(got > 0);
if((got == -1) && ((EAGAIN == errno) || (EWOULDBLOCK == errno))) {
int rc;
fd_set input;
fd_set output;
struct timeval timeout = {1, 0}; /* 1000 ms */
logmsg("Got EAGAIN from sread");
FD_ZERO(&input);
FD_ZERO(&output);
got = 0;
FD_SET(sock, &input);
do {
logmsg("Wait until readable");
rc = select((int)sock + 1, &input, &output, NULL, &timeout);
} while(rc < 0 && errno == EINTR && !got_exit_signal);
logmsg("readable %d", rc);
if(rc)
got = 1;
}
} while(got > 0);
}
else {
logmsg("NO wait for websocket traffic");
}
if(req->offset) {
logmsg("log the websocket traffic");
/* dump the incoming websocket traffic to the external file */