luo980/curl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test2302: improve reliability

Browse Source 
- make result print collected write data, unless
  change in meta flags is detected
- will show same result even when data arrives via
  several writecb invocations

Closes #12068
This commit is contained in:
Stefan Eissing 2023-10-09 10:18:20 +02:00 committed by Daniel Stenberg
parent dc4e885f35
commit 56d373033d
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 49 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
tests/libtest/lib2302.c
View File

@ -26,97 +26,66 @@
#ifdef USE_WEBSOCKETS
#if 0
struct ws_data {
CURL *easy;
char buf[1024*1024];
size_t blen;
size_t nwrites;
int has_meta;
int meta_flags;
};
static int ping(CURL *curl, const char *send_payload)
static void flush_data(struct ws_data *wd)
{
size_t sent;
CURLcode result =
curl_ws_send(curl, send_payload, strlen(send_payload), &sent, CURLWS_PING);
fprintf(stderr,
"ws: curl_ws_send returned %u, sent %u\n", (int)result, (int)sent);
size_t i;
return (int)result;
if(!wd->nwrites)
return;
for(i = 0; i < wd->blen; ++i)
printf("%02x ", (unsigned char)wd->buf[i]);
printf("\n");
if(wd->has_meta)
printf("RECFLAGS: %x\n", wd->meta_flags);
else
fprintf(stderr, "RECFLAGS: NULL\n");
wd->blen = 0;
wd->nwrites = 0;
}
static int recv_pong(CURL *curl, const char *expected_payload)
static size_t add_data(struct ws_data *wd, const char *buf, size_t blen,
const struct curl_ws_frame *meta)
{
size_t rlen;
unsigned int rflags;
char buffer[256];
CURLcode result =
curl_ws_recv(curl, buffer, sizeof(buffer), &rlen, &rflags);
if(rflags & CURLWS_PONG) {
int same = 0;
fprintf(stderr, "ws: got PONG back\n");
if(rlen == strlen(expected_payload)) {
if(!memcmp(expected_payload, buffer, rlen)) {
fprintf(stderr, "ws: got the same payload back\n");
same = 1;
}
}
if(!same)
fprintf(stderr, "ws: did NOT get the same payload back\n");
if((wd->nwrites == 0) ||
(!!meta != !!wd->has_meta) ||
(meta && meta->flags != wd->meta_flags)) {
if(wd->nwrites > 0)
flush_data(wd);
wd->has_meta = (meta != NULL);
wd->meta_flags = meta? meta->flags : 0;
}
else {
fprintf(stderr, "recv_pong: got %u bytes rflags %x\n", (int)rlen, rflags);
if(wd->blen + blen > sizeof(wd->buf)) {
return 0;
}
fprintf(stderr, "ws: curl_ws_recv returned %u, received %u\n", (int)result,
rlen);
return (int)result;
memcpy(wd->buf + wd->blen, buf, blen);
wd->blen += blen;
wd->nwrites++;
return blen;
}
/* just close the connection */
static void websocket_close(CURL *curl)
{
size_t sent;
CURLcode result =
curl_ws_send(curl, "", 0, &sent, CURLWS_CLOSE);
fprintf(stderr,
"ws: curl_ws_send returned %u, sent %u\n", (int)result, (int)sent);
}
static void websocket(CURL *curl)
{
int i = 0;
fprintf(stderr, "ws: websocket() starts\n");
do {
if(ping(curl, "foobar"))
return;
if(recv_pong(curl, "foobar"))
return;
sleep(2);
} while(i++ < 10);
websocket_close(curl);
}
#endif
static size_t writecb(char *buffer, size_t size, size_t nitems, void *p)
{
CURL *easy = p;
size_t i;
struct ws_data *ws_data = p;
size_t incoming = nitems;
const struct curl_ws_frame *meta;
(void)size;
for(i = 0; i < nitems; i++)
printf("%02x ", (unsigned char)buffer[i]);
printf("\n");
meta = curl_ws_meta(easy);
if(meta)
printf("RECFLAGS: %x\n", meta->flags);
else
fprintf(stderr, "RECFLAGS: NULL\n");
meta = curl_ws_meta(ws_data->easy);
incoming = add_data(ws_data, buffer, incoming, meta);
/* this assumes we get a simple TEXT frame first */
{
CURLcode result = CURLE_OK;
fprintf(stderr, "send back a TEXT\n");
(void)easy;
if(result)
nitems = 0;
}
if(nitems != incoming)
fprintf(stderr, "returns error from callback\n");
return nitems;
@ -126,26 +95,27 @@ int test(char *URL)
{
CURL *curl;
CURLcode res = CURLE_OK;
struct ws_data ws_data;
global_init(CURL_GLOBAL_ALL);
curl = curl_easy_init();
if(curl) {
curl_easy_setopt(curl, CURLOPT_URL, URL);
memset(&ws_data, 0, sizeof(ws_data));
ws_data.easy = curl;
curl_easy_setopt(curl, CURLOPT_URL, URL);
/* use the callback style */
curl_easy_setopt(curl, CURLOPT_USERAGENT, "webbie-sox/3");
curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writecb);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, curl);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &ws_data);
res = curl_easy_perform(curl);
fprintf(stderr, "curl_easy_perform() returned %u\n", (int)res);
#if 0
if(res == CURLE_OK)
websocket(curl);
#endif
/* always cleanup */
curl_easy_cleanup(curl);
flush_data(&ws_data);
}
curl_global_cleanup();
return (int)res;