remove legacy layer, just assume 4.3 and GetInterfaces

[nodeconfig.git] / PlanetLabConf / blacklist.php

diff --git a/PlanetLabConf/blacklist.php b/PlanetLabConf/blacklist.php
index 33a04f9..bcc8d87 100755 (executable)
--- a/PlanetLabConf/blacklist.php
+++ b/PlanetLabConf/blacklist.php
@@ -9,8 +9,6 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2004 The Trustees of Princeton University
 #
-# $Id$
-#
 
 *filter
 -F BLACKLIST
@@ -21,18 +19,7 @@
 require_once 'plc_api.php';
 global $adm;
 
-// 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;
-
-// Look up the node
-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']));
   if (!empty($nodes)) {