From dfef599ce74d059c7a227ba262608c5f62685eb5 Mon Sep 17 00:00:00 2001 From: "Leigh B. Stoller" Date: Tue, 26 Aug 2003 18:57:10 +0000 Subject: [PATCH] Change a several occurrences of control_net to control_iface. There are couple left in the newnodes code that Rob will need to help me with. --- www/dbdefs.php3.in | 2 +- www/newnode-defs.php3 | 2 +- www/showstuff.php3 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/www/dbdefs.php3.in b/www/dbdefs.php3.in index 94d52092b..9ca17acb6 100644 --- a/www/dbdefs.php3.in +++ b/www/dbdefs.php3.in @@ -1506,7 +1506,7 @@ function TBIPtoNodeID($ip) { DBQueryFatal("select n.node_id from interfaces as i ". "left join nodes as n on n.node_id=i.node_id ". "left join node_types as t ". - " on t.type=n.type and i.card=t.control_net ". + " on t.type=n.type and i.iface=t.control_iface ". "where i.IP='$ip'"); if (mysql_num_rows($query_result) == 0) { diff --git a/www/newnode-defs.php3 b/www/newnode-defs.php3 index abf52b8d3..75eea2007 100644 --- a/www/newnode-defs.php3 +++ b/www/newnode-defs.php3 @@ -125,7 +125,7 @@ function guess_IP ($prefix, $number) { $query_result = DBQueryFatal("select IP from interfaces as i " . "left join nodes as n on i.node_id = n.node_id left join " . "node_types as nt on n.type = nt.type " . - "where n.node_id='$prefix$i' and i.card = nt.control_net"); + "where n.node_id='$prefix$i' and i.iface = nt.control_iface"); if (mysql_num_rows($query_result)) { $row = mysql_fetch_array($query_result); $IP = $row[IP]; diff --git a/www/showstuff.php3 b/www/showstuff.php3 index 67dca9736..68bdbfe65 100644 --- a/www/showstuff.php3 +++ b/www/showstuff.php3 @@ -1516,7 +1516,7 @@ function SHOWNODE($node_id) { "left join reserved as r on n.node_id=r.node_id ". "left join node_activity as na on n.node_id=na.node_id ". "left join node_types as t on t.type=n.type ". - "left join interfaces as i on i.card=t.control_net ". + "left join interfaces as i on i.iface=t.control_iface ". " and i.node_id=n.node_id ". "left join interfaces as pi on pi.card=t.control_net ". " and pi.node_id=n.phys_nodeid ". -- GitLab