ircd.chat/irc-go
10
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Compabillity fixes for new go core version

Browse Source
This commit is contained in:
tj 2011-04-05 10:37:17 +02:00
parent ea8495857e
commit 9d322aca1a
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
irc.go
View File

@ -59,17 +59,18 @@ func reader(irc *IRCConnection) {
}
func writer(irc *IRCConnection) {
for !error && !closed(irc.pwrite) {
b := []byte(<-irc.pwrite)
if b == nil || irc.socket == nil {
b, ok := <-irc.pwrite
for !error && ok {
if b == "" || irc.socket == nil {
break
}
_, err := irc.socket.Write(b)
_, err := irc.socket.Write([]byte(b))
if err != nil {
fmt.Printf("%s\n", err)
irc.Error <- err
break
}
b, ok = <-irc.pwrite
}
irc.syncwriter <- true
}
@ -135,7 +136,7 @@ func (i *IRCConnection) Reconnect() os.Error {
for {
fmt.Printf("Reconnecting to %s\n", i.server)
var err os.Error
i.socket, err = net.Dial("tcp", "", i.server)
i.socket, err = net.Dial("tcp", i.server)
if err == nil {
break
}
@ -170,7 +171,7 @@ func (i *IRCConnection) Connect(server string) os.Error {
i.server = server
fmt.Printf("Connecting to %s\n", i.server)
var err os.Error
i.socket, err = net.Dial("tcp", "", i.server)
i.socket, err = net.Dial("tcp", i.server)
if err != nil {
return err
}