Skip to content

minecraft/dial.go: Close connection when dialing fails #532

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
EinBexiii wants to merge 1 commit into
base: master
Choose a base branch
from
Open

minecraft/dial.go: Close connection when dialing fails #532

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 7 additions & 1 deletion minecraft/dial.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,6 +298,11 @@ func (d Dialer) DialContextNetwork(ctx context.Context, network Network, address
}

conn = newConn(netConn, key, d.ErrorLog, d.Protocol, d.FlushRate, false)
defer func(c *Conn) {
if err != nil {
c.closeTransport(err)
}
}(conn)
conn.pool = conn.proto.Packets(false)
conn.identityData = d.IdentityData
conn.clientData = d.ClientData
Expand Down Expand Up @@ -333,8 +338,9 @@ func (d Dialer) DialContextNetwork(ctx context.Context, network Network, address
conn.identityData = identityData
}

readyForLogin, connected := make(chan struct{}), make(chan struct{})
readyForLogin, connected := make(chan struct{}, 1), make(chan struct{}, 1)
ctx, cancel := context.WithCancelCause(ctx)
defer cancel(nil)
go listenConn(conn, readyForLogin, connected, cancel)

conn.expect(packet.IDNetworkSettings, packet.IDPlayStatus)
Expand Down