urldecode values before passing them to radius

nazim/xmlcdrd/plugins/radcdr/Makefile.am

@@ -12,6 +12,8 @@ all:
 	-I@with_radius_includes@ \
 	@with_radius_lib@ \
 	@with_glib2_flags@ \
+	`@with_apreq2_config@ --libs --includes` \
+	`@with_apr_config@ --libs --includes  --cppflags` \
 	-lconfig  -lglib-2.0 -lm -lz -lcrypt \
 	../../stmtexpldr.o ../../stmtexp.o ../../log.o
 

nazim/xmlcdrd/plugins/radcdr/radcdr.c

@@ -13,7 +13,7 @@
 #include <string.h>
 #include <libconfig.h>
 #include <glib.h>
-
+#include <apreq2/apreq_util.h>
 
 #define PLUGIN_NAME "rad cdr"
 #define PLUGIN_DESC "Rad cdr logger"
@@ -90,6 +90,8 @@ typedef struct radcdr_local_vars
     char my_servers [SERVER_MAX][XCDR_PLUGIN_STRMAXLEN];
     char cf [XCDR_PLUGIN_STRMAXLEN];// = "mod_radius_cdr.conf";
 
+    GString *decoded;
+
     RADVSAS *vsas;
     int vsas_count;
 
@@ -413,6 +415,8 @@ int plugin_init (const char* filename, const char *options, XCDR_PLUGSTATE *stat
         return PLUG_STATUS_ERROR;
     }
 
+    vars->decoded = g_string_sized_new (XCDR_PLUGIN_STRMAXLEN * 2);
+
     plugin_config (options);
 
     fprintf (stderr, "%s plugin_init (%s) \n", PLUGIN_NAME, options);
@@ -425,7 +429,7 @@ int plugin_init (const char* filename, const char *options, XCDR_PLUGSTATE *stat
 int plugin_free (XCDR_PLUGSTATE *state)
 {
     vars = state->local_vars;
-
+    g_string_free (vars->decoded, TRUE);
 
     free (vars->vsas);
     free (vars);
@@ -453,7 +457,7 @@ int plugin_main (STMTEXP_TAB *vex, XCDR_PLUGSTATE *state)
 
     int retval;
 
-	char buffer[32] = "";
+
 
 
     vars = state->local_vars;
@@ -503,6 +507,15 @@ int plugin_main (STMTEXP_TAB *vex, XCDR_PLUGSTATE *state)
         if (NULL != t)
         {
 
+            /* urldecode value  */
+            apr_size_t len = strlen(t);
+
+            g_string_set_size (vars->decoded, len);
+            
+            apreq_decode (vars->decoded->str, &len, t, strlen(t));
+
+            t = vars->decoded->str;
+            
             syslog (LOG_DEBUG, 
                     "radcdr adding rad vsa '%s': '%s' pec:%d\n",
                     vars->vsas[i].vsa_name,