# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1470734094 -7200
# Node ID 50aef5b483cbe8f876b2efe9b48960edd36f44d9
# Parent  90198f573d18e93f7ecb098ecc96c91ae76cf276
ppp: remove pppnc (done by pppssh)

diff -r 90198f573d18 -r 50aef5b483cb ppp/receipt
--- a/ppp/receipt	Tue Aug 09 11:03:52 2016 +0200
+++ b/ppp/receipt	Tue Aug 09 11:14:54 2016 +0200
@@ -34,8 +34,6 @@
 	mkdir -p $fs/usr $fs/var/www/tazpanel/menu.d/network/VPN
 	cp -a $install/usr/sbin $fs/usr
 	[ -d "$install/usr/lib" ] && cp -a $install/usr/lib $fs/usr
-	cp -a $stuff/pppnc-server $fs/usr/sbin
-	ln $fs/usr/sbin/pppnc-server $fs/usr/sbin/pppnc-client
 	cp -a $stuff/ppp.cgi $fs/var/www/tazpanel
 	ln -s ../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/ppp
 	ln -s ../../../ppp.cgi $fs/var/www/tazpanel/menu.d/network/VPN/ppp
diff -r 90198f573d18 -r 50aef5b483cb ppp/stuff/ppp.cgi
--- a/ppp/stuff/ppp.cgi	Tue Aug 09 11:03:52 2016 +0200
+++ b/ppp/stuff/ppp.cgi	Tue Aug 09 11:14:54 2016 +0200
@@ -23,9 +23,6 @@
 		[ "$(which pppssh 2>/dev/null)" ] && cat <<EOT
 <li><a data-icon="vpn" href="ppp.cgi#pppssh" data-root>$(_ 'PPP/SSH')</a></li>
 EOT
-		cat <<EOT
-<li><a data-icon="upgrade" href="ppp.cgi#pppnc" data-root>$(_ 'Route shortcut')</a></li>
-EOT
 		;;
 		*)
 		cat <<EOT
@@ -79,14 +76,6 @@
 		killall pppd
 	fi
 	;;
-*\ setpppnc\ *)
-	[ "$(GET stop_pppncs)" ] && killall pppnc-server
-	[ "$(GET start_pppncs)" ] &&
-		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)" &
-	;;
 *\ setpppssh\ *)
 	cat > /etc/ppp/pppssh <<EOT
 PEER="$(GET peer)"
@@ -128,8 +117,6 @@
 ACCOUNT="$(sed '/^ACCOUNT=/!d;s/^.*=\([^ \t]*\).*/\1/' /etc/ppp/scripts/ppp-on)"
 PASSPSTN="$(sed '/^PASSWORD=/!d;s/^.*=\([^ \t]*\).*/\1/' /etc/ppp/scripts/ppp-on)"
 PHONE="$(sed '/^TELEPHONE=/!d;s/^.*=\([^ \t]*\).*/\1/' /etc/ppp/scripts/ppp-on)"
-busybox ps x | grep -v grep | grep -q pppnc_server || stops_disabled='disabled'
-busybox ps x | grep -v grep | grep -q pppnc_client || stopc_disabled='disabled'
 TITLE="$(_ 'TazPanel - Network') - $(_ 'PPP Connections')"
 header
 xhtml_header | sed 's/id="content"/id="content-sidebar"/'
@@ -247,46 +234,6 @@
 	--></footer>
 </form>
 </section>
-
-<a name="pppnc"></a>
-<section>
-	<header>
-		<span data-icon="upgrade">$(_ 'Route shortcut') -
-		$(_ 'Reach unreachable networks')</span>
-	</header>
-<form method="get">
-	<input type="hidden" name="setppprc" />
-	<table>
-	<tr>
-		<td>$(_ 'UDP port')</td>
-		<td><input type="text" name="port" size="50" value="1111" /></td>
-	</tr>
-	<tr> <td colspan=2 align=center>--- $(_ 'Server only') ---</td> </tr>
-	<tr>
-		<td>$(_ 'Local IP address')</td>
-		<td><input type="text" name="localip" size="50" value="${LOCALIP:-192.168.254.1}" /></td>
-	</tr>
-	<tr>
-		<td>$(_ 'Remote IP address')</td>
-		<td><input type="text" name="remoteip" size="50" value="${REMOTEIP:-192.168.254.2}" /></td>
-	<tr> <td colspan=2 align=center>--- $(_ 'Client only') ---</td> </tr>
-	<tr>
-		<td>$(_ 'Server IP address')</td>
-		<td><input type="text" name="serverip" size="50" value="1.2.3.4" /></td>
-	</tr>
-	<tr>
-		<td>$(_ 'Server 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>
-	</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>
-</section>
 EOT
 if [ "$(which pppssh 2>/dev/null)" ]; then
 	[ -s /etc/ppp/pppssh ] && . /etc/ppp/pppssh
diff -r 90198f573d18 -r 50aef5b483cb ppp/stuff/pppnc-server
--- a/ppp/stuff/pppnc-server	Tue Aug 09 11:03:52 2016 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-#!/bin/sh
-
-ppp="/usr/sbin/pppd local noauth nodetach"
-port=1111
-ipupd=/etc/ppp/ip-up.d
-
-case "$0" in
-*server) # Usage: pppnc-server [port] [localip:remoteip]
-	n=10.$(($$%256)).$(($$/256))
-	exec $ppp ${2:-$n.1:$n.2} passive proxyarp pty "nc -ulp ${1:-$port}"
-esac
-
-[ -z "$1" ] && echo "Usage: $0 serverip [port] [routes]" && exit 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 ${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$$
-chmod +x $ipupd/pppnc$$
-$ppp noipdefault pty "nc -u $1 ${2:-$port}" ipparam pppnc$$
-[ "$3" ] && route del $extra
-rm -f $ipupd/pppnc$$