From 3586ca3d262b3bc9ddd9b48f84b720061d03b157 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Fri, 7 Feb 2020 11:39:56 +0100 Subject: [PATCH] Add Server.getUser --- downstream.go | 7 ++----- server.go | 7 +++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/downstream.go b/downstream.go index 6926742..e0d4f40 100644 --- a/downstream.go +++ b/downstream.go @@ -167,11 +167,8 @@ func (c *downstreamConn) handleMessageUnregistered(msg *irc.Message) error { } func (c *downstreamConn) register() error { - c.srv.lock.Lock() - u, ok := c.srv.users[c.username] - c.srv.lock.Unlock() - - if !ok { + u := c.srv.getUser(c.username) + if u == nil { c.messages <- &irc.Message{ Prefix: c.srv.prefix(), Command: irc.ERR_PASSWDMISMATCH, diff --git a/server.go b/server.go index f89177e..3076eb8 100644 --- a/server.go +++ b/server.go @@ -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 { for { netConn, err := ln.Accept()