diff options
| author | Ermal <eri@pfsense.org> | 2010-06-17 21:57:39 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2010-06-17 21:57:39 +0000 |
| commit | 64c0462becb942f92e65e71eb0bbac1b797994a2 (patch) | |
| tree | 78eac97e1f6a37c4482cf579f9e2ea47c3d87805 /etc/inc/captiveportal.inc | |
| parent | 80b292f3d886430cf6a2fb0c34d460125c94ee5b (diff) | |
| download | pfsense-64c0462becb942f92e65e71eb0bbac1b797994a2.zip pfsense-64c0462becb942f92e65e71eb0bbac1b797994a2.tar.gz | |
Teach even getNasIP for the new callingstation ip setting.
Diffstat (limited to 'etc/inc/captiveportal.inc')
| -rw-r--r-- | etc/inc/captiveportal.inc | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc index 83d8b31..be3c831 100644 --- a/etc/inc/captiveportal.inc +++ b/etc/inc/captiveportal.inc @@ -1248,10 +1248,17 @@ function getNasID() function getNasIP() { - $nasIp = get_interface_ip(); - if(!$nasIp) - $nasIp = "0.0.0.0"; - return $nasIp; + global $config; + + if (!empty($config['captiveportal']['radiussrcip_attribute'])) + $nasIp = get_interface_ip($config['captiveportal']['radiussrcip_attribute']); + else + $nasIp = get_interface_ip(); + + if(!is_ipaddr($nasIp)) + $nasIp = "0.0.0.0"; + + return $nasIp; } function portal_ip_from_client_ip($cliip) { @@ -1278,4 +1285,4 @@ function portal_ip_from_client_ip($cliip) { return false; } -?>
\ No newline at end of file +?> |
