Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Websocket CURLOPT_HEADERFUNCTION #61

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Websocket CURLOPT_HEADERFUNCTION #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
379637e
Websocket CURLOPT_HEADERFUNCTION test
GameParrot Apr 12, 2023
3d094cd
Merge branch 'master' into websocket-headercb-test
GameParrot Apr 15, 2023
46528e1
Merge branch 'master' into websocket-headercb-test
GameParrot Apr 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions src/jni/lib_http_client_websocket.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ HttpClientWebSocket::HttpClientWebSocket(FakeJni::JLong owner) {
curl = curl_easy_init();
curl_easy_setopt(curl, CURLOPT_WRITEDATA, this);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, writecb);
curl_easy_setopt(curl, CURLOPT_HEADERDATA, this);
curl_easy_setopt(curl, CURLOPT_HEADERFUNCTION, headercb);
#endif

jvm = (void*)&FakeJni::JniEnvContext().getJniEnv().getVM();
Expand Down Expand Up @@ -104,9 +106,6 @@ void HttpClientWebSocket::disconnect(int id) {

size_t HttpClientWebSocket::write_callback(char *ptr, size_t size, size_t nmemb) {
#ifdef ENABLE_WEBSOCKETS
if(!connected) {
sendOpened();
}
auto frame = curl_ws_meta(curl);
if(frame->flags & CURLWS_TEXT) {
std::string cont((const char*)ptr, nmemb);
Expand All @@ -133,14 +132,21 @@ size_t HttpClientWebSocket::writecb(char *buffer, size_t size, size_t nitems, vo
return ((HttpClientWebSocket*)userdata)->write_callback(buffer, size, nitems);
}

size_t HttpClientWebSocket::headercb(char *ptr, size_t size, size_t nmemb, void *userdata) {
((HttpClientWebSocket*)userdata)->sendOpened();
return size * nmemb;
}

void HttpClientWebSocket::sendOpened() {
if(!connected) {
#ifndef NDEBUG
Log::trace("HttpClientWebSocket", "Sending onOpen");
Log::trace("HttpClientWebSocket", "Sending onOpen");
#endif
FakeJni::LocalFrame frame(*(FakeJni::Jvm*)jvm);
auto method = getClass().getMethod("()V", "onOpen");
method->invoke(frame.getJniEnv(), this);
connected = true;
FakeJni::LocalFrame frame(*(FakeJni::Jvm*)jvm);
auto method = getClass().getMethod("()V", "onOpen");
method->invoke(frame.getJniEnv(), this);
connected = true;
}
}

void HttpClientWebSocket::sendClosed() {
Expand Down
1 change: 1 addition & 0 deletions src/jni/lib_http_client_websocket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ class HttpClientWebSocket : public FakeJni::JObject {
struct curl_slist *header = nullptr;
size_t write_callback(char *ptr, size_t size, size_t nmemb);
static size_t writecb(char *buffer, size_t size, size_t nitems, void* data);
static size_t headercb(char *ptr, size_t size, size_t nmemb, void *userdata);
void sendOpened();
void sendClosed();
};