# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1469533639 -7200
# Node ID 1ae2567134a8a2b637fabe45f0cb08395ad4a1db
# Parent  cfa37fb98858d28a676af725878f7990b7ad6378
drobbear/pppssh: optional UDP unencrypted link

diff -r cfa37fb98858 -r 1ae2567134a8 dropbear/stuff/sshx
--- a/dropbear/stuff/sshx	Mon Jul 25 12:47:51 2016 +0300
+++ b/dropbear/stuff/sshx	Tue Jul 26 13:47:19 2016 +0200
@@ -30,7 +30,7 @@
 		read -s -t 30 DROPBEAR_PASSWORD && export DROPBEAR_PASSWORD
 		$ssh $1 true || exit 1
 	}
-	extra="$(route -n | awk -vd=$(nslookup ${1#*@} | \
+	extra="$(route -n | awk -vd=$(nslookup ${1#*@} | sed '/::/d' | \
 		 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
@@ -39,11 +39,14 @@
 	[ "$4" ] && echo "route add $extra" >> /etc/ppp/ip-up.d/pppssh$$
 	chmod +x /etc/ppp/ip-up.d/pppssh$$
 	n=10.$(($$%256)).$(($$/256))
+	n="${2:-$n.1:$n.2} passive"
 	ppp="/usr/sbin/pppd local noauth nodetach"
-	$ppp ${2:-$n.1:$n.2} passive pty "$ssh $1 $ppp ${3:-proxyarp} notty" \
-		ipparam pppssh$$
+	arg="$n pty '$ssh $1 $ppp ${3:-proxyarp} notty'"
+	[ -n "$5" ] && arg="noipdefault pty 'nc -u ${1#*@} $5'" && $ssh -f $1 \
+		"$ppp $n ${3:-proxyarp} pty 'nc -ulp $5' >/dev/null"
+	eval $ppp $arg ipparam pppssh$$
 	[ "$4" ] && route del $extra
-	rm -f /etc/ppp/ip-up.d/pppssh$$
+	rm -f /etc/ppp/ip-up.d/pppssh$$ 2> /dev/null
 }
 
 xfbvnc()
@@ -63,7 +66,7 @@
 $(fbvnc --help 2>&1 | sed '1,/Usage:/d')
 EOT
 ppp*)	[ -z "$1" ] && cat <<EOT || pppssh "$@" ;;
-Usage: $0 '[sshargs] user@remote' '[localip:remoteip] [localpppargs]' 'remotepppargs' 'routes' 
+Usage: $0 '[sshargs] user@remote' '[localip:remoteip] [localpppargs]' 'remotepppargs' 'routes' [udp-port]
 Example: $0 tux@slitaz.org '' '' '192.168.1.0/24 10.1.2.0/24'
 EOT
 *)	[ -z "$DISPLAY" ] && exec dbclient "$@"
diff -r cfa37fb98858 -r 1ae2567134a8 ppp/stuff/ppp.cgi
--- a/ppp/stuff/ppp.cgi	Mon Jul 25 12:47:51 2016 +0300
+++ b/ppp/stuff/ppp.cgi	Tue Jul 26 13:47:19 2016 +0200
@@ -96,6 +96,7 @@
 LOCALPPP="$(GET localpppopt)"
 REMOTEPPP="$(GET remotepppopt)"
 ROUTES="$(GET routes)"
+UDP="$(GET udp)"
 EOT
 	[ "$(GET pass)" ] && export DROPBEAR_PASSWORD="$(GET pass)"
 	case " $(GET) " in
@@ -116,7 +117,7 @@
 EOT
 		pppssh	"$(GET ssharg) $(GET peer)" \
 			"$(GET localip):$(GET remoteip) $(GET localpppopt)" \
-			"$(GET remotepppopt)" "$(GET routes)" &
+			"$(GET remotepppopt)" "$(GET routes)" "$(GET udp)" &
 		;;
 	esac
 	;;
@@ -337,6 +338,10 @@
 		<td>$(_ 'Peer routes')</td>
 		<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>
+	<tr>
+		<td>$(_ 'UDP port')</td>
+		<td><input type="text" name="udp" size="50" value="$UDP" title="$(_ "Optional UDP port for a real-time but unencrypted link")"/></td>
+	</tr>
 	</table>
 	<footer><!--
 		--><button type="submit" name="start_pppssh" data-icon="start" $startssh_disabled>$(_ 'Start'  )</button><!--
diff -r cfa37fb98858 -r 1ae2567134a8 ppp/stuff/pppnc-server
--- a/ppp/stuff/pppnc-server	Mon Jul 25 12:47:51 2016 +0300
+++ b/ppp/stuff/pppnc-server	Tue Jul 26 13:47:19 2016 +0200
@@ -11,7 +11,7 @@
 esac
 
 [ -z "$1" ] && echo "Usage: $0 serverip [port] [routes]" && exit 1
-extra="$(route -n | awk -vd=$(nslookup ${1#*@} | sed \
+extra="$(route -n | awk -vd=$(nslookup ${1#*@} | sed '/::/d' | 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"
diff -r cfa37fb98858 -r 1ae2567134a8 pwnat/receipt
--- a/pwnat/receipt	Mon Jul 25 12:47:51 2016 +0300
+++ b/pwnat/receipt	Tue Jul 26 13:47:19 2016 +0200
@@ -10,6 +10,7 @@
 TARBALL="$PACKAGE-$VERSION.zip"
 WEB_SITE="http://samy.pl/pwnat"
 WGET_URL="https://github.com/samyk/pwnat/archive/$GITHASH.zip"
+TAGS="nat traversal icmp tunnel"
 
 # Rules to configure and make the package.
 compile_rules()