Skip to content

feature: multiple sip subscriptions support #3604

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 1 commit into
base: master
Choose a base branch
from
Open

feature: multiple sip subscriptions support #3604

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 23 additions & 4 deletions src/plugins/janus_sip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3519,11 +3519,16 @@ static void *janus_sip_handler(void *data) {
if(request_callid)
callid = json_string_value(request_callid);

/* Create a hash key for the subscriptions table */
const char *hashkey = event_type;
if(callid)
hashkey = callid;

/* Do we have a handle for this subscription already? */
janus_mutex_lock(&session->stack->smutex);
nua_handle_t *nh = NULL;
if(session->stack->subscriptions != NULL)
nh = g_hash_table_lookup(session->stack->subscriptions, (char *)event_type);
nh = g_hash_table_lookup(session->stack->subscriptions, (char *)hashkey);
if(nh == NULL) {
/* We don't, create one now */
if(!session->helper) {
Expand Down Expand Up @@ -3555,10 +3560,10 @@ static void *janus_sip_handler(void *data) {
}
if(session->stack->subscriptions == NULL) {
/* We still need a table for mapping these subscriptions as well */
session->stack->subscriptions = g_hash_table_new_full(g_int64_hash, g_int64_equal,
session->stack->subscriptions = g_hash_table_new_full(g_str_hash, g_str_equal,
(GDestroyNotify)g_free, (GDestroyNotify)nua_handle_destroy);
}
g_hash_table_insert(session->stack->subscriptions, g_strdup(event_type), nh);
g_hash_table_insert(session->stack->subscriptions, g_strdup(hashkey), nh);
}
janus_mutex_unlock(&session->stack->smutex);
char custom_headers[2048];
Expand Down Expand Up @@ -3599,11 +3604,23 @@ static void *janus_sip_handler(void *data) {
if(to == NULL)
to = session->account.identity;
const char *event_type = json_string_value(json_object_get(root, "event"));

/* Take call-id from request, if it exists */
const char *callid = NULL;
json_t *request_callid = json_object_get(root, "call_id");
if(request_callid)
callid = json_string_value(request_callid);

/* Create a hash key for the subscriptions table */
const char *hashkey = event_type;
if(callid)
hashkey = callid;

/* Get the handle we used for this subscription */
janus_mutex_lock(&session->stack->smutex);
nua_handle_t *nh = NULL;
if(session->stack->subscriptions != NULL)
nh = g_hash_table_lookup(session->stack->subscriptions, (char *)event_type);
nh = g_hash_table_lookup(session->stack->subscriptions, (char *)hashkey);
janus_mutex_unlock(&session->stack->smutex);
if(nh == NULL) {
JANUS_LOG(LOG_ERR, "Wrong state (not subscribed to this event)\n");
Expand All @@ -3616,6 +3633,8 @@ static void *janus_sip_handler(void *data) {
SIPTAG_EXPIRES_STR("0"), TAG_END());
result = json_object();
json_object_set_new(result, "event", json_string("unsubscribing"));
if (callid)
json_object_set_new(result, "call_id", json_string(callid));
} else if(!strcasecmp(request_text, "call")) {
/* Call another peer */
if(session->stack == NULL) {
Expand Down