From 7c5bebc943557d771d0310bb7d82fbfbcc51b62b Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 11 Dec 2017 16:10:38 +0100
Subject: [dnbd3] Allow configuring alternative IP address for managed proxy

---
 modules-available/dnbd3/baseconfig/getconfig.inc.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'modules-available/dnbd3/baseconfig/getconfig.inc.php')

diff --git a/modules-available/dnbd3/baseconfig/getconfig.inc.php b/modules-available/dnbd3/baseconfig/getconfig.inc.php
index e0389c71..fe1bef17 100644
--- a/modules-available/dnbd3/baseconfig/getconfig.inc.php
+++ b/modules-available/dnbd3/baseconfig/getconfig.inc.php
@@ -24,6 +24,7 @@ $res = Database::simpleQuery('SELECT s.fixedip, m.clientip, sxl.locationid FROM
 		LEFT JOIN dnbd3_server_x_location sxl USING (serverid)
 		WHERE sxl.locationid IS NULL OR sxl.locationid IN (:lids)', array('lids' => $locationIds));
 // Lookup of priority - first index (0) will be closest location in chain
+// low value is higher priority
 $locationsAssoc = array_flip($locationIds);
 $servers = array();
 while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
@@ -33,7 +34,7 @@ while ($row = $res->fetch(PDO::FETCH_ASSOC)) {
 	} else {
 		$defPrio = 1000;
 	}
-	$ip = $row['clientip'] ? $row['clientip'] : $row['fixedip'];
+	$ip = $row['fixedip'] ? $row['fixedip'] : $row['clientip'];
 	if ($defPrio === 1000 && is_null($row['locationid'])) {
 		$serverLoc = Location::getFromIp($ip);
 		if ($serverLoc !== false) {
-- 
cgit v1.2.3-55-g7522