ref: gathers all sctp config in one struct

Author: gomaja

client.go

@@ -18,12 +18,17 @@ import (
 // signals and heartbeats are automatically handled background in another goroutine.
 func Dial(ctx context.Context, net string, laddr, raddr *sctp.SCTPAddr, cfg *Config) (*Conn, error) {
 	var err error
+
+	if cfg.SCTPConfig == nil {
+		cfg.SCTPConfig = &SCTPConfig{}
+	}
+	cfg.SCTPConfig.sctpInfo = &sctp.SndRcvInfo{PPID: 0x03000000, Stream: 0}
+
 	conn := &Conn{
 		muState:     new(sync.RWMutex),
 		mode:        modeClient,
 		stateChan:   make(chan State),
 		established: make(chan struct{}),
-		sctpInfo:    &sctp.SndRcvInfo{PPID: 0x03000000, Stream: 0},
 		cfg:         cfg,
 	}
 
@@ -36,22 +41,22 @@ func Dial(ctx context.Context, net string, laddr, raddr *sctp.SCTPAddr, cfg *Con
 		return nil, fmt.Errorf("invalid network: %s", net)
 	}
 
-	conn.sctpConn, err = sctp.DialSCTP(n, laddr, raddr)
+	conn.cfg.SCTPConfig.sctpConn, err = sctp.DialSCTP(n, laddr, raddr)
 	if err != nil {
 		return nil, err
 	}
 
-	if conn.cfg.SctpSackInfo != nil && conn.cfg.SctpSackInfo.Enabled {
-		err = conn.sctpConn.SetSackTimer(&sctp.SackTimer{
-			SackDelay:     conn.cfg.SctpSackInfo.SackDelay,
-			SackFrequency: conn.cfg.SctpSackInfo.SackFrequency,
+	if conn.cfg.SCTPConfig.SctpSackInfo != nil && conn.cfg.SCTPConfig.SctpSackInfo.Enabled {
+		err = conn.cfg.SCTPConfig.sctpConn.SetSackTimer(&sctp.SackTimer{
+			SackDelay:     conn.cfg.SCTPConfig.SctpSackInfo.SackDelay,
+			SackFrequency: conn.cfg.SCTPConfig.SctpSackInfo.SackFrequency,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("failed to set sack timer: %w", err)
 		}
 	}
 
-	r, err := conn.sctpConn.GetStatus()
+	r, err := conn.cfg.SCTPConfig.sctpConn.GetStatus()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get sctpConn status: %w", err)
 	}
@@ -65,12 +70,12 @@ func Dial(ctx context.Context, net string, laddr, raddr *sctp.SCTPAddr, cfg *Con
 	select {
 	case _, ok := <-conn.established:
 		if !ok {
-			conn.sctpConn.Close()
+			conn.cfg.SCTPConfig.sctpConn.Close()
 			return nil, ErrFailedToEstablish
 		}
 		return conn, nil
 	case <-time.After(10 * time.Second):
-		conn.sctpConn.Close()
+		conn.cfg.SCTPConfig.sctpConn.Close()
 		return nil, ErrTimeout
 	}
 }

config.go

@@ -7,6 +7,7 @@ package m3ua
 import (
 	"time"
 
+	"github.com/ishidawataru/sctp"
 	"github.com/wmnsk/go-m3ua/messages/params"
 )
 
@@ -18,6 +19,13 @@ type HeartbeatInfo struct {
 	Data     []byte
 }
 
+// NewHeartbeatInfo creates a new HeartbeatInfo.
+func NewHeartbeatInfo(interval, timer time.Duration, data []byte) *HeartbeatInfo {
+	return &HeartbeatInfo{
+		Enabled: true, Interval: interval, Timer: timer, Data: data,
+	}
+}
+
 // SctpSackInfo is a set of information for SCTP SACK timer configuration.
 //
 // SackDelay sack_delay: This parameter contains the number of milliseconds the
@@ -35,17 +43,20 @@ type SctpSackInfo struct {
 	SackFrequency uint32
 }
 
-// NewHeartbeatInfo creates a new HeartbeatInfo.
-func NewHeartbeatInfo(interval, timer time.Duration, data []byte) *HeartbeatInfo {
-	return &HeartbeatInfo{
-		Enabled: true, Interval: interval, Timer: timer, Data: data,
-	}
+// SCTPConfig holds all SCTP-related configuration parameters.
+// This separates SCTP layer configuration from M3UA layer configuration.
+type SCTPConfig struct {
+	*SctpSackInfo
+	// sctpConn is the underlying SCTP association
+	sctpConn *sctp.SCTPConn
+	// sctpInfo is SndRcvInfo in SCTP association
+	sctpInfo *sctp.SndRcvInfo
 }
 
 // Config is a configuration that defines a M3UA server.
 type Config struct {
 	*HeartbeatInfo
-	*SctpSackInfo
+	*SCTPConfig
 	AspIdentifier          *params.Param
 	TrafficModeType        *params.Param
 	NetworkAppearance      *params.Param
@@ -101,7 +112,10 @@ func (c *Config) EnableHeartbeat(interval, timer time.Duration) *Config {
 //
 // Note: sackDelay=0, sackFrequency=1 (disables delayed SACK)
 func (c *Config) SetSackConfig(sackDelay, sackFrequency uint32) *Config {
-	c.SctpSackInfo = &SctpSackInfo{
+	if c.SCTPConfig == nil {
+		c.SCTPConfig = &SCTPConfig{}
+	}
+	c.SCTPConfig.SctpSackInfo = &SctpSackInfo{
 		Enabled:       true,
 		SackDelay:     sackDelay,
 		SackFrequency: sackFrequency,

conn.go

@@ -23,7 +23,7 @@ const (
 	modeServer
 )
 
-// Conn represents a M3UA connection, which satisfies standard net.Conn interface.
+// Conn represents a M3UA connection, which satisfies the standard net.Conn interface.
 type Conn struct {
 	// maxMessageStreamID is the maximum negotiated sctp stream ID used,
 	// must not be zero, must vary from 1 to maxMessageStreamID
@@ -40,15 +40,11 @@ type Conn struct {
 	established chan struct{}
 	// beatAckChan notifies that heartbeat gets the ack as expected
 	beatAckChan chan struct{}
-	// dataChan is to pass the ProtocolDataPayload(=payload on M3UA DATA) to user
+	// dataChan is to pass the ProtocolDataPayload(=payload on M3UA DATA) to the user
 	dataChan chan *params.ProtocolDataPayload
-	// errChan is to pass errors to goroutine that monitors status
+	// errChan is to pass errors to a goroutine that monitors status
 	errChan chan error
-	// sctpConn is the underlying SCTP association
-	sctpConn *sctp.SCTPConn
-	// sctpInfo is SndRcvInfo in SCTP association
-	sctpInfo *sctp.SndRcvInfo
-	// cfg is a configuration that is required to communicate between M3UA endpoints
+	// cfg is a configuration required to communicate between M3UA endpoints
 	cfg *Config
 	// Condition to allow heartbeat, only after the state is AspUp
 	beatAllow *sync.Cond
@@ -126,9 +122,9 @@ func (c *Conn) WriteToStream(b []byte, streamID uint16) (n int, err error) {
 	}
 
 	// taken by value to avoid race condition on the stream id
-	info := *c.sctpInfo
+	info := *c.cfg.SCTPConfig.sctpInfo
 	info.Stream = streamID
-	n, err = c.sctpConn.SCTPWrite(d, &info)
+	n, err = c.cfg.SCTPConfig.sctpConn.SCTPWrite(d, &info)
 	if err != nil {
 		return 0, err
 	}
@@ -160,9 +156,9 @@ func (c *Conn) WritePDToStream(protocolData *params.Param, streamID uint16) (n i
 	}
 
 	// taken by value to avoid race condition on the stream id
-	info := *c.sctpInfo
+	info := *c.cfg.SCTPConfig.sctpInfo
 	info.Stream = streamID
-	n, err = c.sctpConn.SCTPWrite(d, &info)
+	n, err = c.cfg.SCTPConfig.sctpConn.SCTPWrite(d, &info)
 	if err != nil {
 		return 0, err
 	}
@@ -180,12 +176,12 @@ func (c *Conn) WriteSignal(m3 messages.M3UA) (n int, err error) {
 	}
 
 	// taken by value to avoid race condition on the stream id
-	sctpInfo := *c.sctpInfo
+	sctpInfo := *c.cfg.SCTPConfig.sctpInfo
 	if m3.MessageClass() != messages.MsgClassTransfer {
 		sctpInfo.Stream = 0
 	}
 
-	nn, err := c.sctpConn.SCTPWrite(buf, &sctpInfo)
+	nn, err := c.cfg.SCTPConfig.sctpConn.SCTPWrite(buf, &sctpInfo)
 	if err != nil {
 		return 0, fmt.Errorf("failed to write M3UA: %w", err)
 	}
@@ -200,39 +196,39 @@ func (c *Conn) Close() error {
 	defer c.muState.Unlock()
 
 	if c.state == StateAspDown {
-		return c.sctpConn.Close()
+		return c.cfg.SCTPConfig.sctpConn.Close()
 	}
 
 	close(c.established)
 	close(c.beatAckChan)
 	close(c.dataChan)
 	c.state = StateAspDown
-	return c.sctpConn.Close()
+	return c.cfg.SCTPConfig.sctpConn.Close()
 }
 
 // LocalAddr returns the local network address.
 func (c *Conn) LocalAddr() net.Addr {
-	return c.sctpConn.LocalAddr()
+	return c.cfg.SCTPConfig.sctpConn.LocalAddr()
 }
 
 // RemoteAddr returns the remote network address.
 func (c *Conn) RemoteAddr() net.Addr {
-	return c.sctpConn.RemoteAddr()
+	return c.cfg.SCTPConfig.sctpConn.RemoteAddr()
 }
 
 // SetDeadline sets the read and write deadlines associated.
 func (c *Conn) SetDeadline(t time.Time) error {
-	return c.sctpConn.SetDeadline(t)
+	return c.cfg.SCTPConfig.sctpConn.SetDeadline(t)
 }
 
 // SetReadDeadline sets the deadline for future Read calls.
 func (c *Conn) SetReadDeadline(t time.Time) error {
-	return c.sctpConn.SetReadDeadline(t)
+	return c.cfg.SCTPConfig.sctpConn.SetReadDeadline(t)
 }
 
 // SetWriteDeadline sets the deadline for future Write calls.
 func (c *Conn) SetWriteDeadline(t time.Time) error {
-	return c.sctpConn.SetWriteDeadline(t)
+	return c.cfg.SCTPConfig.sctpConn.SetWriteDeadline(t)
 }
 
 // State returns current state of Conn.
@@ -244,7 +240,7 @@ func (c *Conn) State() State {
 
 // StreamID returns sctpInfo.Stream of Conn.
 func (c *Conn) StreamID() uint16 {
-	return c.sctpInfo.Stream
+	return c.cfg.SCTPConfig.sctpInfo.Stream
 }
 
 // MaxMessageStreamID returns the maximum negotiated sctp stream ID
@@ -264,7 +260,7 @@ func (c *Conn) MaxMessageStreamID() uint16 {
 //
 // Note: sackDelay=0, sackFrequency=1 (disables delayed SACK)
 func (c *Conn) SetSctpSackConfig(sackDelay, sackFrequency uint32) error {
-	return c.sctpConn.SetSackTimer(&sctp.SackTimer{
+	return c.cfg.SCTPConfig.sctpConn.SetSackTimer(&sctp.SackTimer{
 		SackDelay:     sackDelay,
 		SackFrequency: sackFrequency,
 	})

fsm.go

@@ -226,7 +226,7 @@ func (c *Conn) monitor(ctx context.Context) {
 			}
 
 			// Read from conn to see something coming from the peer.
-			n, _, err := c.sctpConn.SCTPRead(buf)
+			n, _, err := c.cfg.SCTPConfig.sctpConn.SCTPRead(buf)
 			if err != nil {
 				c.Close()
 				return

server.go

@@ -41,12 +41,17 @@ func Listen(net string, laddr *sctp.SCTPAddr, cfg *Config) (*Listener, error) {
 // After successfully establishing the association with peer, Payload can be read with Read() func.
 // Other signals are automatically handled background in another goroutine.
 func (l *Listener) Accept(ctx context.Context) (*Conn, error) {
+
+	if l.Config.SCTPConfig == nil {
+		l.Config.SCTPConfig = &SCTPConfig{}
+	}
+	l.Config.SCTPConfig.sctpInfo = &sctp.SndRcvInfo{PPID: 0x03000000, Stream: 0}
+
 	conn := &Conn{
 		muState:     new(sync.RWMutex),
 		mode:        modeServer,
 		stateChan:   make(chan State),
 		established: make(chan struct{}),
-		sctpInfo:    &sctp.SndRcvInfo{PPID: 0x03000000, Stream: 0},
 		cfg:         l.Config,
 	}
 
@@ -60,23 +65,23 @@ func (l *Listener) Accept(ctx context.Context) (*Conn, error) {
 	}
 
 	var ok bool
-	conn.sctpConn, ok = c.(*sctp.SCTPConn)
+	conn.cfg.SCTPConfig.sctpConn, ok = c.(*sctp.SCTPConn)
 	if !ok {
 		c.Close()
 		return nil, fmt.Errorf("failed to assert server connection")
 	}
 
-	if conn.cfg.SctpSackInfo != nil && conn.cfg.SctpSackInfo.Enabled {
-		err = conn.sctpConn.SetSackTimer(&sctp.SackTimer{
-			SackDelay:     conn.cfg.SctpSackInfo.SackDelay,
-			SackFrequency: conn.cfg.SctpSackInfo.SackFrequency,
+	if conn.cfg.SCTPConfig.SctpSackInfo != nil && conn.cfg.SCTPConfig.SctpSackInfo.Enabled {
+		err = conn.cfg.SCTPConfig.sctpConn.SetSackTimer(&sctp.SackTimer{
+			SackDelay:     conn.cfg.SCTPConfig.SctpSackInfo.SackDelay,
+			SackFrequency: conn.cfg.SCTPConfig.SctpSackInfo.SackFrequency,
 		})
 		if err != nil {
 			return nil, fmt.Errorf("failed to set sack timer: %w", err)
 		}
 	}
 
-	r, err := conn.sctpConn.GetStatus()
+	r, err := conn.cfg.SCTPConfig.sctpConn.GetStatus()
 	if err != nil {
 		return nil, fmt.Errorf("failed to get sctpConn status: %w", err)
 	}
@@ -90,12 +95,12 @@ func (l *Listener) Accept(ctx context.Context) (*Conn, error) {
 	select {
 	case _, ok := <-conn.established:
 		if !ok {
-			conn.sctpConn.Close()
+			conn.cfg.SCTPConfig.sctpConn.Close()
 			return nil, ErrFailedToEstablish
 		}
 		return conn, nil
 	case <-time.After(10 * time.Second):
-		conn.sctpConn.Close()
+		conn.cfg.SCTPConfig.sctpConn.Close()
 		return nil, ErrTimeout
 	}
 }