[1/7] fff-nodewatcher: style: remove unused code

Submitted by Tim Niemeyer on May 14, 2016, 12:32 p.m.

Details

Message ID 1463229144-29414-1-git-send-email-tim@tn-x.org
State Accepted, archived
Commit f765eef45792765f6a97c1b9a48acb57d6b15b6b
Headers show

Commit Message

Tim Niemeyer May 14, 2016, 12:32 p.m.
Signed-off-by: Tim Niemeyer <tim@tn-x.org>
---

 .../fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 22 ----------------------
 1 file changed, 22 deletions(-)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
index e9b734b..1610055 100755
--- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
+++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
@@ -123,11 +123,8 @@  crawl() {
     err "`date`: Collecting information from network interfaces"
 
 	#Get interfaces
-	#IFACES=`cat /proc/net/dev | awk -F: '!/\|/ { gsub(/[[:space:]]*/, "", $1); split($2, a, " "); printf("%s=%s=%s ", $1, a[1], a[9]) }'`
-
 	interface_data=""	
 	#Loop interfaces
-	#for entry in $IFACES; do
     for filename in `grep 'up\|unknown' /sys/class/net/*/operstate`; do
         ifpath=${filename%/operstate*}
         iface=${ifpath#/sys/class/net/}
@@ -150,9 +147,7 @@  crawl() {
         traffic_rx=`cat $ifpath/statistics/rx_bytes`
         traffic_tx=`cat $ifpath/statistics/tx_bytes`
         
-        #interface_data=$interface_data"<$iface><name>$iface</name><mac_addr>$mac_addr</mac_addr><ipv4_addr>$ipv4_addr</ipv4_addr><ipv6_addr>$ipv6_addr</ipv6_addr><ipv6_link_local_addr>$ipv6_link_local_addr</ipv6_link_local_addr><traffic_rx>$traffic_rx</traffic_rx><traffic_tx>$traffic_tx</traffic_tx><mtu>$mtu</mtu>"
         interface_data=$interface_data"<$iface><name>$iface</name>$addrs<traffic_rx>$traffic_rx</traffic_rx><traffic_tx>$traffic_tx</traffic_tx>"
-        
 
         interface_data=$interface_data$(iwconfig ${iface} 2>/dev/null | awk -F':' '
             /Mode/{ split($2, m, " "); printf "<wlan_mode>"m[1]"</wlan_mode>" }
@@ -161,23 +156,6 @@  crawl() {
             /Freq/{ split($3, f, " "); printf "<wlan_frequency>"f[1]f[2]"</wlan_frequency>" }
             /Tx-Power/{ split($0, p, "="); sub(/[[:space:]]*$/, "", p[2]); printf "<wlan_tx_power>"p[2]"</wlan_tx_power>" }
         ')"</$iface>"
-
-        #if [ "`iwconfig ${iface} 2>/dev/null | grep IEEE`" != "" ]; then
-        #    wlan_mode="`iwconfig $iface | awk -F':' '/Mode/{ split($2, m, " "); print m[1] }'`"
-        #
-        #    if [ $wlan_mode = "Master" ]; then	
-        #        wlan_bssid="`iw $iface info | awk '/addr/{ print $2 }'`"
-        #    elif [ $wlan_mode = "Ad-Hoc" ]; then	
-        #        wlan_bssid="`iwconfig $iface | awk '/Cell/{ print $5 }'`"
-        #    fi
-        #    
-        #    wlan_essid="`iwconfig ${iface} | awk -F'"' '/ESSID/ { print $2 }'`"
-        #    wlan_frequency="`iwconfig $iface | awk -F':' '/Freq/{ split($3, f, " "); print f[1] }'`"
-        #    wlan_tx_power="`iwconfig $iface | awk -F'=' '/Tx-Power/{ print $2 }'`"
-        #
-        #    interface_data=$interface_data"<wlan_mode>$wlan_mode</wlan_mode><wlan_frequency>$wlan_frequency</wlan_frequency><wlan_essid>$wlan_essid</wlan_essid><wlan_bssid>$wlan_bssid</wlan_bssid><wlan_tx_power>$wlan_tx_power</wlan_tx_power>"
-        #fi
-        #interface_data=$interface_data"</$iface>"
 	done
 
     err "`date`: Collecting information from batman advanced and it´s interfaces"

Comments

Tobias Klaus May 27, 2016, 9:12 a.m.
Reviewed-by: Tobias Klaus <tk+ff@meskal.net>

On Samstag, 14. Mai 2016 14:32:18 CEST Tim Niemeyer wrote:
> Signed-off-by: Tim Niemeyer <tim@tn-x.org>
> ---
> 
>  .../fff/fff-nodewatcher/files/usr/sbin/nodewatcher | 22
> ---------------------- 1 file changed, 22 deletions(-)
> 
> diff --git a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher index
> e9b734b..1610055 100755
> --- a/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> +++ b/src/packages/fff/fff-nodewatcher/files/usr/sbin/nodewatcher
> @@ -123,11 +123,8 @@ crawl() {
>      err "`date`: Collecting information from network interfaces"
> 
>  	#Get interfaces
> -	#IFACES=`cat /proc/net/dev | awk -F: '!/\|/ { gsub(/[[:space:]]*/, "",
> $1); split($2, a, " "); printf("%s=%s=%s ", $1, a[1], a[9]) }'` -
>  	interface_data=""
>  	#Loop interfaces
> -	#for entry in $IFACES; do
>      for filename in `grep 'up\|unknown' /sys/class/net/*/operstate`; do
>          ifpath=${filename%/operstate*}
>          iface=${ifpath#/sys/class/net/}
> @@ -150,9 +147,7 @@ crawl() {
>          traffic_rx=`cat $ifpath/statistics/rx_bytes`
>          traffic_tx=`cat $ifpath/statistics/tx_bytes`
> 
> -       
> #interface_data=$interface_data"<$iface><name>$iface</name><mac_addr>$mac_a
> ddr</mac_addr><ipv4_addr>$ipv4_addr</ipv4_addr><ipv6_addr>$ipv6_addr</ipv6_a
> ddr><ipv6_link_local_addr>$ipv6_link_local_addr</ipv6_link_local_addr><traff
> ic_rx>$traffic_rx</traffic_rx><traffic_tx>$traffic_tx</traffic_tx><mtu>$mtu<
> /mtu>"
> interface_data=$interface_data"<$iface><name>$iface</name>$addrs<traffic_rx
> >$traffic_rx</traffic_rx><traffic_tx>$traffic_tx</traffic_tx>" -
> 
>          interface_data=$interface_data$(iwconfig ${iface} 2>/dev/null | awk
> -F':' ' /Mode/{ split($2, m, " "); printf "<wlan_mode>"m[1]"</wlan_mode>" }
> @@ -161,23 +156,6 @@ crawl() {
>              /Freq/{ split($3, f, " "); printf
> "<wlan_frequency>"f[1]f[2]"</wlan_frequency>" } /Tx-Power/{ split($0, p,
> "="); sub(/[[:space:]]*$/, "", p[2]); printf
> "<wlan_tx_power>"p[2]"</wlan_tx_power>" } ')"</$iface>"
> -
> -        #if [ "`iwconfig ${iface} 2>/dev/null | grep IEEE`" != "" ]; then
> -        #    wlan_mode="`iwconfig $iface | awk -F':' '/Mode/{ split($2, m,
> " "); print m[1] }'`" -        #
> -        #    if [ $wlan_mode = "Master" ]; then
> -        #        wlan_bssid="`iw $iface info | awk '/addr/{ print $2 }'`"
> -        #    elif [ $wlan_mode = "Ad-Hoc" ]; then
> -        #        wlan_bssid="`iwconfig $iface | awk '/Cell/{ print $5 }'`"
> -        #    fi
> -        #
> -        #    wlan_essid="`iwconfig ${iface} | awk -F'"' '/ESSID/ { print $2
> }'`" -        #    wlan_frequency="`iwconfig $iface | awk -F':' '/Freq/{
> split($3, f, " "); print f[1] }'`" -        #    wlan_tx_power="`iwconfig
> $iface | awk -F'=' '/Tx-Power/{ print $2 }'`" -        #
> -        #   
> interface_data=$interface_data"<wlan_mode>$wlan_mode</wlan_mode><wlan_frequ
> ency>$wlan_frequency</wlan_frequency><wlan_essid>$wlan_essid</wlan_essid><wl
> an_bssid>$wlan_bssid</wlan_bssid><wlan_tx_power>$wlan_tx_power</wlan_tx_powe
> r>" -        #fi
> -        #interface_data=$interface_data"</$iface>"
>  	done
> 
>      err "`date`: Collecting information from batman advanced and it´s
> interfaces"