Reduce allocations

gobaresip.go

@@ -227,9 +227,6 @@ func (b *Baresip) read() {
 				}
 			}
 		} else if bytes.Contains(msg, []byte("\"response\":true")) {
-			if bytes.Contains(msg, []byte("keep_active_ping")) {
-				continue
-			}
 
 			var r ResponseMsg
 			r.RawJSON = msg
@@ -309,14 +306,16 @@ func (b *Baresip) GetResponseChan() <-chan ResponseMsg {
 	return b.responseChan
 }
 
+var ping = []byte(`16:{"token":"ping"},`)
+
 func (b *Baresip) keepActive() {
 	for {
 		time.Sleep(1 * time.Second)
 		if atomic.LoadUint32(&b.ctrlConnAlive) == 0 {
 			break
 		}
 		b.ctrlConn.SetWriteDeadline(time.Now().Add(2 * time.Second))
-		b.ctrlConn.Write([]byte(`46:{"command":"about","token":"keep_active_ping"},`))
+		b.ctrlConn.Write(ping)
 	}
 }
 

netstring.go

@@ -26,9 +26,9 @@ package gobaresip
 import (
 	"bufio"
 	"bytes"
+	"fmt"
 	"io"
 	"strconv"
-	"strings"
 )
 
 const (
@@ -49,10 +49,21 @@ func (r *reader) readNetstring() ([]byte, error) {
 	if err != nil {
 		return nil, err
 	}
-	l, err := strconv.Atoi(strings.TrimSuffix(string(length), string(lengthDelim)))
-	if err != nil {
-		return nil, err
+
+	var l int
+	for _, ch := range length {
+		if ch != lengthDelim && ch != dataDelim {
+			ch -= '0'
+			if ch > 9 {
+				return nil, fmt.Errorf("wrong netstring length character")
+			}
+			l = l*10 + int(ch)
+		}
+	}
+	if l <= 0 {
+		return nil, fmt.Errorf("wrong netstring length")
 	}
+
 	ret := make([]byte, l)
 	_, err = io.ReadFull(r.r, ret)
 	if err != nil {