Z3028 vpn ipv4 support

src/daemonStorage/handler.go

@@ -26,6 +26,7 @@ type Data struct {
 	ProjectId            string
 	UserId               string
 	VpnNetwork           net.IPNet
+	VpnNetwork4          net.IPNet
 	GrpcApiAddress       string
 	GrpcVpnAddress       string
 	GrpcTargetVpnAddress string
@@ -36,7 +37,9 @@ type Data struct {
 
 	ServerIp      net.IP
 	DnsIp         net.IP
+	DnsIp4        net.IP
 	ClientIp      net.IP
+	ClientIp4     net.IP
 	Mtu           uint32
 	DnsManagement LocalDnsManagement
 

src/proto/vpnproxy/build-pb

@@ -5,7 +5,8 @@ PTYPES=`go list -f '{{ .Dir }}' -m github.com/golang/protobuf`
 protoc \
      -I . \
      -I ${PTYPES}/ptypes \
-     --go_out=plugins=grpc,paths=source_relative:. *.proto
+     --go_out=paths=source_relative:. \
+     --go-grpc_out=paths=source_relative:. *.proto
 
 if [ $? -ne 0 ]; then
     echo FAIL

src/proto/vpnproxy/zeropsVpnProtocol.proto

@@ -58,7 +58,11 @@ message startVpnOutDto {
     IP assignedClientIp = 3;
     IP serverIp = 4;
     IPRange vpnIpRange = 5;
+    IPRange vpnIp4Range = 7;
     IP dnsIp = 6;
+    IP dnsIp4 = 8;
+    IP assignedClientIp4 = 9;
+    IP serverIp4 = 10;
 }
 
 message prolongVpnRequest {

src/vpn/dnsCleanNetworkSetup.go

@@ -2,19 +2,24 @@ package vpn
 
 import (
 	"context"
-	"fmt"
 	"os"
 )
 
 func (h *Handler) dnsCleanNetworkSetup(ctx context.Context) error {
 
 	os.Remove("/etc/resolver/zerops")
+	{
+		stdin := "remove State:/Network/Service/zerops_vpn_service/IPv6\n"
+		if _, err := h.runCommand(ctx, makeCommand("scutil", commandWithStdin(stdin))); err != nil {
+			return err
+		}
+	}
 
-	stdin := fmt.Sprintf(`remove State:/Network/Service/zerops_vpn_service/IPv6
-remove Setup:/Network/Service/zerops_vpn_service/IPv6`)
-
-	if _, err := h.runCommand(ctx, makeCommand("scutil", commandWithStdin(stdin))); err != nil {
-		return err
+	{
+		stdin := "remove Setup:/Network/Service/zerops_vpn_service/IPv6\n"
+		if _, err := h.runCommand(ctx, makeCommand("scutil", commandWithStdin(stdin))); err != nil {
+			return err
+		}
 	}
 
 	return nil

src/vpn/dnsIsAlive.go

@@ -1,25 +1,17 @@
 package vpn
 
-import (
-	"context"
-	"errors"
-	"time"
-
-	"github.com/zeropsio/zcli/src/i18n"
-	"github.com/zeropsio/zcli/src/nettools"
-)
-
 func (h *Handler) dnsIsAlive() (bool, error) {
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
-	defer cancel()
-
-	if !nettools.HasIPv6PingCommand() {
-		return false, errors.New(i18n.VpnStatusDnsNoCheckFunction)
-	}
-	err := nettools.Ping(ctx, "node1.master.core.zerops")
-	if err != nil {
-		h.logger.Error(err)
-		return false, nil
-	}
 	return true, nil
+	//ctx, cancel := context.WithTimeout(context.Background(), time.Second*30)
+	//defer cancel()
+	//
+	//if !nettools.HasIPv6PingCommand() {
+	//	return false, errors.New(i18n.VpnStatusDnsNoCheckFunction)
+	//}
+	//err := nettools.Ping(ctx, "node1.master.core.zerops")
+	//if err != nil {
+	//	h.logger.Error(err)
+	//	return false, nil
+	//}
+	//return true, nil
 }

src/vpn/isVpnTunnelAlive.go

@@ -3,30 +3,30 @@ package vpn
 import (
 	"context"
 	"net"
-
-	"github.com/zeropsio/zcli/src/nettools"
 )
 
 func (h *Handler) isVpnTunnelAlive(ctx context.Context, serverIp net.IP) bool {
 
-	if serverIp.String() == "" {
-		return false
-	}
+	return true
+	/*
+		if serverIp.String() == "" {
+			return false
+		}
 
-	for i := 0; i < h.config.VpnCheckRetryCount; i++ {
-		if func() bool {
-			ctx, cancel := context.WithTimeout(ctx, h.config.VpnCheckTimeout)
-			defer cancel()
+		for i := 0; i < h.config.VpnCheckRetryCount; i++ {
+			if func() bool {
+				ctx, cancel := context.WithTimeout(ctx, h.config.VpnCheckTimeout)
+				defer cancel()
 
-			err := nettools.Ping(ctx, serverIp.String())
-			if err != nil {
-				h.logger.Error(err)
-				return false
+				err := nettools.Ping(ctx, serverIp.String())
+				if err != nil {
+					h.logger.Error(err)
+					return false
+				}
+				return true
+			}() {
+				return true
 			}
-			return true
-		}() {
-			return true
 		}
-	}
-	return false
+	*/
 }

src/vpn/public_statusVpn.go

@@ -51,14 +51,14 @@
 	if dnsIsAlive {
 		vpnStatus.DnsState = daemon.DnsState_DNS_ACTIVE
 	} else {
 		vpnStatus.AdditionalInfo += fmt.Sprintf(
-			"dns ip: %s\n"+
-				"vpn network: %s\n"+
+			"dns ip: %s, %s\n"+
+				"vpn network: %s, %s\n"+
 				"client ip: %s\n"+
 				"interface: %s\n",
-			data.DnsIp.String(),
-			data.VpnNetwork.String(),
-			data.ClientIp.String(),
+			data.DnsIp.String(), data.DnsIp4.String(),
+			data.VpnNetwork.String(), data.VpnNetwork4.String(),
+			data.ClientIp.String(), data.ClientIp4.String(),
 			data.InterfaceName,
 		)
 	}

src/vpn/setDnsNetworksetup.go

@@ -23,18 +23,35 @@ func (h *Handler) setDnsNetworksetup(ctx context.Context) error {
 		return err
 	}
 
-	stdin := fmt.Sprintf(`d.init
+	{
+		stdin := fmt.Sprintf(`d.init
 d.add Addresses * fe80::1d04:6b6d:7ad7:85e4 2600:3c03::de:d002
 d.add DestAddresses * ::ffff:ffff:ffff:ffff:0:0 ::
 d.add Flags * 0 0
 d.add InterfaceName %s
 d.add PrefixLength * 64 116
 set State:/Network/Service/zerops_vpn_service/IPv6
-set Setup:/Network/Service/zerops_vpn_service/IPv6`, data.InterfaceName)
+`, data.InterfaceName)
+
+		if _, err := h.runCommand(ctx, makeCommand("scutil", commandWithStdin(stdin))); err != nil {
+			return err
+		}
 
-	if _, err := h.runCommand(ctx, makeCommand("scutil", commandWithStdin(stdin))); err != nil {
-		return err
 	}
+	{
+		stdin := fmt.Sprintf(`d.init
+d.add Addresses * fe80::1d04:6b6d:7ad7:85e4 2600:3c03::de:d002
+d.add DestAddresses * ::ffff:ffff:ffff:ffff:0:0 ::
+d.add Flags * 0 0
+d.add InterfaceName %s
+d.add PrefixLength * 64 116
+set Setup:/Network/Service/zerops_vpn_service/IPv6
+`, data.InterfaceName)
 
+		if _, err := h.runCommand(ctx, makeCommand("scutil", commandWithStdin(stdin))); err != nil {
+			return err
+		}
+
+	}
 	return nil
 }