From 8797d35fa1dcd2ee54e19bc0067c6de61fd31eca Mon Sep 17 00:00:00 2001 From: Zack Scholl Date: Sun, 23 Sep 2018 06:27:59 -0700 Subject: [PATCH] use single variable for buffer size --- src/relay/conn.go | 7 ++++--- src/sender/sender.go | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/relay/conn.go b/src/relay/conn.go index 0e2d3f5b..71a565a2 100644 --- a/src/relay/conn.go +++ b/src/relay/conn.go @@ -6,6 +6,7 @@ import ( log "github.com/cihub/seelog" "github.com/gorilla/websocket" + "github.com/schollz/croc/src/models" ) const ( @@ -19,12 +20,12 @@ const ( pingPeriod = (pongWait * 9) / 10 // Maximum message size allowed from peer. - maxMessageSize = 1024 * 1024 * 16 + maxMessageSize = models.WEBSOCKET_BUFFER_SIZE / 2 ) var upgrader = websocket.Upgrader{ - ReadBufferSize: 1024 * 1024 * 32, - WriteBufferSize: 1024 * 1024 * 32, + ReadBufferSize: models.WEBSOCKET_BUFFER_SIZE, + WriteBufferSize: models.WEBSOCKET_BUFFER_SIZE, } // connection is an middleman between the websocket connection and the hub. diff --git a/src/sender/sender.go b/src/sender/sender.go index 92c74d11..2a946a75 100644 --- a/src/sender/sender.go +++ b/src/sender/sender.go @@ -194,7 +194,7 @@ func send(isLocal bool, c *websocket.Conn, fname string, codephrase string, useC fmt.Fprintf(os.Stderr, "\rSending (->%s)...\n", otherIP) // send file, compure hash simultaneously startTransfer = time.Now() - buffer := make([]byte, 1024*1024*8) + buffer := make([]byte, models.WEBSOCKET_BUFFER_SIZE/8) bar := progressbar.NewOptions( int(fstats.Size), progressbar.OptionSetRenderBlankState(true),