From f379c27a01c6b51d02fd5456ea5bb8862bbd7e02 Mon Sep 17 00:00:00 2001 From: wish Date: Sun, 16 Apr 2023 14:29:29 +1000 Subject: [PATCH] combine login process again --- server/signserver/session.go | 24 +++++------------------- 1 file changed, 5 insertions(+), 19 deletions(-) diff --git a/server/signserver/session.go b/server/signserver/session.go index 28bb0c323..e67e8ef49 100644 --- a/server/signserver/session.go +++ b/server/signserver/session.go @@ -55,10 +55,10 @@ func (s *Session) handlePacket(pkt []byte) error { s.handleDSGN(bf) case "PS3SGN:100": s.client = PS3 - s.handlePS3SGN(bf) + s.handlePSSGN(bf) case "VITASGN:100": s.client = VITA - s.handleVITASGN(bf) + s.handlePSSGN(bf) case "DELETE:100": loginTokenString := string(bf.ReadNullTerminatedBytes()) characterID := int(bf.ReadUint32()) @@ -137,23 +137,9 @@ func (s *Session) authenticate(username string, password string) { err = s.cryptConn.SendPacket(bf.Data()) } -func (s *Session) handlePS3SGN(bf *byteframe.ByteFrame) { - _ = bf.ReadBytes(95) - psnUser := string(bf.ReadNullTerminatedBytes()) - var reqUsername string - err := s.server.db.QueryRow(`SELECT username FROM users WHERE psn_id = $1`, psnUser).Scan(&reqUsername) - if err == sql.ErrNoRows { - resp := byteframe.NewByteFrame() - resp.WriteUint8(uint8(SIGN_ECOGLINK)) - s.cryptConn.SendPacket(resp.Data()) - return - } - s.authenticate(reqUsername, "") -} - -func (s *Session) handleVITASGN(bf *byteframe.ByteFrame) { - _ = bf.ReadNullTerminatedBytes() // 0000000256 - _ = bf.ReadNullTerminatedBytes() // 1 +func (s *Session) handlePSSGN(bf *byteframe.ByteFrame) { + _ = bf.ReadNullTerminatedBytes() // VITA = 0000000256, PS3 = 0000000255 + _ = bf.ReadBytes(2) // VITA = 1, PS3 = ! _ = bf.ReadBytes(82) psnUser := string(bf.ReadNullTerminatedBytes()) var reqUsername string