major refactoring; started DB

- DB work has started in db. this will be a direct port of the OpenFusion DB format.
- LoginServer is now less of a dummy. You can create and login to accounts, and create a character to go through the tutorial with.
- config.go will host some commonly changed variables.
- protocol: fixed a bug relating to arrays being ignored while encoding packets
This commit is contained in:
2023-03-09 01:48:13 -06:00
parent 1fff485f93
commit 8569225ec7
16 changed files with 947 additions and 89 deletions

View File

@@ -4,14 +4,15 @@ import (
"fmt"
"log"
"net"
"sync"
"github.com/CPunch/GopenFusion/protocol"
)
type LoginServer struct {
listener net.Listener
clients map[*protocol.Client]bool
unregister chan *protocol.Client
listener net.Listener
clients map[*Client]bool
lock sync.Mutex
}
func NewLoginServer() *LoginServer {
@@ -21,9 +22,8 @@ func NewLoginServer() *LoginServer {
}
return &LoginServer{
listener: listener,
clients: make(map[*protocol.Client]bool),
unregister: make(chan *protocol.Client),
listener: listener,
clients: make(map[*Client]bool),
}
}
@@ -31,33 +31,22 @@ func (server *LoginServer) Start() {
log.Print("Server hosted on 127.0.0.1:23000")
for {
select {
case client := <-server.unregister:
delete(server.clients, client)
fmt.Printf("Client %p disconnected\n", client)
default:
conn, err := server.listener.Accept()
if err != nil {
log.Println("Connection error: ", err)
return
}
client := protocol.NewClient(server, conn)
server.clients[client] = true
fmt.Printf("Client %p connected\n", client)
go client.ClientHandler()
conn, err := server.listener.Accept()
if err != nil {
log.Println("Connection error: ", err)
return
}
client := NewClient(server, conn)
server.Connect(client)
go client.ClientHandler()
}
}
func (server *LoginServer) HandlePacket(client *protocol.Client, typeID uint32, pkt *protocol.Packet) {
func (server *LoginServer) HandlePacket(client *Client, typeID uint32, pkt *protocol.Packet) {
switch typeID {
case protocol.P_CL2LS_REQ_LOGIN:
var loginPkt protocol.SP_CL2LS_REQ_LOGIN
pkt.Decode(&loginPkt)
// TODO: for now, we're a dummy server
client.AcceptLogin(loginPkt.SzID, loginPkt.IClientVerC, 1, []protocol.SP_LS2CL_REP_CHAR_INFO{})
server.Login(client, pkt)
case protocol.P_CL2LS_REQ_CHECK_CHAR_NAME:
var charPkt protocol.SP_CL2LS_REQ_CHECK_CHAR_NAME
pkt.Decode(&charPkt)
@@ -67,21 +56,24 @@ func (server *LoginServer) HandlePacket(client *protocol.Client, typeID uint32,
SzLastName: charPkt.SzLastName,
}, protocol.P_LS2CL_REP_CHECK_CHAR_NAME_SUCC)
case protocol.P_CL2LS_REQ_SAVE_CHAR_NAME:
var charPkt protocol.SP_CL2LS_REQ_SAVE_CHAR_NAME
pkt.Decode(&charPkt)
client.Send(&protocol.SP_LS2CL_REP_SAVE_CHAR_NAME_SUCC{
IPC_UID: 1,
ISlotNum: charPkt.ISlotNum,
IGender: charPkt.IGender,
SzFirstName: charPkt.SzFirstName,
SzLastName: charPkt.SzLastName,
}, protocol.P_LS2CL_REP_SAVE_CHAR_NAME_SUCC)
server.SaveCharacterName(client, pkt)
case protocol.P_CL2LS_REQ_CHAR_CREATE:
server.CharacterCreate(client, pkt)
default:
log.Printf("[WARN] unsupported packet ID: %x\n", typeID)
}
}
func (server *LoginServer) Disconnect(client *protocol.Client) {
server.unregister <- client
func (server *LoginServer) Disconnect(client *Client) {
server.lock.Lock()
delete(server.clients, client)
fmt.Printf("Client %p disconnected\n", client)
server.lock.Unlock()
}
func (server *LoginServer) Connect(client *Client) {
server.lock.Lock()
server.clients[client] = true
fmt.Printf("Client %p connected\n", client)
server.lock.Unlock()
}