mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-06-07 21:44:51 +00:00
update
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@3369 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
parent
f3ffaff015
commit
81ff111339
@ -1486,14 +1486,17 @@ static switch_status_t channel_outgoing_channel(switch_core_session_t *session,
|
|||||||
*dnis++ = '\0';
|
*dnis++ = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((p = strchr(profile_name, '@'))) {
|
if ((mdl_profile->user_flags & LDL_FLAG_COMPONENT)) {
|
||||||
*p++ = '\0';
|
if ((p = strchr(profile_name, '@'))) {
|
||||||
u = profile_name;
|
*p++ = '\0';
|
||||||
profile_name = p;
|
u = profile_name;
|
||||||
snprintf(ubuf, sizeof(ubuf), "%s@%s/talk", u, profile_name);
|
profile_name = p;
|
||||||
user = ubuf;
|
snprintf(ubuf, sizeof(ubuf), "%s@%s/talk", u, profile_name);
|
||||||
} else {
|
user = ubuf;
|
||||||
user = (char *) modname;
|
} else {
|
||||||
|
terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
|
||||||
|
return SWITCH_STATUS_GENERR;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((mdl_profile = switch_core_hash_find(globals.profile_hash, profile_name))) {
|
if ((mdl_profile = switch_core_hash_find(globals.profile_hash, profile_name))) {
|
||||||
@ -1503,6 +1506,10 @@ static switch_status_t channel_outgoing_channel(switch_core_session_t *session,
|
|||||||
user = ubuf;
|
user = ubuf;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!user) {
|
||||||
|
user = mdl_profile->login;
|
||||||
|
}
|
||||||
|
|
||||||
if (!ldl_handle_ready(mdl_profile->handle)) {
|
if (!ldl_handle_ready(mdl_profile->handle)) {
|
||||||
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doh! we are not logged in yet!\n");
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doh! we are not logged in yet!\n");
|
||||||
terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
|
terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user