mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-03-15 13:14:03 +00:00
FS-7911 #resolve
Conflicts: src/mod/endpoints/mod_sofia/mod_sofia.c
This commit is contained in:
parent
e49f8c65f7
commit
a2061df862
@ -1503,11 +1503,6 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!zstr(msg->string_array_arg[0]) && !zstr(msg->string_array_arg[1])) {
|
|
||||||
ct = switch_core_session_sprintf(session, "%s/%s", msg->string_array_arg[0], msg->string_array_arg[1]);
|
|
||||||
ok = 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (switch_stristr("send_message", tech_pvt->x_freeswitch_support_remote)) {
|
if (switch_stristr("send_message", tech_pvt->x_freeswitch_support_remote)) {
|
||||||
ok = 1;
|
ok = 1;
|
||||||
}
|
}
|
||||||
@ -1519,6 +1514,10 @@ static switch_status_t sofia_receive_message(switch_core_session_t *session, swi
|
|||||||
if (ok) {
|
if (ok) {
|
||||||
const char *pl = NULL;
|
const char *pl = NULL;
|
||||||
|
|
||||||
|
if (!zstr(msg->string_array_arg[0]) && !zstr(msg->string_array_arg[1])) {
|
||||||
|
switch_snprintf(ct, sizeof(ct), "%s/%s", msg->string_array_arg[0], msg->string_array_arg[1]);
|
||||||
|
}
|
||||||
|
|
||||||
if (!zstr(msg->string_array_arg[2])) {
|
if (!zstr(msg->string_array_arg[2])) {
|
||||||
pl = msg->string_array_arg[2];
|
pl = msg->string_array_arg[2];
|
||||||
}
|
}
|
||||||
|
@ -620,7 +620,7 @@ void sofia_glue_set_extra_headers(switch_core_session_t *session, sip_t const *s
|
|||||||
sip_unknown_t *un;
|
sip_unknown_t *un;
|
||||||
char name[512] = "";
|
char name[512] = "";
|
||||||
switch_channel_t *channel = switch_core_session_get_channel(session);
|
switch_channel_t *channel = switch_core_session_get_channel(session);
|
||||||
char *pstr;
|
char pstr[32];
|
||||||
|
|
||||||
|
|
||||||
if (!sip || !channel) {
|
if (!sip || !channel) {
|
||||||
@ -636,7 +636,7 @@ void sofia_glue_set_extra_headers(switch_core_session_t *session, sip_t const *s
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pstr = switch_core_session_sprintf(session, "execute_on_%sprefix", prefix);
|
switch_snprintf(pstr, sizeof(pstr), "execute_on_%sprefix", prefix);
|
||||||
switch_channel_execute_on(channel, pstr);
|
switch_channel_execute_on(channel, pstr);
|
||||||
switch_channel_api_on(channel, pstr);
|
switch_channel_api_on(channel, pstr);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user