Merge pull request #4 from Minetest-j45/master

[hydra-dragonfire.git] / client.go

diff --git a/client.go b/client.go
index 4595d131383ac8b2fc746934713be2d7a63b5be7..b177a073844805b4942bf5b3acfef2b80f073887 100644 (file)
--- a/client.go
+++ b/client.go
@@ -2,8 +2,8 @@ package main
 
 import (
        "errors"
-       "github.com/anon55555/mt"
        "github.com/dragonfireclient/hydra-dragonfire/convert"
+       "github.com/dragonfireclient/mt"
        "github.com/yuin/gopher-lua"
        "net"
        "sync"
@@ -25,12 +25,13 @@ type Component interface {
 }
 
 type Client struct {
-       mu         sync.Mutex
        address    string
        state      clientState
        conn       mt.Peer
+       muConn     sync.Mutex
        queue      chan Event
        components map[string]Component
+       muComp     sync.Mutex
        table      *lua.LTable
        userdata   *lua.LUserData
 }
@@ -80,8 +81,8 @@ func getClients(l *lua.LState) []*Client {
 }
 
 func (client *Client) closeConn() {
-       client.mu.Lock()
-       defer client.mu.Unlock()
+       client.muConn.Lock()
+       defer client.muConn.Unlock()
 
        if client.state == csConnected {
                client.conn.Close()
@@ -165,11 +166,11 @@ func l_client_connect(l *lua.LState) int {
                        pkt, err := client.conn.Recv()
 
                        if err == nil {
-                               client.mu.Lock()
-                               for _, component := range client.components {
-                                       component.process(&pkt)
+                               client.muComp.Lock()
+                               for _, comp := range client.components {
+                                       comp.process(&pkt)
                                }
-                               client.mu.Unlock()
+                               client.muComp.Unlock()
                        } else if errors.Is(err, net.ErrClosed) {
                                client.queue <- EventDisconnect{client: client}
                                return
@@ -179,11 +180,11 @@ func l_client_connect(l *lua.LState) int {
                }
        }()
 
-       client.mu.Lock()
-       for _, component := range client.components {
-               component.connect()
+       client.muComp.Lock()
+       for _, comp := range client.components {
+               comp.connect()
        }
-       client.mu.Unlock()
+       client.muComp.Unlock()
 
        return 0
 }
@@ -203,26 +204,26 @@ func l_client_enable(l *lua.LState) int {
        client := getClient(l)
        n := l.GetTop()
 
-       client.mu.Lock()
-       defer client.mu.Unlock()
+       client.muComp.Lock()
+       defer client.muComp.Unlock()
 
        for i := 2; i <= n; i++ {
-               compname := l.CheckString(i)
+               name := l.CheckString(i)
 
-               if component, exists := client.components[compname]; !exists {
-                       switch compname {
+               if comp, exists := client.components[name]; !exists {
+                       switch name {
                        case "auth":
-                               component = &Auth{}
+                               comp = &CompAuth{}
                        case "map":
-                               component = &Map{}
+                               comp = &CompMap{}
                        case "pkts":
-                               component = &Pkts{}
+                               comp = &CompPkts{}
                        default:
-                               panic("invalid component: " + compname)
+                               panic("invalid component: " + name)
                        }
 
-                       client.components[compname] = component
-                       component.create(client, l)
+                       client.components[name] = comp
+                       comp.create(client, l)
                }
        }
 
@@ -232,6 +233,9 @@ func l_client_enable(l *lua.LState) int {
 func l_client_send(l *lua.LState) int {
        client := getClient(l)
 
+       client.muConn.Lock()
+       defer client.muConn.Unlock()
+
        if client.state != csConnected {
                panic("not connected")
        }
@@ -239,9 +243,6 @@ func l_client_send(l *lua.LState) int {
        cmd := convert.ReadCmd(l)
        doAck := l.ToBool(4)
 
-       client.mu.Lock()
-       defer client.mu.Unlock()
-
        if client.state == csConnected {
                ack, err := client.conn.SendCmd(cmd)
                if err != nil && !errors.Is(err, net.ErrClosed) {