Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2025-12-23 04:16:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

add pascalstring as helper package

Browse Source
This commit is contained in:
wish
2022-07-16 04:38:26 +10:00
parent 0d8ad9bbde
commit 28b6c03d08
2 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Erupe/common/pascalstring/pascalstring.go Normal file
View File

@@ -0,0 +1,20 @@
package pascalstring
import (
"erupe-ce/common/byteframe"
)
func Uint8(bf *byteframe.ByteFrame, x string) {
bf.WriteUint8(uint8(len(x) + 1))
bf.WriteNullTerminatedBytes([]byte(x))
}
func Uint16(bf *byteframe.ByteFrame, x string) {
bf.WriteUint16(uint16(len(x) + 1))
bf.WriteNullTerminatedBytes([]byte(x))
}
func Uint32(bf *byteframe.ByteFrame, x string) {
bf.WriteUint32(uint32(len(x) + 1))
bf.WriteNullTerminatedBytes([]byte(x))
}

22
Erupe/server/signserver/dsgn_resp.go
View File

@@ -5,8 +5,9 @@ import (
"math/rand" "math/rand"
"time" "time"
"erupe-ce/server/channelserver" "erupe-ce/server/channelserver"
ps "erupe-ce/common/pascalstring"
"erupe-ce/common/byteframe"
"github.com/Andoryuuta/byteframe"
"go.uber.org/zap" "go.uber.org/zap"
"golang.org/x/text/encoding/japanese" "golang.org/x/text/encoding/japanese"
"golang.org/x/text/transform" "golang.org/x/text/transform"
@@ -21,16 +22,6 @@ func paddedString(x string, size uint) []byte {
return out return out
} }
func uint8PascalString(bf *byteframe.ByteFrame, x string) {
bf.WriteUint8(uint8(len(x) + 1))
bf.WriteNullTerminatedBytes([]byte(x))
}
func uint16PascalString(bf *byteframe.ByteFrame, x string) {
bf.WriteUint16(uint16(len(x) + 1))
bf.WriteNullTerminatedBytes([]byte(x))
}
func makeSignInFailureResp(respID RespID) []byte { func makeSignInFailureResp(respID RespID) []byte {
bf := byteframe.NewByteFrame() bf := byteframe.NewByteFrame()
bf.WriteUint8(uint8(respID)) bf.WriteUint8(uint8(respID))
@@ -67,7 +58,7 @@ func (s *Session) makeSignInResp(uid int) []byte {
bf.WriteUint32(0xFFFFFFFF) // login_token_number bf.WriteUint32(0xFFFFFFFF) // login_token_number
bf.WriteBytes(paddedString(token, 16)) // login_token (16 byte padded string) bf.WriteBytes(paddedString(token, 16)) // login_token (16 byte padded string)
bf.WriteUint32(uint32(time.Now().Unix())) // unk timestamp bf.WriteUint32(uint32(time.Now().Unix())) // unk timestamp
uint8PascalString(bf, fmt.Sprintf("%s:%d", s.server.erupeConfig.HostIP, s.server.erupeConfig.Entrance.Port)) ps.Uint8(bf, fmt.Sprintf("%s:%d", s.server.erupeConfig.HostIP, s.server.erupeConfig.Entrance.Port))
for _, char := range chars { for _, char := range chars {
bf.WriteUint32(char.ID) bf.WriteUint32(char.ID)
@@ -105,14 +96,13 @@ func (s *Session) makeSignInResp(uid int) []byte {
// if err != nil { // if err != nil {
// panic(err) // panic(err)
// } // }
// bf.WriteUint32(uint32(len(notice_transformed)+1)) // ps.Uint32(bf, notice_transformed)
// bf.WriteNullTerminatedBytes([]byte(notice_transformed))
bf.WriteUint32(0) // some_last_played_character_id bf.WriteUint32(0) // some_last_played_character_id
bf.WriteUint32(14) // unk_flags bf.WriteUint32(14) // unk_flags
uint16PascalString(bf, "") // filters ps.Uint16(bf, "") // filters
bf.WriteUint32(0xCA104E20) bf.WriteUint32(0xCA104E20)
uint16PascalString(bf, "") // encryption ps.Uint16(bf, "") // encryption
bf.WriteUint8(0x00) bf.WriteUint8(0x00)
bf.WriteUint32(0xCA110001) bf.WriteUint32(0xCA110001)
bf.WriteUint32(0x4E200000) bf.WriteUint32(0x4E200000)