Merge pull request #60 from wmnsk/ack-aspdn

Handle ASPDN correctly + housekeeping

Author: wmnsk

aspsm.go

@@ -17,11 +17,11 @@ func (c *Conn) initiateASPSM() error {
 }
 func (c *Conn) handleAspUp(aspUp *messages.AspUp) error {
 	if c.State() != StateAspDown {
-		return NewErrUnexpectedMessage(aspUp)
+		return NewUnexpectedMessageError(aspUp)
 
 	}
 	if c.StreamID() != 0 {
-		return NewErrInvalidSCTPStreamID(c.StreamID())
+		return NewInvalidSCTPStreamIDError(c.StreamID())
 	}
 
 	if _, err := c.WriteSignal(
@@ -38,10 +38,10 @@ func (c *Conn) handleAspUp(aspUp *messages.AspUp) error {
 
 func (c *Conn) handleAspUpAck(aspUpAck *messages.AspUpAck) error {
 	if c.State() != StateAspDown {
-		return NewErrUnexpectedMessage(aspUpAck)
+		return NewUnexpectedMessageError(aspUpAck)
 	}
 	if c.StreamID() != 0 {
-		return NewErrInvalidSCTPStreamID(c.StreamID())
+		return NewInvalidSCTPStreamIDError(c.StreamID())
 	}
 
 	return nil
@@ -50,10 +50,12 @@ func (c *Conn) handleAspUpAck(aspUpAck *messages.AspUpAck) error {
 func (c *Conn) handleAspDown(aspDown *messages.AspDown) error {
 	switch c.State() {
 	case StateAspInactive, StateAspActive:
-		return NewErrUnexpectedMessage(aspDown)
+		// expected, do nothing here
+	default:
+		return NewUnexpectedMessageError(aspDown)
 	}
 	if c.StreamID() != 0 {
-		return NewErrInvalidSCTPStreamID(c.StreamID())
+		return NewInvalidSCTPStreamIDError(c.StreamID())
 	}
 
 	// XXX - Validate the params.
@@ -68,10 +70,10 @@ func (c *Conn) handleAspDown(aspDown *messages.AspDown) error {
 func (c *Conn) handleAspDownAck(aspDownAck *messages.AspDownAck) error {
 	switch c.State() {
 	case StateAspInactive, StateAspActive:
-		return NewErrUnexpectedMessage(aspDownAck)
+		return NewUnexpectedMessageError(aspDownAck)
 	}
 	if c.StreamID() != 0 {
-		return NewErrInvalidSCTPStreamID(c.StreamID())
+		return NewInvalidSCTPStreamIDError(c.StreamID())
 	}
 
 	return nil

asptm.go

@@ -68,7 +68,7 @@ func (c *Conn) heartbeat(ctx context.Context) {
 
 func (c *Conn) handleAspActive(aspActive *messages.AspActive) error {
 	if c.State() != StateAspInactive {
-		return NewErrUnexpectedMessage(aspActive)
+		return NewUnexpectedMessageError(aspActive)
 	}
 
 	if _, err := c.WriteSignal(
@@ -82,7 +82,7 @@ func (c *Conn) handleAspActive(aspActive *messages.AspActive) error {
 
 func (c *Conn) handleAspActiveAck(aspAcAck *messages.AspActiveAck) error {
 	if c.State() != StateAspInactive {
-		return NewErrUnexpectedMessage(aspAcAck)
+		return NewUnexpectedMessageError(aspAcAck)
 	}
 
 	// XXX - Add some additional validation for aspAcAck here.
@@ -92,7 +92,7 @@ func (c *Conn) handleAspActiveAck(aspAcAck *messages.AspActiveAck) error {
 
 func (c *Conn) handleAspInactive(aspInactive *messages.AspInactive) error {
 	if c.State() != StateAspActive {
-		return NewErrUnexpectedMessage(aspInactive)
+		return NewUnexpectedMessageError(aspInactive)
 	}
 
 	if _, err := c.WriteSignal(
@@ -106,7 +106,7 @@ func (c *Conn) handleAspInactive(aspInactive *messages.AspInactive) error {
 
 func (c *Conn) handleAspInactiveAck(aspAcAck *messages.AspInactiveAck) error {
 	if c.State() != StateAspActive {
-		return NewErrUnexpectedMessage(aspAcAck)
+		return NewUnexpectedMessageError(aspAcAck)
 	}
 
 	// XXX - Add some additional validation for aspAcAck here.
@@ -116,7 +116,7 @@ func (c *Conn) handleAspInactiveAck(aspAcAck *messages.AspInactiveAck) error {
 
 func (c *Conn) handleHeartbeat(beat *messages.Heartbeat) error {
 	if c.State() != StateAspActive {
-		return NewErrUnexpectedMessage(beat)
+		return NewUnexpectedMessageError(beat)
 	}
 
 	// No need to create new HeartbeatAck, as it's identical to Heartbeat except the MessageType.
@@ -129,17 +129,17 @@ func (c *Conn) handleHeartbeat(beat *messages.Heartbeat) error {
 
 func (c *Conn) handleHeartbeatAck(beatAck *messages.HeartbeatAck) error {
 	if c.State() != StateAspActive {
-		return NewErrUnexpectedMessage(beatAck)
+		return NewUnexpectedMessageError(beatAck)
 	}
 
 	myData := c.cfg.HeartbeatInfo.Data
 	dataFromPeer := beatAck.HeartbeatData.HeartbeatData()
 	if len(dataFromPeer) != len(myData) {
-		return NewErrUnexpectedMessage(beatAck)
+		return NewUnexpectedMessageError(beatAck)
 	}
 	for i, p := range dataFromPeer {
 		if p != myData[i] {
-			return NewErrUnexpectedMessage(beatAck)
+			return NewUnexpectedMessageError(beatAck)
 		}
 	}
 

errors.go

@@ -22,40 +22,44 @@ var (
 	ErrHeartbeatExpired    = errors.New("heartbeat timer expired")
 	ErrFailedToPeelOff     = errors.New("failed to peel off Protocol Data")
 	ErrFailedToWriteSignal = errors.New("failed to write signal")
+
+	// ErrAspIDRequired is used by an SGP in response to an ASP Up message that
+	// does not contain an ASP Identifier parameter when the SGP requires one.
+	ErrAspIDRequired = errors.New("ASP Identifier required")
 )
 
-// ErrInvalidVersion is used if a message with an unsupported version is received.
-type ErrInvalidVersion struct {
+// InvalidVersionError is used if a message with an unsupported version is received.
+type InvalidVersionError struct {
 	Ver uint8
 }
 
-// NewErrInvalidVersion creates ErrInvalidVersion.
-func NewErrInvalidVersion(ver uint8) *ErrInvalidVersion {
-	return &ErrInvalidVersion{Ver: ver}
+// NewInvalidVersionError creates InvalidVersionError.
+func NewInvalidVersionError(ver uint8) *InvalidVersionError {
+	return &InvalidVersionError{Ver: ver}
 }
 
 // Error returns error string with violating version.
-func (e *ErrInvalidVersion) Error() string {
+func (e *InvalidVersionError) Error() string {
 	return fmt.Sprintf("invalid version: %d", e.Ver)
 }
 
-// ErrUnsupportedClass is used if a message with an unexpected or
+// UnsupportedClassError is used if a message with an unexpected or
 // unsupported Message Class is received.
-type ErrUnsupportedClass struct {
+type UnsupportedClassError struct {
 	Msg messages.M3UA
 }
 
-// NewErrUnsupportedClass creates ErrUnsupportedClass
-func NewErrUnsupportedClass(msg messages.M3UA) *ErrUnsupportedClass {
-	return &ErrUnsupportedClass{Msg: msg}
+// NewUnsupportedClassError creates UnsupportedClassError
+func NewUnsupportedClassError(msg messages.M3UA) *UnsupportedClassError {
+	return &UnsupportedClassError{Msg: msg}
 }
 
 // Error returns error string with message class.
-func (e *ErrUnsupportedClass) Error() string {
+func (e *UnsupportedClassError) Error() string {
 	return fmt.Sprintf("message class unsupported. class: %s", e.Msg.MessageClassName())
 }
 
-func (e *ErrUnsupportedClass) first40Octets() []byte {
+func (e *UnsupportedClassError) first40Octets() []byte {
 	b, err := e.Msg.MarshalBinary()
 	if err != nil {
 		return nil
@@ -67,23 +71,23 @@ func (e *ErrUnsupportedClass) first40Octets() []byte {
 	return b[:40]
 }
 
-// ErrUnsupportedMessage is used if a message with an
+// UnsupportedMessageError is used if a message with an
 // unexpected or unsupported Message Type is received.
-type ErrUnsupportedMessage struct {
+type UnsupportedMessageError struct {
 	Msg messages.M3UA
 }
 
-// NewErrUnsupportedMessage creates ErrUnsupportedMessage
-func NewErrUnsupportedMessage(msg messages.M3UA) *ErrUnsupportedMessage {
-	return &ErrUnsupportedMessage{Msg: msg}
+// NewUnsupportedMessageError creates UnsupportedMessageError
+func NewUnsupportedMessageError(msg messages.M3UA) *UnsupportedMessageError {
+	return &UnsupportedMessageError{Msg: msg}
 }
 
 // Error returns error string with message class and type.
-func (e *ErrUnsupportedMessage) Error() string {
+func (e *UnsupportedMessageError) Error() string {
 	return fmt.Sprintf("message unsupported. class: %s, type: %s", e.Msg.MessageClassName(), e.Msg.MessageTypeName())
 }
 
-func (e *ErrUnsupportedMessage) first40Octets() []byte {
+func (e *UnsupportedMessageError) first40Octets() []byte {
 	b, err := e.Msg.MarshalBinary()
 	if err != nil {
 		return nil
@@ -95,81 +99,67 @@ func (e *ErrUnsupportedMessage) first40Octets() []byte {
 	return b[:40]
 }
 
-// ErrUnexpectedMessage is used if a defined and recognized message is received
+// UnexpectedMessageError is used if a defined and recognized message is received
 // that is not expected in the current state (in some cases, the ASP may optionally
 // silently discard the message and not send an Error message).
-type ErrUnexpectedMessage struct {
+type UnexpectedMessageError struct {
 	Msg messages.M3UA
 }
 
-// NewErrUnexpectedMessage creates ErrUnexpectedMessage
-func NewErrUnexpectedMessage(msg messages.M3UA) *ErrUnexpectedMessage {
-	return &ErrUnexpectedMessage{Msg: msg}
+// NewUnexpectedMessageError creates UnexpectedMessageError
+func NewUnexpectedMessageError(msg messages.M3UA) *UnexpectedMessageError {
+	return &UnexpectedMessageError{Msg: msg}
 }
 
 // Error returns error string with message class and type.
-func (e *ErrUnexpectedMessage) Error() string {
+func (e *UnexpectedMessageError) Error() string {
 	return fmt.Sprintf("unexpected message. class: %s, type: %s", e.Msg.MessageClassName(), e.Msg.MessageTypeName())
 }
 
-// ErrInvalidSCTPStreamID is used if a message is received on an unexpected SCTP stream.
-type ErrInvalidSCTPStreamID struct {
+// InvalidSCTPStreamIDError is used if a message is received on an unexpected SCTP stream.
+type InvalidSCTPStreamIDError struct {
 	ID uint16
 }
 
-// NewErrInvalidSCTPStreamID creates ErrInvalidSCTPStreamID
-func NewErrInvalidSCTPStreamID(id uint16) *ErrInvalidSCTPStreamID {
-	return &ErrInvalidSCTPStreamID{ID: id}
+// NewInvalidSCTPStreamIDError creates InvalidSCTPStreamIDError
+func NewInvalidSCTPStreamIDError(id uint16) *InvalidSCTPStreamIDError {
+	return &InvalidSCTPStreamIDError{ID: id}
 }
 
 // Error returns error string with violating stream ID.
-func (e *ErrInvalidSCTPStreamID) Error() string {
+func (e *InvalidSCTPStreamIDError) Error() string {
 	return fmt.Sprintf("invalid SCTP Stream ID: %d", e.ID)
 }
 
-// ErrAspIDRequired is used by an SGP in response to an ASP Up message that
-// does not contain an ASP Identifier parameter when the SGP requires one..
-type ErrAspIDRequired struct{}
-
-// NewErrAspIDRequired creates ErrAspIDRequired
-func NewErrAspIDRequired() *ErrAspIDRequired {
-	return &ErrAspIDRequired{}
-}
-
-// Error returns error string.
-func (e *ErrAspIDRequired) Error() string {
-	return "ASP ID required"
-}
-
 func (c *Conn) handleErrors(e error) error {
 	var res messages.M3UA
-	var errInvalidVersion *ErrInvalidVersion
-	if errors.As(e, &errInvalidVersion) {
+	var InvalidVersionError *InvalidVersionError
+	if errors.As(e, &InvalidVersionError) {
 		res = messages.NewError(
-			params.NewErrorCode(params.ErrInvalidVersion),
+			params.NewErrorCode(params.InvalidVersionError),
 			nil, nil, nil, nil,
 		)
 	}
 	//nolint:errorlint
-	if err, ok := e.(*ErrUnsupportedClass); ok {
+	if err, ok := e.(*UnsupportedClassError); ok {
 		res = messages.NewError(
-			params.NewErrorCode(params.ErrUnsupportedMessageClass),
+			params.NewErrorCode(params.UnsupportedMessageErrorClass),
 			nil, nil, nil,
 			params.NewDiagnosticInformation(err.first40Octets()),
 		)
 	}
 	//nolint:errorlint
-	if err, ok := e.(*ErrUnsupportedMessage); ok {
+	if err, ok := e.(*UnsupportedMessageError); ok {
 		res = messages.NewError(
-			params.NewErrorCode(params.ErrUnsupportedMessageType),
+			params.NewErrorCode(params.UnsupportedMessageErrorType),
 			nil, nil, nil,
 			params.NewDiagnosticInformation(err.first40Octets()),
 		)
 	}
-	var errUnexpectedMessage *ErrUnexpectedMessage
-	if errors.As(e, &errUnexpectedMessage) {
+	var UnexpectedMessageError *UnexpectedMessageError
+	if errors.As(e, &UnexpectedMessageError) {
 		res = messages.NewError(
-			params.NewErrorCode(params.ErrUnexpectedMessage),
+			params.NewErrorCode(params.UnexpectedMessageError),
 			c.cfg.RoutingContexts,
 			c.cfg.NetworkAppearance,
 			params.NewAffectedPointCode(
@@ -178,15 +168,14 @@ func (c *Conn) handleErrors(e error) error {
 			nil,
 		)
 	}
-	var errInvalidSCTPStreamID *ErrInvalidSCTPStreamID
-	if errors.As(e, &errInvalidSCTPStreamID) {
+	var InvalidSCTPStreamIDError *InvalidSCTPStreamIDError
+	if errors.As(e, &InvalidSCTPStreamIDError) {
 		res = messages.NewError(
 			params.NewErrorCode(params.ErrInvalidStreamIdentifier),
 			nil, nil, nil, nil,
 		)
 	}
-	var errAspIDRequired *ErrAspIDRequired
-	if errors.As(e, &errAspIDRequired) {
+	if errors.Is(e, ErrAspIDRequired) {
 		res = messages.NewError(
 			params.NewErrorCode(params.ErrAspIdentifierRequired),
 			nil, nil, nil, nil,

fsm.go

@@ -114,7 +114,7 @@ func (c *Conn) handleSignals(ctx context.Context, m3 messages.M3UA) {
 
 	// Signal validations
 	if m3.Version() != 1 {
-		c.errChan <- NewErrInvalidVersion(m3.Version())
+		c.errChan <- NewInvalidVersionError(m3.Version())
 		return
 	}
 
@@ -189,7 +189,7 @@ func (c *Conn) handleSignals(ctx context.Context, m3 messages.M3UA) {
 		c.stateChan <- c.State()
 	// Others: SSNM and RKM is not implemented.
 	default:
-		c.errChan <- NewErrUnsupportedMessage(m3)
+		c.errChan <- NewUnsupportedMessageError(m3)
 		c.stateChan <- c.State()
 	}
 }

go.sum

@@ -1,7 +1,5 @@
 github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
 github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
-github.com/ishidawataru/sctp v0.0.0-20250425063137-c91d9fd4afaf h1:Yk0+ELKOCwbQ3ysGeTYMQYZJMb1rEj7VPTRXHqaEasM=
-github.com/ishidawataru/sctp v0.0.0-20250425063137-c91d9fd4afaf/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=
 github.com/ishidawataru/sctp v0.0.0-20250427101207-53eab83c1cf6 h1:BcV9jRUmgOhP6dWHo1awB1QQQjGMRUuS9E4/lmwcbQY=
 github.com/ishidawataru/sctp v0.0.0-20250427101207-53eab83c1cf6/go.mod h1:co9pwDoBCm1kGxawmb4sPq0cSIOOWNPT4KnHotMP1Zg=
 github.com/pascaldekloe/goe v0.1.1 h1:Ah6WQ56rZONR3RW3qWa2NCZ6JAVvSpUcoLBaOmYFt9Q=

management.go

@@ -10,7 +10,7 @@ import "github.com/wmnsk/go-m3ua/messages"
 func (c *Conn) handleError(e *messages.Error) error {
 	switch c.State() {
 	case StateSCTPCDI, StateSCTPRI:
-		return NewErrUnexpectedMessage(e)
+		return NewUnexpectedMessageError(e)
 	}
 
 	return nil
@@ -20,7 +20,7 @@ func (c *Conn) handleError(e *messages.Error) error {
 func (c *Conn) handleNotify(e *messages.Notify) error {
 	switch c.State() {
 	case StateSCTPCDI, StateSCTPRI:
-		return NewErrUnexpectedMessage(e)
+		return NewUnexpectedMessageError(e)
 	}
 
 	return nil

messages/error_test.go

@@ -15,7 +15,7 @@ func TestError(t *testing.T) {
 		{
 			"has-all",
 			NewError(
-				params.NewErrorCode(params.ErrInvalidVersion),
+				params.NewErrorCode(params.InvalidVersionError),
 				params.NewRoutingContext(1),
 				params.NewNetworkAppearance(1),
 				params.NewAffectedPointCode(0x11111111, 0x22222222),