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

4.3 #758

Closed
wants to merge 7 commits into from
Closed

4.3 #758

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2ae0f54
Code formatting changes.
TheGrandWazoo Aug 11, 2016
4c3fbb7
Terminate all LM_* statement messages with a new line.
TheGrandWazoo Aug 26, 2016
947dbb2
Added some additional debug statements to the code
TheGrandWazoo Aug 26, 2016
5bd354b
Additional debug statements, comments and code formatting.
TheGrandWazoo Aug 26, 2016
d2545dc
Reversed variables to make 2 line appearance when a held call is seized
TheGrandWazoo Aug 26, 2016
002cc31
Caller ID follows the seize after being held.
TheGrandWazoo Aug 26, 2016
92e5090
Fixed sca owner change on reinvite.
TheGrandWazoo Aug 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 22 additions & 9 deletions modules/sca/sca_call_info.c
View file
Open in desktop
Expand Up @@ -1265,15 +1265,28 @@ static int sca_call_info_invite_reply_200_handler(sip_msg_t *msg,
goto done;
}

if (sca_appearance_update_unsafe(app, state, &to->display, &app_uri_aor,
&dialog, NULL, contact_uri) < 0) {
sca_appearance_state_to_str(state, &state_str);
LM_ERR( "sca_call_info_invite_handler: failed to update appearance "
"%.*s appearance-index %d with dialog id %.*s to "
"state %.*s\n", STR_FMT( &app->owner ), app->index,
STR_FMT( &app->dialog.id ), STR_FMT( &state_str ));
rc = -1;
goto done;
if (SCA_STR_EQ(from_aor, to_aor)) {
if (sca_appearance_update_unsafe(app, state, NULL, NULL,
&dialog, NULL, contact_uri) < 0) {
sca_appearance_state_to_str(state, &state_str);
LM_ERR( "sca_call_info_invite_handler: failed to update appearance "
"%.*s appearance-index %d with dialog id %.*s to "
"state %.*s", STR_FMT( &app->owner ), app->index,
STR_FMT( &app->dialog.id ), STR_FMT( &state_str ));
rc = -1;
goto done;
}
} else {
if (sca_appearance_update_unsafe(app, state, &to->display, &app_uri_aor,
&dialog, NULL, contact_uri) < 0) {
sca_appearance_state_to_str(state, &state_str);
LM_ERR( "sca_call_info_invite_handler: failed to update appearance "
"%.*s appearance-index %d with dialog id %.*s to "
"state %.*s\n", STR_FMT( &app->owner ), app->index,
STR_FMT( &app->dialog.id ), STR_FMT( &state_str ));
rc = -1;
goto done;
}
}

rc = 1;
Expand Down