Skip to content

Telecom 11880 3.4 #115

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

Open
wants to merge 8 commits into
base: 3.4-genesys
Choose a base branch
from
Open

Telecom 11880 3.4 #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3e3a3c8
TELECOM-11880: rest_client refactor to use curl_multi_socket_action
davidtrihy-genesys Jul 31, 2025
3483af7
TELECOM-11880: Implementing curl_share locking
davidtrihy-genesys Aug 29, 2025
d110860
TELECOM-11880: Build compilation updates
davidtrihy-genesys Sep 3, 2025
c973924
TELECOM-11880: Remove prereq callback
davidtrihy-genesys Sep 8, 2025
bbe2f96
Merge branch '3.4-genesys' of github.com:purecloudlabs/opensips into …
davidtrihy-genesys Sep 19, 2025
259b99a
TELECOM-11880: rest socket change
davidtrihy-genesys Sep 22, 2025
96fc6e0
TELECOM-11880: Updating connect_only mechanism
davidtrihy-genesys Sep 25, 2025
771e93b
Merge branch '3.4-genesys' of github.com:purecloudlabs/opensips into …
davidtrihy-genesys Oct 8, 2025
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
9 changes: 9 additions & 0 deletions modules/rest_client/rest_cb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,3 +109,12 @@ size_t header_func(char *ptr, size_t size, size_t nmemb, void *userdata)
return len;
}

int timer_cb(CURLM *multi_handle, long timeout_ms, void *cbp)
{
LM_DBG("multi_handle timer called %ld\n", timeout_ms);
long *p = (long*) cbp;

*p = timeout_ms;

return 0;
Copy link
Collaborator

@bcnewlin bcnewlin Sep 3, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Feedback from ChatGPT:

timer_cb writes timeout_ms into a variable, but the multi-socket path requires you to arm/cancel a real timer when the callback is called:
	•	timeout_ms == -1 → delete timer
	•	timeout_ms == 0 → call curl_multi_socket_action(..., CURL_SOCKET_TIMEOUT, 0) ASAP
Make sure the surrounding code actually honors those semantics; the callback alone is not enough. (This is from libcurl docs

Copy link
Collaborator Author

@davidtrihy-genesys davidtrihy-genesys Sep 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a simple timer that gets decremented on each call of multi_socket_action and I just have a static variable in the source to track it, if we wanted this to run multiple concurrent requests or attach running handles we'd need to re evaluate that and create some extra context but for now it works fine and it times out when the curl timeout that is configured times out

}
3 changes: 3 additions & 0 deletions modules/rest_client/rest_cb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
#ifndef _REST_CB_H_
#define _REST_CB_H_

#include <curl/curl.h>

#include "rest_client.h"

#include "../../str.h"
Expand All @@ -41,6 +43,7 @@

size_t write_func(char *ptr, size_t size, size_t nmemb, void *userdata);
size_t header_func(char *ptr, size_t size, size_t nmemb, void *userdata);
int timer_cb(CURLM *multi_handle, long timeout_ms, void *cbp);

#endif /* _REST_CB_H_ */

Loading
Loading