Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix SendDatagram #4436

Closed
wants to merge 4 commits into from
Closed

Fix SendDatagram #4436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4420fd
Fix SendDatagram
nekohasekai Apr 15, 2024
d874641
Remove bad Is(error) implementation for DatagramTooLargeError
nekohasekai Apr 15, 2024
07904f6
Also remove Is(error) for StreamError
nekohasekai Apr 15, 2024
c83ad80
Fix tests related to StreamError
nekohasekai Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions connection.go
View file
Open in desktop
Expand Up @@ -2358,9 +2358,10 @@ func (s *connection) SendDatagram(p []byte) error {
}

f := &wire.DatagramFrame{DataLenPresent: true}
if protocol.ByteCount(len(p)) > f.MaxDataLen(s.peerParams.MaxDatagramFrameSize, s.version) {
maxDataLen := f.MaxDataLen(s.peerParams.MaxDatagramFrameSize, s.version)
if protocol.ByteCount(len(p)) > maxDataLen {
return &DatagramTooLargeError{
PeerMaxDatagramFrameSize: int64(s.peerParams.MaxDatagramFrameSize),
PeerMaxDatagramFrameSize: int64(maxDataLen),
}
}
f.Data = make([]byte, len(p))
Expand Down
10 changes: 0 additions & 10 deletions errors.go
View file
Open in desktop
Expand Up @@ -49,11 +49,6 @@ type StreamError struct {
Remote bool
}

func (e *StreamError) Is(target error) bool {
_, ok := target.(*StreamError)
return ok
}

func (e *StreamError) Error() string {
pers := "local"
if e.Remote {
Expand All @@ -67,9 +62,4 @@ type DatagramTooLargeError struct {
PeerMaxDatagramFrameSize int64
}

func (e *DatagramTooLargeError) Is(target error) bool {
_, ok := target.(*DatagramTooLargeError)
return ok
}

func (e *DatagramTooLargeError) Error() string { return "DATAGRAM frame too large" }
5 changes: 5 additions & 0 deletions integrationtests/self/cancelation_test.go
View file
Open in desktop
Expand Up @@ -246,6 +246,7 @@ var _ = Describe("Stream Cancellations", func() {
Expect(err).To(MatchError(&quic.StreamError{
StreamID: str.StreamID(),
ErrorCode: quic.StreamErrorCode(str.StreamID()),
Remote: true,
}))
return
}
Expand Down Expand Up @@ -356,6 +357,7 @@ var _ = Describe("Stream Cancellations", func() {
Expect(err).To(MatchError(&quic.StreamError{
StreamID: str.StreamID(),
ErrorCode: quic.StreamErrorCode(str.StreamID()),
Remote: true,
}))
return
}
Expand Down Expand Up @@ -396,6 +398,7 @@ var _ = Describe("Stream Cancellations", func() {
Expect(err).To(MatchError(&quic.StreamError{
StreamID: str.StreamID(),
ErrorCode: quic.StreamErrorCode(str.StreamID()),
Remote: true,
}))
return
}
Expand Down Expand Up @@ -441,6 +444,7 @@ var _ = Describe("Stream Cancellations", func() {
Expect(err).To(MatchError(&quic.StreamError{
StreamID: str.StreamID(),
ErrorCode: quic.StreamErrorCode(str.StreamID()),
Remote: true,
}))
return
}
Expand Down Expand Up @@ -486,6 +490,7 @@ var _ = Describe("Stream Cancellations", func() {
Expect(err).To(MatchError(&quic.StreamError{
StreamID: str.StreamID(),
ErrorCode: quic.StreamErrorCode(str.StreamID()),
Remote: true,
}))
return
}
Expand Down