Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
This commit is contained in:
commit
9fcaa9e84c
|
@ -146,12 +146,12 @@ switch_status_t megaco_activate_termination(mg_termination_t *term)
|
||||||
switch_channel_t *channel = switch_core_session_get_channel(session);
|
switch_channel_t *channel = switch_core_session_get_channel(session);
|
||||||
switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "command", "media_modify");
|
switch_event_add_header_string(var_event, SWITCH_STACK_BOTTOM, "command", "media_modify");
|
||||||
|
|
||||||
switch_core_session_receive_event(session, &var_event);
|
|
||||||
|
|
||||||
if (term->u.rtp.t38_options) {
|
if (term->u.rtp.t38_options) {
|
||||||
switch_channel_set_private(channel, "t38_options", term->u.rtp.t38_options);
|
switch_channel_set_private(channel, "t38_options", term->u.rtp.t38_options);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch_core_session_receive_event(session, &var_event);
|
||||||
|
|
||||||
switch_core_session_rwunlock(session);
|
switch_core_session_rwunlock(session);
|
||||||
|
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sent refresh to channel [%s], for termination [%s]\n", term->uuid, term->name);
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sent refresh to channel [%s], for termination [%s]\n", term->uuid, term->name);
|
||||||
|
|
|
@ -509,7 +509,7 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
|
||||||
}
|
}
|
||||||
|
|
||||||
if (compare_var(event, channel, kRFC2833PT)) {
|
if (compare_var(event, channel, kRFC2833PT)) {
|
||||||
const char *szpt = switch_channel_get_variable(channel, kRFC2833PT);
|
const char *szpt = switch_event_get_header(event, kRFC2833PT);
|
||||||
int pt = !zstr(szpt) ? atoi(szpt) : 0;
|
int pt = !zstr(szpt) ? atoi(szpt) : 0;
|
||||||
|
|
||||||
tech_pvt->rfc2833_pt = pt;
|
tech_pvt->rfc2833_pt = pt;
|
||||||
|
@ -525,7 +525,7 @@ static switch_status_t channel_receive_event(switch_core_session_t *session, swi
|
||||||
}
|
}
|
||||||
|
|
||||||
if (compare_var(event, channel, kMEDIATYPE)) {
|
if (compare_var(event, channel, kMEDIATYPE)) {
|
||||||
const char *newmode = switch_channel_get_variable(channel, kMEDIATYPE);
|
const char *newmode = switch_event_get_header(event, kMEDIATYPE);
|
||||||
|
|
||||||
if (!strcmp(newmode, "image")) {
|
if (!strcmp(newmode, "image")) {
|
||||||
switch_channel_set_variable(tech_pvt->channel, "has_t38", "true");
|
switch_channel_set_variable(tech_pvt->channel, "has_t38", "true");
|
||||||
|
|
Loading…
Reference in New Issue