diff options
| -rw-r--r-- | .SRCINFO | 2 | ||||
| -rw-r--r-- | PKGBUILD | 2 | ||||
| -rw-r--r-- | README.tun-cfg | 5 | ||||
| -rwxr-xr-x | tun-cfg | 32 |
4 files changed, 35 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = vtun pkgdesc = The easiest way to create Virtual Tunnels over TCP/IP networks with traffic shaping, compression, encryption and IPv6 support. pkgver = 3.0.3.2013.d - pkgrel = 13 + pkgrel = 14 url = http://vtun.sourceforge.net/ install = vtun.install arch = i686 @@ -4,7 +4,7 @@ pkgname=vtun pkgver=3.0.3.2013.d _pkgver=3.0.3 -pkgrel=13 +pkgrel=14 pkgdesc="The easiest way to create Virtual Tunnels over TCP/IP networks with traffic shaping, compression, encryption and IPv6 support." arch=('i686' 'x86_64' 'armv7h' 'armv6h' 'aarch64') url="http://vtun.sourceforge.net/" diff --git a/README.tun-cfg b/README.tun-cfg index b193ef7637b7..0999fe57fb5e 100644 --- a/README.tun-cfg +++ b/README.tun-cfg @@ -1,4 +1,4 @@ -Tunnel-configurer version 1.7.1 +Tunnel-configurer version 1.8 Client-server IP tunnel configuration via the same IP tunnel. -- vtund.conf -- @@ -64,6 +64,8 @@ LOCAL=server.vpn ROUTES='10.10.10.0/24 10.10.0.0/24' # kill connection on server side if client still not configured ABORT=yes + # No client's callback to server, confirmation by ping +CALLBACK=0 -- Command-line description -- ifconfig wrapper: @@ -99,6 +101,7 @@ noroutes|-r : server - Don't send any routes from config : client - Don't get IPv4 routes from server no6routes|-R : Don't get IPv6 routes from server (client only) timeout|-t <sec> : default=10, 0=endless +callback|-c <port> : Confirmation by sending 'Ok' to the server, instead of ping abort|-k : Abort connection after timeout keep|-K : ... or don't do it nofork|-B | nobg | nobackground @@ -25,10 +25,11 @@ MTU=1500 TIMEOUT=10 CMD=tun-cat ABORT= +CALLBACK=0 usage() { [[ -n "$1" ]] && return 0 - echo "Tunnel-configurer version 1.7.1 + echo "Tunnel-configurer version 1.8 Client-server IP tunnel configuration via the same IP tunnel. -- vtund.conf -- @@ -94,6 +95,8 @@ LOCAL=server.vpn ROUTES='10.10.10.0/24 10.10.0.0/24' # kill connection on server side if client still not configured ABORT=yes + # No client's callback to server, confirmation by ping +CALLBACK=0 -- Command-line description -- ifconfig wrapper: @@ -129,6 +132,7 @@ noroutes|-r : server - Don't send any routes from config : client - Don't get IPv4 routes from server no6routes|-R : Don't get IPv6 routes from server (client only) timeout|-t <sec> : default=10, 0=endless +callback|-c <port> : Confirmation by sending 'Ok' to the server, instead of ping abort|-k : Abort connection after timeout keep|-K : ... or don't do it nofork|-B | nobg | nobackground @@ -279,13 +283,25 @@ main() { fi sec_up START log "sending ->" + if ((CALLBACK)) ; then + log "waiting Ok back from client <--" + exec < <(exec "$CMD" listen "$ifc" "$CALLBACK" "$TIMEOUT") + fi while :; do "$CMD" send "$ifc" "$PORT" "${SEND[@]}" || exit 4 - "$ping" -q -c1 -W1 -I "$ifc" "$P" &> /dev/null && break + if ((CALLBACK)) ; then + read -t 1 c && exec <&- + log "<-- $c" + [[ "$c" = 'Ok' ]] && break + else + "$ping" -q -c1 -W1 -I "$ifc" "$P" &> /dev/null && { + log "Confirmed, $P is UP." + break + } + fi sec_up SEC ((TIMEOUT!=0)) && ((SEC > START+TIMEOUT)) && ifabort "Time is out." done - log "Confirmed, $P is UP." ;; get) @@ -325,6 +341,10 @@ main() { FIRST=0 done ((FIRST==0)) || ifabort "Failed." + if ((CALLBACK)) ; then + log "sending Ok back to server -->" + "$CMD" send "$ifc" "$CALLBACK" Ok + fi log "Completed." ;; esac @@ -394,6 +414,12 @@ while (($#>0)) ; do shift ;; + -c|callback) + usage "$2" + CALLBACK="$2" + shift 2 + ;; + -K|keep) ABORT= shift |