tazpanel rev 136
network.cgi: pscan is too slow, needs its own page
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Apr 16 14:40:49 2011 +0200 (2011-04-16) |
parents | 2dd85684201e |
children | 67fa759f1357 |
files | lib/libtazpanel network.cgi |
line diff
1.1 --- a/lib/libtazpanel Sat Apr 16 14:05:38 2011 +0200 1.2 +++ b/lib/libtazpanel Sat Apr 16 14:40:49 2011 +0200 1.3 @@ -61,8 +61,10 @@ 1.4 ip=`ifconfig | grep -A 1 $i | grep inet | \ 1.5 awk '{ print $2 }' | cut -d ":" -f 2` 1.6 echo "<td>connected</td><td>$ip</td>" 1.7 + echo "<td><a href='/network.cgi?scan=$ip'>" 1.8 + echo "<img src="$IMAGES/recharge.png" />Scan ports</a></td>" 1.9 else 1.10 - echo "<td>----</td><td>----</td>" 1.11 + echo "<td>----</td><td>----</td><td></td>" 1.12 fi 1.13 } 1.14 1.15 @@ -75,6 +77,7 @@ 1.16 <td>`gettext "Name"`</td> 1.17 <td>`gettext "Status"`</td> 1.18 <td>`gettext "IP Address"`</td> 1.19 + <td></td> 1.20 </tr> 1.21 EOT 1.22 for i in `ls /sys/class/net`
2.1 --- a/network.cgi Sat Apr 16 14:05:38 2011 +0200 2.2 +++ b/network.cgi Sat Apr 16 14:40:49 2011 +0200 2.3 @@ -91,6 +91,19 @@ 2.4 # 2.5 2.6 case " $(GET) " in 2.7 + *\ scan\ *) 2.8 + # Scan open ports 2.9 + scan=$(GET scan) 2.10 + xhtml_header 2.11 + LOADING_MSG=$(gettext "Scanning open ports...") 2.12 + loading_msg 2.13 + cat << EOT 2.14 +<h2>`gettext "Port scanning for"` $scan</h2> 2.15 +<pre> 2.16 +$(pscan -b $scan) 2.17 +</pre> 2.18 +EOT 2.19 + ;; 2.20 *\ eth\ *) 2.21 # Wired connections settings 2.22 xhtml_header 2.23 @@ -115,7 +128,7 @@ 2.24 fi 2.25 . /etc/network.conf 2.26 cat << EOT 2.27 -<h2>`gettext "Ethernet connection`</h2> 2.28 +<h2>`gettext "Ethernet connection"`</h2> 2.29 2.30 <h3>$(gettext "Setup a static IP")</h3> 2.31 <form method="get" action="$SCRIPT_NAME"> 2.32 @@ -171,7 +184,7 @@ 2.33 LOADING_MSG=$(gettext "Scanning wireless interface...") 2.34 loading_msg 2.35 cat << EOT 2.36 -<h2>`gettext "Wireless connection`</h2> 2.37 +<h2>`gettext "Wireless connection"`</h2> 2.38 <div id="actions"> 2.39 <a class="button" href="$SCRIPT_NAME?wifi&start-wifi=start-wifi"> 2.40 <img src="$IMAGES/start.png" />$(gettext "Start")</a> 2.41 @@ -205,9 +218,9 @@ 2.42 xhtml_header 2.43 hostname=$(cat /etc/hostname) 2.44 cat << EOT 2.45 -<h2>`gettext "Networking`</h2> 2.46 +<h2>`gettext "Networking"`</h2> 2.47 <p> 2.48 - `gettext "Manage network connections and services` 2.49 + `gettext "Manage network connections and services"` 2.50 </p> 2.51 <div id="actions"> 2.52 <div class="float-left"> 2.53 @@ -271,12 +284,6 @@ 2.54 <pre> 2.55 $(netstat -anp 2> /dev/null | sed '/UNIX domain sockets/,$d') 2.56 </pre> 2.57 - 2.58 -<a name="scan"></a> 2.59 -<h3>`gettext "Local ports scan"`</h3> 2.60 -<pre> 2.61 -$(pscan -b localhost) 2.62 -</pre> 2.63 EOT 2.64 ;; 2.65 esac