From 0803bff9beba48645aceee7ed62ef7dee7368d0f Mon Sep 17 00:00:00 2001 From: jdegraeve Date: Fri, 10 Feb 2006 16:27:27 +0000 Subject: [PATCH] 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 --- captiveportal/radius_accounting.inc | 2 -- phpconf/inc/radius.inc | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/captiveportal/radius_accounting.inc b/captiveportal/radius_accounting.inc index e7e3077..1b3959f 100644 --- 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 73f6644..c86df3a 100644 --- 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()); -- 2.43.0