Changeset 116

Timestamp:

08/27/06 16:08:41 (7 years ago)

Author:

root

Message:

Fixes from Brad.

Location:

floppyfw/packages/skeleton/wsmenu/etc

Files:

• showffw.sh (modified) (2 diffs)
• voipvars.sh (modified) (1 diff)
• wsmenu.sh (modified) (1 diff)

floppyfw/packages/skeleton/wsmenu/etc/showffw.sh

@@ -1 +1 @@
 #!/bin/sh
 
-# showffw.sh by Brad Skiff 20060713
+# showffw.sh by Brad Skiff 20060825
 # 
 . /etc/config
 . /etc/inside.info
 . /etc/outside.info
-echo
-myvers=`uname -r` 
-echo "Version ${myvers} is running as follows:"
-echo
-printf "\t\t   Inside\t\tOutside
- Physical device:  %-15s\t%-15s
-  Logical device:  %-15s\t%-15s
-\t Network:  %-15s\t%-15s
-      IP Address:  %-15s\t%-15s
-\t Netmask:  %-15s\t%-15s
-       Broadcast:  %-15s\t%-15s
-\t Gateway:  %-15s\t%-15s\n"    $INSIDE_DEV             $OUTSIDE_DEV \
+
+OUT_MAC=`ifconfig |grep eth0 |cut -f 2 -d 'W' |cut -f 2 -d ' '`
+IN_MAC=`ifconfig |grep eth1 |cut -f 2 -d 'W' |cut -f 2 -d ' '`
+
+printf "## Revision: ${myvers} ##\n
+\t\t   Inside\t\tOutside
+      MAC HWaddr:  %-17s\t%-17s
+ Physical device:  %-17s\t%-17s
+  Logical device:  %-17s\t%-17s
+\t Network:  %-17s\t%-17s
+      IP Address:  %-17s\t%-17s
+\t Netmask:  %-17s\t%-17s
+       Broadcast:  %-17s\t%-17s
+\t Gateway:  %-17s\t%-17s\n"    $IN_MAC                 $OUT_MAC \
+                                $INSIDE_DEV             $OUTSIDE_DEV \
                                 $INSIDE_DEVICE          $OUTSIDE_DEVICE \
                                 $INSIDE_NETWORK         $OUTSIDE_NETWORK \
@@ -24 +27 @@
                                 $INSIDE_BROADCAST       $OUTSIDE_BROADCAST \
                                 "[None Set]"            $OUTSIDE_GATEWAY
+
 echo 
 echo "contents of /etc/resolv.conf:"

floppyfw/packages/skeleton/wsmenu/etc/voipvars.sh

@@ -1 +1 @@
 #!/bin/sh
 
-# voipvars.sh by Brad Skiff 20060713
+# voipvars.sh by Brad Skiff 20060824
 # 
 . /etc/config
-echo
 myvers=`uname -r` 
-echo "Version ${myvers} is running as follows:"
-echo
-printf "      ColumnA\t\t       ColumnB
+printf "## Revision: ${myvers} ##\n
+      config VoIP\t       config VoIP
 Var:  %-24s %-24s
 set:  %-24s %-24s

floppyfw/packages/skeleton/wsmenu/etc/wsmenu.sh

@@ -1 +1 @@
 #!/bin/sh
 
-# wsmenu.sh by Brad Skiff 20060815
+REVN="r03"
+#
+# wsmenu.sh by Brad Skiff
 # 
-press_enter ()
+p_e ()
 {
     echo ""
     echo -n "Press Enter for wsmenu "
-    read selection
+    read pick
     clear
 }
 
-MENU1="1 - Show VoIP config Vars"
-MENU2="2 - Show wshaper status"
-MENU3="3 - Stop wshaper"
-MENU4="4 - Start wshaper"
-MENU5="5 - Start wshaper - nocop"
-MENU6="6 - Show floppyfw I/O setup"
-MENU7="7 - Re-run firewall.init"
-MENU8="8 - Show disk space"
-MENU9="9 - Show memory use"
-MENU0="0 - exit wsmenu"
+M1="1 - VoIP config"
+M2="2 - wshaper status"
+M3="3 - >STOP wshaper"
+M4="4 - >START wshaper"
+M5="5 - >START wshaper nocop"
+M6="6 - floppyfw I/O setup"
+M7="7 - >RE-INIT firewall"
+#
+M8="8 - disk space"
+M9="9 - memory use"
+MA="a - ip_conntrack - all"
+MB="b - ip_conntrack - tcp"
+MC="c - ip_conntrack - udp"
+MD="d - iptables -L -n -v"
+M0="0 - >exit wsmenu"
 
-selection=
-until [ "$selection" = "0" ]; do
-printf "\t\t\t## wsmenu ##\n
+pick=
+until [ "$pick" = "0" ]; do
+printf "\t\t## wsmenu $REVN ##\n
+  show >Do\t\t\tshow >Do
   %-28s  %-28s
   %-28s  %-28s
   %-28s  %-28s
   %-28s  %-28s
-  %-28s  %-28s\n"       "$MENU1"        "$MENU6" \
-                        "$MENU2"        "$MENU7" \
-                        "$MENU3"        "$MENU8" \
-                        "$MENU4"        "$MENU9" \
-                        "$MENU5"        "$MENU0"
+  %-28s  %-28s
+  %-28s  %-28s
+  %-28s  %-28s\n"       "$M1"   "$M8" \
+                        "$M2"   "$M9" \
+                        "$M3"   "$MA" \
+                        "$M4"   "$MB" \
+                        "$M5"   "$MC" \
+                        "$M6"   "$MD" \
+                        "$M7"   "$M0"
 echo ""
-echo -n "                       Enter (1-9 or 0): "
-read selection
+echo -n "  Enter (1-9/a-d or 0): "
+read pick
 echo ""
-    case $selection in
-        1 ) . /etc/voipvars.sh ; press_enter ;;
-        2 ) wshaper.htb status ; press_enter ;;
-        3 ) wshaper.htb stop ; press_enter ;;
-        4 ) wshaper.htb ; press_enter ;;
-        5 ) wshaper.htb nocop ; press_enter ;;
-        6 ) . /etc/showffw.sh ; press_enter ;;
-        7 ) . /etc/firewall.init ; press_enter ;;
-        8 ) df -h ; press_enter ;;
-        9 ) free ; press_enter ;;
+    case $pick in
+        1 ) . /etc/voipvars.sh ; p_e ;;
+        2 ) wshaper.htb status ; p_e ;;
+        3 ) wshaper.htb stop ; p_e ;;
+        4 ) wshaper.htb ; p_e ;;
+        5 ) wshaper.htb nocop ; p_e ;;
+        6 ) . /etc/showffw.sh ; p_e ;;
+        7 ) . /etc/firewall.init ; p_e ;;
+        8 ) df -h ; p_e ;;
+        9 ) free ; p_e ;;
+        a ) cat /proc/net/ip_conntrack ; p_e ;;
+        b ) cat /proc/net/ip_conntrack |grep tcp ; p_e ;;
+        c ) cat /proc/net/ip_conntrack |grep udp ; p_e ;;
+        d ) iptables -L -n -v ; p_e ;;
         0 ) exit ;;
-        * ) echo "Please enter 1-9 or 0"; press_enter
+        * ) echo "Please enter 1-9/a-d or 0" ; p_e
     esac
 done