From 1701b1acb0efec5a0143373a193f9875f0c523df Mon Sep 17 00:00:00 2001 From: Henry Camacho Date: Fri, 24 Mar 2017 17:45:54 -0500 Subject: [PATCH] Back and running --- rvpn/genericlistener/connection.go | 13 ++++++------- rvpn/genericlistener/listener_generic.go | 4 ++-- rvpn/packer/packer.go | 2 -- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/rvpn/genericlistener/connection.go b/rvpn/genericlistener/connection.go index d2134ee..1149240 100755 --- a/rvpn/genericlistener/connection.go +++ b/rvpn/genericlistener/connection.go @@ -2,7 +2,6 @@ package genericlistener import ( "context" - "encoding/hex" "io" "strconv" "sync" @@ -224,11 +223,11 @@ func (c *Connection) Reader(ctx context.Context) { loginfo.Println("Reader Start ", c) - c.conn.SetReadLimit(65535) + //c.conn.SetReadLimit(65535) for { - msgType, message, err := c.conn.ReadMessage() + _, message, err := c.conn.ReadMessage() - loginfo.Println("ReadMessage", msgType, err) + //loginfo.Println("ReadMessage", msgType, err) c.Update() @@ -245,10 +244,10 @@ func (c *Connection) Reader(ctx context.Context) { key := p.Header.Address().String() + ":" + strconv.Itoa(p.Header.Port) track, err := connectionTrack.Lookup(key) - loginfo.Println(hex.Dump(p.Data.Data())) + //loginfo.Println(hex.Dump(p.Data.Data())) if err != nil { - loginfo.Println("Unable to locate Tracking for ", key) + //loginfo.Println("Unable to locate Tracking for ", key) continue } @@ -263,7 +262,7 @@ func (c *Connection) Reader(ctx context.Context) { c.addIn(int64(len(message))) c.addResponse() - loginfo.Println("end of read") + //loginfo.Println("end of read") } } diff --git a/rvpn/genericlistener/listener_generic.go b/rvpn/genericlistener/listener_generic.go index fa563b4..6dce8e7 100644 --- a/rvpn/genericlistener/listener_generic.go +++ b/rvpn/genericlistener/listener_generic.go @@ -370,8 +370,8 @@ func handleWssClient(ctx context.Context, oneConn *oneConnListener) { domains, ok := claims["domains"].([]interface{}) var upgrader = websocket.Upgrader{ - ReadBufferSize: 1024, - WriteBufferSize: 1024, + ReadBufferSize: 65535, + WriteBufferSize: 65535, } conn, err := upgrader.Upgrade(w, r, nil) diff --git a/rvpn/packer/packer.go b/rvpn/packer/packer.go index a981273..7f4af1b 100644 --- a/rvpn/packer/packer.go +++ b/rvpn/packer/packer.go @@ -45,8 +45,6 @@ func splitHeader(header []byte, names []string) (map[string]string, error) { //ReadMessage - func ReadMessage(b []byte) (*Packer, error) { - fmt.Println("ReadMessage") - // Detect protocol in use if b[0] == packerV1 { // Separate the header and body using the header length in the second byte.