Merge pull request #348 from xssnick/dev-14

v1.14.1

Author: xssnick

README.md

@@ -4,7 +4,7 @@
 
 [![Based on TON][ton-svg]][ton]
 [![Telegram Channel][tgc-svg]][tg-channel]
-![Coverage](https://img.shields.io/badge/Coverage-69.7%25-yellow)
+![Coverage](https://img.shields.io/badge/Coverage-69.5%25-yellow)
 
 Golang library for interacting with TON blockchain.
 

adnl/address/address.go

@@ -7,6 +7,7 @@ import (
 
 func init() {
 	tl.Register(UDP{}, "adnl.address.udp ip:int port:int = adnl.Address")
+	tl.Register(UDP6{}, "adnl.address.udp6 ip:int128 port:int = adnl.Address")
 	tl.Register(List{}, "adnl.addressList addrs:(vector adnl.Address) version:int reinit_date:int priority:int expire_at:int = adnl.AddressList")
 }
 
@@ -15,8 +16,13 @@ type UDP struct {
 	Port int32  `tl:"int"`
 }
 
+type UDP6 struct {
+	IP   net.IP `tl:"int128"`
+	Port int32  `tl:"int"`
+}
+
 type List struct {
-	Addresses  []*UDP `tl:"vector struct boxed"`
+	Addresses  []*UDP `tl:"vector struct boxed"` // TODO: v6 too
 	Version    int32  `tl:"int"`
 	ReinitDate int32  `tl:"int"`
 	Priority   int32  `tl:"int"`

adnl/adnl.go

@@ -689,7 +689,7 @@ func (a *ADNL) send(buf []byte) error {
 		// not close on io timeout because it can be triggered by network overload
 		if !strings.Contains(err.Error(), "i/o timeout") {
 			// it should trigger disconnect handler in read routine
-			a.writer.Close()
+			a.Close()
 		}
 		return err
 	} else if n != len(buf) {

adnl/conn.go

@@ -25,10 +25,12 @@ func newWriter(writer func(p []byte, deadline time.Time) (err error), close func
 	}
 }
 
+var ErrPeerConnClosed = errors.New("peer connection was closed")
+
 func (c *clientConn) Write(b []byte, deadline time.Time) (n int, err error) {
 	select {
 	case <-c.closer:
-		return 0, fmt.Errorf("connection was closed")
+		return 0, ErrPeerConnClosed
 	default:
 	}
 

adnl/gateway.go

@@ -125,8 +125,7 @@ func NewGatewayWithNetManager(key ed25519.PrivateKey, reader NetManager) *Gatewa
 var PacketsBufferSize = 128 * 1024
 
 var DefaultListener = func(addr string) (net.PacketConn, error) {
-	// since ip field in adnl accept only 4 bytes, we cannot fully support v6 right now
-	lp, err := net.ListenPacket("udp4", addr)
+	lp, err := net.ListenPacket("udp", addr)
 	if err != nil {
 		return nil, err
 	}
@@ -565,7 +564,9 @@ func (p *peerConn) SetDisconnectHandler(handler func(addr string, key ed25519.Pu
 		p.server.mx.Unlock()
 
 		if handler != nil {
-			handler(addr, key)
+			// run it async to avoid potential deadlock issues in user code
+			// in case closed under lock, and the same lock is used in handler
+			go handler(addr, key)
 		}
 	})
 }

adnl/overlay/manager-rldp.go

@@ -12,6 +12,7 @@ import (
 
 type RLDP interface {
 	GetADNL() rldp.ADNL
+	GetRateInfo() (left int64, total int64)
 	Close()
 	DoQuery(ctx context.Context, maxAnswerSize uint64, query, result tl.Serializable) error
 	DoQueryAsync(ctx context.Context, maxAnswerSize uint64, id []byte, query tl.Serializable, result chan<- rldp.AsyncQueryResult) error

adnl/rldp/bucket.go

@@ -26,8 +26,8 @@ func NewTokenBucket(rate int64, peerName string) *TokenBucket {
 }
 
 func (tb *TokenBucket) SetRate(pps int64) {
-	if pps < 50 {
-		pps = 50
+	if pps < 128 {
+		pps = 128
 	} else if pps > 5000000 {
 		pps = 5000000
 	}