an
/
ircd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

/NAMES implemented

This commit is contained in:
Andreas Neue 2016-07-20 18:17:13 +02:00
parent 2c1db1a573
commit 98c785df43
3 changed files with 212 additions and 217 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
client.go
View File

@ -41,9 +41,9 @@ type RemoteClient struct {
writeq chan string writeq chan string
} }
func NewRemoteClient(srv *Server, conn net.Conn) *RemoteClient { func NewRemoteClient(sv *Server, conn net.Conn) *RemoteClient {
cl := new(RemoteClient) cl := new(RemoteClient)
cl.server = srv cl.server = sv
cl.name = "" cl.name = ""
cl.password = "" cl.password = ""
@ -141,7 +141,7 @@ func (cl *RemoteClient) connReader() {
return return
} }
s = strings.Trim(s, "\r\n") s = strings.Trim(s, "\r\n")
cl.handleLine(s) cl.handleCmd(s)
} }
} }
@ -174,22 +174,27 @@ func (cl *RemoteClient) writeLine(format string, a ...interface{}) {
cl.writeq <- fmt.Sprintf(format, a...) cl.writeq <- fmt.Sprintf(format, a...)
} }
var lineFuncs = map[string]func(*RemoteClient, *irc.Message) bool{ func (cl *RemoteClient) handleCmd(s string) {
"PASS": handleLinePass, xlog.Debug("handleCmd: [%s] '%s'", cl.name, s)
"NICK": handleLineNick,
"USER": handleLineUser,
}
func (cl *RemoteClient) handleLine(s string) {
xlog.Debug("handleLine: [%s] '%s'", cl.name, s)
msg := irc.Parse(s) msg := irc.Parse(s)
hook, exists := lineFuncs[msg.Cmd] if cl.name != "" {
forward := true
if exists {
forward = hook(cl, msg)
}
if forward {
cl.Send(msg) cl.Send(msg)
return
}
// If client name is not set, intercept cmds until we get one
switch msg.Cmd {
case "PASS":
cl.password = msg.Args[0]
case "NICK":
cl.name = msg.Args[0]
if _, exists := cl.server.clients[cl.name]; exists {
cl.Destroy()
xlog.Debug("User registration failed: '%s'", msg.Args[0])
return
}
cl.server.AddClient <- cl
xlog.Debug("User '%s' registered", msg.Args[0])
case "USER":
} }
} }
@ -198,27 +203,3 @@ func checkAuth(cl *RemoteClient) {
return return
} }
} }
func handleLinePass(cl *RemoteClient, msg *irc.Message) bool {
cl.password = msg.Args[0]
return false
}
func handleLineNick(cl *RemoteClient, msg *irc.Message) bool {
if cl.name != "" {
return false
}
cl.name = msg.Args[0]
if _, exists := cl.server.clients[cl.name]; exists {
cl.Destroy()
xlog.Error("Registration of user '%s' failed", msg.Args[0])
return false
}
cl.server.AddClient <- cl
xlog.Info("User '%s' registered", msg.Args[0])
return false
}
func handleLineUser(cl *RemoteClient, msg *irc.Message) bool {
return false
}

19
monitoring.go
View File

@ -12,9 +12,10 @@ import (
var ( var (
gaugePacketsTransferred prometheus.Gauge gaugePacketsTransferred prometheus.Gauge
gaugeClientConnections prometheus.Gauge gaugeClientConnections prometheus.Gauge
gaugeQueueLen prometheus.Gauge
) )
func monitoringRun(srv *Server) { func monitoringRun(sv *Server) {
gaugePacketsTransferred = prometheus.NewGauge(prometheus.GaugeOpts{ gaugePacketsTransferred = prometheus.NewGauge(prometheus.GaugeOpts{
Name: "ircd_packets_transferred", Name: "ircd_packets_transferred",
Help: "Packets handled", Help: "Packets handled",
@ -23,18 +24,24 @@ func monitoringRun(srv *Server) {
Name: "ircd_clients_connected", Name: "ircd_clients_connected",
Help: "Client connections", Help: "Client connections",
}) })
gaugeQueueLen = prometheus.NewGauge(prometheus.GaugeOpts{
Name: "ircd_queue_len",
Help: "Unhandled msgs in dispatcher queue",
})
prometheus.MustRegister(gaugePacketsTransferred) prometheus.MustRegister(gaugePacketsTransferred)
prometheus.MustRegister(gaugeClientConnections) prometheus.MustRegister(gaugeClientConnections)
go monitoringUpdater(srv) prometheus.MustRegister(gaugeQueueLen)
go monitoringUpdater(sv)
http.Handle("/metrics", prometheus.Handler()) http.Handle("/metrics", prometheus.Handler())
laddr, _ := srv.config.GetString("net", "listen_prom") laddr, _ := sv.config.GetString("net", "listen_prom")
http.ListenAndServe(laddr, nil) http.ListenAndServe(laddr, nil)
} }
func monitoringUpdater(srv *Server) { func monitoringUpdater(sv *Server) {
for { for {
time.Sleep(5 * time.Second) time.Sleep(5 * time.Second)
gaugePacketsTransferred.Set(srv.packetsTransferred) gaugePacketsTransferred.Set(sv.packetsTransferred)
gaugeClientConnections.Set(srv.clientConnections) gaugeClientConnections.Set(sv.clientConnections)
gaugeClientConnections.Set(sv.queueLen)
} }
} }

347
server.go
View File

@ -36,306 +36,313 @@ type Server struct {
created string created string
motd string motd string
clients map[string]Client clients map[string]Client
chSubs map[string]map[string]string chUsers map[string]map[string]string
chTopics map[string]string chTopics map[string]string
ports map[int]bool chModes map[string][]string
config *conf.ConfigFile config *conf.ConfigFile
configPath string configPath string
packetsTransferred float64 packetsTransferred float64
clientConnections float64 clientConnections float64
} queueLen float64
func init() {
} }
// Create a new server instance. // Create a new server instance.
func NewServer(configPath, software, version string) *Server { func NewServer(configPath, software, version string) *Server {
srv := &Server{software: software, version: version, created: "yes"} sv := &Server{software: software, version: version, created: "yes"}
srv.Dispatch = make(chan *irc.Message, 1024) sv.Dispatch = make(chan *irc.Message, 1024)
srv.AddClient = make(chan Client, 1024) sv.AddClient = make(chan Client, 1024)
srv.DelClient = make(chan Client, 1024) sv.DelClient = make(chan Client, 1024)
srv.clients = make(map[string]Client) sv.clients = make(map[string]Client)
srv.chSubs = make(map[string]map[string]string) sv.chUsers = make(map[string]map[string]string)
srv.chTopics = make(map[string]string) sv.chTopics = make(map[string]string)
srv.configPath = configPath sv.configPath = configPath
srv.loadConfig() sv.loadConfig()
loglevel, _ := srv.config.GetInt("system", "loglevel") loglevel, _ := sv.config.GetInt("system", "loglevel")
srv.host, _ = srv.config.GetString("server", "host") sv.host, _ = sv.config.GetString("server", "host")
srv.info, _ = srv.config.GetString("server", "info") sv.info, _ = sv.config.GetString("server", "info")
srv.motd, _ = srv.config.GetString("server", "motd") sv.motd, _ = sv.config.GetString("server", "motd")
xlog.Init(loglevel) xlog.Init(loglevel)
srv.packetsTransferred = 0 sv.packetsTransferred = 0
srv.clientConnections = 0 sv.clientConnections = 0
sv.queueLen = 0
return srv return sv
} }
// Open the listening port and start the main server loop. // Open the listening port and start the main server loop.
func (srv *Server) Run() { func (sv *Server) Run() {
xlog.Info("%s/%s", srv.software, srv.version) xlog.Info("%s/%s", sv.software, sv.version)
go monitoringRun(srv) go monitoringRun(sv)
laddr, _ := srv.config.GetString("net", "listen_ircd") laddr, _ := sv.config.GetString("net", "listen_ircd")
go srv.listen(laddr) go sv.listen(laddr)
srv.dispatch() sv.dispatch()
} }
func (srv *Server) listen(laddr string) { func (sv *Server) listen(laddr string) {
listen, err := net.Listen("tcp", laddr) listen, err := net.Listen("tcp", laddr)
if err != nil { if err != nil {
xlog.Fatal(err.Error()) xlog.Fatal(err.Error())
os.Exit(-1) os.Exit(-1)
} }
xlog.Info("Start listening on %s", laddr)
for { for {
time.Sleep(1 * time.Millisecond) time.Sleep(1 * time.Millisecond)
conn, err := listen.Accept() conn, err := listen.Accept()
if err != nil { if err != nil {
xlog.Error(err.Error()) xlog.Error(err.Error())
} else { } else {
NewRemoteClient(srv, conn) NewRemoteClient(sv, conn)
srv.clientConnections++ sv.clientConnections++
} }
} }
} }
func (srv *Server) dispatch() { func (sv *Server) dispatch() {
xlog.Debug("Entering msg dispatcher")
for { for {
time.Sleep(1 * time.Millisecond) time.Sleep(1 * time.Millisecond)
sv.queueLen = float64(len(sv.Dispatch))
select { select {
case msg := <-srv.Dispatch: case msg := <-sv.Dispatch:
srv.recvMsg(msg) sv.recvMsg(msg)
srv.packetsTransferred++ sv.packetsTransferred++
case cl := <-srv.AddClient: case cl := <-sv.AddClient:
name := cl.Name() name := cl.Name()
srv.clients[name] = cl sv.clients[name] = cl
srv.clientLogon(cl) sv.clientLogon(cl)
srv.clientMotd(cl)
xlog.Info("Client registered: '%s'", name) xlog.Info("Client registered: '%s'", name)
xlog.Info("Server has %d client(s)", len(srv.clients)) xlog.Info("Server has %d client(s)", len(sv.clients))
xlog.Debug("Goroutines running: %d", runtime.NumGoroutine()) xlog.Debug("Goroutines running: %d", runtime.NumGoroutine())
case cl := <-srv.DelClient: case cl := <-sv.DelClient:
name := cl.Name() name := cl.Name()
cl.Destroy() cl.Destroy()
delete(srv.clients, name) delete(sv.clients, name)
xlog.Info("Client deleted: '%s'", name) xlog.Info("Client deleted: '%s'", name)
xlog.Info("Server has %d client(s)", len(srv.clients)) xlog.Info("Server has %d client(s)", len(sv.clients))
xlog.Debug("Goroutines running: %d", runtime.NumGoroutine()) xlog.Debug("Goroutines running: %d", runtime.NumGoroutine())
default: default:
} }
} }
} }
func (srv *Server) loadConfig() { func (sv *Server) loadConfig() {
cfg, err := conf.ReadConfigFile(srv.configPath) cfg, err := conf.ReadConfigFile(sv.configPath)
if err != nil { if err != nil {
xlog.Fatal("Can't read config file (%s)", err.Error()) xlog.Fatal("Can't read config file (%s)", err.Error())
os.Exit(-1) os.Exit(-1)
} }
srv.config = cfg sv.config = cfg
} }
func (srv *Server) recvMsg(msg *irc.Message) { func (sv *Server) recvMsg(msg *irc.Message) {
cmd := msg.Cmd cmd := msg.Cmd
hook, exists := srvCommandHooks[cmd] hook, exists := svCommandHooks[cmd]
if !exists { if !exists {
srv.sendReply(msg.Pre, ERR_UNKNOWNCOMMAND, cmd, "Unknown command") sv.sendReply(msg.Pre, ERR_UNKNOWNCOMMAND, cmd, "Unknown command")
return return
} }
argc := len(msg.Args) argc := len(msg.Args)
if argc < hook.MinArgs { if argc < hook.MinArgs {
srv.sendReply(msg.Pre, ERR_NEEDMOREPARAMS, cmd, "Not enough parameters") sv.sendReply(msg.Pre, ERR_NEEDMOREPARAMS, cmd, "Not enough parameters")
return return
} }
if hook.NeedTrail && msg.Trail == "" { if hook.NeedTrail && msg.Trail == "" {
srv.sendReply(msg.Pre, ERR_NEEDMOREPARAMS, cmd, "Not enough parameters") sv.sendReply(msg.Pre, ERR_NEEDMOREPARAMS, cmd, "Not enough parameters")
return return
} }
hook.HookFn(srv, msg) hook.HookFn(sv, msg)
} }
func (srv *Server) sendMsg(msg *irc.Message) { func (sv *Server) sendMsg(msg *irc.Message) {
if strings.HasPrefix(msg.Args[0], "#") { if strings.HasPrefix(msg.Args[0], "#") {
srv.bcChan(msg) ch := msg.Args[0]
} else { if _, exists := sv.chUsers[ch]; !exists {
srv.sendClient(msg) sv.sendReply(msg.Pre, ERR_NOSUCHNICK, msg.Args[0], "No such nick/channel")
} return
}
func (srv *Server) sendClient(msg *irc.Message) {
if _, exists := srv.clients[msg.Args[0]]; !exists {
xlog.Debug("sendClient: Client '%s' does not exist", msg.Args[0])
srv.sendReply(msg.Pre, ERR_NOSUCHNICK, msg.Args[0], "No such nick/channel")
return
}
cl := srv.clients[msg.Args[0]]
cl.Receive(msg)
}
func (srv *Server) bcChan(msg *irc.Message) {
ch := msg.Args[0]
if _, exists := srv.chSubs[ch]; !exists {
xlog.Error("bcChan: Channel '%s' does not exist", ch)
return
}
for nick, _ := range srv.chSubs[ch] {
if msg.Pre == nick && msg.Cmd == "PRIVMSG" {
continue
} }
srv.clients[nick].Receive(msg) for nick, _ := range sv.chUsers[ch] {
if msg.Pre == nick && msg.Cmd == "PRIVMSG" {
continue
}
sv.clients[nick].Receive(msg)
}
} else {
if _, exists := sv.clients[msg.Args[0]]; !exists {
sv.sendReply(msg.Pre, ERR_NOSUCHNICK, msg.Args[0], "No such nick/channel")
return
}
cl := sv.clients[msg.Args[0]]
cl.Receive(msg)
} }
} }
func (srv *Server) sendReply(tar, cmd, args, trail string) { func (sv *Server) sendReply(tar, cmd, args, trail string) {
if _, exists := srv.clients[tar]; !exists { if _, exists := sv.clients[tar]; !exists {
xlog.Error("sendReply: Client '%s' does not exist", tar)
return return
} }
cl := srv.clients[tar] cl := sv.clients[tar]
if args != "" { if args != "" {
args = tar + " " + args args = tar + " " + args
} else { } else {
args = tar args = tar
} }
cl.Receive(irc.M(srv.host, cmd, args, trail)) cl.Receive(irc.M(sv.host, cmd, args, trail))
} }
func (srv *Server) clientLogon(cl Client) { func (sv *Server) clientLogon(cl Client) {
srv.sendReply(cl.Name(), RPL_WELCOME, "", "Willkommen!") sv.sendReply(cl.Name(), RPL_WELCOME, "", "Willkommen!")
srv.sendReply(cl.Name(), RPL_YOURHOST, "", sv.sendReply(cl.Name(), RPL_YOURHOST, "",
fmt.Sprintf("Your host is %s, running on %s/%s", fmt.Sprintf("Your host is %s, running on %s/%s",
srv.host, srv.software, srv.version)) sv.host, sv.software, sv.version))
srv.sendReply(cl.Name(), RPL_CREATED, "", sv.sendReply(cl.Name(), RPL_CREATED, "",
fmt.Sprintf("Created: %s", srv.created)) fmt.Sprintf("Created: %s", sv.created))
srv.sendReply(cl.Name(), RPL_MYINFO, "", sv.sendReply(cl.Name(), RPL_MYINFO, "",
fmt.Sprintf(myinfo, srv.host, srv.software, srv.version)) fmt.Sprintf(myinfo, sv.host, sv.software, sv.version))
srv.sendReply(cl.Name(), RPL_ISUPPORT, "", sv.sendReply(cl.Name(), RPL_ISUPPORT, "",
isupport+" are supported by this server") isupport+" are supported by this server")
sv.sendReply(cl.Name(), RPL_MOTDSTART, "",
fmt.Sprintf("- %s Message of the day -", sv.host))
for _, line := range strings.Split(sv.motd, "\n") {
sv.sendReply(cl.Name(), RPL_MOTD, "", fmt.Sprintf("- %s", line))
}
sv.sendReply(cl.Name(), RPL_ENDOFMOTD, "", "End of MOTD command")
} }
func (srv *Server) clientMotd(cl Client) { func (sv *Server) channelJoin(nick, ch string) {
srv.sendReply(cl.Name(), RPL_MOTDSTART, "", if _, exists := sv.chUsers[ch]; !exists {
fmt.Sprintf("- %s Message of the day -", srv.host)) sv.chUsers[ch] = make(map[string]string)
for _, line := range strings.Split(srv.motd, "\n") { sv.chTopics[ch] = ""
srv.sendReply(cl.Name(), RPL_MOTD, "", fmt.Sprintf("- %s", line))
} }
srv.sendReply(cl.Name(), RPL_ENDOFMOTD, "", "End of MOTD command") if _, exists := sv.chUsers[ch][nick]; exists {
}
func (srv *Server) channelJoin(nick, ch string) {
if _, exists := srv.chSubs[ch]; !exists {
srv.chSubs[ch] = make(map[string]string)
srv.chTopics[ch] = ""
}
if _, exists := srv.chSubs[ch][nick]; exists {
return return
} }
srv.chSubs[ch][nick] = "" sv.chUsers[ch][nick] = ""
srv.bcChan(irc.M(nick, "JOIN", ch, "")) sv.sendMsg(irc.M(nick, "JOIN", ch, ""))
srv.sendReply(nick, RPL_TOPIC, ch, srv.chTopics[ch]) sv.sendReply(nick, RPL_TOPIC, ch, sv.chTopics[ch])
sv.channelNames(nick, ch)
} }
func (srv *Server) channelPart(nick, ch, reason string) { func (sv *Server) channelPart(nick, ch, reason string) {
if _, exists := srv.chSubs[ch]; !exists { if _, exists := sv.chUsers[ch]; !exists {
return return
} }
if _, exists := srv.chSubs[ch][nick]; !exists { if _, exists := sv.chUsers[ch][nick]; !exists {
return return
} }
srv.bcChan(irc.M(nick, "PART", ch, reason)) sv.sendMsg(irc.M(nick, "PART", ch, reason))
delete(srv.chSubs[ch], nick) delete(sv.chUsers[ch], nick)
} }
type SrvCommandHook struct { func (sv *Server) channelNames(nick, ch string) {
HookFn func(srv *Server, msg *irc.Message) if _, exists := sv.chUsers[ch]; !exists {
return
}
names := ""
for name, mode := range sv.chUsers[ch] {
if names != "" {
names += " "
}
names = names + mode + name
}
sv.sendReply(nick, RPL_NAMEREPLY, "= "+ch, names)
sv.sendReply(nick, RPL_ENDOFNAMES, ch, "End of /NAMES list")
}
type commandHook struct {
HookFn func(sv *Server, msg *irc.Message)
MinArgs int MinArgs int
NeedTrail bool NeedTrail bool
NeedOper bool NeedOper bool
NeedAuth bool NeedAuth bool
} }
var srvCommandHooks = map[string]SrvCommandHook{ var svCommandHooks = map[string]commandHook{
"PRIVMSG": {srvHandleCmdPrivmsg, 1, true, false, false}, "PRIVMSG": {handleCmdPrivmsg, 1, true, false, false},
"JOIN": {srvHandleCmdJoin, 1, false, false, false}, "JOIN": {handleCmdJoin, 1, false, false, false},
"PART": {srvHandleCmdPart, 1, false, false, false}, "PART": {handleCmdPart, 1, false, false, false},
"QUIT": {srvHandleCmdQuit, 0, false, false, false}, "QUIT": {handleCmdQuit, 0, false, false, false},
"MODE": {srvHandleCmdMode, 1, false, false, false}, "MODE": {handleCmdMode, 1, false, false, false},
"TOPIC": {srvHandleCmdTopic, 1, false, false, false}, "TOPIC": {handleCmdTopic, 1, false, false, false},
"WHOIS": {srvHandleCmdWhois, 0, false, false, false}, "NAMES": {handleCmdNames, 1, false, false, false},
"PING": {srvHandleCmdPing, 1, false, false, false}, "WHOIS": {handleCmdWhois, 0, false, false, false},
"REHASH": {srvHandleCmdRehash, 0, false, false, false}, "PING": {handleCmdPing, 1, false, false, false},
"REHASH": {handleCmdRehash, 0, false, false, false},
/* /*
"LIST": {srvHandleCmdList, 0, false, false}, "LIST": {handleCmdList, 0, false, false},
"VERSION": {srvHandleCmdVersion, 0, false, false}, "VERSION": {handleCmdVersion, 0, false, false},
"STATS": {srvHandleCmdStats, 0, false, false}, "STATS": {handleCmdStats, 0, false, false},
"TIME": {srvHandleCmdTime, 0, false, false}, "TIME": {handleCmdTime, 0, false, false},
"OPER": {srvHandleCmdOper, 1, false, false}, "OPER": {handleCmdOper, 1, false, false},
"ADMIN": {srvHandleCmdAdmin, 0, false, false}, "ADMIN": {handleCmdAdmin, 0, false, false},
"INFO": {srvHandleCmdInfo, 0, false, false}, "INFO": {handleCmdInfo, 0, false, false},
"WHO": {srvHandleCmdWho, 0, false, false}, "WHO": {handleCmdWho, 0, false, false},
"WHOWAS": {srvHandleCmdWhowas, 0, false, false}, "WHOWAS": {handleCmdWhowas, 0, false, false},
"KILL": {srvHandleCmdKill, 0, false, false}, "KILL": {handleCmdKill, 0, false, false},
"PONG": {srvHandleCmdPong, 0, false, false}, "PONG": {handleCmdPong, 0, false, false},
"ERROR": {srvHandleCmdError, 0, false, false}, "ERROR": {handleCmdError, 0, false, false},
"AWAY": {srvHandleCmdAway, 0, false, false}, "AWAY": {handleCmdAway, 0, false, false},
"RESTART": {srvHandleCmdRestart, 0, false, false}, "RESTART": {handleCmdRestart, 0, false, false},
"SUMMON": {srvHandleCmdSummon, 0, false, false}, "SUMMON": {handleCmdSummon, 0, false, false},
"USERS": {srvHandleCmdUsers, 0, false, false}, "USERS": {handleCmdUsers, 0, false, false},
"USERHOST": {srvHandleCmdUserhost, 0, false, false}, "USERHOST": {handleCmdUserhost, 0, false, false},
"ISON": {srvHandleCmdIson, 0, false, false}, "ISON": {handleCmdIson, 0, false, false},
*/ */
} }
func srvHandleCmdPrivmsg(srv *Server, msg *irc.Message) { func handleCmdPrivmsg(sv *Server, msg *irc.Message) {
srv.sendMsg(msg) sv.sendMsg(msg)
} }
func srvHandleCmdJoin(srv *Server, msg *irc.Message) { func handleCmdJoin(sv *Server, msg *irc.Message) {
srv.channelJoin(msg.Pre, msg.Args[0]) sv.channelJoin(msg.Pre, msg.Args[0])
} }
func srvHandleCmdPart(srv *Server, msg *irc.Message) { func handleCmdPart(sv *Server, msg *irc.Message) {
srv.channelPart(msg.Pre, msg.Args[0], msg.Trail) sv.channelPart(msg.Pre, msg.Args[0], msg.Trail)
} }
func srvHandleCmdQuit(srv *Server, msg *irc.Message) { func handleCmdQuit(sv *Server, msg *irc.Message) {
} }
func srvHandleCmdMode(srv *Server, msg *irc.Message) { func handleCmdMode(sv *Server, msg *irc.Message) {
} }
func srvHandleCmdTopic(srv *Server, msg *irc.Message) { func handleCmdTopic(sv *Server, msg *irc.Message) {
ch := msg.Args[0] ch := msg.Args[0]
if _, exists := srv.chSubs[ch]; !exists { if _, exists := sv.chUsers[ch]; !exists {
srv.sendReply(msg.Pre, ERR_NOSUCHCHANNEL, ch, "No such channel") sv.sendReply(msg.Pre, ERR_NOSUCHCHANNEL, ch, "No such channel")
} }
if msg.Trail == "" { if msg.Trail == "" {
srv.sendReply(msg.Pre, RPL_TOPIC, ch, srv.chTopics[ch]) sv.sendReply(msg.Pre, RPL_TOPIC, ch, sv.chTopics[ch])
} else { } else {
srv.chTopics[ch] = msg.Trail sv.chTopics[ch] = msg.Trail
srv.bcChan(msg) sv.sendMsg(msg)
//srv.sendReply(msg.Pre, RPL_TOPIC, ch, msg.Trail) //sv.sendReply(msg.Pre, RPL_TOPIC, ch, msg.Trail)
} }
} }
func srvHandleCmdWhois(srv *Server, msg *irc.Message) { func handleCmdNames(sv *Server, msg *irc.Message) {
srv.sendReply(msg.Pre, RPL_WHOISUSER, "nick user host *", "real name") ch := msg.Args[0]
if _, exists := sv.chUsers[ch]; !exists {
sv.sendReply(msg.Pre, ERR_NOSUCHCHANNEL, ch, "No such channel")
}
sv.channelNames(msg.Pre, ch)
} }
func srvHandleCmdPing(srv *Server, msg *irc.Message) { func handleCmdWhois(sv *Server, msg *irc.Message) {
srv.sendReply(msg.Pre, "PONG", msg.Args[0], "") sv.sendReply(msg.Pre, RPL_WHOISUSER, "nick user host *", "real name")
} }
func srvHandleCmdRehash(srv *Server, msg *irc.Message) { func handleCmdPing(sv *Server, msg *irc.Message) {
srv.loadConfig() sv.sendReply(msg.Pre, "PONG", msg.Args[0], "")
srv.sendReply(msg.Pre, RPL_REHASHING, "", "Rehashing.") }
func handleCmdRehash(sv *Server, msg *irc.Message) {
sv.loadConfig()
sv.sendReply(msg.Pre, RPL_REHASHING, "", "Rehashing.")
xlog.Info("Rehashing") xlog.Info("Rehashing")
} }