kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

MODENDP-60 (reject calls for no remaining forwards in core) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6975 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-12-24 19:23:36 +00:00
parent 0e7a329069
commit 2ce02469fd
2 changed files with 51 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mod/endpoints/mod_sofia/mod_sofia.c
View File

@ -224,6 +224,8 @@ static int hangup_cause_to_sip(switch_call_cause_t cause)
return 504; return 504;
case SWITCH_CAUSE_ORIGINATOR_CANCEL: case SWITCH_CAUSE_ORIGINATOR_CANCEL:
return 487; return 487;
case SWITCH_CAUSE_EXCHANGE_ROUTING_ERROR:
return 483;
default: default:
return 480; return 480;
} }

96
src/switch_core_session.c
View File

@ -186,53 +186,63 @@ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(switch_
switch_channel_t *channel = NULL; switch_channel_t *channel = NULL;
switch_caller_profile_t *outgoing_profile = caller_profile; switch_caller_profile_t *outgoing_profile = caller_profile;
switch_call_cause_t cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL; switch_call_cause_t cause = SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL;
const char *forwardvar;
int forwardval = 70;
if ((endpoint_interface = switch_loadable_module_get_endpoint_interface(endpoint_name)) == 0) { if ((endpoint_interface = switch_loadable_module_get_endpoint_interface(endpoint_name)) == 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate channel type %s\n", endpoint_name); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate channel type %s\n", endpoint_name);
return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED; return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED;
} }
if (endpoint_interface->io_routines->outgoing_channel) { if (!endpoint_interface->io_routines->outgoing_channel) {
if (session) {
channel = switch_core_session_get_channel(session);
if (caller_profile) {
const char *ecaller_id_name = NULL, *ecaller_id_number = NULL;
ecaller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name");
ecaller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number");
if (ecaller_id_name || ecaller_id_number) {
outgoing_profile = switch_caller_profile_clone(session, caller_profile);
if (ecaller_id_name) {
outgoing_profile->caller_id_name = ecaller_id_name;
}
if (ecaller_id_number) {
outgoing_profile->caller_id_number = ecaller_id_number;
}
}
}
if (!outgoing_profile) {
outgoing_profile = switch_channel_get_caller_profile(channel);
}
}
if ((cause = endpoint_interface->io_routines->outgoing_channel(session, outgoing_profile, new_session, pool, flags)) != SWITCH_CAUSE_SUCCESS) {
return cause;
}
if (session) {
for (ptr = session->event_hooks.outgoing_channel; ptr; ptr = ptr->next) {
if ((status = ptr->outgoing_channel(session, caller_profile, *new_session, flags)) != SWITCH_STATUS_SUCCESS) {
break;
}
}
}
} else {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate outgoing channel interface for %s\n", endpoint_name); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate outgoing channel interface for %s\n", endpoint_name);
return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED; return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED;
} }
forwardvar = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE);
if (!switch_strlen_zero(forwardvar)) {
forwardval = atoi(forwardvar) - 1;
}
if (forwardval <= 0) {
return SWITCH_CAUSE_EXCHANGE_ROUTING_ERROR;
}
if (session) {
channel = switch_core_session_get_channel(session);
if (caller_profile) {
const char *ecaller_id_name = NULL, *ecaller_id_number = NULL;
ecaller_id_name = switch_channel_get_variable(channel, "effective_caller_id_name");
ecaller_id_number = switch_channel_get_variable(channel, "effective_caller_id_number");
if (ecaller_id_name || ecaller_id_number) {
outgoing_profile = switch_caller_profile_clone(session, caller_profile);
if (ecaller_id_name) {
outgoing_profile->caller_id_name = ecaller_id_name;
}
if (ecaller_id_number) {
outgoing_profile->caller_id_number = ecaller_id_number;
}
}
}
if (!outgoing_profile) {
outgoing_profile = switch_channel_get_caller_profile(channel);
}
}
if ((cause = endpoint_interface->io_routines->outgoing_channel(session, outgoing_profile, new_session, pool, flags)) != SWITCH_CAUSE_SUCCESS) {
return cause;
}
if (session) {
for (ptr = session->event_hooks.outgoing_channel; ptr; ptr = ptr->next) {
if ((status = ptr->outgoing_channel(session, caller_profile, *new_session, flags)) != SWITCH_STATUS_SUCCESS) {
break;
}
}
}
switch_assert(*new_session != NULL); switch_assert(*new_session != NULL);
if (*new_session) { if (*new_session) {
@ -251,6 +261,8 @@ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(switch_
if (channel && peer_channel) { if (channel && peer_channel) {
const char *export_vars, *val; const char *export_vars, *val;
switch_codec_t *read_codec = switch_core_session_get_read_codec(session); switch_codec_t *read_codec = switch_core_session_get_read_codec(session);
const char *max_forwards = switch_core_session_sprintf(session, "%d", forwardval);
switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards);
if (read_codec) { if (read_codec) {
char tmp[80]; char tmp[80];
@ -288,16 +300,6 @@ SWITCH_DECLARE(switch_call_cause_t) switch_core_session_outgoing_channel(switch_
switch_channel_set_variable(peer_channel, SWITCH_B_SDP_VARIABLE, val); switch_channel_set_variable(peer_channel, SWITCH_B_SDP_VARIABLE, val);
} }
val = switch_channel_get_variable(channel, SWITCH_MAX_FORWARDS_VARIABLE);
if (!switch_strlen_zero(val)) {
int forwardval = atoi(val) - 1;
const char *max_forwards = switch_core_session_sprintf(session, "%d", forwardval);
switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, max_forwards);
} else {
switch_channel_set_variable(peer_channel, SWITCH_MAX_FORWARDS_VARIABLE, "70");
}
if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) { if (switch_channel_test_flag(channel, CF_BYPASS_MEDIA)) {
switch_channel_set_flag(peer_channel, CF_BYPASS_MEDIA); switch_channel_set_flag(peer_channel, CF_BYPASS_MEDIA);
} }