X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=daemon.go;h=d8cc3b8bc2729d87af875dc7ea30ffd06b389c7b;hb=a154bd6120c2d455ae553e92d0e0df89dea7b797;hp=a5b2d77dcd822d257132fe045cee53473bf89757;hpb=cda982f7e9e853d8c6e56b14a43deb30aa5830ef;p=goircd.git

diff --git a/daemon.go b/daemon.go
index a5b2d77..d8cc3b8 100644
--- 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("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("422", "MOTD File is missing")
+	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
@@ -252,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
@@ -289,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()