X-Git-Url: http://www.git.cypherpunks.ru/?a=blobdiff_plain;f=daemon.go;h=1f142c2c13f9917c8e986627ff3529f560fd45aa;hb=c1d256aaa0af4e0cb3649552e5067a9ec3bc94d5;hp=49e2dd876c6faaa1789c8e0bb454075eaa711687;hpb=6d2c47a7af3afc09b3b8899d9b770b58e2792d31;p=goircd.git

diff --git a/daemon.go b/daemon.go
index 49e2dd8..1f142c2 100644
--- a/daemon.go
+++ b/daemon.go
@@ -40,17 +40,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)
@@ -101,7 +102,7 @@ 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
@@ -195,8 +196,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 +241,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
@@ -247,12 +248,13 @@ func (daemon *Daemon) HandlerJoin(client *Client, cmd string) {
 		room_new, room_sink := daemon.RoomRegister(room)
 		if key != "" {
 			room_new.key = key
+			room_new.StateSave()
 		}
 		room_sink <- ClientEvent{client, EVENT_NEW, ""}
 	}
 }
 
-func (daemon *Daemon) Processor(events chan ClientEvent) {
+func (daemon *Daemon) Processor(events <-chan ClientEvent) {
 	for event := range events {
 
 		// Check for clients aliveness
@@ -289,7 +291,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()
@@ -348,6 +352,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, ""}
 				}
@@ -395,6 +400,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 {
@@ -412,6 +418,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":