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

diff --git a/daemon.go b/daemon.go
index 1f979ce..3c1692f 100644
--- a/daemon.go
+++ b/daemon.go
@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"log"
+	"net"
 	"regexp"
 	"sort"
 	"strings"
@@ -98,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 {
@@ -151,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
 			}
@@ -370,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
 					}