Skip to content

Reconnect fixes #190

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Reconnect fixes #190

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
1e6db86
xmpp_transport: Reset encryption status when initiating new connection
mwild1 Oct 9, 2025
d02ca11
xmpp_transport: Add buffer to closeChan to prevent deadlock
mwild1 Oct 9, 2025
5007e17
client: Notify transport when stream close is received
mwild1 Oct 9, 2025
be6f23d
client: Notify session when explicitly disconnected
mwild1 Oct 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,11 @@ func (c *Client) Resume() error {
// Disconnect disconnects the client from the server, sending a stream close nonza and closing the TCP connection.
func (c *Client) Disconnect() error {
if c.transport != nil {
return c.transport.Close()
err := c.transport.Close()
if c.Session != nil {
c.disconnected(c.Session.SMState)
}
return err
}
// No transport so no connection.
return nil
Expand Down Expand Up @@ -411,7 +415,8 @@ func (c *Client) recv(keepaliveQuit chan<- struct{}) {
case stanza.StreamClosePacket:
// TCP messages should arrive in order, so we can expect to get nothing more after this occurs
c.transport.ReceivedStreamClose()
return
c.Disconnect()
continue
default:
c.Session.SMState.Inbound++
}
Expand Down
5 changes: 4 additions & 1 deletion xmpp_transport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,15 @@ var clientStreamOpen = fmt.Sprintf("<?xml version='1.0'?><stream:stream to='%%s'
func (t *XMPPTransport) Connect() (string, error) {
var err error

// Since we're starting a new connection, reset the encryption status
t.isSecure = false

t.conn, err = net.DialTimeout("tcp", t.Config.Address, time.Duration(t.Config.ConnectTimeout)*time.Second)
if err != nil {
return "", NewConnError(err, true)
}

t.closeChan = make(chan stanza.StreamClosePacket)
t.closeChan = make(chan stanza.StreamClosePacket, 1)
t.readWriter = newStreamLogger(t.conn, t.logFile)
t.decoder = xml.NewDecoder(bufio.NewReaderSize(t.readWriter, maxPacketSize))
t.decoder.CharsetReader = t.Config.CharsetReader
Expand Down