/*
goircd -- minimalistic simple Internet Relay Chat (IRC) server
-Copyright (C) 2014 Sergey Matveev <stargrave@stargrave.org>
+Copyright (C) 2014-2015 Sergey Matveev <stargrave@stargrave.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+
package main
import (
)
const (
- CRLF = "\x0d\x0a"
- BUF_SIZE = 1380
+ BufSize = 1500
+)
+
+var (
+ CRLF []byte = []byte{'\x0d', '\x0a'}
)
type Client struct {
- hostname string
+ hostname *string
conn net.Conn
registered bool
nickname string
username string
realname string
+ password string
+ away *string
}
type ClientAlivenessState struct {
- ping_sent bool
+ pingSent bool
timestamp time.Time
}
return client.nickname + "!" + client.username + "@" + client.conn.RemoteAddr().String()
}
-func NewClient(hostname string, conn net.Conn) *Client {
- return &Client{hostname: hostname, conn: conn, nickname: "*"}
+func NewClient(hostname *string, conn net.Conn) *Client {
+ return &Client{hostname: hostname, conn: conn, nickname: "*", password: ""}
}
// Client processor blockingly reads everything remote client sends,
// splits messages by CRLF and send them to Daemon gorouting for processing
// it futher. Also it can signalize that client is unavailable (disconnected).
func (client *Client) Processor(sink chan<- ClientEvent) {
- var buf_net []byte
- buf := make([]byte, 0)
+ sink <- ClientEvent{client, EventNew, ""}
log.Println(client, "New client")
- sink <- ClientEvent{client, EVENT_NEW, ""}
+ buf := make([]byte, BufSize*2)
+ var n int
+ var prev int
+ var i int
+ var err error
for {
- buf_net = make([]byte, BUF_SIZE)
- _, err := client.conn.Read(buf_net)
+ if prev == BufSize {
+ log.Println(client, "buffer size exceeded, kicking him")
+ sink <- ClientEvent{client, EventDel, ""}
+ client.conn.Close()
+ break
+ }
+ n, err = client.conn.Read(buf[prev:])
if err != nil {
- log.Println(client, "connection lost", err)
- sink <- ClientEvent{client, EVENT_DEL, ""}
+ sink <- ClientEvent{client, EventDel, ""}
break
}
- buf_net = bytes.TrimRight(buf_net, "\x00")
- buf = append(buf, buf_net...)
- if !bytes.HasSuffix(buf, []byte(CRLF)) {
+ prev += n
+ CheckMore:
+ i = bytes.Index(buf[:prev], CRLF)
+ if i == -1 {
continue
}
- for _, msg := range bytes.Split(buf[:len(buf)-2], []byte(CRLF)) {
- if len(msg) > 0 {
- sink <- ClientEvent{client, EVENT_MSG, string(msg)}
- }
- }
- buf = []byte{}
+ sink <- ClientEvent{client, EventMsg, string(buf[:i])}
+ copy(buf, buf[i+2:prev])
+ prev -= (i + 2)
+ goto CheckMore
}
}
// Send message as is with CRLF appended.
func (client *Client) Msg(text string) {
- client.conn.Write([]byte(text + CRLF))
+ client.conn.Write(append([]byte(text), CRLF...))
}
// Send message from server. It has ": servername" prefix.
func (client *Client) Reply(text string) {
- client.Msg(":" + client.hostname + " " + text)
+ client.Msg(":" + *client.hostname + " " + text)
}
// Send server message, concatenating all provided text parts and