always return the IP address hosting the page, rather than forcing to the hostname, requiring functional DNS name resolution which possibly doesn't exist. Restores 1.2.x behavior where client IP isn't in the same subnet as any CP-enabled interface.

1 files changed, 10 insertions, 0 deletions

diff --git a/etc/inc/captiveportal.inc b/etc/inc/captiveportal.inc
index 40db3a5..6b3e804 100644
--- a/etc/inc/captiveportal.inc
+++ b/etc/inc/captiveportal.inc
@@ -1093,6 +1093,16 @@ function portal_ip_from_client_ip($cliip) {
 			return $ip;
 	}
 
+	// doesn't match up to any particular interface
+	// so let's set the portal IP to what PHP says 
+	// the server IP issuing the request is. 
+	// allows same behavior as 1.2.x where IP isn't 
+	// in the subnet of any CP interface (static routes, etc.)
+	// rather than forcing to DNS hostname resolution
+	$ip = $_SERVER['SERVER_ADDR'];
+	if (is_ipaddr($ip))
+		return $ip;
+
 	return false;
 }