]> Cypherpunks.ru repositories - goircd.git/blobdiff - daemon.go
Remove goroutines that lead to possible races
[goircd.git] / daemon.go
index 3c1692ffa09a762d9397d65fdf005a7fc9192f2f..06916b0d6c39649dd4e5d519a72347fa72125ffd 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -29,34 +29,36 @@ import (
 )
 
 const (
-       PING_TIMEOUT    = time.Second * 180 // Max time deadline for client's unresponsiveness
-       PING_THRESHOLD  = time.Second * 90  // Max idle client's time before PING are sent
-       ALIVENESS_CHECK = time.Second * 10  // Client's aliveness check period
+       PingTimeout    = time.Second * 180 // Max time deadline for client's unresponsiveness
+       PingThreshold  = time.Second * 90  // Max idle client's time before PING are sent
+       AlivenessCheck = time.Second * 10  // Client's aliveness check period
 )
 
 var (
-       RE_NICKNAME = regexp.MustCompile("^[a-zA-Z0-9-]{1,9}$")
+       RENickname = regexp.MustCompile("^[a-zA-Z0-9-]{1,9}$")
 )
 
 type Daemon struct {
-       Verbose              bool
-       hostname             string
-       motd                 string
-       clients              map[*Client]bool
-       rooms                map[string]*Room
-       room_sinks           map[*Room]chan ClientEvent
-       last_aliveness_check time.Time
-       log_sink             chan<- LogEvent
-       state_sink           chan<- StateEvent
+       Verbose            bool
+       hostname           string
+       motd               string
+       clients            map[*Client]bool
+       clientAliveness    map[*Client]*ClientAlivenessState
+       rooms              map[string]*Room
+       roomSinks          map[*Room]chan ClientEvent
+       lastAlivenessCheck time.Time
+       logSink            chan<- LogEvent
+       stateSink          chan<- StateEvent
 }
 
-func NewDaemon(hostname, motd string, log_sink chan<- LogEvent, state_sink chan<- StateEvent) *Daemon {
+func NewDaemon(hostname, motd string, logSink chan<- LogEvent, stateSink chan<- StateEvent) *Daemon {
        daemon := Daemon{hostname: hostname, motd: motd}
        daemon.clients = make(map[*Client]bool)
+       daemon.clientAliveness = make(map[*Client]*ClientAlivenessState)
        daemon.rooms = make(map[string]*Room)
-       daemon.room_sinks = make(map[*Room]chan ClientEvent)
-       daemon.log_sink = log_sink
-       daemon.state_sink = state_sink
+       daemon.roomSinks = make(map[*Room]chan ClientEvent)
+       daemon.logSink = logSink
+       daemon.stateSink = stateSink
        return &daemon
 }
 
@@ -158,13 +160,13 @@ func (daemon *Daemon) ClientRegister(client *Client, command string, cols []stri
                        return
                }
                nickname := cols[1]
-               for existing_client := range daemon.clients {
-                       if existing_client.nickname == nickname {
+               for existingClient := range daemon.clients {
+                       if existingClient.nickname == nickname {
                                client.ReplyParts("433", "*", nickname, "Nickname is already in use")
                                return
                        }
                }
-               if !RE_NICKNAME.MatchString(nickname) {
+               if !RENickname.MatchString(nickname) {
                        client.ReplyParts("432", "*", cols[1], "Erroneous nickname")
                        return
                }
@@ -196,13 +198,13 @@ func (daemon *Daemon) ClientRegister(client *Client, command string, cols []stri
 // Register new room in Daemon. Create an object, events sink, save pointers
 // to corresponding daemon's places and start room's processor goroutine.
 func (daemon *Daemon) RoomRegister(name string) (*Room, chan<- ClientEvent) {
-       room_new := NewRoom(daemon.hostname, name, daemon.log_sink, daemon.state_sink)
-       room_new.Verbose = daemon.Verbose
-       room_sink := make(chan ClientEvent)
-       daemon.rooms[name] = room_new
-       daemon.room_sinks[room_new] = room_sink
-       go room_new.Processor(room_sink)
-       return room_new, room_sink
+       roomNew := NewRoom(daemon.hostname, name, daemon.logSink, daemon.stateSink)
+       roomNew.Verbose = daemon.Verbose
+       roomSink := make(chan ClientEvent)
+       daemon.rooms[name] = roomNew
+       daemon.roomSinks[roomNew] = roomSink
+       go roomNew.Processor(roomSink)
+       return roomNew, roomSink
 }
 
 func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
@@ -227,12 +229,12 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
                }
                denied := false
                joined := false
-               for room_existing, room_sink := range daemon.room_sinks {
-                       if room == room_existing.name {
-                               if (room_existing.key != "") && (room_existing.key != key) {
+               for roomExisting, roomSink := range daemon.roomSinks {
+                       if room == roomExisting.name {
+                               if (roomExisting.key != "") && (roomExisting.key != key) {
                                        denied = true
                                } else {
-                                       room_sink <- ClientEvent{client, EVENT_NEW, ""}
+                                       roomSink <- ClientEvent{client, EventNew, ""}
                                        joined = true
                                }
                                break
@@ -244,50 +246,56 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
                if denied || joined {
                        continue
                }
-               room_new, room_sink := daemon.RoomRegister(room)
+               roomNew, roomSink := daemon.RoomRegister(room)
                if key != "" {
-                       room_new.key = key
-                       room_new.StateSave()
+                       roomNew.key = key
+                       roomNew.StateSave()
                }
-               room_sink <- ClientEvent{client, EVENT_NEW, ""}
+               roomSink <- ClientEvent{client, EventNew, ""}
        }
 }
 
 func (daemon *Daemon) Processor(events <-chan ClientEvent) {
        for event := range events {
+               now := time.Now()
+               client := event.client
 
                // Check for clients aliveness
-               now := time.Now()
-               if daemon.last_aliveness_check.Add(ALIVENESS_CHECK).Before(now) {
+               if daemon.lastAlivenessCheck.Add(AlivenessCheck).Before(now) {
                        for c := range daemon.clients {
-                               if c.timestamp.Add(PING_TIMEOUT).Before(now) {
+                               aliveness, alive := daemon.clientAliveness[c]
+                               if !alive {
+                                       continue
+                               }
+                               if aliveness.timestamp.Add(PingTimeout).Before(now) {
                                        log.Println(c, "ping timeout")
                                        c.conn.Close()
                                        continue
                                }
-                               if !c.ping_sent && c.timestamp.Add(PING_THRESHOLD).Before(now) {
+                               if !aliveness.pingSent && aliveness.timestamp.Add(PingThreshold).Before(now) {
                                        if c.registered {
                                                c.Msg("PING :" + daemon.hostname)
-                                               c.ping_sent = true
+                                               aliveness.pingSent = true
                                        } else {
                                                log.Println(c, "ping timeout")
                                                c.conn.Close()
                                        }
                                }
                        }
-                       daemon.last_aliveness_check = now
+                       daemon.lastAlivenessCheck = now
                }
 
-               client := event.client
-               switch event.event_type {
-               case EVENT_NEW:
+               switch event.eventType {
+               case EventNew:
                        daemon.clients[client] = true
-               case EVENT_DEL:
+                       daemon.clientAliveness[client] = &ClientAlivenessState{pingSent: false, timestamp: now}
+               case EventDel:
                        delete(daemon.clients, client)
-                       for _, room_sink := range daemon.room_sinks {
-                               room_sink <- event
+                       delete(daemon.clientAliveness, client)
+                       for _, roomSink := range daemon.roomSinks {
+                               roomSink <- event
                        }
-               case EVENT_MSG:
+               case EventMsg:
                        cols := strings.SplitN(event.text, " ", 2)
                        command := strings.ToUpper(cols[0])
                        if daemon.Verbose {
@@ -295,11 +303,12 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                        }
                        if command == "QUIT" {
                                delete(daemon.clients, client)
+                               delete(daemon.clientAliveness, client)
                                client.conn.Close()
                                continue
                        }
                        if !client.registered {
-                               go daemon.ClientRegister(client, command, cols)
+                               daemon.ClientRegister(client, command, cols)
                                continue
                        }
                        switch command {
@@ -310,11 +319,11 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                        client.ReplyNotEnoughParameters("JOIN")
                                        continue
                                }
-                               go daemon.HandlerJoin(client, cols[1])
+                               daemon.HandlerJoin(client, cols[1])
                        case "LIST":
                                daemon.SendList(client, cols)
                        case "LUSERS":
-                               go daemon.SendLusers(client)
+                               daemon.SendLusers(client)
                        case "MODE":
                                if len(cols) == 1 || len(cols[1]) < 1 {
                                        client.ReplyNotEnoughParameters("MODE")
@@ -336,9 +345,9 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                        continue
                                }
                                if len(cols) == 1 {
-                                       daemon.room_sinks[r] <- ClientEvent{client, EVENT_MODE, ""}
+                                       daemon.roomSinks[r] <- ClientEvent{client, EventMode, ""}
                                } else {
-                                       daemon.room_sinks[r] <- ClientEvent{client, EVENT_MODE, cols[1]}
+                                       daemon.roomSinks[r] <- ClientEvent{client, EventMode, cols[1]}
                                }
                        case "MOTD":
                                go daemon.SendMotd(client)
@@ -353,7 +362,7 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                                client.ReplyNoChannel(room)
                                                continue
                                        }
-                                       daemon.room_sinks[r] <- ClientEvent{client, EVENT_DEL, ""}
+                                       daemon.roomSinks[r] <- ClientEvent{client, EventDel, ""}
                                }
                        case "PING":
                                if len(cols) == 1 {
@@ -389,7 +398,7 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                if !found {
                                        client.ReplyNoNickChan(target)
                                }
-                               daemon.room_sinks[r] <- ClientEvent{client, EVENT_MSG, command + " " + strings.TrimLeft(cols[1], ":")}
+                               daemon.roomSinks[r] <- ClientEvent{client, EventMsg, command + " " + strings.TrimLeft(cols[1], ":")}
                        case "TOPIC":
                                if len(cols) == 1 {
                                        client.ReplyNotEnoughParameters("TOPIC")
@@ -407,7 +416,7 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                } else {
                                        change = ""
                                }
-                               daemon.room_sinks[r] <- ClientEvent{client, EVENT_TOPIC, change}
+                               daemon.roomSinks[r] <- ClientEvent{client, EventTopic, change}
                        case "WHO":
                                if len(cols) == 1 || len(cols[1]) < 1 {
                                        client.ReplyNotEnoughParameters("WHO")
@@ -419,7 +428,7 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                        client.ReplyNoChannel(room)
                                        continue
                                }
-                               daemon.room_sinks[r] <- ClientEvent{client, EVENT_WHO, ""}
+                               daemon.roomSinks[r] <- ClientEvent{client, EventWho, ""}
                        case "WHOIS":
                                if len(cols) == 1 || len(cols[1]) < 1 {
                                        client.ReplyNotEnoughParameters("WHOIS")
@@ -427,10 +436,14 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
                                }
                                cols := strings.Split(cols[1], " ")
                                nicknames := strings.Split(cols[len(cols)-1], ",")
-                               go daemon.SendWhois(client, nicknames)
+                               daemon.SendWhois(client, nicknames)
                        default:
                                client.ReplyNicknamed("421", command, "Unknown command")
                        }
                }
+               if aliveness, alive := daemon.clientAliveness[client]; alive {
+                       aliveness.timestamp = now
+                       aliveness.pingSent = false
+               }
        }
 }