romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-08-25 14:43:33 +03:00
Code Issues Projects Releases Packages Wiki Activity

curl_ws_meta: initial implementation

Browse source
This commit is contained in:
Daniel Stenberg 2022-09-09 15:11:14 +02:00
parent 07cb887ed3
commit eebfa3279d
No known key found for this signature in database
GPG key ID: 5CC908FDB71E12C2
4 changed files with 37 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/http.h
View file

@ -209,6 +209,8 @@ struct websockets {
struct dynbuf buf;
size_t usedbuf; /* number of leading bytes in 'buf' the most recent complete
websocket frame uses */
struct curl_ws_metadata handout; /* the struct storage used for
curl_ws_meta() returns */
};
/****************************************************************************

32
lib/ws.c
View file

@ -335,8 +335,10 @@ size_t Curl_ws_writecb(char *buffer, size_t size /* 1 */,
return result;
}
else {
/* TODO: store details about the frame in a struct to be reachable with
curl_ws_meta() from within the write callback */
/* Store details about the frame to be reachable with curl_ws_meta()
from within the write callback */
ws->ws.handout.age = 0;
ws->ws.handout.recvflags = recvflags;
/* deliver the decoded frame to the user callback */
if(data->set.fwrite_func((char *)wsp, 1, wslen, writebody_ptr) != wslen)
@ -354,8 +356,9 @@ size_t Curl_ws_writecb(char *buffer, size_t size /* 1 */,
}
CURLcode curl_ws_recv(struct Curl_easy *data, void *buffer, size_t buflen,
size_t *nread, unsigned int *recvflags)
CURL_EXTERN CURLcode curl_ws_recv(struct Curl_easy *data, void *buffer,
size_t buflen,
size_t *nread, unsigned int *recvflags)
{
size_t bytes;
CURLcode result;
@ -523,9 +526,9 @@ static size_t ws_packet(struct Curl_easy *data,
return outi;
}
CURLcode curl_ws_send(struct Curl_easy *data, const void *buffer,
size_t buflen, size_t *sent,
unsigned int sendflags)
CURL_EXTERN CURLcode curl_ws_send(struct Curl_easy *data, const void *buffer,
size_t buflen, size_t *sent,
unsigned int sendflags)
{
size_t bytes;
CURLcode result;
@ -582,6 +585,16 @@ void Curl_ws_done(struct Curl_easy *data)
Curl_dyn_free(&wsp->buf);
}
CURL_EXTERN struct curl_ws_metadata *curl_ws_meta(struct Curl_easy *data)
{
/* we only return something for websockets, called from within the callback
when not using raw mode */
if(GOOD_EASY_HANDLE(data) && Curl_is_in_callback(data) && data->req.p.http &&
!data->set.ws_raw_mode)
return &data->req.p.http->ws.handout;
return NULL;
}
#else
CURL_EXTERN CURLcode curl_ws_recv(CURL *curl, void *buffer, size_t buflen,
@ -607,4 +620,9 @@ CURL_EXTERN CURLcode curl_ws_send(CURL *curl, const void *buffer,
return CURLE_OK;
}
CURL_EXTERN struct curl_ws_metadata *curl_ws_meta(struct Curl_easy *data)
{
(void)data;
return NULL;
}
#endif /* USE_WEBSOCKETS */