MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-04-04 11:50:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

Always remove subroute when queuing message on the connection. (#18550)

Browse Source
This commit is contained in:
Klaus Post 2023-11-28 11:22:29 -08:00 committed by GitHub
parent bea0b050cd
commit 0bb81f2e9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/grid/connection.go
View File

@ -544,7 +544,10 @@ func (c *Connection) send(msg []byte) error {
// queueMsg queues a message, with an optional payload. // queueMsg queues a message, with an optional payload.
// sender should not reference msg.Payload // sender should not reference msg.Payload
func (c *Connection) queueMsg(msg message, payload sender) error { func (c *Connection) queueMsg(msg message, payload sender) error {
msg.Flags |= c.baseFlags // Add baseflags.
msg.Flags.Set(c.baseFlags)
// This cannot encode subroute.
msg.Flags.Clear(FlagSubroute)
if payload != nil { if payload != nil {
if cap(msg.Payload) < payload.Msgsize() { if cap(msg.Payload) < payload.Msgsize() {
old := msg.Payload old := msg.Payload

10
internal/grid/msg.go
View File

@ -186,6 +186,16 @@ func (f Flags) String() string {
return "[" + strings.Join(res, ",") + "]" return "[" + strings.Join(res, ",") + "]"
} }
// Set one or more flags on f.
func (f *Flags) Set(flags Flags) {
*f |= flags
}
// Clear one or more flags on f.
func (f *Flags) Clear(flags Flags) {
*f &^= flags
}
// parse an incoming message. // parse an incoming message.
func (m *message) parse(b []byte) (*subHandlerID, []byte, error) { func (m *message) parse(b []byte) (*subHandlerID, []byte, error) {
var sub *subHandlerID var sub *subHandlerID