enh: enhances code

Author: gomaja

client.go

@@ -39,15 +39,14 @@ func Dial(ctx context.Context, net string, laddr, raddr *sctp.SCTPAddr, cfg *Con
 	conn.sctpConn, err = sctp.DialSCTP(n, laddr, raddr)
 	if err != nil {
 		if conn.sctpConn != nil {
-			logf("go-m3ua: issue dialing connection. closing error: %v\n", conn.sctpConn.Close())
+			return nil, fmt.Errorf("go-m3ua: issue dialing connection. closing error: %w", conn.sctpConn.Close())
 		}
 		return nil, err
 	}
 
 	r, err := conn.sctpConn.GetStatus()
 	if err != nil {
-		logf("go-m3ua: failed to retrive sctpConnection status for Dial: %v\n", err)
-		return nil, err
+		return nil, fmt.Errorf("go-m3ua: failed to retrive sctpConnection status for Dial: %w", err)
 	}
 	conn.maxMessageStreamID = r.Ostreams - 1 // removing 1 for management messages of stream ID 0
 
@@ -59,12 +58,10 @@ func Dial(ctx context.Context, net string, laddr, raddr *sctp.SCTPAddr, cfg *Con
 	select {
 	case _, ok := <-conn.established:
 		if !ok {
-			logf("go-m3ua: issue having established client connection. closing error: %v\n", conn.sctpConn.Close())
-			return nil, ErrFailedToEstablish
+			return nil, fmt.Errorf("go-m3ua: issue having established client connection. error: %w, closing error: %w", ErrFailedToEstablish, conn.sctpConn.Close())
 		}
 		return conn, nil
 	case <-time.After(10 * time.Second):
-		logf("go-m3ua: issue client connection timeout. closing error: %v\n", conn.sctpConn.Close())
-		return nil, ErrTimeout
+		return nil, fmt.Errorf("go-m3ua: issue client connection timeout. error: %w, closing error: %w", ErrTimeout, conn.sctpConn.Close())
 	}
 }

conn.go

@@ -6,7 +6,6 @@ package m3ua
 
 import (
 	"fmt"
-	"log"
 	"math/rand"
 	"net"
 	"sync"
@@ -105,7 +104,7 @@ func (c *Conn) ReadPD() (pd *params.ProtocolDataPayload, err error) {
 
 // Write writes data to the connection.
 func (c *Conn) Write(b []byte) (n int, err error) {
-	stream := RandomUint16(c.maxMessageStreamID) // choose a random stream number from 1 to a certain maximum
+	stream := c.chooseStreamID()
 
 	return c.WriteToStream(b, stream)
 }
@@ -131,8 +130,7 @@ func (c *Conn) WriteToStream(b []byte, streamID uint16) (n int, err error) {
 	info.Stream = streamID
 	n, err = c.sctpConn.SCTPWrite(d, &info)
 	if err != nil {
-		log.Printf("go-m3ua: error writing on sctp connection, stream id: %v, max negotiated stream id: %v, error : %v", streamID, c.maxMessageStreamID, err)
-		return 0, err
+		return 0, fmt.Errorf("go-m3ua: error writing on sctp connection, stream id: %v, max negotiated stream id: %v, error : %w", streamID, c.maxMessageStreamID, err)
 	}
 
 	n += len(d)
@@ -141,7 +139,7 @@ func (c *Conn) WriteToStream(b []byte, streamID uint16) (n int, err error) {
 
 // WritePD writes data with a specific mtp3 protocol data to the connection.
 func (c *Conn) WritePD(protocolData *params.Param) (n int, err error) {
-	stream := RandomUint16(c.maxMessageStreamID) // choose a random stream number from 1 to a certain maximum
+	stream := c.chooseStreamID()
 
 	return c.WritePDToStream(protocolData, stream)
 }
@@ -255,15 +253,15 @@ func (c *Conn) MaxMessageStreamID() uint16 {
 	return c.maxMessageStreamID
 }
 
-// RandomUint16 generates a random uint16 from 1 to max (inclusive)
-func RandomUint16(max uint16) uint16 {
+// chooseStreamID generates a random uint16 from 1 to max (inclusive)
+func (c *Conn) chooseStreamID() uint16 {
 	r := rand.New(rand.NewSource(time.Now().UnixNano()))
 
-	if max == 1 {
+	if c.maxMessageStreamID == 1 {
 		return 1
 	}
 
-	randomNum := uint16(r.Intn(int(max)))
+	randomNum := uint16(r.Intn(int(c.maxMessageStreamID)))
 
 	return randomNum + 1
 }

server.go

@@ -6,7 +6,6 @@ package m3ua
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"net"
 	"sync"
@@ -63,14 +62,12 @@ func (l *Listener) Accept(ctx context.Context) (*Conn, error) {
 	var ok bool
 	conn.sctpConn, ok = c.(*sctp.SCTPConn)
 	if !ok {
-		logf("go-m3ua: issue asserting server connection. closing error: %v\n", c.Close())
-		return nil, errors.New("failed to assert conn")
+		return nil, fmt.Errorf("go-m3ua: issue asserting server connection. error: %w, closing error: %w", fmt.Errorf("failed to assert conn"), c.Close())
 	}
 
 	r, err := conn.sctpConn.GetStatus()
 	if err != nil {
-		logf("go-m3ua: failed to retrive sctpConnection status for Accept: %v\n", err)
-		return nil, err
+		return nil, fmt.Errorf("go-m3ua: failed to retrive sctpConnection status for Accept: %w", err)
 	}
 	conn.maxMessageStreamID = r.Ostreams - 1 // removing 1 for management messages of stream ID 0
 
@@ -86,17 +83,15 @@ func (l *Listener) Accept(ctx context.Context) (*Conn, error) {
 			if conn.sctpConn != nil {
 				closeErr = conn.sctpConn.Close()
 			}
-			logf("go-m3ua: issue having established server connection. closing error: %v\n", closeErr)
-			return nil, ErrFailedToEstablish
+			return nil, fmt.Errorf("go-m3ua: issue having established server connection. error: %w, closing error: %w", ErrFailedToEstablish, closeErr)
 		}
 		return conn, nil
 	case <-time.After(10 * time.Second):
 		var closeErr error
 		if conn.sctpConn != nil {
 			closeErr = conn.sctpConn.Close()
 		}
-		logf("go-m3ua: issue server connection timeout. closing error: %v\n", closeErr)
-		return nil, ErrTimeout
+		return nil, fmt.Errorf("go-m3ua: issue server connection timeout.  error: %w, closing error: %w", ErrTimeout, closeErr)
 	}
 }