2010-11-21 19:53:14 +00:00
|
|
|
package client
|
2009-11-29 20:23:15 +00:00
|
|
|
|
|
|
|
import (
|
2009-12-17 21:30:18 +00:00
|
|
|
"bufio"
|
2010-08-30 11:16:20 +00:00
|
|
|
"crypto/tls"
|
2011-11-13 13:34:32 +00:00
|
|
|
"errors"
|
|
|
|
"fmt"
|
2011-11-06 04:56:46 +00:00
|
|
|
"github.com/fluffle/goirc/state"
|
2012-02-04 00:51:06 +00:00
|
|
|
"github.com/fluffle/golog/logging"
|
2011-07-27 20:10:01 +00:00
|
|
|
"net"
|
2009-12-17 21:30:18 +00:00
|
|
|
"strings"
|
2009-12-19 13:40:50 +00:00
|
|
|
"time"
|
2009-11-29 20:23:15 +00:00
|
|
|
)
|
|
|
|
|
2011-08-21 12:57:47 +00:00
|
|
|
// An IRC connection is represented by this struct.
|
2009-12-17 17:22:31 +00:00
|
|
|
type Conn struct {
|
2013-02-16 18:05:56 +00:00
|
|
|
// Connection related vars people will care about
|
|
|
|
Me *state.Nick
|
|
|
|
Host string
|
|
|
|
Network string
|
|
|
|
Connected bool
|
|
|
|
|
|
|
|
// Deprecated: future work to turn Conn into an interface will break this.
|
|
|
|
// Use the State field to store external state that handlers might need.
|
|
|
|
State interface{}
|
|
|
|
|
|
|
|
// Contains parameters that people can tweak to change client behaviour.
|
|
|
|
cfg *Config
|
2009-12-17 17:22:31 +00:00
|
|
|
|
2013-02-16 00:17:31 +00:00
|
|
|
// Handlers and Commands
|
|
|
|
handlers *hSet
|
|
|
|
commands *cSet
|
2011-07-27 20:35:45 +00:00
|
|
|
|
2011-09-28 19:48:58 +00:00
|
|
|
// State tracker for nicks and channels
|
2013-02-16 11:29:56 +00:00
|
|
|
st state.Tracker
|
2013-02-16 00:17:31 +00:00
|
|
|
stRemovers []Remover
|
2011-11-06 04:56:46 +00:00
|
|
|
|
2009-12-17 17:22:31 +00:00
|
|
|
// I/O stuff to server
|
2010-08-30 11:16:20 +00:00
|
|
|
sock net.Conn
|
2009-12-17 21:30:18 +00:00
|
|
|
io *bufio.ReadWriter
|
|
|
|
in chan *Line
|
|
|
|
out chan string
|
2009-12-17 17:22:31 +00:00
|
|
|
|
2011-07-22 00:08:42 +00:00
|
|
|
// Control channels to goroutines
|
2011-11-15 22:17:29 +00:00
|
|
|
cSend, cLoop, cPing chan bool
|
2011-07-22 00:08:42 +00:00
|
|
|
|
2013-02-16 18:05:56 +00:00
|
|
|
// Internal counters for flood protection
|
|
|
|
badness time.Duration
|
|
|
|
lastsent time.Time
|
|
|
|
}
|
|
|
|
|
|
|
|
// Misc knobs to tweak client behaviour go in here
|
|
|
|
type Config struct {
|
|
|
|
// Set this to provide the Nick, Ident and Name for the client to use.
|
|
|
|
Me *state.Nick
|
|
|
|
|
2010-11-03 23:49:28 +00:00
|
|
|
// Are we connecting via SSL? Do we care about certificate validity?
|
2010-11-04 00:25:46 +00:00
|
|
|
SSL bool
|
2010-11-03 23:49:28 +00:00
|
|
|
SSLConfig *tls.Config
|
2010-08-30 11:16:20 +00:00
|
|
|
|
2013-02-16 00:17:31 +00:00
|
|
|
// Replaceable function to customise the 433 handler's new nick
|
|
|
|
NewNick func(string) string
|
|
|
|
|
2011-11-15 22:17:29 +00:00
|
|
|
// Client->server ping frequency, in seconds. Defaults to 3m.
|
2012-06-06 16:12:07 +00:00
|
|
|
PingFreq time.Duration
|
2011-11-15 22:17:29 +00:00
|
|
|
|
2013-02-16 00:17:31 +00:00
|
|
|
// Controls what is stripped from line.Args[1] for Commands
|
|
|
|
CommandStripNick, CommandStripPrefix bool
|
|
|
|
|
2009-12-19 18:09:29 +00:00
|
|
|
// Set this to true to disable flood protection and false to re-enable
|
2010-08-30 11:16:20 +00:00
|
|
|
Flood bool
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
|
|
|
|
2013-02-16 18:05:56 +00:00
|
|
|
func NewConfig(nick string, args ...string) *Config {
|
2011-11-07 13:34:13 +00:00
|
|
|
ident := "goirc"
|
|
|
|
name := "Powered by GoIRC"
|
|
|
|
|
|
|
|
if len(args) > 0 && args[0] != "" {
|
|
|
|
ident = args[0]
|
|
|
|
}
|
|
|
|
if len(args) > 1 && args[1] != "" {
|
|
|
|
name = args[1]
|
2011-11-06 04:56:46 +00:00
|
|
|
}
|
2013-02-16 18:05:56 +00:00
|
|
|
cfg := &Config{
|
|
|
|
PingFreq: 3 * time.Minute,
|
|
|
|
NewNick: func(s string) string { return s + "_" },
|
|
|
|
}
|
|
|
|
cfg.Me = state.NewNick(nick)
|
|
|
|
cfg.Me.Ident = ident
|
|
|
|
cfg.Me.Name = name
|
|
|
|
return cfg
|
|
|
|
}
|
|
|
|
|
|
|
|
// Creates a new IRC connection object, but doesn't connect to anything so
|
|
|
|
// that you can add event handlers to it. See AddHandler() for details
|
|
|
|
func SimpleClient(nick string, args ...string) (*Conn, error) {
|
|
|
|
return Client(NewConfig(nick, args...))
|
|
|
|
}
|
|
|
|
|
|
|
|
func Client(cfg *Config) (*Conn, error) {
|
|
|
|
logging.InitFromFlags()
|
|
|
|
if cfg.Me == nil || cfg.Me.Nick == "" || cfg.Me.Ident == "" {
|
|
|
|
return nil, fmt.Errorf("Must provide a valid state.Nick in cfg.Me.")
|
|
|
|
}
|
2011-07-21 22:03:11 +00:00
|
|
|
conn := &Conn{
|
2013-02-16 18:05:56 +00:00
|
|
|
Me: cfg.Me,
|
|
|
|
cfg: cfg,
|
2013-02-16 00:17:31 +00:00
|
|
|
in: make(chan *Line, 32),
|
|
|
|
out: make(chan string, 32),
|
|
|
|
cSend: make(chan bool),
|
|
|
|
cLoop: make(chan bool),
|
|
|
|
cPing: make(chan bool),
|
|
|
|
handlers: handlerSet(),
|
|
|
|
commands: commandSet(),
|
|
|
|
stRemovers: make([]Remover, 0, len(stHandlers)),
|
|
|
|
lastsent: time.Now(),
|
2011-07-21 22:03:11 +00:00
|
|
|
}
|
2011-11-06 04:56:46 +00:00
|
|
|
conn.addIntHandlers()
|
2011-07-21 22:03:11 +00:00
|
|
|
conn.initialise()
|
2013-02-16 18:05:56 +00:00
|
|
|
return conn, nil
|
|
|
|
}
|
|
|
|
|
|
|
|
func (conn *Conn) Config() *Config {
|
|
|
|
return conn.cfg
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
|
|
|
|
2011-11-07 13:34:13 +00:00
|
|
|
func (conn *Conn) EnableStateTracking() {
|
2013-02-16 11:29:56 +00:00
|
|
|
if conn.st == nil {
|
2011-11-07 13:34:13 +00:00
|
|
|
n := conn.Me
|
2013-02-16 11:29:56 +00:00
|
|
|
conn.st = state.NewTracker(n.Nick)
|
|
|
|
conn.Me = conn.st.Me()
|
2011-11-07 13:34:13 +00:00
|
|
|
conn.Me.Ident = n.Ident
|
|
|
|
conn.Me.Name = n.Name
|
|
|
|
conn.addSTHandlers()
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
func (conn *Conn) DisableStateTracking() {
|
2013-02-16 11:29:56 +00:00
|
|
|
if conn.st != nil {
|
2011-11-07 13:34:13 +00:00
|
|
|
conn.delSTHandlers()
|
2013-02-16 11:29:56 +00:00
|
|
|
conn.st.Wipe()
|
|
|
|
conn.st = nil
|
2011-11-07 13:34:13 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-02-16 11:29:56 +00:00
|
|
|
func (conn *Conn) StateTracker() state.Tracker {
|
|
|
|
return conn.st
|
|
|
|
}
|
|
|
|
|
2011-07-21 22:03:11 +00:00
|
|
|
// Per-connection state initialisation.
|
2009-12-17 17:22:31 +00:00
|
|
|
func (conn *Conn) initialise() {
|
2009-12-17 21:30:18 +00:00
|
|
|
conn.io = nil
|
|
|
|
conn.sock = nil
|
2013-02-16 11:29:56 +00:00
|
|
|
if conn.st != nil {
|
|
|
|
conn.st.Wipe()
|
2009-12-19 19:00:27 +00:00
|
|
|
}
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
|
|
|
|
2009-12-18 22:39:22 +00:00
|
|
|
// Connect the IRC connection object to "host[:port]" which should be either
|
2010-08-30 11:16:20 +00:00
|
|
|
// a hostname or an IP address, with an optional port. To enable explicit SSL
|
2010-11-03 23:49:28 +00:00
|
|
|
// on the connection to the IRC server, set Conn.SSL to true before calling
|
|
|
|
// Connect(). The port will default to 6697 if ssl is enabled, and 6667
|
|
|
|
// otherwise. You can also provide an optional connect password.
|
2011-11-13 13:34:32 +00:00
|
|
|
func (conn *Conn) Connect(host string, pass ...string) error {
|
2011-08-22 16:09:48 +00:00
|
|
|
if conn.Connected {
|
2011-11-13 13:34:32 +00:00
|
|
|
return errors.New(fmt.Sprintf(
|
2010-11-04 00:25:46 +00:00
|
|
|
"irc.Connect(): already connected to %s, cannot connect to %s",
|
|
|
|
conn.Host, host))
|
2009-12-17 17:22:31 +00:00
|
|
|
}
|
2010-11-03 23:49:28 +00:00
|
|
|
|
2013-02-16 18:05:56 +00:00
|
|
|
if conn.cfg.SSL {
|
2010-11-03 23:49:28 +00:00
|
|
|
if !hasPort(host) {
|
2010-08-30 11:16:20 +00:00
|
|
|
host += ":6697"
|
2010-11-03 23:49:28 +00:00
|
|
|
}
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Info("irc.Connect(): Connecting to %s with SSL.", host)
|
2013-02-16 18:05:56 +00:00
|
|
|
if s, err := tls.Dial("tcp", host, conn.cfg.SSLConfig); err == nil {
|
2011-07-21 21:00:45 +00:00
|
|
|
conn.sock = s
|
2010-08-30 11:16:20 +00:00
|
|
|
} else {
|
2010-11-03 23:49:28 +00:00
|
|
|
return err
|
2010-08-30 11:16:20 +00:00
|
|
|
}
|
2010-11-03 20:42:39 +00:00
|
|
|
} else {
|
2010-11-03 23:49:28 +00:00
|
|
|
if !hasPort(host) {
|
|
|
|
host += ":6667"
|
|
|
|
}
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Info("irc.Connect(): Connecting to %s without SSL.", host)
|
2011-07-18 08:14:58 +00:00
|
|
|
if s, err := net.Dial("tcp", host); err == nil {
|
2010-11-03 23:49:28 +00:00
|
|
|
conn.sock = s
|
|
|
|
} else {
|
|
|
|
return err
|
|
|
|
}
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
2009-12-17 21:30:18 +00:00
|
|
|
conn.Host = host
|
2011-08-22 16:09:48 +00:00
|
|
|
conn.Connected = true
|
2011-08-21 12:23:42 +00:00
|
|
|
conn.postConnect()
|
2009-12-17 17:22:31 +00:00
|
|
|
|
2010-10-24 09:06:18 +00:00
|
|
|
if len(pass) > 0 {
|
|
|
|
conn.Pass(pass[0])
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
2009-12-17 21:30:18 +00:00
|
|
|
conn.Nick(conn.Me.Nick)
|
|
|
|
conn.User(conn.Me.Ident, conn.Me.Name)
|
2011-08-21 12:23:42 +00:00
|
|
|
return nil
|
|
|
|
}
|
2009-11-29 20:23:15 +00:00
|
|
|
|
2011-08-21 12:23:42 +00:00
|
|
|
// Post-connection setup (for ease of testing)
|
|
|
|
func (conn *Conn) postConnect() {
|
|
|
|
conn.io = bufio.NewReadWriter(
|
|
|
|
bufio.NewReader(conn.sock),
|
|
|
|
bufio.NewWriter(conn.sock))
|
|
|
|
go conn.send()
|
|
|
|
go conn.recv()
|
2013-02-16 18:05:56 +00:00
|
|
|
if conn.cfg.PingFreq > 0 {
|
2011-11-15 22:22:40 +00:00
|
|
|
go conn.ping()
|
2011-11-15 22:57:29 +00:00
|
|
|
} else {
|
|
|
|
// Otherwise the send in shutdown will hang :-/
|
|
|
|
go func() { <-conn.cPing }()
|
2011-11-15 22:22:40 +00:00
|
|
|
}
|
2009-12-17 21:30:18 +00:00
|
|
|
go conn.runLoop()
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// copied from http.client for great justice
|
2010-11-03 23:46:58 +00:00
|
|
|
func hasPort(s string) bool {
|
|
|
|
return strings.LastIndex(s, ":") > strings.LastIndex(s, "]")
|
|
|
|
}
|
2009-11-29 20:23:15 +00:00
|
|
|
|
2011-07-22 00:08:42 +00:00
|
|
|
// goroutine to pass data from output channel to write()
|
2009-12-17 17:22:31 +00:00
|
|
|
func (conn *Conn) send() {
|
2011-07-22 00:08:42 +00:00
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case line := <-conn.out:
|
|
|
|
conn.write(line)
|
|
|
|
case <-conn.cSend:
|
|
|
|
// strobe on control channel, bail out
|
|
|
|
return
|
2010-11-02 21:47:05 +00:00
|
|
|
}
|
2009-12-17 17:22:31 +00:00
|
|
|
}
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
|
|
|
|
2009-12-17 17:22:31 +00:00
|
|
|
// receive one \r\n terminated line from peer, parse and dispatch it
|
|
|
|
func (conn *Conn) recv() {
|
|
|
|
for {
|
2009-12-17 21:30:18 +00:00
|
|
|
s, err := conn.io.ReadString('\n')
|
2009-12-17 17:22:31 +00:00
|
|
|
if err != nil {
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Error("irc.recv(): %s", err.Error())
|
2009-12-17 21:30:18 +00:00
|
|
|
conn.shutdown()
|
2011-09-29 21:54:54 +00:00
|
|
|
return
|
2009-12-17 17:22:31 +00:00
|
|
|
}
|
2010-08-21 18:23:07 +00:00
|
|
|
s = strings.Trim(s, "\r\n")
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Debug("<- %s", s)
|
2009-12-17 17:22:31 +00:00
|
|
|
|
2011-07-27 20:15:09 +00:00
|
|
|
if line := parseLine(s); line != nil {
|
2012-02-04 00:51:06 +00:00
|
|
|
line.Time = time.Now()
|
2011-07-27 20:15:09 +00:00
|
|
|
conn.in <- line
|
2011-11-06 04:56:46 +00:00
|
|
|
} else {
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Warn("irc.recv(): problems parsing line:\n %s", s)
|
2011-07-27 20:15:09 +00:00
|
|
|
}
|
2009-12-17 17:22:31 +00:00
|
|
|
}
|
|
|
|
}
|
2009-11-29 20:23:15 +00:00
|
|
|
|
2011-11-15 22:17:29 +00:00
|
|
|
// Repeatedly pings the server every PingFreq seconds (no matter what)
|
|
|
|
func (conn *Conn) ping() {
|
2013-02-16 18:05:56 +00:00
|
|
|
tick := time.NewTicker(conn.cfg.PingFreq)
|
2011-11-15 22:17:29 +00:00
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case <-tick.C:
|
2012-06-06 16:12:07 +00:00
|
|
|
conn.Raw(fmt.Sprintf("PING :%d", time.Now().UnixNano()))
|
2011-11-15 22:17:29 +00:00
|
|
|
case <-conn.cPing:
|
|
|
|
tick.Stop()
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2011-07-22 00:08:42 +00:00
|
|
|
// goroutine to dispatch events for lines received on input channel
|
2009-12-17 17:22:31 +00:00
|
|
|
func (conn *Conn) runLoop() {
|
2011-07-22 00:08:42 +00:00
|
|
|
for {
|
|
|
|
select {
|
|
|
|
case line := <-conn.in:
|
2013-02-16 00:17:31 +00:00
|
|
|
conn.dispatch(line)
|
2011-07-22 00:08:42 +00:00
|
|
|
case <-conn.cLoop:
|
|
|
|
// strobe on control channel, bail out
|
|
|
|
return
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Write a \r\n terminated line of output to the connected server,
|
2013-02-16 18:05:56 +00:00
|
|
|
// using Hybrid's algorithm to rate limit if conn.cfg.Flood is false.
|
2011-07-22 00:08:42 +00:00
|
|
|
func (conn *Conn) write(line string) {
|
2013-02-16 18:05:56 +00:00
|
|
|
if !conn.cfg.Flood {
|
2012-02-04 01:13:07 +00:00
|
|
|
if t := conn.rateLimit(len(line)); t != 0 {
|
2011-11-11 11:17:18 +00:00
|
|
|
// sleep for the current line's time value before sending it
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Debug("irc.rateLimit(): Flood! Sleeping for %.2f secs.",
|
2012-02-04 01:13:07 +00:00
|
|
|
t.Seconds())
|
2011-11-11 11:17:18 +00:00
|
|
|
<-time.After(t)
|
|
|
|
}
|
2011-07-22 00:08:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
if _, err := conn.io.WriteString(line + "\r\n"); err != nil {
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Error("irc.send(): %s", err.Error())
|
2011-07-22 00:08:42 +00:00
|
|
|
conn.shutdown()
|
|
|
|
return
|
|
|
|
}
|
2011-11-11 10:17:17 +00:00
|
|
|
if err := conn.io.Flush(); err != nil {
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Error("irc.send(): %s", err.Error())
|
2011-11-11 10:17:17 +00:00
|
|
|
conn.shutdown()
|
|
|
|
return
|
|
|
|
}
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Debug("-> %s", line)
|
2011-07-22 00:08:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Implement Hybrid's flood control algorithm to rate-limit outgoing lines.
|
2012-02-04 01:13:07 +00:00
|
|
|
func (conn *Conn) rateLimit(chars int) time.Duration {
|
2011-07-22 00:08:42 +00:00
|
|
|
// Hybrid's algorithm allows for 2 seconds per line and an additional
|
|
|
|
// 1/120 of a second per character on that line.
|
2012-02-04 01:13:07 +00:00
|
|
|
linetime := 2*time.Second + time.Duration(chars)*time.Second/120
|
2012-02-04 00:51:06 +00:00
|
|
|
elapsed := time.Now().Sub(conn.lastsent)
|
2011-07-22 00:08:42 +00:00
|
|
|
if conn.badness += linetime - elapsed; conn.badness < 0 {
|
|
|
|
// negative badness times are badness...
|
2012-02-04 01:13:07 +00:00
|
|
|
conn.badness = 0
|
2011-07-22 00:08:42 +00:00
|
|
|
}
|
2012-02-04 00:51:06 +00:00
|
|
|
conn.lastsent = time.Now()
|
2011-07-22 00:08:42 +00:00
|
|
|
// If we've sent more than 10 second's worth of lines according to the
|
|
|
|
// calculation above, then we're at risk of "Excess Flood".
|
2012-02-04 01:13:07 +00:00
|
|
|
if conn.badness > 10*time.Second {
|
2011-11-11 11:17:18 +00:00
|
|
|
return linetime
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
2011-11-11 11:17:18 +00:00
|
|
|
return 0
|
2009-12-17 17:22:31 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
func (conn *Conn) shutdown() {
|
2011-07-22 00:17:35 +00:00
|
|
|
// Guard against double-call of shutdown() if we get an error in send()
|
2013-02-16 18:05:56 +00:00
|
|
|
// as calling sock.Close() will cause recv() to receive EOF in readstring()
|
2011-08-22 16:09:48 +00:00
|
|
|
if conn.Connected {
|
2013-02-16 00:11:39 +00:00
|
|
|
logging.Info("irc.shutdown(): Disconnected from server.")
|
2013-02-16 00:17:31 +00:00
|
|
|
conn.dispatch(&Line{Cmd: "disconnected"})
|
2011-08-22 16:09:48 +00:00
|
|
|
conn.Connected = false
|
2011-07-22 00:17:35 +00:00
|
|
|
conn.sock.Close()
|
|
|
|
conn.cSend <- true
|
|
|
|
conn.cLoop <- true
|
2011-11-15 22:17:29 +00:00
|
|
|
conn.cPing <- true
|
2011-07-22 00:17:35 +00:00
|
|
|
// reinit datastructures ready for next connection
|
|
|
|
// do this here rather than after runLoop()'s for due to race
|
|
|
|
conn.initialise()
|
|
|
|
}
|
2009-12-17 17:22:31 +00:00
|
|
|
}
|
2009-11-29 20:23:15 +00:00
|
|
|
|
2009-12-18 22:39:22 +00:00
|
|
|
// Dumps a load of information about the current state of the connection to a
|
2011-11-06 04:56:46 +00:00
|
|
|
// string for debugging state tracking and other such things.
|
2009-12-17 17:22:31 +00:00
|
|
|
func (conn *Conn) String() string {
|
2009-12-17 21:30:18 +00:00
|
|
|
str := "GoIRC Connection\n"
|
|
|
|
str += "----------------\n\n"
|
2011-08-22 16:09:48 +00:00
|
|
|
if conn.Connected {
|
2009-12-17 17:22:31 +00:00
|
|
|
str += "Connected to " + conn.Host + "\n\n"
|
|
|
|
} else {
|
2009-12-17 21:30:18 +00:00
|
|
|
str += "Not currently connected!\n\n"
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
2009-12-17 21:30:18 +00:00
|
|
|
str += conn.Me.String() + "\n"
|
2013-02-16 11:29:56 +00:00
|
|
|
if conn.st != nil {
|
|
|
|
str += conn.st.String() + "\n"
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|
2009-12-17 21:30:18 +00:00
|
|
|
return str
|
2009-11-29 20:23:15 +00:00
|
|
|
}
|