Mention TLS and -verbose options in documentation

[goircd.git] / daemon.go

diff --git a/daemon.go b/daemon.go
index 1dc1763520b310bb984803adaa852177b741ff24..d8cc3b8bc2729d87af875dc7ea30ffd06b389c7b 100644 (file)
--- a/daemon.go
+++ b/daemon.go
@@ -18,11 +18,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-       "bytes"
        "fmt"
-       "io"
+       "io/ioutil"
        "log"
-       "os"
+       "net"
        "regexp"
        "sort"
        "strings"
@@ -40,17 +39,18 @@ var (
 )
 
 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
+       log_sink             chan<- LogEvent
+       state_sink           chan<- StateEvent
 }
 
-func NewDaemon(hostname, motd string, log_sink chan LogEvent, state_sink chan StateEvent) *Daemon {
+func NewDaemon(hostname, motd string, log_sink chan<- LogEvent, state_sink chan<- StateEvent) *Daemon {
        daemon := Daemon{hostname: hostname, motd: motd}
        daemon.clients = make(map[*Client]bool)
        daemon.rooms = make(map[string]*Room)
@@ -71,29 +71,23 @@ func (daemon *Daemon) SendLusers(client *Client) {
 }
 
 func (daemon *Daemon) SendMotd(client *Client) {
-       if daemon.motd != "" {
-               fd, err := os.Open(daemon.motd)
-               if err == nil {
-                       defer fd.Close()
-                       motd := []byte{}
-                       var err error
-                       for err != io.EOF {
-                               buf := make([]byte, 1024)
-                               _, err = fd.Read(buf)
-                               motd = append(motd, bytes.TrimRight(buf, "\x00")...)
-                       }
+       if len(daemon.motd) == 0 {
+               client.ReplyNicknamed("422", "MOTD File is missing")
+               return
+       }
 
-                       client.ReplyNicknamed("375", "- "+daemon.hostname+" Message of the day -")
-                       for _, s := range bytes.Split(bytes.TrimRight(motd, "\n"), []byte("\n")) {
-                               client.ReplyNicknamed("372", "- "+string(s))
-                       }
-                       client.ReplyNicknamed("376", "End of /MOTD command")
-                       return
-               } else {
-                       log.Println("Can not open motd file", daemon.motd, err)
-               }
+       motd, err := ioutil.ReadFile(daemon.motd)
+       if err != nil {
+               log.Printf("Can not read motd file %s: %v", daemon.motd, err)
+               client.ReplyNicknamed("422", "Error reading MOTD File")
+               return
        }
-       client.ReplyNicknamed("422", "MOTD File is missing")
+
+       client.ReplyNicknamed("375", "- "+daemon.hostname+" Message of the day -")
+       for _, s := range strings.Split(strings.Trim(string(motd), "\n"), "\n") {
+               client.ReplyNicknamed("372", "- "+string(s))
+       }
+       client.ReplyNicknamed("376", "End of /MOTD command")
 }
 
 func (daemon *Daemon) SendWhois(client *Client, nicknames []string) {
@@ -101,11 +95,17 @@ func (daemon *Daemon) SendWhois(client *Client, nicknames []string) {
                nickname = strings.ToLower(nickname)
                found := false
                for c := range daemon.clients {
-                       if c.nickname != nickname {
+                       if strings.ToLower(c.nickname) != nickname {
                                continue
                        }
                        found = true
-                       client.ReplyNicknamed("311", c.nickname, c.username, c.conn.RemoteAddr().String(), "*", c.realname)
+                       h := c.conn.RemoteAddr().String()
+                       h, _, err := net.SplitHostPort(h)
+                       if err != nil {
+                               log.Printf("Can't parse RemoteAddr %q: %v", h, err)
+                               h = "Unknown"
+                       }
+                       client.ReplyNicknamed("311", c.nickname, c.username, h, "*", c.realname)
                        client.ReplyNicknamed("312", c.nickname, daemon.hostname, daemon.hostname)
                        subscriptions := []string{}
                        for _, room := range daemon.rooms {
@@ -195,8 +195,9 @@ 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) {
+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
@@ -239,7 +240,6 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
                }
                if denied {
                        client.ReplyNicknamed("475", room, "Cannot join channel (+k) - bad key")
-                       continue
                }
                if denied || joined {
                        continue
@@ -253,7 +253,7 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
        }
 }
 
-func (daemon *Daemon) Processor(events chan ClientEvent) {
+func (daemon *Daemon) Processor(events <-chan ClientEvent) {
        for event := range events {
 
                // Check for clients aliveness
@@ -290,7 +290,9 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
                case EVENT_MSG:
                        cols := strings.SplitN(event.text, " ", 2)
                        command := strings.ToUpper(cols[0])
-                       log.Println(client, "command", command)
+                       if daemon.Verbose {
+                               log.Println(client, "command", command)
+                       }
                        if command == "QUIT" {
                                delete(daemon.clients, client)
                                client.conn.Close()
@@ -349,6 +351,7 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
                                        r, found := daemon.rooms[room]
                                        if !found {
                                                client.ReplyNoChannel(room)
+                                               continue
                                        }
                                        daemon.room_sinks[r] <- ClientEvent{client, EVENT_DEL, ""}
                                }
@@ -396,6 +399,7 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
                                r, found := daemon.rooms[cols[0]]
                                if !found {
                                        client.ReplyNoChannel(cols[0])
+                                       continue
                                }
                                var change string
                                if len(cols) > 1 {
@@ -413,6 +417,7 @@ func (daemon *Daemon) Processor(events chan ClientEvent) {
                                r, found := daemon.rooms[room]
                                if !found {
                                        client.ReplyNoChannel(room)
+                                       continue
                                }
                                daemon.room_sinks[r] <- ClientEvent{client, EVENT_WHO, ""}
                        case "WHOIS":