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

If the timer value isn't available it isn't an error. Instead just don't add the field.

This commit is contained in:
William King 2012-09-13 15:12:35 -07:00
parent 4985a41f27
commit c28c99c394
2 changed files with 3 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/mod/xml_int/mod_xml_radius/mod_radius.diff
View File

@ -1,59 +0,0 @@
diff --git src/mod/xml_int/mod_xml_radius/mod_xml_radius.c src/mod/xml_int/mod_xml_radius/mod_xml_radius.c
index 0707388..e9e6e2a 100644
--- src/mod/xml_int/mod_xml_radius/mod_xml_radius.c
+++ src/mod/xml_int/mod_xml_radius/mod_xml_radius.c
@@ -367,6 +367,10 @@ switch_status_t mod_xml_radius_add_params(switch_core_session_t *session, switch
switch_time_t time = profile->times->created;
switch_time_exp_t tm;
+ if ( !time ) {
+ goto err;
+ }
+
switch_time_exp_lt(&tm, time);
av_value = switch_mprintf("%04u-%02u-%02uT%02u:%02u:%02u.%06u%+03d%02d",
tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday,
@@ -381,6 +385,10 @@ switch_status_t mod_xml_radius_add_params(switch_core_session_t *session, switch
switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel);
switch_time_t time = profile->times->answered;
switch_time_exp_t tm;
+
+ if ( !time ) {
+ goto err;
+ }
switch_time_exp_lt(&tm, time);
@@ -397,6 +405,10 @@ switch_status_t mod_xml_radius_add_params(switch_core_session_t *session, switch
switch_caller_profile_t *profile = switch_channel_get_caller_profile(channel);
switch_time_t time = profile->times->hungup;
switch_time_exp_t tm;
+
+ if ( !time ) {
+ goto err;
+ }
switch_time_exp_lt(&tm, time);
diff --git src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml
index eb3070c..6349d05 100644
--- src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml
+++ src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml
@@ -22,7 +22,7 @@
<param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="src-gw-ip=%s"/>
<param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
<param vendor="Cisco" name="h323-conf-id" variable="Core-UUID" format="%s"/>
- <param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="number"/>
+ <param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="request-type=number"/>
<param name="Called-Station-Id" variable="sip_to_user" format="%s"/>
<param name="Calling-Station-Id" variable="sip_from_user" format="%s"/>
<param name="User-Name" variable="sip_from_user" format="%s"/>
@@ -48,7 +48,7 @@
<param name="seqfile" value="/var/run/radius.seq"/>
</connection>
<fields>
- <param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="user"/>
+ <param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="request-type=user"/>
<param vendor="Cisco" name="Cisco-AVPair" variable="ip" format="src-gw-ip=%s"/>
<param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
<param name="User-Name" variable="sip_from_user" format="%s"/>

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

@ -368,7 +368,7 @@ switch_status_t mod_xml_radius_add_params(switch_core_session_t *session, switch
switch_time_exp_t tm;
if ( !time ) {
goto err;
return SWITCH_STATUS_SUCCESS;
}
switch_time_exp_lt(&tm, time);
@ -387,7 +387,7 @@ switch_status_t mod_xml_radius_add_params(switch_core_session_t *session, switch
switch_time_exp_t tm;
if ( !time ) {
goto err;
return SWITCH_STATUS_SUCCESS;
}
switch_time_exp_lt(&tm, time);
@ -407,7 +407,7 @@ switch_status_t mod_xml_radius_add_params(switch_core_session_t *session, switch
switch_time_exp_t tm;
if ( !time ) {
goto err;
return SWITCH_STATUS_SUCCESS;
}
switch_time_exp_lt(&tm, time);