Skip to content

Commit

Permalink
reduce buffer allocation
Browse files Browse the repository at this point in the history
  • Loading branch information
ginuerzh committed Feb 29, 2020
1 parent b2d5319 commit d8af58c
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 4 deletions.
10 changes: 8 additions & 2 deletions relay.go
Expand Up @@ -284,7 +284,7 @@ func (c *relayConn) Read(b []byte) (n int, err error) {
})

if err != nil {
log.Log("[relay] %s <- %s: %s", c.Conn.LocalAddr(), c.Conn.RemoteAddr(), err)
log.Logf("[relay] %s <- %s: %s", c.Conn.LocalAddr(), c.Conn.RemoteAddr(), err)
return
}

Expand Down Expand Up @@ -334,7 +334,13 @@ func (c *relayConn) Write(b []byte) (n int, err error) {
if !c.udp {
return c.Conn.Write(b)
}
buf := make([]byte, 2+len(b))
var buf []byte
if 2+len(b) <= mediumBufferSize {
buf = mPool.Get().([]byte)
defer mPool.Put(buf)
} else {
buf = make([]byte, 2+len(b))
}
binary.BigEndian.PutUint16(buf[:2], uint16(len(b)))
n = copy(buf[2:], b)
_, err = c.Conn.Write(buf)
Expand Down
8 changes: 7 additions & 1 deletion tuntap.go
Expand Up @@ -563,7 +563,13 @@ func (h *tapHandler) Handle(conn net.Conn) {
if err != nil {
return err
}
pc = cc.(net.PacketConn)
var ok bool
pc, ok = cc.(net.PacketConn)
if !ok {
err = errors.New("not a packet connection")
log.Logf("[tap] %s - %s: %s", conn.LocalAddr(), raddr, err)
return err
}
} else {
if h.options.TCPMode {
if raddr != nil {
Expand Down
7 changes: 6 additions & 1 deletion udp.go
Expand Up @@ -89,7 +89,9 @@ func UDPListener(addr string, cfg *UDPListenConfig) (Listener, error) {

func (l *udpListener) listenLoop() {
for {
b := make([]byte, mediumBufferSize)
// NOTE: this buffer will be released in the udpServerConn after read.
b := mPool.Get().([]byte)

n, raddr, err := l.ln.ReadFrom(b)
if err != nil {
log.Logf("[udp] peer -> %s : %s", l.Addr(), err)
Expand Down Expand Up @@ -240,6 +242,9 @@ func (c *udpServerConn) ReadFrom(b []byte) (n int, addr net.Addr, err error) {
select {
case bb := <-c.rChan:
n = copy(b, bb)
if cap(bb) == mediumBufferSize {
mPool.Put(bb[:cap(bb)])
}
case <-c.closed:
err = errors.New("read from closed connection")
return
Expand Down

0 comments on commit d8af58c

Please sign in to comment.