remove legacy layer, just assume 4.3 and GetInterfaces

[nodeconfig.git] / PlanetLabConf / proxies.php

diff --git a/PlanetLabConf/proxies.php b/PlanetLabConf/proxies.php
index 4431aca..f15d833 100755 (executable)
--- a/PlanetLabConf/proxies.php
+++ b/PlanetLabConf/proxies.php
@@ -9,25 +9,13 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004 The Trustees of Princeton University
 #
-# $Id$
-#
 
 <?php
 // Get admin API handle
 require_once 'plc_api.php';
 global $adm;
 
-// Look up the node
-// backwards compatibility with the old 4.2 API
-global $__PLC_API_VERSION;
-if ( ! method_exists ($adm,"GetInterfaces"))
-  $__PLC_API_VERSION = 4.2;
-else
-  $__PLC_API_VERSION = 4.3;
-if ($__PLC_API_VERSION==4.2)
-  $interfaces = $adm->GetNodeNetworks(array('ip' => $_SERVER['REMOTE_ADDR']));
-else
-  $interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR']));
+$interfaces = $adm->GetInterfaces(array('ip' => $_SERVER['REMOTE_ADDR']));
 
 if (!empty($interfaces)) {
   $nodes = $adm->GetNodes(array($interfaces[0]['node_id']));
@@ -40,10 +28,7 @@ if (!isset($node)) {
   exit();
 }
 
-if ($__PLC_API_VERSION==4.2)
-  $interfaces = $adm->GetInterfaces($node['nodenetwork_ids']);
-else
-  $interfaces = $adm->GetInterfaces($node['interface_ids']);
+$interfaces = $adm->GetInterfaces($node['interface_ids']);
 
 foreach ($interfaces as $interface) {
   // XXX PL2896: need interfaces.device