idle/quit timeout

irc/client.go

@@ -8,7 +8,6 @@ import (
 )
 
 type Client struct {
-	atime      time.Time
 	away       bool
 	channels   ChannelSet
 	conn       net.Conn
@@ -22,6 +21,8 @@ type Client struct {
 	server     *Server
 	serverPass bool
 	username   string
+	idleTimer  *time.Timer
+	quitTimer  *time.Timer
 }
 
 func NewClient(server *Server, conn net.Conn) *Client {
@@ -40,9 +41,38 @@ func NewClient(server *Server, conn net.Conn) *Client {
 	go client.readConn(read)
 	go client.writeConn(write, replies)
 
+	client.Touch()
 	return client
 }
 
+func (client *Client) Touch() {
+	if client.quitTimer != nil {
+		client.quitTimer.Stop()
+	}
+	if client.idleTimer == nil {
+		client.idleTimer = time.AfterFunc(IDLE_TIMEOUT, client.Idle)
+	} else {
+		client.idleTimer.Reset(IDLE_TIMEOUT)
+	}
+}
+
+func (client *Client) Idle() {
+	if client.quitTimer == nil {
+		client.quitTimer = time.AfterFunc(QUIT_TIMEOUT, client.Quit)
+	} else {
+		client.quitTimer.Reset(QUIT_TIMEOUT)
+	}
+	client.Reply(RplPing(client.server, client))
+}
+
+func (client *Client) Quit() {
+	msg := &QuitCommand{
+		message: "connection timeout",
+	}
+	msg.SetClient(client)
+	client.server.commands <- msg
+}
+
 func (c *Client) readConn(recv <-chan string) {
 	for str := range recv {
 		m, err := ParseCommand(str)

irc/constants.go

@@ -2,6 +2,7 @@ package irc
 
 import (
 	"errors"
+	"time"
 )
 
 var (
@@ -14,8 +15,14 @@ var (
 )
 
 const (
-	VERSION = "ergonomadic-1"
+	VERSION       = "ergonomadic-1"
-	CRLF    = "\r\n"
+	CRLF          = "\r\n"
+	MAX_REPLY_LEN = 512 - len(CRLF)
+
+	// how long before a client is considered idle
+	IDLE_TIMEOUT = time.Minute
+	// how long after idle before a client is kicked
+	QUIT_TIMEOUT = time.Minute
 
 	// numeric codes
 	RPL_WELCOME           = 1
@@ -161,6 +168,7 @@ const (
 	RPL_JOIN    = "JOIN"
 	RPL_NICK    = "NICK"
 	RPL_PART    = "PART"
+	RPL_PING    = "PING"
 	RPL_PONG    = "PONG"
 	RPL_PRIVMSG = "PRIVMSG"
 	RPL_QUIT    = "QUIT"

irc/reply.go

@@ -6,10 +6,6 @@ import (
 	"time"
 )
 
-const (
-	MAX_REPLY_LEN = 510 // 512 - CRLF
-)
-
 func joinedLen(names []string) int {
 	var l = len(names) - 1 // " " between names
 	for _, name := range names {
@@ -139,6 +135,10 @@ func RplPart(client *Client, channel *Channel, message string) Reply {
 	return NewStringReply(client, RPL_PART, "%s :%s", channel.name, message)
 }
 
+func RplPing(server *Server, target Identifier) Reply {
+	return NewStringReply(server, RPL_PING, target.Nick())
+}
+
 func RplPong(server *Server, client *Client) Reply {
 	return NewStringReply(server, RPL_PONG, client.Nick())
 }

irc/server.go

@@ -47,7 +47,8 @@ func (server *Server) receiveCommands(commands <-chan Command) {
 			log.Printf("%s → %s : %s", command.Client(), server, command)
 		}
 		client := command.Client()
-		client.atime = time.Now()
+		client.Touch()
+
 		if !client.serverPass {
 			if server.password == "" {
 				client.serverPass = true