# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1431353291 -7200
# Node ID e726e3214807e3c60bd2607c8487fcb12778d0d9
# Parent  2ac3320b31e9f1229e98396416545ec8059967ec
ppp/ppp.cgi: misc fixes

diff -r 2ac3320b31e9 -r e726e3214807 dropbear/stuff/sshx
--- a/dropbear/stuff/sshx	Mon May 11 08:03:12 2015 +0200
+++ b/dropbear/stuff/sshx	Mon May 11 16:08:11 2015 +0200
@@ -30,12 +30,13 @@
 		read -s -t 30 DROPBEAR_PASSWORD && export DROPBEAR_PASSWORD
 		$ssh $1 true || exit 1
 	}
-	extra="$(route -n | awk -vd=${1#*@} \
+	extra="$(route -n | awk -vd=$(nslookup ${1#*@} | \
+		 sed '$!d;s/.*: \([^ ]*\).*/\1/') \
 		'$1=="0.0.0.0"{ print d " gw " $2 " dev " $8 }')"
 	for i in ${4/default/128.0.0.0/1 0.0.0.0/1} ; do
 		echo "route add -net $i dev \$1"
 	done > /etc/ppp/ip-up.d/pppssh$$
-	[ "$4" ] && echo "route add $extra" >> /etc/ppp/ip-up.d/pppssh$
+	[ "$4" ] && echo "route add $extra" >> /etc/ppp/ip-up.d/pppssh$$
 	chmod +x /etc/ppp/ip-up.d/pppssh$$
 	n=10.$(($$%256)).$(($$/256))
 	ppp="/usr/sbin/pppd local noauth nodetach"
diff -r 2ac3320b31e9 -r e726e3214807 ppp/stuff/ppp.cgi
--- a/ppp/stuff/ppp.cgi	Mon May 11 08:03:12 2015 +0200
+++ b/ppp/stuff/ppp.cgi	Mon May 11 16:08:11 2015 +0200
@@ -82,10 +82,10 @@
 *\ setpppnc\ *)
 	[ "$(GET stop_pppncs)" ] && killall pppnc-server
 	[ "$(GET start_pppncs)" ] &&
-		pppnc-server $(GET port) "$(GET localip):$(GET remoteip)" &
+		pppnc-server "$(GET port)" "$(GET localip):$(GET remoteip)" &
 	[ "$(GET stop_pppncc)" ] && killall pppnc-client
 	[ "$(GET start_pppncc)" ] &&
-		pppnc-client $(GET serverip) $(GET port) "$(GET routes)" &
+		pppnc-client "$(GET serverip)" "$(GET port)" "$(GET routes)" &
 	;;
 *\ setpppssh\ *)
 	cat > /etc/ppp/pppssh <<EOT
@@ -98,7 +98,8 @@
 ROUTES="$(GET routes)"
 EOT
 	[ "$(GET pass)" ] && export DROPBEAR_PASSWORD="$(GET pass)"
-	if [ "$(GET send_key)" ]; then
+	case " $(GET) " in
+	*\ send_key\ *)
 		( dropbearkey -y -f /etc/dropbear/dropbear_rsa_host_key ;
 		  cat /etc/ssh/ssh_host_rsa_key.pub ) 2> /dev/null | \
 		grep ^ssh | dbclient $(echo $(GET send_key) | sed \
@@ -106,16 +107,18 @@
 		while read key; do for i in authorized_keys authorized_keys2; do \
 		grep -qs '\$key' .ssh/\$i || echo '\$key' >> .ssh/\$i ; done ; done ; \
 		chmod 700 .ssh ; chmod 600 .ssh/authorized_keys*"
-	fi
-	if [ "$(GET stop_pppssh)" ]; then
+		;;
+	*\ stop_pppssh\ *)
 		ppp="$(sed '/pppd/!d;s/.*="\([^"]*\).*/\1/' /usr/bin/pppssh)"
-		kill $(busybox ps x | grep "$ppp" | awk '/dbclient/{print $1}')
-	fi
-	if [ "$(GET start_pppssh)" ]; then
+		kill $(busybox ps x | grep "$ppp" | awk '/pty/{next}/dbclient/{print $1}')
+		;;
+	*\ start_pppssh\ *)
+EOT
 		pppssh	"$(GET ssharg) $(GET peer)" \
 			"$(GET localip):$(GET remoteip) $(GET localpppopt)" \
-			"$(GET remotepppopt)" &
-	fi
+			"$(GET remotepppopt)" "$(GET routes)" &
+		;;
+	esac
 	;;
 esac
 
@@ -196,7 +199,8 @@
 		$(_ 'Manage PSTN Internet connections')</span>
 	</header>
 <form action="index.cgi" id="indexform"></form>
-<form method="get" action="?setppppstn">
+<form method="get">
+	<input type="hidden" name="setppppstn" />
 	<table>
 	<tr>
 		<td>$(_ 'Username')</td>
@@ -211,11 +215,11 @@
 		<td><input type="text" name="phone" size="40" value="$PHONE" /></td>
 	</tr>
 	</table>
+	<footer><!--
+		--><button type="submit" name="start_pstn" data-icon="start" $start_disabled>$(_ 'Start'  )</button><!--
+		--><button type="submit" name="stop_pstn"  data-icon="stop"  $stop_disabled >$(_ 'Stop'   )</button><!--
+	--></footer>
 </form>
-	<footer><!--
-		--><button form="conf" type="submit" name="start_pstn" data-icon="start" $start_disabled>$(_ 'Start'  )</button><!--
-		--><button form="conf" type="submit" name="stop_pstn"  data-icon="stop"  $stop_disabled >$(_ 'Stop'   )</button><!--
-	--></footer>
 </section>
 
 <a name="pppoe"></a>
@@ -224,7 +228,8 @@
 		<span data-icon="eth">$(_ 'Cable Modem') -
 		$(_ 'Manage PPPoE Internet connections')</span>
 	</header>
-<form method="get" action="?setpppoe">
+<form method="get">
+	<input type="hidden" name="setpppoe" />
 	<table>
 	<tr>
 		<td>$(_ 'Username')</td>
@@ -235,11 +240,11 @@
 		<td><input type="text" name="pass" size="40" value="$PASSWORD" /></td>
 	</tr>
 	</table>
+	<footer><!--
+		--><button type="submit" name="start_pppoe" data-icon="start" $startoe_disabled>$(_ 'Start'  )</button><!--
+		--><button type="submit" name="stop_pppoe"  data-icon="stop"  $stopoe_disabled >$(_ 'Stop'   )</button><!--
+	--></footer>
 </form>
-	<footer><!--
-		--><button form="conf" type="submit" name="start_pppoe" data-icon="start" $startoe_disabled>$(_ 'Start'  )</button><!--
-		--><button form="conf" type="submit" name="stop_pppoe"  data-icon="stop"  $stopoe_disabled >$(_ 'Stop'   )</button><!--
-	--></footer>
 </section>
 
 <a name="pppnc"></a>
@@ -248,7 +253,8 @@
 		<span data-icon="upgrade">$(_ 'Route shortcut') -
 		$(_ 'Reach unreachable networks')</span>
 	</header>
-<form method="get" action="?setppprc">
+<form method="get">
+	<input type="hidden" name="setppprc" />
 	<table>
 	<tr>
 		<td>$(_ 'TCP port')</td>
@@ -272,22 +278,22 @@
 		<td><input type="text" name="routes" size="50" value="${ROUTES:-192.168.10.0/24 192.168.20.0/28}" title="$(_ "Routes on peer network to import or 'default' to redirect the default route")"/></td>
 	</tr>
 	</table>
+	<footer><!--
+		--><button type="submit" name="start_pppncs" data-icon="start" >$(_ 'Start server'  )</button><!--
+		--><button type="submit" name="stop_pppncs"  data-icon="stop" $stops_disabled>$(_ 'Stop server'   )</button><!--
+		--><button type="submit" name="start_pppncc" data-icon="start" >$(_ 'Start client'  )</button><!--
+		--><button type="submit" name="stop_pppncc"  data-icon="stop" $stopc_disabled>$(_ 'Stop client'   )</button><!--
+	--></footer>
 </form>
-	<footer><!--
-		--><button form="conf" type="submit" name="start_pppncs" data-icon="start" >$(_ 'Start server'  )</button><!--
-		--><button form="conf" type="submit" name="stop_pppncs"  data-icon="stop" $stops_disabled>$(_ 'Stop server'   )</button><!--
-		--><button form="conf" type="submit" name="start_pppncc" data-icon="start" >$(_ 'Start client'  )</button><!--
-		--><button form="conf" type="submit" name="stop_pppncc"  data-icon="stop" $stopc_disabled>$(_ 'Stop client'   )</button><!--
-	--></footer>
 </section>
 EOT
 if [ "$(which pppssh 2>/dev/null)" ]; then
 	[ -s /etc/ppp/pppssh ] && . /etc/ppp/pppssh
 	ppp="$(sed '/pppd/!d;s/.*="\([^"]*\).*/\1/' /usr/bin/pppssh)"
 	if [ "$(busybox ps x | grep "$ppp" | awk '/dbclient/{print $1}')" ]; then
-		start_disabled='disabled'
+		startssh_disabled='disabled'
 	else
-		stop_disabled='disabled'
+		stopssh_disabled='disabled'
 	fi
 	cat <<EOT
 <a name="pppssh"></a>
@@ -296,7 +302,8 @@
 		<span data-icon="eth">$(_ 'Virtual Private Network') -
 		$(_ 'Manage private TCP/IP connections')</span>
 	</header>
-<form method="get" action="?setpppssh">
+<form method="get">
+	<input type="hidden" name="setpppssh" />
 	<table>
 	<tr>
 		<td>$(_ 'Peer')</td>
@@ -331,12 +338,12 @@
 		<td><input type="text" name="routes" size="50" value="${ROUTES:-192.168.10.0/24 192.168.20.0/28}" title="$(_ "Routes on peer network to import or 'default' to redirect the default route")"/></td>
 	</tr>
 	</table>
+	<footer><!--
+		--><button type="submit" name="start_pppssh" data-icon="start" $startssh_disabled>$(_ 'Start'  )</button><!--
+		--><button type="submit" name="stop_pppssh"  data-icon="stop"  $stopssh_disabled>$(_ 'Stop'   )</button><!--
+		--><button type="submit" name="send_key"  data-icon="sync"  >$(_ 'Send SSH key'   )</button><!--
+	--></footer>
 </form>
-	<footer><!--
-		--><button form="conf" type="submit" name="start_pppssh" data-icon="start" $start_disabled>$(_ 'Start'  )</button><!--
-		--><button form="conf" type="submit" name="stop_pppssh"  data-icon="stop"  $stop_disabled>$(_ 'Stop'   )</button><!--
-		--><button form="conf" type="submit" name="send_key"  data-icon="sync"  >$(_ 'Send SSH key'   )</button><!--
-	--></footer>
 </section>
 EOT
 fi
diff -r 2ac3320b31e9 -r e726e3214807 ppp/stuff/pppnc-server
--- a/ppp/stuff/pppnc-server	Mon May 11 08:03:12 2015 +0200
+++ b/ppp/stuff/pppnc-server	Mon May 11 16:08:11 2015 +0200
@@ -11,11 +11,12 @@
 esac
 
 [ -z "$1" ] && echo "Usage: $0 serverip [port] [routes]" && exit 1
-extra="$(route -n | awk -vd=$1 '$1=="0.0.0.0"{ print d " gw " $2 " dev " $8 }')"
+extra="$(route -n | awk -vd=$(nslookup ${1#*@} | sed \
+ '$!d;s/.*: \([^ ]*\).*/\1/') '$1=="0.0.0.0"{ print d " gw " $2 " dev " $8 }')"
 for i in ${3/default/128.0.0.0/1 0.0.0.0/1} ; do
 	echo "route add -net $i dev \$1"
 done > $ipupd/pppnc$$
-[ "$3" ] && echo "route add $extra" >> $ipupd/pppnc$
+[ "$3" ] && echo "route add $extra" >> $ipupd/pppnc$$
 chmod +x $ipupd/pppnc$$
 $ppp noipdefault pty "nc $1 ${2:-$port}" ipparam pppnc$$
 [ "$3" ] && route del $extra