This repo is obsolete, please see git://git.code.sf.net/p/dummynet/code@master

[ipfw.git] / planetlab / ipfw

diff --git a/planetlab/ipfw b/planetlab/ipfw
index adec18f..114cafb 100755 (executable)
--- a/planetlab/ipfw
+++ b/planetlab/ipfw
@@ -21,20 +21,20 @@ fi
 # Load the ipfw module, and initialize netconfig
 start() {
        # load the module
-       modprobe $IPFW_MOD > /dev/null 2> /dev/null
+       modprobe $IPFW_MOD >& /dev/null
        let ret=$?;
         [ $ret -eq 0 ] && success || failure
 
        # init netconfig
-       echo "super dbcleanup" | ${IPFW_BACKEND} root > /dev/null 2> /dev/null
-       echo "super init" | ${IPFW_BACKEND} root > /dev/null 2> /dev/null
+       echo "super dbcleanup" | ${IPFW_BACKEND} root >& /dev/null
+       echo "super init" | ${IPFW_BACKEND} root >& /dev/null
 
        return $ret
 }
 
 stop() {
        # clean netconfig stuff
-       echo "super dbcleanup" | ${IPFW_BACKEND} root > /dev/null 2> /dev/null
+       echo "super dbcleanup" | ${IPFW_BACKEND} root >& /dev/null
        echo "Unloading $IPFW_MOD module: "
 
        # unload the ipfw module
@@ -48,11 +48,10 @@ stop() {
 # echo the ipfw status
 status() {
        # check for module presence
-       LOADED=`cat /proc/modules | grep ^ipfw_mod`
-       [ ! -n "$LOADED" ] && echo "ipfw not loaded" && return 0
+       grep '^ipfw_mod$' /proc/modules >& /dev/null || echo "ipfw not loaded" && return 0
 
        # Show active users
-       USERS=`cat /tmp/ff | grep BLOCK | wc -l`
+       USERS=$(grep BLOCK /tmp/ff | wc -l)
        echo "ipfw is loaded and there are currently ${USERS} with active emulation."
        return 0
 }