kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 16:39:14 +00:00
Code Issues Projects Releases Wiki Activity

fix outgoing channel selection

Browse Source 
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@369 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Anthony Minessale 2008-01-25 15:05:37 +00:00
parent 2b4fa5f221
commit ac6d26f72c
1 changed files with 26 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
libs/freetdm/mod_openzap/mod_openzap.c
View File

@ -785,6 +785,7 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
switch_call_cause_t cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; switch_call_cause_t cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
char name[128]; char name[128];
zap_status_t status; zap_status_t status;
int direction = ZAP_TOP_DOWN;
if (!outbound_profile) { if (!outbound_profile) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing caller profile\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing caller profile\n");
@ -796,37 +797,40 @@ static switch_call_cause_t channel_outgoing_channel(switch_core_session_t *sessi
return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
} }
dest = outbound_profile->destination_number; if (switch_strlen_zero(outbound_profile->destination_number)) {
if ((p = strchr(outbound_profile->destination_number, '/'))) {
dest = p + 1;
span_id = atoi(outbound_profile->destination_number);
if (!switch_strlen_zero(dest)) {
if ((p = strchr(dest, '/'))) {
chan_id = atoi(dest);
dest = p + 1;
}
}
}
if (switch_strlen_zero(dest)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid dial string\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid dial string\n");
return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
} }
dest = outbound_profile->destination_number;
span_id = atoi(dest);
if ((p = strchr(dest, '/'))) {
if (*p++) {
if (*p == 'A') {
direction = ZAP_BOTTOM_UP;
} else if (*p == 'a') {
direction = ZAP_TOP_DOWN;
} else {
chan_id = atoi(dest);
}
}
}
if (!span_id) { if (!span_id) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing span\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing span\n");
return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER; return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
} }
if (chan_id < 0) {
direction = ZAP_BOTTOM_UP;
chan_id = 0;
}
if (chan_id) { if (chan_id) {
if (chan_id > 0) {
status = zap_channel_open(span_id, chan_id, &zchan); status = zap_channel_open(span_id, chan_id, &zchan);
} else { } else {
status = zap_channel_open_any(span_id, ZAP_BOTTOM_UP, &zchan); status = zap_channel_open_any(span_id, direction, &zchan);
}
} else {
status = zap_channel_open_any(span_id, ZAP_TOP_DOWN, &zchan);
} }
if (status != ZAP_SUCCESS) { if (status != ZAP_SUCCESS) {