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

git merge failure fixed. wrong side of the merge was kept in previous commit

This commit is contained in:
William King 2012-08-20 10:27:39 -07:00
parent 7f74f7fbc8
commit 802af6e5cb
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/mod/xml_int/mod_xml_radius/mod_xml_radius.c
View File

@ -849,7 +849,6 @@ switch_status_t mod_xml_radius_check_conditions(switch_channel_t *channel, switc
} }
switch_status_t mod_xml_radius_accounting_start(switch_core_session_t *session){ switch_status_t mod_xml_radius_accounting_start(switch_core_session_t *session){
switch_channel_t *channel = switch_core_session_get_channel(session);
VALUE_PAIR *send = NULL; VALUE_PAIR *send = NULL;
uint32_t service = PW_STATUS_START; uint32_t service = PW_STATUS_START;
rc_handle *new_handle = NULL; rc_handle *new_handle = NULL;
@ -869,7 +868,7 @@ switch_status_t mod_xml_radius_accounting_start(switch_core_session_t *session){
if ( mod_xml_radius_new_handle(&new_handle, globals.acct_start_configs) != SWITCH_STATUS_SUCCESS || new_handle == NULL ) { if ( mod_xml_radius_new_handle(&new_handle, globals.acct_start_configs) != SWITCH_STATUS_SUCCESS || new_handle == NULL ) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create new accounting_start handle for call: %s\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create new accounting_start handle for call: %s\n",
swich_channel_get_variable(channel, "uuid")); switch_channel_get_variable(channel, "uuid"));
goto end; goto end;
} }
@ -927,7 +926,7 @@ switch_status_t mod_xml_radius_accounting_end(switch_core_session_t *session){
if ( mod_xml_radius_new_handle(&new_handle, globals.acct_end_configs) != SWITCH_STATUS_SUCCESS || new_handle == NULL ) { if ( mod_xml_radius_new_handle(&new_handle, globals.acct_end_configs) != SWITCH_STATUS_SUCCESS || new_handle == NULL ) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create new accounting_end handle for call: %s\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create new accounting_end handle for call: %s\n",
swich_channel_get_variable(channel, "uuid")); switch_channel_get_variable(channel, "uuid"));
goto end; goto end;
} }
@ -982,7 +981,7 @@ SWITCH_STANDARD_APP(radius_auth_handle)
if ( mod_xml_radius_new_handle(&new_handle, globals.auth_app_configs) != SWITCH_STATUS_SUCCESS || new_handle == NULL ) { if ( mod_xml_radius_new_handle(&new_handle, globals.auth_app_configs) != SWITCH_STATUS_SUCCESS || new_handle == NULL ) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create new authentication handle for call: %s\n", switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create new authentication handle for call: %s\n",
swich_channel_get_variable(channel, "uuid")); switch_channel_get_variable(channel, "uuid"));
goto err; goto err;
} }