[hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5960: cosmetics: Add whitespace after shell output redirection operator.

  • From: noreply@xxxxxxxxxxxxx
  • To: HIPL core team <hipl-dev@xxxxxxxxxxxxx>
  • Date: Thu, 09 Jun 2011 19:14:15 -0000

------------------------------------------------------------
revno: 5960
committer: Diego Biurrun <diego@xxxxxxxxxx>
branch nick: hipl
timestamp: Thu 2011-06-09 21:11:46 +0200
message:
  cosmetics: Add whitespace after shell output redirection operator.
modified:
  doc/HOWTO.xml.in
  firewall/firewall.c
  packaging/openwrt/hipl/files/hipd.init
  packaging/openwrt/hipl/files/hipfw.init
  tools/hipdnsproxy/hipdnsproxy.in


--
lp:hipl
https://code.launchpad.net/~hipl-core/hipl/trunk

Your team HIPL core team is subscribed to branch lp:hipl.
To unsubscribe from this branch go to 
https://code.launchpad.net/~hipl-core/hipl/trunk/+edit-subscription
=== modified file 'doc/HOWTO.xml.in'
--- doc/HOWTO.xml.in    2011-04-02 08:57:53 +0000
+++ doc/HOWTO.xml.in    2011-06-09 19:11:46 +0000
@@ -618,7 +618,7 @@
 
     <programlisting>
     ulimit -c unlimited
-    echo /tmp/%e.core >/proc/sys/kernel/core_pattern
+    echo /tmp/%e.core > /proc/sys/kernel/core_pattern
     </programlisting>
 
     <para>

=== modified file 'firewall/firewall.c'
--- firewall/firewall.c 2011-05-16 10:41:36 +0000
+++ firewall/firewall.c 2011-06-09 19:11:46 +0000
@@ -229,15 +229,15 @@
         HIP_IFEL(userspace_ipsec_uninit(), -1, "failed to uninit user 
ipsec\n");
 
         // delete all rules previously set up for this extension
-        system_print("iptables -D HIPFW-INPUT -p 50 -j QUEUE 2>/dev/null");
-        system_print("iptables -D HIPFW-INPUT -p 17 --dport 10500 -j QUEUE 
2>/dev/null");
-        system_print("iptables -D HIPFW-INPUT -p 17 --sport 10500 -j QUEUE 
2>/dev/null");
-
-        system_print("ip6tables -D HIPFW-INPUT -p 50 -j QUEUE 2>/dev/null");
-
-        system_print("ip6tables -D HIPFW-OUTPUT -p 58 -d 2001:0010::/28 -j 
QUEUE 2>/dev/null");
-        system_print("ip6tables -D HIPFW-OUTPUT -p 6 -d 2001:0010::/28 -j 
QUEUE 2>/dev/null");
-        system_print("ip6tables -D HIPFW-OUTPUT -p 17 -d 2001:0010::/28 -j 
QUEUE 2>/dev/null");
+        system_print("iptables -D HIPFW-INPUT -p 50 -j QUEUE 2> /dev/null");
+        system_print("iptables -D HIPFW-INPUT -p 17 --dport 10500 -j QUEUE 2> 
/dev/null");
+        system_print("iptables -D HIPFW-INPUT -p 17 --sport 10500 -j QUEUE 2> 
/dev/null");
+
+        system_print("ip6tables -D HIPFW-INPUT -p 50 -j QUEUE 2> /dev/null");
+
+        system_print("ip6tables -D HIPFW-OUTPUT -p 58 -d 2001:0010::/28 -j 
QUEUE 2> /dev/null");
+        system_print("ip6tables -D HIPFW-OUTPUT -p 6 -d 2001:0010::/28 -j 
QUEUE 2> /dev/null");
+        system_print("ip6tables -D HIPFW-OUTPUT -p 17 -d 2001:0010::/28 -j 
QUEUE 2> /dev/null");
     }
 
 out_err:
@@ -361,9 +361,9 @@
         hip_lsi_support = 0;
 
         // remove the rule
-        system_print("iptables -D HIPFW-OUTPUT -d " HIP_FULL_LSI_STR " -j 
QUEUE 2>/dev/null");
+        system_print("iptables -D HIPFW-OUTPUT -d " HIP_FULL_LSI_STR " -j 
QUEUE 2> /dev/null");
 
-        system_print("ip6tables -D HIPFW-INPUT -d 2001:0010::/28 -j QUEUE 
2>/dev/null");
+        system_print("ip6tables -D HIPFW-INPUT -d 2001:0010::/28 -j QUEUE 2> 
/dev/null");
     }
 
     return err;
@@ -585,32 +585,32 @@
     HIP_DEBUG("Firewall flush; may cause warnings on hipfw init\n");
     HIP_DEBUG("Deleting hipfw subchains from main chains\n");
 
-    system_print("iptables -D INPUT -j HIPFW-INPUT 2>/dev/null");
-    system_print("iptables -D OUTPUT -j HIPFW-OUTPUT 2>/dev/null");
-    system_print("iptables -D FORWARD -j HIPFW-FORWARD 2>/dev/null");
+    system_print("iptables -D INPUT -j HIPFW-INPUT 2> /dev/null");
+    system_print("iptables -D OUTPUT -j HIPFW-OUTPUT 2> /dev/null");
+    system_print("iptables -D FORWARD -j HIPFW-FORWARD 2> /dev/null");
 
-    system_print("ip6tables -D INPUT -j HIPFW-INPUT 2>/dev/null");
-    system_print("ip6tables -D OUTPUT -j HIPFW-OUTPUT 2>/dev/null");
-    system_print("ip6tables -D FORWARD -j HIPFW-FORWARD 2>/dev/null");
+    system_print("ip6tables -D INPUT -j HIPFW-INPUT 2> /dev/null");
+    system_print("ip6tables -D OUTPUT -j HIPFW-OUTPUT 2> /dev/null");
+    system_print("ip6tables -D FORWARD -j HIPFW-FORWARD 2> /dev/null");
 
     HIP_DEBUG("Flushing hipfw chains\n");
 
     /* Flush in case there are some residual rules */
-    system_print("iptables -F HIPFW-INPUT 2>/dev/null");
-    system_print("iptables -F HIPFW-OUTPUT 2>/dev/null");
-    system_print("iptables -F HIPFW-FORWARD 2>/dev/null");
-    system_print("ip6tables -F HIPFW-INPUT 2>/dev/null");
-    system_print("ip6tables -F HIPFW-OUTPUT 2>/dev/null");
-    system_print("ip6tables -F HIPFW-FORWARD 2>/dev/null");
+    system_print("iptables -F HIPFW-INPUT 2> /dev/null");
+    system_print("iptables -F HIPFW-OUTPUT 2> /dev/null");
+    system_print("iptables -F HIPFW-FORWARD 2> /dev/null");
+    system_print("ip6tables -F HIPFW-INPUT 2> /dev/null");
+    system_print("ip6tables -F HIPFW-OUTPUT 2> /dev/null");
+    system_print("ip6tables -F HIPFW-FORWARD 2> /dev/null");
 
     HIP_DEBUG("Deleting hipfw chains\n");
 
-    system_print("iptables -X HIPFW-INPUT 2>/dev/null");
-    system_print("iptables -X HIPFW-OUTPUT 2>/dev/null");
-    system_print("iptables -X HIPFW-FORWARD 2>/dev/null");
-    system_print("ip6tables -X HIPFW-INPUT 2>/dev/null");
-    system_print("ip6tables -X HIPFW-OUTPUT 2>/dev/null");
-    system_print("ip6tables -X HIPFW-FORWARD 2>/dev/null");
+    system_print("iptables -X HIPFW-INPUT 2> /dev/null");
+    system_print("iptables -X HIPFW-OUTPUT 2> /dev/null");
+    system_print("iptables -X HIPFW-FORWARD 2> /dev/null");
+    system_print("ip6tables -X HIPFW-INPUT 2> /dev/null");
+    system_print("ip6tables -X HIPFW-OUTPUT 2> /dev/null");
+    system_print("ip6tables -X HIPFW-FORWARD 2> /dev/null");
 }
 
 /**

=== modified file 'packaging/openwrt/hipl/files/hipd.init'
--- packaging/openwrt/hipl/files/hipd.init      2011-06-08 16:40:25 +0000
+++ packaging/openwrt/hipl/files/hipd.init      2011-06-09 19:11:46 +0000
@@ -19,7 +19,7 @@
 
 stop_daemon() {
     PID=$(cat $PID_FILE)
-    kill $PID >/dev/null
+    kill $PID > /dev/null
 }
 
 start() {

=== modified file 'packaging/openwrt/hipl/files/hipfw.init'
--- packaging/openwrt/hipl/files/hipfw.init     2011-06-08 16:40:25 +0000
+++ packaging/openwrt/hipl/files/hipfw.init     2011-06-09 19:11:46 +0000
@@ -19,7 +19,7 @@
 
 stop_daemon() {
     PID=$(cat $PID_FILE)
-    kill $PID >/dev/null
+    kill $PID > /dev/null
 }
 
 start() {

=== modified file 'tools/hipdnsproxy/hipdnsproxy.in'
--- tools/hipdnsproxy/hipdnsproxy.in    2011-02-22 12:50:07 +0000
+++ tools/hipdnsproxy/hipdnsproxy.in    2011-06-09 19:11:46 +0000
@@ -154,7 +154,7 @@
         else:
             self.resolvconf_towrite = '/etc/resolv.conf'
 
-        self.dnsmasq_restart = self.dnsmasq_initd_script + ' restart 
>/dev/null'
+        self.dnsmasq_restart = self.dnsmasq_initd_script + ' restart > 
/dev/null'
         if filetowatch is None:
             self.filetowatch = self.guess_resolvconf()
         self.resolvconf_orig = self.filetowatch
@@ -289,7 +289,7 @@
         os.system("ifconfig lo:53 down")
         # Sometimes hipconf processes get stuck, particularly when
         # hipd is busy or unresponsive. This is a workaround.
-        os.system('killall --quiet hipconf 2>/dev/null')
+        os.system('killall --quiet hipconf 2> /dev/null')
 
 class Global:
     default_hiphosts = "@sysconfdir@/hosts"
@@ -571,7 +571,7 @@
 
     def add_hit_ip_map(gp, hit, ip):
         cmd = "hipconf add map " + hit + " " + ip + \
-            " >/dev/null 2>&1"
+            " > /dev/null 2>&1"
         gp.fout.write('Associating HIT %s with IP %s\n' % (hit, ip))
         os.system(cmd)
 

Other related posts:

  • » [hipl-dev] [Branch ~hipl-core/hipl/trunk] Rev 5960: cosmetics: Add whitespace after shell output redirection operator. - noreply