Fix several races

[goircd.git] / client.go

diff --git a/client.go b/client.go
index cc179c8ca1eaadca8796c5d144288ca3d2e0c359..07a209b61d0a524653e56714bfa7fe81b10e4ebf 100644 (file)
--- a/client.go
+++ b/client.go
@@ -34,13 +34,16 @@ type Client struct {
        hostname   string
        conn       net.Conn
        registered bool
-       ping_sent  bool
-       timestamp  time.Time
        nickname   string
        username   string
        realname   string
 }
 
+type ClientAlivenessState struct {
+       ping_sent bool
+       timestamp time.Time
+}
+
 func (client Client) String() string {
        return client.nickname + "!" + client.username + "@" + client.conn.RemoteAddr().String()
 }
@@ -55,7 +58,7 @@ func NewClient(hostname string, conn net.Conn) *Client {
 func (client *Client) Processor(sink chan<- ClientEvent) {
        var buf_net []byte
        buf := make([]byte, 0)
-       log.Println("New client", client)
+       log.Println(client, "New client")
        sink <- ClientEvent{client, EVENT_NEW, ""}
        for {
                buf_net = make([]byte, BUF_SIZE)
@@ -65,8 +68,6 @@ func (client *Client) Processor(sink chan<- ClientEvent) {
                        sink <- ClientEvent{client, EVENT_DEL, ""}
                        break
                }
-               client.timestamp = time.Now()
-               client.ping_sent = false
                buf_net = bytes.TrimRight(buf_net, "\x00")
                buf = append(buf, buf_net...)
                if !bytes.HasSuffix(buf, []byte(CRLF)) {