Leahnaya/wfc-server
1
0
Fork 0
mirror of https://github.com/WiiLink24/wfc-server.git synced 2026-07-19 01:05:46 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

NATNEG: Disconnect clients on timeout

Browse Source 
Appears to cause error code 86009 on failure to connect, but needs more testing
This commit is contained in:
mkwcat 2024-02-03 17:56:49 -05:00
parent 0fa0c2422d
commit 9e6ea0c225
No known key found for this signature in database
GPG Key ID: 7A505679CE9E7AA9
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
natneg/main.go
View File

@ -56,6 +56,7 @@ const (
)
type NATNEGSession struct {
Open bool
Version byte
Cookie uint32
Mutex sync.RWMutex
@ -135,6 +136,7 @@ func handleConnection(conn net.PacketConn, addr net.Addr, buffer []byte) {
if !exists {
logging.Info(moduleName, "Creating session")
session = &NATNEGSession{
Open: true,
Version: version,
Cookie: cookie,
Mutex: sync.RWMutex{},
@ -144,10 +146,29 @@ func handleConnection(conn net.PacketConn, addr net.Addr, buffer []byte) {
// Session has TTL of 30 seconds
time.AfterFunc(30*time.Second, func() {
session.Open = false
mutex.Lock()
delete(sessions, cookie)
mutex.Unlock()
session.Mutex.Lock()
defer session.Mutex.Unlock()
// Disconnect each client
for _, client := range session.Clients {
if client.ConnectingIndex == client.Index {
continue
}
logging.Info(moduleName, "Disconnecting client", aurora.Cyan(client.Index))
// Send report ack, which will cause the client to cancel
reportAck := createPacketHeader(version, NNReportReply, session.Cookie)
reportAck = append(reportAck, 0x00, client.Index, 0x00)
reportAck = append(reportAck, 0x00, 0x00, 0x00, 0x06, 0x00, 0x00)
conn.WriteTo(reportAck, addr)
}
logging.Info(moduleName, "Deleted session")
})
}
@ -379,6 +400,10 @@ func (session *NATNEGSession) sendConnectRequests(moduleName string) {
go func(session *NATNEGSession, sender *NATNEGClient, destination *NATNEGClient) {
for {
if !session.Open {
return
}
check := false
if !destination.ConnectAck && destination.ConnectingIndex == sender.Index {
@ -392,11 +417,10 @@ func (session *NATNEGSession) sendConnectRequests(moduleName string) {
}
if !check {
logging.Notice(moduleName, "No connect requests to send")
return
}
time.Sleep(1 * time.Second)
time.Sleep(500 * time.Millisecond)
}
}(session, sender, destination)
}
@ -424,9 +448,6 @@ func (session *NATNEGSession) handleConnectReply(conn net.PacketConn, addr net.A
// useGamePort := buffer[2]
// localIPBytes := buffer[3:7]
session.Mutex.Lock()
defer session.Mutex.Unlock()
if client, exists := session.Clients[clientIndex]; exists {
client.ConnectAck = true
}
@ -446,10 +467,9 @@ func (session *NATNEGSession) handleReport(conn net.PacketConn, addr net.Addr, b
// gameName, err := common.GetString(buffer[11:])
moduleName := "NATNEG:" + fmt.Sprintf("%08x/", session.Cookie) + addr.String()
logging.Notice(moduleName, "Report from", aurora.BrightCyan(clientIndex), "result:", aurora.Cyan(result))
if client, exists := session.Clients[clientIndex]; exists {
logging.Notice(moduleName, "Report from", aurora.BrightCyan(clientIndex), "result:", aurora.Cyan(result))
client.Connected[client.ConnectingIndex] = true
client.ConnectingIndex = clientIndex
client.ConnectAck = false

4
qr2/message.go
View File

@ -298,8 +298,8 @@ func processClientMessage(moduleName string, sender, receiver *Session, message
if isNatnegPacket {
mutex.Unlock()
cookie := binary.BigEndian.Uint32(message[0x2:0x6])
logging.Notice(moduleName, "Send NN cookie", aurora.Cyan(cookie), "to", aurora.BrightCyan(destPid))
cookie := binary.BigEndian.Uint32(message[0x6:0xA])
logging.Notice(moduleName, "Send NN cookie", aurora.Cyan(strconv.FormatUint(uint64(cookie), 16)), "to", aurora.BrightCyan(destPid))
return
}
defer mutex.Unlock()