Commit 324cbb3

authored

[1.9] fix PING on compressed connections (#1723)

Add missing mc.syncSequence() Fix #1718

1 parent dfd973a commit 324cbb3Copy full SHA for 324cbb3

File tree

2 files changed

+19

-22

lines changed

compress.go
packets.go

2 files changed

+19

-22

lines changed

`‎compress.go`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -113,12 +113,11 @@ func (c *compIO) readCompressedPacket() error {`
`113`	`113`	`// Server may return error packet (e.g. 1153 Got a packet bigger than 'max_allowed_packet' bytes)`
`114`	`114`	`// before receiving all packets from client. In this case, seqnr is younger than expected.`
`115`	`115`	`// NOTE: Both of mariadbclient and mysqlclient do not check seqnr. Only server checks it.`
`116`		`- if debug && compressionSequence != c.mc.sequence {`
	`116`	`+ if debug && compressionSequence != c.mc.compressSequence {`
`117`	`117`	`fmt.Printf("WARN: unexpected cmpress seq nr: expected %v, got %v",`
`118`		`- c.mc.sequence, compressionSequence)`
	`118`	`+ c.mc.compressSequence, compressionSequence)`
`119`	`119`	`}`
`120`		`- c.mc.sequence = compressionSequence + 1`
`121`		`- c.mc.compressSequence = c.mc.sequence`
	`120`	`+ c.mc.compressSequence = compressionSequence + 1`
`122`	`121`
`123`	`122`	`comprData, err := c.mc.readNext(comprLength)`
`124`	`123`	`if err != nil {`
`@@ -200,7 +199,7 @@ func (c *compIO) writeCompressedPacket(data []byte, uncompressedLen int) (int, e`
`200`	`199`	`comprLength := len(data) - 7`
`201`	`200`	`if debug {`
`202`	`201`	`fmt.Printf(`
`203`		`- "writeCompressedPacket: comprLength=%v, uncompressedLen=%v, seq=%v",`
	`202`	`+ "writeCompressedPacket: comprLength=%v, uncompressedLen=%v, seq=%v\n",`
`204`	`203`	`comprLength, uncompressedLen, mc.compressSequence)`
`205`	`204`	`}`
`206`	`205`

`‎packets.go`

Lines changed: 15 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@ import (`
`17`	`17`	`"fmt"`
`18`	`18`	`"io"`
`19`	`19`	`"math"`
	`20`	`+ "os"`
`20`	`21`	`"strconv"`
`21`	`22`	`"time"`
`22`	`23`	`)`
`@@ -62,26 +63,20 @@ func (mc *mysqlConn) readPacket() ([]byte, error) {`
`62`	`63`	`pktLen := getUint24(data[:3])`
`63`	`64`	`seq := data[3]`
`64`	`65`
`65`		`- if mc.compress {`
	`66`	`+ // check packet sync [8 bit]`
	`67`	`+ if seq != mc.sequence {`
	`68`	`+ mc.log(fmt.Sprintf("[warn] unexpected sequence nr: expected %v, got %v", mc.sequence, seq))`
`66`	`69`	`// MySQL and MariaDB doesn't check packet nr in compressed packet.`
`67`		`- if debug && seq != mc.compressSequence {`
`68`		`- fmt.Printf("[debug] mismatched compression sequence nr: expected: %v, got %v",`
`69`		`- mc.compressSequence, seq)`
`70`		`- }`
`71`		`- mc.compressSequence = seq + 1`
`72`		`- } else {`
`73`		`- // check packet sync [8 bit]`
`74`		`- if seq != mc.sequence {`
`75`		`- mc.log(fmt.Sprintf("[warn] unexpected seq nr: expected %v, got %v", mc.sequence, seq))`
	`70`	`+ if !mc.compress {`
`76`	`71`	`// For large packets, we stop reading as soon as sync error.`
`77`	`72`	`if len(prevData) > 0 {`
`78`	`73`	`mc.close()`
`79`	`74`	`return nil, ErrPktSyncMul`
`80`	`75`	`}`
`81`	`76`	`invalidSequence = true`
`82`	`77`	`}`
`83`		`- mc.sequence++`
`84`	`78`	`}`
	`79`	`+ mc.sequence = seq + 1`
`85`	`80`
`86`	`81`	`// packets with length 0 terminate a previous packet which is a`
`87`	`82`	`// multiple of (2^24)-1 bytes long`
`@@ -146,7 +141,7 @@ func (mc *mysqlConn) writePacket(data []byte) error {`
`146`	`141`
`147`	`142`	`// Write packet`
`148`	`143`	`if debug {`
`149`		`- fmt.Printf("writePacket: size=%v seq=%v", size, mc.sequence)`
	`144`	`+ fmt.Fprintf(os.Stderr, "writePacket: size=%v seq=%v\n", size, mc.sequence)`
`150`	`145`	`}`
`151`	`146`
`152`	`147`	`n, err := writeFunc(data[:4+size])`
`@@ -445,7 +440,9 @@ func (mc *mysqlConn) writeCommandPacket(command byte) error {`
`445`	`440`	`data[4] = command`
`446`	`441`
`447`	`442`	`// Send CMD packet`
`448`		`- return mc.writePacket(data)`
	`443`	`+ err = mc.writePacket(data)`
	`444`	`+ mc.syncSequence()`
	`445`	`+ return err`
`449`	`446`	`}`
`450`	`447`
`451`	`448`	`func (mc *mysqlConn) writeCommandPacketStr(command byte, arg string) error {`
`@@ -486,7 +483,9 @@ func (mc *mysqlConn) writeCommandPacketUint32(command byte, arg uint32) error {`
`486`	`483`	`binary.LittleEndian.PutUint32(data[5:], arg)`
`487`	`484`
`488`	`485`	`// Send CMD packet`
`489`		`- return mc.writePacket(data)`
	`486`	`+ err = mc.writePacket(data)`
	`487`	`+ mc.syncSequence()`
	`488`	`+ return err`
`490`	`489`	`}`
`491`	`490`
`492`	`491`	`/******************************************************************************`
`@@ -956,7 +955,6 @@ func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error {`
`956`	`955`	`pktLen = dataOffset + argLen`
`957`	`956`	`}`
`958`	`957`
`959`		`- stmt.mc.resetSequence()`
`960`	`958`	`// Add command byte [1 byte]`
`961`	`959`	`data[4] = comStmtSendLongData`
`962`	`960`
`@@ -968,15 +966,15 @@ func (stmt *mysqlStmt) writeCommandLongData(paramID int, arg []byte) error {`
`968`	`966`
`969`	`967`	`// Send CMD packet`
`970`	`968`	`err := stmt.mc.writePacket(data[:4+pktLen])`
	`969`	`+ // Every COM_LONG_DATA packet reset Packet Sequence`
	`970`	`+ stmt.mc.resetSequence()`
`971`	`971`	`if err == nil {`
`972`	`972`	`data = data[pktLen-dataOffset:]`
`973`	`973`	`continue`
`974`	`974`	`}`
`975`	`975`	`return err`
`976`	`976`	`}`
`977`	`977`
`978`		`- // Reset Packet Sequence`
`979`		`- stmt.mc.resetSequence()`
`980`	`978`	`return nil`
`981`	`979`	`}`
`982`	`980`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit 324cbb3

File tree

2 files changed

2 files changed

`‎compress.go`

`‎packets.go`

0 commit comments