From 623eea27ddeec21c189f80e26f06956ec55273f9 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 28 Jan 2007 01:43:59 +0000
Subject: * Do not install ping entries more than once * Only ping 1 packet to
 speed up process

---
 packages/tinydns/tinydns.inc | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

(limited to 'packages')

diff --git a/packages/tinydns/tinydns.inc b/packages/tinydns/tinydns.inc
index bfdee609..1c5155db 100644
--- a/packages/tinydns/tinydns.inc
+++ b/packages/tinydns/tinydns.inc
@@ -197,6 +197,7 @@ function tinydns_setup_ping_items() {
 	$wanif = get_real_wan_interface();
 	$ip = find_interface_ip($wanif);
 	conf_mount_rw();
+	$processed = array();
 	/* XXX: make this work with other packages */
 	$fd = fopen("/var/db/pkgpinghosts", "w");
 	if(!$fd) {
@@ -207,7 +208,10 @@ function tinydns_setup_ping_items() {
 	 *   status and create a database of the status information that we can use.
 	 */
 	foreach($config['installedpackages']['tinydnsdomains']['config'] as $domain) {
-		fwrite($fd, $ip . "|" . $domain['ipaddress'] . "|3|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php\n");
+		if(!in_array($domain['ipaddress'], $processed)) {
+			fwrite($fd, $ip . "|" . $domain['ipaddress'] . "|1|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php\n");
+			$processed[] = $domain['ipaddress'];
+		}
 		if($domain['monitorip'] <> "")
 			$monitorip = $domain['monitorip'];
 		if($domain['row']) {
@@ -216,17 +220,30 @@ function tinydns_setup_ping_items() {
 					$pingthreshold = $row['pingthreshold'];
 				else
 					$row['pingthreshold'] = "";
-				if($row['monitorip'])
-					fwrite($fd, $ip . "|" . $row['monitorip'] . "|3|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php|{$pingthreshold}\n");
-				else
-					fwrite($fd, $ip . "|" . $monitorip . "|3|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php|{$pingthreshold}\n");
+				if($row['monitorip']) {
+					if(!in_array($row['monitorip'], $processed)) {
+						fwrite($fd, $ip . "|" . $row['monitorip'] . "|1|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php|{$pingthreshold}\n");
+						$processed[] = $row['monitorip'];
+					}
+				} else {
+					if(!in_array($monitorip, $processed)) {
+						fwrite($fd, $ip . "|" . $monitorip . "|1|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php|{$pingthreshold}\n");
+						$processed[] = $monitorip;
+					}
+				}
+			}
+		}
+		if($domain['monitorip']) {
+			if(!in_array($domain['monitorip'], $processed)) {
+				fwrite($fd, $ip . "|" . $domain['monitorip'] . "|1|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php|{$pingthreshold}\n");
+				$processed[] = $domain['monitorip'];
+			}
+		} else {
+			if(!in_array($row['failoverip'], $processed)) {
+				fwrite($fd, $ip . "|" . $row['failoverip'] . "|1|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php|{$pingthreshold}\n");
+				$processed[] = $row['failoverip'];
 			}
 		}
-		if($domain['monitorip'])
-			fwrite($fd, $ip . "|" . $domain['monitorip'] . "|3|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php|{$pingthreshold}\n");
-		else
-			fwrite($fd, $ip . "|" . $row['failoverip'] . "|3|/usr/local/pkg/tinydns_down.php|/usr/local/pkg/tinydns_up.php|{$pingthreshold}\n");
-
 	}
 	fclose($fd);
 	conf_mount_ro();
-- 
cgit v1.2.3