From 8dfb0c006af9e460e63e8e9a819d766af37e084c Mon Sep 17 00:00:00 2001
From: smos <seth.mos@dds.nl>
Date: Wed, 30 May 2012 14:17:46 +0200
Subject: Add a few micro optimizations, bail out when the file does not exist.

---
 usr/local/sbin/prefixes.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'usr/local/sbin')

diff --git a/usr/local/sbin/prefixes.php b/usr/local/sbin/prefixes.php
index 4a1f7e0..4fb8126 100644
--- a/usr/local/sbin/prefixes.php
+++ b/usr/local/sbin/prefixes.php
@@ -1,9 +1,11 @@
 <?php
 
 $leases_file = "/var/dhcpd/var/db/dhcpd6.leases";
-$leasefile = file($leases_file);
+if(!file_exists($leases_file)) {
+	exit(1);
+}
 
-foreach($leasefile as $line) {
+foreach(file($leases_file) as $line) {
 	// echo "$line";
 	if(preg_match("/^(ia-[np][ad])[ ]+\"(.*?)\"/i ", $line, $duidmatch)) {
 		$type = $duidmatch[1];
@@ -44,7 +46,6 @@ foreach($leasefile as $line) {
 		unset($ia_pd);
 		continue;
 	}
-	array_shift($leasefile);
 }
 
 $routes = array();
@@ -52,6 +53,7 @@ foreach ($duid_arr as $entry) {
 	if($entry['ia-pd'] <> "") {
 		$routes[$entry['ia-na']] = $entry['ia-pd'];
 	}
+	array_shift($duid_arr);
 }
 
 // echo "add routes\n";
@@ -80,6 +82,7 @@ foreach($clog as $line) {
 // echo "remove routes\n";
 foreach ($expires as $prefix) {
 	echo "/sbin/route delete -inet6 {$prefix['prefix']}\n";
+	array_shift($expires);
 }
 
 ?>
-- 
cgit v1.1