error checking on dial string.
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@359 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
parent
5916d66a28
commit
f81b02f429
|
@ -717,18 +717,25 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (switch_strlen_zero(outbound_profile->destination_number)) {
|
||||||
|
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid dial string\n");
|
||||||
|
return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
|
||||||
|
}
|
||||||
|
|
||||||
dest = outbound_profile->destination_number;
|
dest = outbound_profile->destination_number;
|
||||||
|
|
||||||
if ((p = strchr(outbound_profile->destination_number, '/'))) {
|
if ((p = strchr(outbound_profile->destination_number, '/'))) {
|
||||||
dest = p + 1;
|
dest = p + 1;
|
||||||
span_id = atoi(outbound_profile->destination_number);
|
span_id = atoi(outbound_profile->destination_number);
|
||||||
chan_id = atoi(dest);
|
if (!switch_strlen_zero(dest)) {
|
||||||
if ((p = strchr(dest, '/'))) {
|
chan_id = atoi(dest);
|
||||||
dest = p + 1;
|
if ((p = strchr(dest, '/'))) {
|
||||||
|
dest = p + 1;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!dest) {
|
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;
|
||||||
}
|
}
|
||||||
|
@ -753,8 +760,6 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if ((*new_session = switch_core_session_request(openzap_endpoint_interface, pool)) != 0) {
|
if ((*new_session = switch_core_session_request(openzap_endpoint_interface, pool)) != 0) {
|
||||||
private_t *tech_pvt;
|
private_t *tech_pvt;
|
||||||
switch_channel_t *channel;
|
switch_channel_t *channel;
|
||||||
|
|
Loading…
Reference in New Issue