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

Jump to bottom

[janus_sip] Add "call_id" to "calling", "declining", "updatingcall" & "incomingcall" events #2557

Merged
merged 1 commit into from
Feb 17, 2021
Merged

[janus_sip] Add "call_id" to "calling", "declining", "updatingcall" & "incomingcall" events #2557

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
5 changes: 5 additions & 0 deletions plugins/janus_sip.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3577,6 +3577,7 @@ static void *janus_sip_handler(void *data) {
/* Send an ack back */
result = json_object();
json_object_set_new(result, "event", json_string("calling"));
json_object_set_new(result, "call_id", json_string(session->callid));
} else if(!strcasecmp(request_text, "accept")) {
if(session->status != janus_sip_call_status_invited) {
JANUS_LOG(LOG_ERR, "Wrong state (not invited? status=%s)\n", janus_sip_call_status_string(session->status));
Expand Down Expand Up @@ -4037,6 +4038,8 @@ static void *janus_sip_handler(void *data) {
result = json_object();
json_object_set_new(result, "event", json_string("declining"));
json_object_set_new(result, "code", json_integer(response_code));
if(session->callid)
json_object_set_new(result, "call_id", json_string(session->callid));
} else if(!strcasecmp(request_text, "transfer")) {
/* Transfer an existing call */
JANUS_VALIDATE_JSON_OBJECT(root, transfer_parameters,
Expand Down Expand Up @@ -4924,6 +4927,8 @@ void janus_sip_sofia_callback(nua_event_t event, int status, char const *phrase,
json_t *calling = json_object();
json_object_set_new(calling, "event", json_string(reinvite ? "updatingcall" : "incomingcall"));
json_object_set_new(calling, "username", json_string(session->callee));
if(session->callid)
json_object_set_new(calling, "call_id", json_string(session->callid));
if(sip->sip_from->a_display) {
json_object_set_new(calling, "displayname", json_string(sip->sip_from->a_display));
}
Expand Down