-
Notifications
You must be signed in to change notification settings - Fork 80
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add sctp.Association.Abort(reason string) method #183
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
package sctp | ||
|
||
import ( | ||
"fmt" | ||
) | ||
|
||
/* | ||
This error cause MAY be included in ABORT chunks that are sent | ||
because of an upper-layer request. The upper layer can specify an | ||
Upper Layer Abort Reason that is transported by SCTP transparently | ||
and MAY be delivered to the upper-layer protocol at the peer. | ||
|
||
0 1 2 3 | ||
0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 | ||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||
| Cause Code=12 | Cause Length=Variable | | ||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||
/ Upper Layer Abort Reason / | ||
\ \ | ||
+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ | ||
*/ | ||
type errorCauseUserInitiatedAbort struct { | ||
errorCauseHeader | ||
upperLayerAbortReason []byte | ||
} | ||
|
||
func (e *errorCauseUserInitiatedAbort) marshal() ([]byte, error) { | ||
e.code = userInitiatedAbort | ||
e.errorCauseHeader.raw = e.upperLayerAbortReason | ||
return e.errorCauseHeader.marshal() | ||
} | ||
|
||
func (e *errorCauseUserInitiatedAbort) unmarshal(raw []byte) error { | ||
err := e.errorCauseHeader.unmarshal(raw) | ||
if err != nil { | ||
return err | ||
} | ||
|
||
e.upperLayerAbortReason = e.errorCauseHeader.raw | ||
return nil | ||
} | ||
|
||
// String makes errorCauseUserInitiatedAbort printable | ||
func (e *errorCauseUserInitiatedAbort) String() string { | ||
return fmt.Sprintf("%s: %s", e.errorCauseHeader.String(), e.upperLayerAbortReason) | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are you able to add the following text just to be consistent with other error_cause_xxx.go files?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, I'll try to address it over the next couple of days
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @jeremija !
Some auto tests are failing with TestAssociation_HandlePacketBeforeInit/Abort.
From what I can see, a.handleAbort() calls a.close() which sets the state to
closed
. Then the test case calls a.Close() which complains "use of closed network connection".I think calling a.close() on the receipt of Abort chunk is right. I believe we could safely skip a.Close() in the test when the test case is
"Abort"
in TestAssociation_HandlePacketBeforeInit.Otherwise, it all looks good to me!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is something from before but I think this test case name should be changed to something like: "TestAssociation_HandlePacketInCookieWaitState" IMO.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks, I didn't realize there was a failing test. It should be fixed now. I also renamed the test case.