Fix performance

Author: Lukasz Zajaczkowski

client.ini

@@ -3,8 +3,8 @@
 mode = client
 
 [client]
-server = 192.168.30.128
+server = 104.199.19.152
 # server port
-port = 40100
+port = 80
 # MTU
 mtu = 1400

main

@@ -145,13 +145,7 @@ func NewClient(cfg ClientConfig) error {
 			logger.Debug("Read: ", string(r))
 
 			if messageType == websocket.TextMessage {
-				var message Data
-				if err := json.Unmarshal(r, &message); err != nil {
-					client.ws.Close()
-					close(client.data)
-					logger.Panic(err)
-				}
-				client.dispatcher(&message)
+				client.dispatcher(r)
 			}
 
 		}
@@ -161,11 +155,17 @@ func NewClient(cfg ClientConfig) error {
 	return errors.New("Not expected to exit")
 }
 
-func (clt *Client) dispatcher(message *Data) {
+func (clt *Client) dispatcher(p []byte) {
 	logger.Debug("Dispatcher: ", clt.state)
 	switch clt.state {
 	case STATE_INIT:
 		logger.Debug("STATE_INIT")
+		var message Data
+		if err := json.Unmarshal(p, &message); err != nil {
+			clt.ws.Close()
+			close(clt.data)
+			logger.Panic(err)
+		}
 		if message.ConnectionState == STATE_CONNECT {
 
 			ipStr := string(message.Payload)
@@ -180,12 +180,7 @@ func (clt *Client) dispatcher(message *Data) {
 			clt.handleInterface()
 		}
 	case STATE_CONNECTED:
-	if message.ConnectionState == STATE_CONNECTED {
-		clt.toIface <- message.Payload
-	}
-
-	case STATE_DISCONNECT:
-
+		clt.toIface <- p
 
 	}
 }
@@ -250,24 +245,23 @@ func (clt *Client) writePump() {
 
 func (clt *Client) write(mt int, message *Data) error {
 
-	s, err := json.Marshal(message)
-	if err != nil {
-		logger.Panic(err)
+	if message.ConnectionState == STATE_CONNECTED {
+		return clt.ws.WriteMessage(mt, message.Payload)
+	} else {
+		s, err := json.Marshal(message)
+		if err != nil {
+			logger.Panic(err)
+		}
+		return clt.ws.WriteMessage(mt, s)
 	}
-	logger.Debug("Sending data: ", string(s))
-	return clt.ws.WriteMessage(mt, s)
+
 }
 
 func (clt *Client) cleanUp() {
 	c := make(chan os.Signal, 1)
 	signal.Notify(c, syscall.SIGINT, syscall.SIGTERM)
 	<-c
 	logger.Info("Cleaning Up")
-
-	if err := clt.ws.WriteControl(websocket.CloseMessage, []byte{}, time.Now().Add(writeWait)); err != nil {
-		logger.Error("Send Close Message error", err)
-	}
-
 	delRoute("0.0.0.0/1")
 	delRoute("128.0.0.0/1")
 	for _, dest := range clt.routes {

vpn/client.go

@@ -97,11 +97,7 @@ func (c *connection) readPump() {
 		} else {
 
 			if messageType == websocket.TextMessage {
-				var message Data
-				if err := json.Unmarshal(r, &message); err != nil {
-					logger.Panic(err)
-				}
-				c.dispatcher(&message)
+				c.dispatcher(r)
 			}
 		}
 	}
@@ -141,28 +137,38 @@ func (c *connection) writePump() {
 
 func (c *connection) write(mt int, message *Data) error {
 
-	logger.Debug("write data len: ", len(message.Payload))
-	s, err := json.Marshal(message)
-	if err != nil {
-		logger.Panic(err)
-		return err
-	}
-
 	c.ws.SetWriteDeadline(time.Now().Add(writeWait))
-	err = c.ws.WriteMessage(mt, s)
-	if err != nil {
-		return err
-	}
 
-	return nil
+	if message.ConnectionState == STATE_CONNECTED {
+		err := c.ws.WriteMessage(mt, message.Payload)
+		if err != nil {
+			return err
+		}
+	} else {
+		s, err := json.Marshal(message)
+		if err != nil {
+			logger.Panic(err)
+			return err
+		}
+
 
+		err = c.ws.WriteMessage(mt, s)
+		if err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
-func (c *connection) dispatcher(message *Data) {
+func (c *connection) dispatcher(p []byte) {
 	logger.Debug("Dispatcher: ", c.state)
 	switch c.state {
 	case STATE_INIT:
 		logger.Debug("STATE_INIT")
+		var message Data
+		if err := json.Unmarshal(p, &message); err != nil {
+			logger.Panic(err)
+		}
 		if message.ConnectionState == STATE_CONNECT {
 			d := new(Data)
 			d.ConnectionState = STATE_CONNECT
@@ -181,13 +187,7 @@ func (c *connection) dispatcher(message *Data) {
 		}
 	case STATE_CONNECTED:
 		logger.Debug("STATE_CONNECTED")
-		if message.ConnectionState == STATE_CONNECTED {
-			logger.Debug("Data received: length ", len(message.Payload))
-			c.server.toIface <- message.Payload
-		}
-	case STATE_DISCONNECT:
-
-
+		c.server.toIface <- p
 	}
 }
 

vpn/connection.go

@@ -87,8 +87,6 @@ func NewServer(cfg ServerConfig) error {
 	vpnServer.ipnet = &net.IPNet{ip, subnet.Mask}
 	vpnServer.ippool.subnet = subnet
 
-	//fixMSS(iface.Name(), true)
-
 	go vpnServer.cleanUp()
 
 	go vpnServer.run()