Browse Source

Minor cleanup and small bug fix

master
Trevor Slocum 5 years ago
parent
commit
66b6c5630c
  1. 4
      anonircd.go
  2. 26
      client.go
  3. 41
      server.go

4
anonircd.go

@ -24,11 +24,9 @@ import (
"os"
"os/signal"
"sort"
"sync"
"syscall"
"time"
"github.com/orcaman/concurrent-map"
irc "gopkg.in/sorcix/irc.v2"
)
@ -84,7 +82,7 @@ func randomIdentifier() string {
func main() {
rand.Seed(time.Now().UTC().UnixNano())
server := Server{&Config{}, time.Now().Unix(), cmap.New(), cmap.New(), nil, new(sync.RWMutex), make(chan bool, 1), make(chan bool, 1), new(sync.RWMutex)}
server := NewServer()
server.loadConfig()
sighup := make(chan os.Signal, 1)

26
client.go

@ -1,9 +1,7 @@
package main
import (
"log"
"net"
"strconv"
irc "gopkg.in/sorcix/irc.v2"
)
@ -33,30 +31,6 @@ func (c *Client) write(msg *irc.Message) {
c.writebuffer <- msg
}
func (c *Client) handleWrite() {
for msg := range c.writebuffer {
if msg == nil {
return
}
addnick := false
if _, err := strconv.Atoi(msg.Command); err == nil {
addnick = true
} else if msg.Command == irc.CAP {
addnick = true
}
if addnick {
msg.Params = append([]string{c.nick}, msg.Params...)
}
if len(msg.Command) >= 4 && msg.Command[0:4] != irc.PING && msg.Command[0:4] != irc.PONG {
log.Println(c.identifier, "->", msg)
}
c.writer.Encode(msg)
}
}
func (c *Client) sendNotice(notice string) {
c.write(&irc.Message{&anonirc, irc.NOTICE, []string{c.nick, "*** " + notice}})
}

41
server.go

@ -40,6 +40,19 @@ type Server struct {
*sync.RWMutex
}
func NewServer() *Server {
s := &Server{}
s.created = time.Now().Unix()
s.clients = cmap.New()
s.channels = cmap.New()
s.restartplain = make(chan bool, 1)
s.restartssl = make(chan bool, 1)
s.RWMutex = new(sync.RWMutex)
return s
}
func (s *Server) getAnonymousPrefix(i int) *irc.Prefix {
prefix := anonymous
if i > 1 {
@ -426,7 +439,7 @@ func (s *Server) handlePrivmsg(channel string, client string, message string) {
for cls := range ch.clients.IterBuffered() {
ccl := s.getClient(cls.Key)
if ccl.identifier != client {
if ccl != nil && ccl.identifier != client {
ccl.write(&irc.Message{&anonymous, irc.PRIVMSG, []string{channel, message}})
}
}
@ -581,6 +594,30 @@ func (s *Server) handleRead(c *Client) {
}
}
func (s *Server) handleWrite(c *Client) {
for msg := range c.writebuffer {
if msg == nil {
return
}
addnick := false
if _, err := strconv.Atoi(msg.Command); err == nil {
addnick = true
} else if msg.Command == irc.CAP {
addnick = true
}
if addnick {
msg.Params = append([]string{c.nick}, msg.Params...)
}
if len(msg.Command) >= 4 && msg.Command[0:4] != irc.PING && msg.Command[0:4] != irc.PONG {
log.Println(c.identifier, "->", msg)
}
c.writer.Encode(msg)
}
}
func (s *Server) handleConnection(conn net.Conn, ssl bool) {
defer conn.Close()
var identifier string
@ -595,7 +632,7 @@ func (s *Server) handleConnection(conn net.Conn, ssl bool) {
client := &Client{Entity{ENTITY_CLIENT, identifier, time.Now().Unix(), ENTITY_STATE_NORMAL, cmap.New(), new(sync.RWMutex)}, ssl, "*", "", "", conn, make(chan *irc.Message, writebuffersize), irc.NewDecoder(conn), irc.NewEncoder(conn), false}
s.clients.Set(client.identifier, client)
go client.handleWrite()
go s.handleWrite(client)
s.handleRead(client)
s.killClient(client)

Loading…
Cancel
Save