From cf5e46ed05b7ce65ed13a2ece9813cfbc0b403e0 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@sophia.inria.fr>
Date: Fri, 28 Jan 2011 09:31:13 +0100
Subject: [PATCH] remove legacy layer, just assume 4.3 and GetInterfaces

---
 PlanetLabConf/blacklist.php         | 15 +--------------
 PlanetLabConf/ntp.conf.php          |  6 +-----
 PlanetLabConf/proxies.php           | 19 ++-----------------
 PlanetLabConf/sysctl-ip_forward.php | 21 ++-------------------
 4 files changed, 6 insertions(+), 55 deletions(-)

diff --git a/PlanetLabConf/blacklist.php b/PlanetLabConf/blacklist.php
index 33a04f9..bcc8d87 100755
--- 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)) {
diff --git a/PlanetLabConf/ntp.conf.php b/PlanetLabConf/ntp.conf.php
index afd0d76..616d8a7 100755
--- a/PlanetLabConf/ntp.conf.php
+++ b/PlanetLabConf/ntp.conf.php
@@ -19,11 +19,7 @@ $file_name = $config_directory . $file_prefix . $default_name;
 
 // Look up the node
 
-// backwards compatibility with the old 4.2 API
-if ( ! method_exists ($adm,"GetInterfaces"))
-  $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']));
diff --git a/PlanetLabConf/proxies.php b/PlanetLabConf/proxies.php
index 4431aca..f15d833 100755
--- 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
diff --git a/PlanetLabConf/sysctl-ip_forward.php b/PlanetLabConf/sysctl-ip_forward.php
index 1cc7e5b..47834aa 100755
--- a/PlanetLabConf/sysctl-ip_forward.php
+++ b/PlanetLabConf/sysctl-ip_forward.php
@@ -1,7 +1,4 @@
 <?php
-//
-// $Id$
-//
 
 // Get admin API handle
 require_once 'plc_api.php';
@@ -10,26 +7,13 @@ global $adm;
 $ip_forward = 0;
 
 // 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']));
   if (!empty($nodes)) {
     $node = $nodes[0];
-    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) {
       // Nodes with proxy socket interfaces need to be able to forward
@@ -44,7 +28,6 @@ if (!empty($interfaces)) {
 
 ?>
 
-# $Id$
 #
 # sysctl configuration file to optionally enable/disable IP forwarding
 #
-- 
2.43.0