narayana/go-xmpp
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #159 from remicorniere/close_keepalive

Browse source 
Close keepalive when recv() ends in client.go
This commit is contained in:
remicorniere 2020-03-16 11:13:13 +00:00 committed by GitHub
parent 64e54134df d4960afc97
commit ef6de6000a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client.go
View file

@ -379,11 +379,12 @@ func (c *Client) sendWithWriter(writer io.Writer, packet []byte) error {
// Loop: Receive data from server // Loop: Receive data from server
func (c *Client) recv(keepaliveQuit chan<- struct{}) { func (c *Client) recv(keepaliveQuit chan<- struct{}) {
defer close(keepaliveQuit)
for { for {
val, err := stanza.NextPacket(c.transport.GetDecoder()) val, err := stanza.NextPacket(c.transport.GetDecoder())
if err != nil { if err != nil {
c.ErrorHandler(err) c.ErrorHandler(err)
close(keepaliveQuit)
c.disconnected(c.Session.SMState) c.disconnected(c.Session.SMState)
return return
} }
@ -392,7 +393,6 @@ func (c *Client) recv(keepaliveQuit chan<- struct{}) {
switch packet := val.(type) { switch packet := val.(type) {
case stanza.StreamError: case stanza.StreamError:
c.router.route(c, val) c.router.route(c, val)
close(keepaliveQuit)
c.streamError(packet.Error.Local, packet.Text) c.streamError(packet.Error.Local, packet.Text)
c.ErrorHandler(errors.New("stream error: " + packet.Error.Local)) c.ErrorHandler(errors.New("stream error: " + packet.Error.Local))
// We don't return here, because we want to wait for the stream close tag from the server, or timeout. // We don't return here, because we want to wait for the stream close tag from the server, or timeout.