From d8b96b93f9615230c0b26606400b5e7d77806845 Mon Sep 17 00:00:00 2001
From: Adam Amstrong <adama@localhost>
Date: Tue, 3 Apr 2007 18:26:21 +0000
Subject: [PATCH] git-svn-id: http://www.observium.org/svn/observer/trunk@25
 61d68cd4-352d-0410-923a-c4978735b2b8

---
 README      |  1 -
 cleanup.php | 19 ++++++++++++++-----
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 6691dcdb96..1049e1a0ef 100644
--- a/README
+++ b/README
@@ -14,7 +14,6 @@ Installation
 
 Please see http://www.project-observer.org.
 
-
 Changelog
 ---------
 
diff --git a/cleanup.php b/cleanup.php
index c8be0e089b..867267f660 100755
--- a/cleanup.php
+++ b/cleanup.php
@@ -63,19 +63,28 @@ while ($link = mysql_fetch_array($link_query)) {
 echo(mysql_result(mysql_query("SELECT COUNT(id) FROM `links`"), 0) . " links at end\n");
 
 echo(mysql_result(mysql_query("SELECT COUNT(adj_id) FROM `adjacencies`"), 0) . " adjacencies at start\n");
-$link_query = mysql_query("SELECT * FROM `adjacencies` AS A, `interfaces` AS I, `devices` AS D WHERE I.id = A.interface_id AND D.id = I.host");
+$link_query = mysql_query("SELECT * FROM `adjacencies` AS A, `interfaces` AS I, `devices` AS D, networks AS N WHERE I.id = A.interface_id AND D.id = I.host AND N.id = A.network_id;");
 while ($link = mysql_fetch_array($link_query)) {
   $id = $link['adj_id'];
   $netid = $link['network_id'];
   $ifid = $link['interface_id'];
   if(mysql_result(mysql_query("SELECT COUNT(id) FROM `interfaces` WHERE `id` = '$ifid'"), 0) == '0' || mysql_result(mysql_query("SELECT COUNT(id) FROM `networks` WHERE `id` = '$netid'"), 0) == '0') {
+    $remove = 1;
+    echo("Removed Interface!\n");
+  }
+
+  echo($link['if'] . " (" . $link['interface_id'] . ") -> " . $link['cidr'] . " \n");
+
+  $q = mysql_query("SELECT * FROM `ipaddr` WHERE `interface_id` = '" . $link['interface_id'] . "'");
+
+  if($link['cidr'] == "") { $remove = 1; echo("Broken CIDR entry!"); }
+
+
+  if($remove) {
     mysql_query("delete from adjacencies where `adj_id` = '$id'");
     echo("Deleting link $id \n");
-  } else {
-
-    
-
   }
+  unset($remove);
 }
 echo(mysql_result(mysql_query("SELECT COUNT(adj_id) FROM `adjacencies`"), 0) . " adjacencies at end\n");