# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1302957649 -7200
# Node ID 75908c400f8ba0b2c7ad9ad8f98eafdd067ab74e
# Parent  2dd85684201efacc649942a201d03cf0d0dbccc7
network.cgi: pscan is too slow, needs its own page

diff -r 2dd85684201e -r 75908c400f8b lib/libtazpanel
--- a/lib/libtazpanel	Sat Apr 16 14:05:38 2011 +0200
+++ b/lib/libtazpanel	Sat Apr 16 14:40:49 2011 +0200
@@ -61,8 +61,10 @@
 		ip=`ifconfig | grep -A 1 $i | grep inet | \
 			awk '{ print $2 }' | cut -d ":" -f 2`
 		echo "<td>connected</td><td>$ip</td>"
+		echo "<td><a href='/network.cgi?scan=$ip'>"
+		echo "<img src="$IMAGES/recharge.png" />Scan ports</a></td>"
 	else
-		echo "<td>----</td><td>----</td>"
+		echo "<td>----</td><td>----</td><td></td>"
 	fi
 }
 
@@ -75,6 +77,7 @@
 	<td>`gettext "Name"`</td>
 	<td>`gettext "Status"`</td>
 	<td>`gettext "IP Address"`</td>
+	<td></td>
 </tr>
 EOT
 	for i in `ls /sys/class/net`
diff -r 2dd85684201e -r 75908c400f8b network.cgi
--- a/network.cgi	Sat Apr 16 14:05:38 2011 +0200
+++ b/network.cgi	Sat Apr 16 14:40:49 2011 +0200
@@ -91,6 +91,19 @@
 #
 
 case " $(GET) " in
+	*\ scan\ *)
+		# Scan open ports
+		scan=$(GET scan)
+		xhtml_header
+		LOADING_MSG=$(gettext "Scanning open ports...")
+		loading_msg
+		cat << EOT
+<h2>`gettext "Port scanning for"` $scan</h2>
+<pre>
+$(pscan -b $scan)
+</pre>
+EOT
+		;;
 	*\ eth\ *)
 		# Wired connections settings
 		xhtml_header
@@ -115,7 +128,7 @@
 		fi
 		. /etc/network.conf
 		cat << EOT
-<h2>`gettext "Ethernet connection`</h2>
+<h2>`gettext "Ethernet connection"`</h2>
 
 <h3>$(gettext "Setup a static IP")</h3>
 <form method="get" action="$SCRIPT_NAME">
@@ -171,7 +184,7 @@
 		LOADING_MSG=$(gettext "Scanning wireless interface...")
 		loading_msg
 		cat << EOT
-<h2>`gettext "Wireless connection`</h2>
+<h2>`gettext "Wireless connection"`</h2>
 <div id="actions">
 	<a class="button" href="$SCRIPT_NAME?wifi&start-wifi=start-wifi">
 		<img src="$IMAGES/start.png" />$(gettext "Start")</a>
@@ -205,9 +218,9 @@
 		xhtml_header
 		hostname=$(cat /etc/hostname)
 		cat << EOT
-<h2>`gettext "Networking`</h2>
+<h2>`gettext "Networking"`</h2>
 <p>
-	`gettext "Manage network connections and services`
+	`gettext "Manage network connections and services"`
 </p>
 <div id="actions">
 	<div class="float-left">
@@ -271,12 +284,6 @@
 <pre>
 $(netstat -anp 2> /dev/null | sed '/UNIX domain sockets/,$d')
 </pre>
-
-<a name="scan"></a>
-<h3>`gettext "Local ports scan"`</h3>
-<pre>
-$(pscan -b localhost)
-</pre>
 EOT
 		;;
 esac