sad
/
soju
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add Server.getUser

This commit is contained in:
Simon Ser 2020-02-07 11:39:56 +01:00
parent 3b2bb58c60
commit 3586ca3d26
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
downstream.go
View File

@ -167,11 +167,8 @@ func (c *downstreamConn) handleMessageUnregistered(msg *irc.Message) error {
} }
func (c *downstreamConn) register() error { func (c *downstreamConn) register() error {
c.srv.lock.Lock() u := c.srv.getUser(c.username)
u, ok := c.srv.users[c.username] if u == nil {
c.srv.lock.Unlock()
if !ok {
c.messages <- &irc.Message{ c.messages <- &irc.Message{
Prefix: c.srv.prefix(), Prefix: c.srv.prefix(),
Command: irc.ERR_PASSWDMISMATCH, Command: irc.ERR_PASSWDMISMATCH,

7
server.go
View File

@ -106,6 +106,13 @@ func (s *Server) Run() {
} }
} }
func (s *Server) getUser(name string) *user {
s.lock.Lock()
u := s.users[name]
s.lock.Unlock()
return u
}
func (s *Server) Serve(ln net.Listener) error { func (s *Server) Serve(ln net.Listener) error {
for { for {
netConn, err := ln.Accept() netConn, err := ln.Accept()