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

Rename conn to downstreamConn

Browse Source
This commit is contained in:
Simon Ser 2020-02-06 15:22:26 +01:00
parent 3ccc1bb4e8
commit 003ce38bf8
No known key found for this signature in database
GPG Key ID: 0FDE7BE0E88F5E48
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
server.go
View File

@ -39,7 +39,7 @@ func (err ircError) Error() string {
return err.Message.String() return err.Message.String()
} }
type conn struct { type downstreamConn struct {
net net.Conn net net.Conn
irc *irc.Conn irc *irc.Conn
srv *Server srv *Server
@ -50,7 +50,7 @@ type conn struct {
realname string realname string
} }
func (c *conn) Close() error { func (c *downstreamConn) Close() error {
if err := c.net.Close(); err != nil { if err := c.net.Close(); err != nil {
return err return err
} }
@ -58,12 +58,12 @@ func (c *conn) Close() error {
return nil return nil
} }
func (c *conn) WriteMessage(msg *irc.Message) error { func (c *downstreamConn) WriteMessage(msg *irc.Message) error {
msg.Prefix = c.srv.prefix() msg.Prefix = c.srv.prefix()
return c.irc.WriteMessage(msg) return c.irc.WriteMessage(msg)
} }
func (c *conn) handleMessage(msg *irc.Message) error { func (c *downstreamConn) handleMessage(msg *irc.Message) error {
switch msg.Command { switch msg.Command {
case "PING": case "PING":
// TODO: handle params // TODO: handle params
@ -80,7 +80,7 @@ func (c *conn) handleMessage(msg *irc.Message) error {
} }
} }
func (c *conn) handleMessageUnregistered(msg *irc.Message) error { func (c *downstreamConn) handleMessageUnregistered(msg *irc.Message) error {
switch msg.Command { switch msg.Command {
case "NICK": case "NICK":
if len(msg.Params) != 1 { if len(msg.Params) != 1 {
@ -104,7 +104,7 @@ func (c *conn) handleMessageUnregistered(msg *irc.Message) error {
return nil return nil
} }
func (c *conn) register() error { func (c *downstreamConn) register() error {
c.registered = true c.registered = true
err := c.WriteMessage(&irc.Message{ err := c.WriteMessage(&irc.Message{
@ -150,7 +150,7 @@ func (c *conn) register() error {
return nil return nil
} }
func (c *conn) handleMessageRegistered(msg *irc.Message) error { func (c *downstreamConn) handleMessageRegistered(msg *irc.Message) error {
switch msg.Command { switch msg.Command {
case "NICK", "USER": case "NICK", "USER":
return ircError{&irc.Message{ return ircError{&irc.Message{
@ -176,7 +176,7 @@ func (s *Server) prefix() *irc.Prefix {
} }
func (s *Server) handleConn(netConn net.Conn) error { func (s *Server) handleConn(netConn net.Conn) error {
c := conn{net: netConn, irc: irc.NewConn(netConn), srv: s} c := downstreamConn{net: netConn, irc: irc.NewConn(netConn), srv: s}
defer c.Close() defer c.Close()
for { for {
msg, err := c.irc.ReadMessage() msg, err := c.irc.ReadMessage()