X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=daemon.go;h=3c1692ffa09a762d9397d65fdf005a7fc9192f2f;hb=87ba38e7f7aa8c5542bb13c255912a9e1a0f7931;hp=1f142c2c13f9917c8e986627ff3529f560fd45aa;hpb=c1d256aaa0af4e0cb3649552e5067a9ec3bc94d5;p=goircd.git

diff --git a/daemon.go b/daemon.go
index 1f142c2..3c1692f 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"
@@ -72,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) {
@@ -106,7 +99,13 @@ func (daemon *Daemon) SendWhois(client *Client, nicknames []string) {
 				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 {
@@ -159,8 +158,8 @@ func (daemon *Daemon) ClientRegister(client *Client, command string, cols []stri
 			return
 		}
 		nickname := cols[1]
-		for client := range daemon.clients {
-			if client.nickname == nickname {
+		for existing_client := range daemon.clients {
+			if existing_client.nickname == nickname {
 				client.ReplyParts("433", "*", nickname, "Nickname is already in use")
 				return
 			}
@@ -378,7 +377,7 @@ func (daemon *Daemon) Processor(events <-chan ClientEvent) {
 				target := strings.ToLower(cols[0])
 				for c := range daemon.clients {
 					if c.nickname == target {
-						msg = fmt.Sprintf(":%s %s %s :%s", client, command, c.nickname, cols[1])
+						msg = fmt.Sprintf(":%s %s %s %s", client, command, c.nickname, cols[1])
 						c.Msg(msg)
 						break
 					}