From b7ac22f0274db60e96dbf135aeb1f41f6564e044 Mon Sep 17 00:00:00 2001
From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Wed, 23 Dec 2009 15:38:51 +0000
Subject: [PATCH] migrate kernel parameters to a static sysctl.conf file and
 the special proxy0 device handling into a separate sysctl-ip_forward.php
 script.  This latter script should be NUKED and ip forwarding should be
 enabled by NM managing the node's interface

---
 .../{sysctl.php => sysctl-ip_forward.php}     | 47 +++----------------
 PlanetLabConf/sysctl.conf                     | 30 ++++++++++++
 2 files changed, 37 insertions(+), 40 deletions(-)
 rename PlanetLabConf/{sysctl.php => sysctl-ip_forward.php} (53%)
 create mode 100644 PlanetLabConf/sysctl.conf

diff --git a/PlanetLabConf/sysctl.php b/PlanetLabConf/sysctl-ip_forward.php
similarity index 53%
rename from PlanetLabConf/sysctl.php
rename to PlanetLabConf/sysctl-ip_forward.php
index 53a5feb..1cc7e5b 100755
--- a/PlanetLabConf/sysctl.php
+++ b/PlanetLabConf/sysctl-ip_forward.php
@@ -1,10 +1,5 @@
 <?php
 //
-// /etc/sysctl.conf generator
-//
-// Mark Huang <mlhuang@cs.princeton.edu>
-// Copyright (C) 2006 The Trustees of Princeton University
-//
 // $Id$
 //
 
@@ -49,44 +44,16 @@ if (!empty($interfaces)) {
 
 ?>
 
-# Kernel sysctl configuration file for Red Hat Linux
+# $Id$
+#
+# sysctl configuration file to optionally enable/disable IP forwarding
 #
 # For binary values, 0 is disabled, 1 is enabled.  See sysctl(8) and
 # sysctl.conf(5) for more details.
-
-# $Id$
+#
+# This file is generated by NodeManager Configuration Files... 
+# do not manually edit
+#
 
 # Controls IP packet forwarding
 net.ipv4.ip_forward = <?php echo $ip_forward; ?>
-
-# Controls source route verification
-net.ipv4.conf.default.rp_filter = 1
-
-# Controls the System Request debugging functionality of the kernel
-kernel.sysrq = 0
-
-# Controls whether core dumps will append the PID to the core filename.
-# Useful for debugging multi-threaded applications.
-kernel.core_uses_pid = 1
-
-# TCP window scaling and broken routers
-net.ipv4.tcp_moderate_rcvbuf=0
-net.ipv4.tcp_default_win_scale=0
-net.ipv4.tcp_window_scaling=1
-
-# Mark only out of window RST segments as INVALID. This setting, among
-# other things, allows data to be sent with SYN packets.
-net.ipv4.netfilter.ip_conntrack_tcp_be_liberal=1
-
-# Fixes dst cache overflow bug
-net.ipv4.route.max_size=262144
-
-
-net.ipv4.tcp_congestion_control = cubic
-net.ipv4.tcp_moderate_rcvbuf = 0
-net.core.rmem_max = 131071
-net.core.wmem_max = 131071
-net.ipv4.tcp_rmem = 4096 87380 4194304
-net.ipv4.tcp_wmem = 4096 16384 4194304
-net.netfilter.nf_conntrack_icmp_timeout = 60
-
diff --git a/PlanetLabConf/sysctl.conf b/PlanetLabConf/sysctl.conf
new file mode 100644
index 0000000..ce6f512
--- /dev/null
+++ b/PlanetLabConf/sysctl.conf
@@ -0,0 +1,30 @@
+# Controls the System Request debugging functionality of the kernel
+kernel.sysrq = 0
+
+# Controls whether core dumps will append the PID to the core filename.
+# Useful for debugging multi-threaded applications.
+kernel.core_uses_pid = 1
+
+# Controls source route verification
+net.ipv4.conf.default.rp_filter = 1
+
+# TCP window scaling and broken routers
+net.ipv4.tcp_moderate_rcvbuf=0
+net.ipv4.tcp_default_win_scale=0
+net.ipv4.tcp_window_scaling=1
+
+# Mark only out of window RST segments as INVALID. This setting, among
+# other things, allows data to be sent with SYN packets.
+net.ipv4.netfilter.ip_conntrack_tcp_be_liberal=1
+
+# Fixes dst cache overflow bug
+net.ipv4.route.max_size=262144
+
+net.ipv4.tcp_congestion_control = cubic
+net.ipv4.tcp_moderate_rcvbuf = 0
+net.core.rmem_max = 131071
+net.core.wmem_max = 131071
+net.ipv4.tcp_rmem = 4096 87380 4194304
+net.ipv4.tcp_wmem = 4096 16384 4194304
+net.netfilter.nf_conntrack_icmp_timeout = 60
+
-- 
2.43.0