Actually send the wan ip address as calledstationid as advertised on captiveportal configuration page. The same fix was previously done to radius authentication code.

1 files changed, 4 insertions, 4 deletions

diff --git a/usr/local/captiveportal/radius_accounting.inc b/usr/local/captiveportal/radius_accounting.inc
index e60a217..688af74 100644
--- a/usr/local/captiveportal/radius_accounting.inc
+++ b/usr/local/captiveportal/radius_accounting.inc
@@ -54,7 +54,7 @@ function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers,
     global $config;
 
     $retvalue = array();
-    $nas_mac = mac_format(get_interface_mac($config['interfaces']['wan']['if']));
+    $nas_mac = mac_format(get_interface_mac("wan"));
     $clientmac = mac_format($clientmac);
     $nas_port = $ruleno;
     $radiusvendor = $config['captiveportal']['radiusvendor'] ? $config['captiveportal']['radiusvendor'] : null;
@@ -67,7 +67,7 @@ function RADIUS_ACCOUNTING_START($ruleno, $username, $sessionid, $radiusservers,
         break;
 
         default:
-        $calledstationid = $nas_mac;
+        $calledstationid = get_interface_ip("wan");
         $callingstationid = $clientmac;
     }
 
@@ -165,7 +165,7 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius
     global $config;
 
     $retvalue = array();
-    $nas_mac = mac_format(get_interface_mac($config['interfaces']['wan']['if']));
+    $nas_mac = mac_format(get_interface_mac("wan"));
     $clientmac = mac_format($clientmac);
     $nas_port = $ruleno;
     $radiusvendor = $config['captiveportal']['radiusvendor'] ? $config['captiveportal']['radiusvendor'] : null;
@@ -185,7 +185,7 @@ function RADIUS_ACCOUNTING_STOP($ruleno,$username,$sessionid,$start_time,$radius
         break;
 
         default:
-        $calledstationid = $nas_mac;
+        $calledstationid = get_interface_ip("wan");
         $callingstationid = $clientmac;
     }