Skip to content

Commit 10207e3

Browse files
committed
address comments
1 parent 4a02377 commit 10207e3

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

internal/transport/grpchttp2/errors.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818

1919
package grpchttp2
2020

21+
import "fmt"
22+
2123
// ErrCode represents an HTTP/2 Error Code. Error codes are 32-bit fields
2224
// that are used in [RST_STREAM] and [GOAWAY] frames to convey the reasons for
2325
// the stream or connection error. See [HTTP/2 Error Code] for definitions of
@@ -66,5 +68,5 @@ func (err ErrCode) String() string {
6668
if v, ok := errorCodeNames[err]; ok {
6769
return v
6870
}
69-
return "INTERNAL_ERROR"
71+
return fmt.Sprintf("unknown error code 0x%x", uint32(err))
7072
}

internal/transport/grpchttp2/framer.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,8 @@ type FrameType uint8
3030
const (
3131
FrameTypeData FrameType = 0x0
3232
FrameTypeHeaders FrameType = 0x1
33-
FrameTypePriority FrameType = 0x2
3433
FrameTypeRSTStream FrameType = 0x3
3534
FrameTypeSettings FrameType = 0x4
36-
FrameTypePushPromise FrameType = 0x5
3735
FrameTypePing FrameType = 0x6
3836
FrameTypeGoAway FrameType = 0x7
3937
FrameTypeWindowUpdate FrameType = 0x8
@@ -101,6 +99,9 @@ type FrameHeader struct {
10199
// Frame represents an HTTP/2 Frame.
102100
type Frame interface {
103101
Header() *FrameHeader
102+
// Free frees the underlying buffer if present so it can be reused by the
103+
// framer.
104+
Free()
104105
}
105106

106107
type DataFrame struct {
@@ -144,16 +145,19 @@ func (f *RSTStreamFrame) Header() *FrameHeader {
144145
return f.hdr
145146
}
146147

148+
func (f *RSTStreamFrame) Free() {}
149+
147150
type SettingsFrame struct {
148151
hdr *FrameHeader
149-
free func()
150152
settings []Setting
151153
}
152154

153155
func (f *SettingsFrame) Header() *FrameHeader {
154156
return f.hdr
155157
}
156158

159+
func (f *SettingsFrame) Free() {}
160+
157161
type PingFrame struct {
158162
hdr *FrameHeader
159163
free func()
@@ -225,7 +229,9 @@ func (f *MetaHeadersFrame) Header() *FrameHeader {
225229
return f.hdr
226230
}
227231

228-
// Framer represents a Framer used in gRPC-Go.
232+
func (f *MetaHeadersFrame) Free() {}
233+
234+
// Framer encapsulates the functionality to read and write HTTP/2 frames.
229235
type Framer interface {
230236
// SetMetaDecoder will set a decoder for the framer. When the decoder is
231237
// set, ReadFrame will parse the header values, merging all Headers and

0 commit comments

Comments
 (0)