Add interconnection between clients

Author: Lukasz Zajaczkowski

client.ini

@@ -3,8 +3,9 @@
 mode = client
 
 [client]
-server = 104.199.19.152
+server = 104.199.15.195
 # server port
 port = 80
 # MTU
-mtu = 1400
+mtu = 1400
+redirectGateway = true

server.ini

@@ -4,7 +4,9 @@ mode = server
 
 [server]
 # port to listen
-port = 40100
+port = 8080
 # server addr
 vpnaddr = 10.1.1.1/24
-mtu = 1400
+mtu = 1400
+# allow communication between clients
+interconnection = false

utils/config.go

@@ -25,25 +25,27 @@ import (
 
 // Server Config
 type ServerConfig struct {
-	Port       int
-	ListenAddr string
-	VpnAddr    string
-	MTU        int
+	Port            int
+	ListenAddr      string
+	VpnAddr         string
+	MTU             int
+	Interconnection bool
 }
 
 // Client Config
 type ClientConfig struct {
-	Server string
-	Port   int
-	MTU    int
+	Server          string
+	Port            int
+	MTU             int
+	RedirectGateway bool
 }
 
 type VpnConfig struct {
 	Default struct {
-		Mode string
-	}
-	Server ServerConfig
-	Client ClientConfig
+			Mode string
+		}
+	Server  ServerConfig
+	Client  ClientConfig
 }
 
 func ParseConfig(filename string) (interface{}, error) {

vendor/vendor.json

@@ -0,0 +1,6 @@
+{
+	"comment": "",
+	"ignore": "test",
+	"package": [],
+	"rootPath": "github.com/zreigz/ws-vpn"
+}

vpn/client.go

@@ -151,7 +151,6 @@ func NewClient(cfg ClientConfig) error {
 		}
 
 	}
-
 	return errors.New("Not expected to exit")
 }
 
@@ -171,9 +170,11 @@ func (clt *Client) dispatcher(p []byte) {
 			ipStr := string(message.Payload)
 			ip, subnet, _ := net.ParseCIDR(ipStr)
 			setTunIP(clt.iface, ip, subnet)
-			err := redirectGateway(clt.iface.Name(), tun_peer.String())
-			if err != nil {
-				logger.Error("Redirect gateway error", err.Error())
+			if clt.cfg.RedirectGateway {
+				err := redirectGateway(clt.iface.Name(), tun_peer.String())
+				if err != nil {
+					logger.Error("Redirect gateway error", err.Error())
+				}
 			}
 
 			clt.state = STATE_CONNECTED

vpn/connection.go

@@ -27,8 +27,8 @@ import (
 
 const (
 	writeWait      = 10 * time.Second
-	pongWait       = 30 * time.Second
-	pingPeriod     = (pongWait) / 10
+	pongWait       = 60 * time.Second
+	pingPeriod     = (pongWait) / 2
 	maxMessageSize = 1024 * 1024
 )
 

vpn/server.go

@@ -35,29 +35,29 @@ import (
 
 type VpnServer struct {
 	// config
-	cfg ServerConfig
+	cfg        ServerConfig
 	// interface
-	iface *water.Interface
+	iface      *water.Interface
 	// subnet
-	ipnet *net.IPNet
+	ipnet      *net.IPNet
 	// IP Pool
-	ippool *VpnIpPool
+	ippool     *VpnIpPool
 	// client peers, key is the mac address, value is a HopPeer record
 
 	// Registered clients
-	clients map[string]*connection
+	clients    map[string]*connection
 
 	// Register requests
-	register chan *connection
+	register   chan *connection
 
 	// Unregister requests
 	unregister chan *connection
 
-	outData *Data
+	outData    *Data
 
-	inData chan *Data
+	inData     chan *Data
 
-	toIface chan []byte
+	toIface    chan []byte
 }
 
 func NewServer(cfg ServerConfig) error {
@@ -176,24 +176,40 @@ func (srv *VpnServer) handleInterface() {
 				break
 			}
 			header, _ := ipv4.ParseHeader(packet[:plen])
-			logger.Debug("Sending to remote: ", header)
-
+			logger.Debug("Try sending: ", header)
 			clientIP := header.Dst.String()
 			client, ok := srv.clients[clientIP]
 			if ok {
+				if !srv.cfg.Interconnection {
+					if srv.isConnectionBetweenClients(header) {
+						logger.Info("Drop connection betwenn ", header.Src, header.Dst)
+						continue
+					}
+				}
+
 				logger.Debug("Sending to client: ", client.ipAddress)
 				client.data <- &Data{
 					ConnectionState: STATE_CONNECTED,
 					Payload:         packet[:plen],
 				}
+
 			} else {
-				logger.Error("Client not found ", clientIP)
+				logger.Warning("Client not found ", clientIP)
 			}
 
 		}
 	}()
 }
 
+func (srv *VpnServer) isConnectionBetweenClients(header *ipv4.Header) bool {
+
+	if (header.Src.String() != header.Dst.String() && header.Src.String() != srv.ipnet.IP.String() && srv.ippool.subnet.Contains(header.Dst)) {
+		return true
+	}
+
+	return false
+}
+
 func (srv *VpnServer) cleanUp() {
 
 	c := make(chan os.Signal, 1)