Enable the volume back again. Last commit for the day, I can't see the problem :s

git-svn-id: https://svn.m0n0.ch/wall/trunk@86 e36fee2c-cc09-0410-a7cc-ebac5c6737de

diff --git a/captiveportal/radius_accounting.inc b/captiveportal/radius_accounting.inc
index e7e3077991db09614a728eb5e3284aec779db688..1b3959f150d10dba76e7368586588ac329deff75 100644 (file)
--- a/captiveportal/radius_accounting.inc
+++ b/captiveportal/radius_accounting.inc
@@ -235,7 +235,6 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius
     $racct->putAttribute(RADIUS_CALLING_STATION_ID, $callingstationid);
     $racct->putAttribute(RADIUS_CALLED_STATION_ID, $calledstationid);
 
-    /* Make this temporarly disabled to see if we still get errors
     // Volume stuff: Ingress (Note: remove the explicit integer if the type conversion works like we expect)
     $racct->putAttribute(RADIUS_ACCT_INPUT_PACKETS, $input_pkts, "integer");
     $racct->putAttribute(RADIUS_ACCT_INPUT_OCTETS, $input_bytes_radius, "integer");
@@ -244,7 +243,6 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius
     $racct->putAttribute(RADIUS_ACCT_OUTPUT_PACKETS, $output_pkts, "integer");
     $racct->putAttribute(RADIUS_ACCT_OUTPUT_OCTETS, $output_bytes_radius, "integer");
     $racct->putAttribute(RADIUS_ACCT_OUTPUT_GIGAWORDS, $output_gigawords, "integer");
-    */
 
     if (!$interimupdate)
         $racct->putAttribute(RADIUS_ACCT_TERMINATE_CAUSE, $term_cause);

diff --git a/phpconf/inc/radius.inc b/phpconf/inc/radius.inc
index 73f6644a03cad0ff4a56ba858b6e5f2d40d04db6..c86df3a78416fcda84032dddc6dda22f659a8117 100644 (file)
--- a/phpconf/inc/radius.inc
+++ b/phpconf/inc/radius.inc
@@ -292,7 +292,7 @@ class Auth_RADIUS extends PEAR {
     {
 
         // Add support for sending NAS-IP-Address, set this explicitly as an ip_addr
-        $this->putAttribute(RADIUS_NAS_IP_ADDRESS, getNasIP(), addr);
+        $this->putAttribute(RADIUS_NAS_IP_ADDRESS, getNasIP(), "addr");
 
         // Add support for sending NAS-Identifier
         $this->putAttribute(RADIUS_NAS_IDENTIFIER, getNasID());