Adding functionality to mod_xml_radius. Now you can do conditional accounting.…

Adding functionality to mod_xml_radius. Now you can do conditional accounting. And you can pull values from the other leg, specify an alternate variable name in case the variable doesn't exist and you can have default values.

src/mod/xml_int/mod_xml_radius/00_dialplan_auth.xml

 <include>
 
   <extension name="auth" continue="true">
-    <condition>
+    <condition field="${radius_auth_result}" expression="^$">
       <action application="radius_auth" inline="true"/>
     </condition>
   </extension>
@@ -18,5 +18,10 @@
     </condition>
   </extension>
 
+  <extension name="originate_leg" continue="true">
+    <condition>
+      <action application="export" data="nolocal:h323-call-origin=originate"/>
+    </condition>
+  </extension>
 </include>
 

src/mod/xml_int/mod_xml_radius/xml_radius.conf.xml

@@ -22,10 +22,48 @@
       <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 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"/>
+      <param name="Digest-Response" variable="sip_auth_response" format="%s"/>
+      <param name="Digest-Realm" variable="sip_auth_realm" format="%s"/>
+      <param name="Digest-Nonce" variable="sip_auth_nonce" format="%s"/>
+      <param name="Digest-Username" variable="sip_auth_username" format="%s"/> 
+      <param name="Digest-URI" variable="sip_auth_uri" format="%s"/>
+      <param name="Digest-Method" variable="sip_auth_method" format="%s"/>
+      <param name="Digest-Algorithm" variable="sip_auth_method" format="MD5"/>
+      <param name="Digest-Qop" variable="sip_auth_qop" format="%s"/>
+      <param name="Digest-CNonce" variable="sip_auth_cnonce" format="%s"/>
+      <param name="Digest-Nonce-Count" variable="sip_auth_nc" format="%s"/> 
     </fields>
   </auth_invite>
+  <auth_reg>
+    <connection name="testing">
+      <param name="authserver" value="127.0.0.1:1812:testing123"/>
+      <param name="radius_timeout" value="10"/>
+      <param name="radius_retries" value="2"/>
+      <param name="radius_deadtime" value="0"/>
+      <param name="dictionary" value="/usr/local/src/freeswitch/src/mod/xml_int/mod_xml_radius/dictionaries/dictionary"/>
+      <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="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"/>
+      <param name="Digest-Response" variable="sip_auth_response" format="%s"/>
+      <param name="Digest-Realm" variable="sip_auth_realm" format="%s"/>
+      <param name="Digest-Nonce" variable="sip_auth_nonce" format="%s"/>
+      <param name="Digest-Username" variable="sip_auth_username" format="%s"/>
+      <param name="Digest-URI" variable="sip_auth_uri" format="%s"/>
+      <param name="Digest-Method" variable="sip_auth_method" format="%s"/>
+      <param name="Digest-Algorithm" variable="sip_auth_method" format="MD5"/>
+      <param name="Digest-Qop" variable="sip_auth_qop" format="%s"/>
+      <param name="Digest-CNonce" variable="sip_auth_cnonce" format="%s"/>
+      <param name="Digest-Nonce-Count" variable="sip_auth_nc" format="%s"/>
+    </fields>
+  </auth_reg>
   <auth_app>
     <connection name="testing">
       <param name="authserver" value="127.0.0.1:1812:testing123"/>
@@ -36,7 +74,7 @@
       <param name="seqfile" value="/var/run/radius.seq"/>
     </connection>
     <fields>
-      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_network_ip" format="src-gw-ip=%s"/>
+      <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_host" 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 name="Called-Station-Id" variable="sip_to_user" format="%s"/>
@@ -68,17 +106,18 @@
       <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_host" format="src-gw-ip=%s"/>
       <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
       <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_host" format="dst-gw-ip=%s"/>  
-      <param vendor="Cisco" name="h323-conf-id" variable="uuid" format="%s"/>
+      <param vendor="Cisco" name="h323-conf-id" variable_secondary="uuid" variable="originating_leg_uuid" format="%s"/>
       <param vendor="Cisco" name="h323-setup-time"/>
       <param vendor="Cisco" name="h323-connect-time"/>
+      <param vendor="Cisco" name="h323-call-origin" variable="h323-call-origin" default="answer" format="%s"/>
       <param name="Called-Station-Id" variable="sip_to_user" format="%s"/>
       <param name="Calling-Station-Id" variable="sip_from_user" format="%s"/>
     </fields>
-    <conditions>
+<!--    <conditions>
       <condition>
-	<param var="direction" regex="inbound"/>
+	<param var="direction" regex="^outbound$"/>
       </condition> 
-    </conditions>
+    </conditions> -->
   </acct_start>
   <acct_end>
     <connection name="testing">
@@ -93,21 +132,22 @@
       <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_host" format="src-gw-ip=%s"/>
       <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-gw-name=%s"/>
       <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_host" format="dst-gw-ip=%s"/> 
-      <param vendor="Cisco" name="h323-conf-id" variable="uuid" format="%s"/>
+      <param vendor="Cisco" name="h323-conf-id" variable_secondary="uuid" variable="originating_leg_uuid" format="%s"/>
       <param vendor="Cisco" name="h323-setup-time"/>
       <param vendor="Cisco" name="h323-connect-time"/>
       <param vendor="Cisco" name="h323-disconnect-time"/>
       <param vendor="Cisco" name="h323-disconnect-cause"/>
+      <param vendor="Cisco" name="h323-call-origin" variable="h323-call-origin" format="%s" default="answer"/>
       <param name="Called-Station-Id" variable="sip_to_user" format="%s"/>
       <param name="Acct-Session-Time" variable="billsec" format="%s"/>
       <param name="Calling-Station-Id" variable="sip_from_user" format="%s"/>
       <param vendor="Cisco" name="Cisco-AVPair" variable="sip_from_user" format="src-number-out=%s"/>
       <param vendor="Cisco" name="Cisco-AVPair" variable="sip_to_user" format="dst-number-out=%s"/>
     </fields>
-    <conditions>
+<!--    <conditions>
       <condition>
-	<param var="direction" regex="inbound"/>
+	<param var="direction" regex="^outbound$"/>
       </condition> 
-    </conditions>
+    </conditions> -->
   </acct_end>
 </configuration>