Merge pull request #304 from xssnick/dev-v1-11

ADNL improvements & RLDP FEC parse fix

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-72.8%25-brightgreen)
+![Coverage](https://img.shields.io/badge/Coverage-72.6%25-brightgreen)
 
 Golang library for interacting with TON blockchain.
 

adnl/adnl.go

@@ -58,8 +58,7 @@ type ADNL struct {
 	closerCtx context.Context
 	closeFn   context.CancelFunc
 
-	channelPtr               unsafe.Pointer
-	channelExchangeCompleted int32
+	channelPtr unsafe.Pointer
 
 	msgParts map[string]*partitionedMessage
 
@@ -274,7 +273,6 @@ func (a *ADNL) processMessage(message any) error {
 		}
 
 		atomic.StorePointer(&a.channelPtr, unsafe.Pointer(newChan))
-		atomic.StoreInt32(&a.channelExchangeCompleted, 0)
 	case MessageConfirmChannel:
 		a.mx.Lock()
 		defer a.mx.Unlock()
@@ -567,8 +565,6 @@ func (a *ADNL) buildRequest(req tl.Serializable) (buf []byte, err error) {
 			return buf, nil
 		}
 
-		atomic.StoreInt32(&a.channelExchangeCompleted, 1)
-
 		// channel is active
 		buf, err = ch.createPacket(seqno, req)
 		if err != nil {
@@ -591,7 +587,6 @@ func (a *ADNL) buildRequest(req tl.Serializable) (buf []byte, err error) {
 			initDate: int32(time.Now().Unix()),
 		}
 		atomic.StorePointer(&a.channelPtr, unsafe.Pointer(ch))
-		atomic.StoreInt32(&a.channelExchangeCompleted, 0)
 		a.mx.Unlock()
 	}
 
@@ -670,6 +665,18 @@ func (a *ADNL) GetID() []byte {
 	return id
 }
 
+func (a *ADNL) GetPubKey() ed25519.PublicKey {
+	return a.peerKey
+}
+
+func (a *ADNL) Reinit() {
+	atomic.StorePointer(&a.channelPtr, nil)
+	atomic.StoreInt32(&a.reinitTime, int32(time.Now().Unix()))
+	atomic.StoreInt32(&a.dstReinit, 0)
+	atomic.StoreInt64(&a.seqno, 0)
+	atomic.StoreInt64(&a.confirmSeqno, 0)
+}
+
 func (a *ADNL) createPacket(seqno int64, isResp bool, msgs ...any) ([]byte, error) {
 	if a.peerKey == nil {
 		return nil, fmt.Errorf("unknown peer")

adnl/conn.go

@@ -1,8 +1,10 @@
 package adnl
 
 import (
+	"context"
+	"errors"
 	"fmt"
-	"golang.org/x/net/ipv4"
+	"log"
 	"net"
 	"sync"
 	"time"
@@ -52,43 +54,46 @@ func (c *clientConn) Close() error {
 	return nil
 }
 
-type batchConn struct {
-	localAddr net.Addr
-	conn      *ipv4.PacketConn
-
-	buf []ipv4.Message
-	mx  sync.Mutex
-}
-
 type syncPacket struct {
 	addr net.Addr
 	buf  []byte
 }
 
 type SyncConn struct {
-	conn    net.PacketConn
-	chWrite chan syncPacket
-	chRead  chan syncPacket
+	conn      net.PacketConn
+	chWrite   chan syncPacket
+	chRead    chan syncPacket
+	closerCtx context.Context
+	closer    context.CancelFunc
 }
 
 func NewSyncConn(conn net.PacketConn, packetsBufSz int) *SyncConn {
+	ctx, cancel := context.WithCancel(context.Background())
 	sc := &SyncConn{
-		conn:    conn,
-		chWrite: make(chan syncPacket, packetsBufSz),
+		conn:      conn,
+		chWrite:   make(chan syncPacket, packetsBufSz),
+		closer:    cancel,
+		closerCtx: ctx,
 	}
 	go sc.writer()
 	return sc
 }
 
 func (s *SyncConn) writer() {
+	defer s.Close()
+
 	for {
 		select {
 		case p := <-s.chWrite:
-			_, err := s.conn.WriteTo(p.buf, p.addr)
-			if err != nil {
-				_ = s.conn.Close()
-				return
+			if _, err := s.conn.WriteTo(p.buf, p.addr); err != nil {
+				if errors.Is(err, net.ErrClosed) {
+					return
+				}
+				// should not happen, but if will we want to see
+				log.Println("[CONN] Write error:", err.Error())
 			}
+		case <-s.closerCtx.Done():
+			return
 		}
 	}
 }
@@ -98,11 +103,16 @@ func (s *SyncConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
 }
 
 func (s *SyncConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
-	s.chWrite <- syncPacket{addr, p}
-	return len(p), nil
+	select {
+	case <-s.closerCtx.Done():
+		return 0, fmt.Errorf("connection was closed")
+	case s.chWrite <- syncPacket{addr, p}:
+		return len(p), nil
+	}
 }
 
 func (s *SyncConn) Close() error {
+	s.closer()
 	return s.conn.Close()
 }
 

adnl/dht/client_test.go

@@ -53,6 +53,13 @@ type MockADNL struct {
 	close func()
 }
 
+func (m MockADNL) GetPubKey() ed25519.PublicKey {
+	return ed25519.PublicKey{}
+}
+
+func (m MockADNL) Reinit() {
+}
+
 func (m MockADNL) GetCloserCtx() context.Context {
 	return context.Background()
 }

adnl/gateway.go

@@ -29,6 +29,8 @@ type Peer interface {
 	GetCloserCtx() context.Context
 	RemoteAddr() string
 	GetID() []byte
+	GetPubKey() ed25519.PublicKey
+	Reinit()
 	Close()
 }
 
@@ -125,42 +127,11 @@ func NewGatewayWithListener(key ed25519.PrivateKey, listener func(addr string) (
 }
 
 var DefaultListener = func(addr string) (net.PacketConn, error) {
-	/*ra, err := net.ResolveUDPAddr("udp", *dstAddr)
-	if err != nil {
-		log.Fatal(err)
-	}
-	conn, err := net.DialUDP("udp", nil, ra)
-	if err != nil {
-		log.Fatal(err)
-	}
-	pconn := ipv6.NewPacketConn(conn)
-
-	pconn := ipv6.NewPacketConn(g.conn)
-
-	wb := make([]ipv6.Message, *batchSize)
-	for i := 0; i < *batchSize; i++ {
-		wb[i].Addr = ra
-		wb[i].Buffers = [][]byte{make([]byte, *packetSize)}
-	}
-
-	pconn.SendMsgs()*/
-	/*lc := net.ListenConfig{
-		Control: func(network, address string, c syscall.RawConn) error {
-			var opErr error
-			err := c.Control(func(fd uintptr) {
-				opErr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)
-			})
-			if err != nil {
-				return err
-			}
-			return opErr
-		},
-	}*/
 	lp, err := net.ListenPacket("udp", addr)
 	if err != nil {
 		return nil, err
 	}
-	return NewSyncConn(lp, 1*1024*1024), nil
+	return NewSyncConn(lp, 512*1024), nil
 }
 
 func (g *Gateway) GetAddressList() address.List {
@@ -430,20 +401,6 @@ func (g *Gateway) listen(rootId []byte) {
 			}
 		}
 
-		// TODO: processors pool
-		/*func() {
-			defer func() {
-				if r := recover(); r != nil {
-					Logger("critical error while processing packet at server:", r)
-				}
-			}()
-
-			if err := proc.processor(buf); err != nil {
-				Logger("failed to process packet at server:", err)
-				return
-			}
-		}()*/
-
 		if err := proc.processor(buf); err != nil {
 			Logger("failed to process packet at server:", err)
 		}
@@ -458,6 +415,18 @@ func (p *peerConn) checkUpdateAddr(addr net.Addr) {
 	}
 }
 
+func (g *Gateway) GetActivePeers() []Peer {
+	g.mx.RLock()
+	defer g.mx.RUnlock()
+
+	peers := make([]Peer, 0, len(g.peers))
+	for _, p := range g.peers {
+		peers = append(peers, p)
+	}
+
+	return peers
+}
+
 func (g *Gateway) registerClient(addr net.Addr, key ed25519.PublicKey, id string) (*peerConn, error) {
 	g.mx.Lock()
 	defer g.mx.Unlock()
@@ -586,6 +555,14 @@ func (p *peerConn) GetID() []byte {
 	return p.client.GetID()
 }
 
+func (p *peerConn) Reinit() {
+	p.client.Reinit()
+}
+
+func (p *peerConn) GetPubKey() ed25519.PublicKey {
+	return p.client.GetPubKey()
+}
+
 func (p *peerConn) SetCustomMessageHandler(handler func(msg *MessageCustom) error) {
 	p.client.SetCustomMessageHandler(handler)
 }

adnl/rldp/rldp.go

@@ -79,7 +79,7 @@ func (m *MessagePart) Parse(data []byte) ([]byte, error) {
 	copy(transfer, data)
 
 	var fec FECRaptorQ
-	data, err := tl.Parse(fec, data[32:], true)
+	data, err := tl.Parse(&fec, data[32:], true)
 	if err != nil {
 		return nil, err
 	}