VERSION | 2 +- common.mk | 2 +- doc/client.texi | 9 +++++---- doc/download.texi | 4 ++++ doc/glossary.texi | 2 ++ doc/news.ru.texi | 8 ++++++++ doc/news.texi | 8 ++++++++ doc/scripts.texi | 17 +++++++++++++++++ doc/server.texi | 6 +++--- src/cypherpunks.ru/govpn/cmd/govpn-client/main.go | 8 +++++++- src/cypherpunks.ru/govpn/cmd/govpn-client/tcp.go | 2 +- src/cypherpunks.ru/govpn/cmd/govpn-client/udp.go | 2 +- src/cypherpunks.ru/govpn/cmd/govpn-server/common.go | 4 ++-- src/cypherpunks.ru/govpn/cmd/govpn-server/main.go | 15 +++++++++++++++ src/cypherpunks.ru/govpn/cmd/govpn-server/tcp.go | 2 +- src/cypherpunks.ru/govpn/cmd/govpn-server/udp.go | 2 +- src/cypherpunks.ru/govpn/cmd/govpn-verifier/main.go | 5 +++++ src/cypherpunks.ru/govpn/common.go | 14 ++++++++++---- src/cypherpunks.ru/govpn/govpn.go | 15 +++++++++++++++ utils/addroute.sh | 20 ++++++++++---------- diff --git a/VERSION b/VERSION index 2df33d76977064e686bccc1b213c1c9186354aba..760606e1ffff82566e95fa1bfa840ca7d1024dd5 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.6 +5.7 diff --git a/common.mk b/common.mk index 0730f59f283057ac2d1e8759d52f15e3624d34ee..bd2f3a42bbfc8e162877434ec2db7aa7dda31a50 100644 --- a/common.mk +++ b/common.mk @@ -19,7 +19,7 @@ govpn-verifier: GOPATH=$(GOPATH) go build -ldflags "$(LDFLAGS)" cypherpunks.ru/govpn/cmd/govpn-verifier bench: - GOPATH=$(GOPATH) go test -bench . cypherpunks.ru/govpn/... + GOPATH=$(GOPATH) go test -benchmem -bench . cypherpunks.ru/govpn/... clean: rm -f govpn-client govpn-server govpn-verifier diff --git a/doc/client.texi b/doc/client.texi index 5b0ae2b7fda2723894f76a765641ae736c656f95..b6d8aab2a544863e63c7ef6f7cff7af539172b7d 100644 --- a/doc/client.texi +++ b/doc/client.texi @@ -51,8 +51,9 @@ @item -encless Enable @ref{Encless, encryptionless mode}. @item -up -Optional path to script that will be executed after connection is -established. Interface name will be given to it as a first argument. +Optional path to @ref{Scripts, script} that will be executed after +connection is established. Interface name will be given to it as a first +argument. @item -down Same as @option{-up} above, but it is executed when connection is lost, @@ -66,8 +67,8 @@ @verbatim client% cat > up.sh <.` +) diff --git a/utils/addroute.sh b/utils/addroute.sh index a8d85cd4226f5f05b6561f8d37d3a9dbbec6d586..e0ad70b886a11d2944ff10f9df3602f26a0c1054 100755 --- a/utils/addroute.sh +++ b/utils/addroute.sh @@ -6,34 +6,34 @@ # List of parameters passed through environment # - reason -- why this script is called: # pre-init, connect, disconnect -# - VPNGATEWAY -- public address of vpn gateway -# - TAPDEV -- tap device +# - GOVPN_REMOTE -- public address of VPN gateway +# - GOVPN_IFACE -- tap device # - INTERNAL_IP4_ADDRESS -- e.g. 172.0.0.2/24 # - INTERNAL_IP4_GATEWAY -- e.g. 172.0.0.1 set_up_dev() { - ip tuntap add dev $TAPDEV mode tap + ip tuntap add dev $GOVPN_IFACE mode tap } tear_down_dev() { - ip tuntap del dev $TAPDEV mode tap + ip tuntap del dev $GOVPN_IFACE mode tap } do_connect() { local OLDGW=$(ip route show 0/0 | sed 's/^default//') - ip link set dev $TAPDEV up - ip addr add $INTERNAL_IP4_ADDRESS dev $TAPDEV - ip route add $VPNGATEWAY $OLDGW - ip route add 0/1 via $INTERNAL_IP4_GATEWAY dev $TAPDEV - ip route add 128/1 via $INTERNAL_IP4_GATEWAY dev $TAPDEV + ip link set dev $GOVPN_IFACE up + ip addr add $INTERNAL_IP4_ADDRESS dev $GOVPN_IFACE + ip route add $GOVPN_REMOTE $OLDGW + ip route add 0/1 via $INTERNAL_IP4_GATEWAY dev $GOVPN_IFACE + ip route add 128/1 via $INTERNAL_IP4_GATEWAY dev $GOVPN_IFACE } do_disconnect() { - ip route del $VPNGATEWAY + ip route del $GOVPN_REMOTE }