Add missing ucmdr {} {}

[ircbot] / irccore.tcl

diff --git a/irccore.tcl b/irccore.tcl
index 5d28cef85d21aff387c5b74d2bfd91dd985a9168..069743e54f046cfc938e192f803909289151ef82 100644 (file)
--- a/irccore.tcl
+++ b/irccore.tcl
@@ -16,9 +16,7 @@ defset out_maxburst 6
 defset out_interval 2100
 defset out_lag_lag 5000
 defset out_lag_very 25000
-
-defset marktime_min 300
-defset marktime_join_startdelay 5000
+defset ownping_every 300000
 
 proc manyset {list args} {
     foreach val $list var $args {
@@ -142,6 +140,10 @@ proc sendout {command args} { eval sendout_priority [list 0 $command] $args }
 proc log {data} {
     puts $data
 }
+    
+proc log_intern {what data} {
+    puts "[clock seconds] ++ $what $data"
+}
 
 proc logerror {data} {
     log $data
@@ -165,7 +167,9 @@ proc bgerror {msg} {
 proc onread {args} {
     global sock nick calling_nick errorInfo errorCode line_org_endchar
 
-    if {[gets $sock line] == -1} { fail "EOF/error on input" }
+    if {[catch { gets $sock line } rv]} { fail "error on input: $rv" }
+    if {$rv == -1} { fail "EOF on input" }
+
     set line_org_endchar [string range $line end end]
     regsub -all "\[^ -\176\240-\376\]" $line ? line
     set org $line
@@ -212,6 +216,20 @@ proc onread {args} {
     }
 }
 
+proc catch_restoreei {body} {
+    global errorInfo errorCode
+    set l [list $errorInfo $errorCode]
+    catch { uplevel 1 $body }
+    manyset $l errorInfo errorCode
+}
+
+proc catch_logged {body} {
+    global errorInfo
+    if {[catch { uplevel 1 $body } emsg]} {
+       logerror "error (catch_logged): $emsg\n $errorInfo"
+    }
+}
+
 proc sendprivmsg {dest l} {
     foreach v [split $l "\n"] {
        sendout [expr {[ischan $dest] ? "PRIVMSG" : "NOTICE"}] $dest $v
@@ -226,6 +244,7 @@ proc msendprivmsg_delayed {delay dest ll} { after $delay [list msendprivmsg $des
 proc check_nick {n} {
     if {[regexp -nocase {[^][\\`_^{|}a-z0-9-]} $n]} { error "bad char in nick" }
     if {[regexp {^[-0-9]} $n]} { error "bad nick start" }
+    if {[string length $n] > 18} { error "nick too long" }
 }
 
 proc ischan {dest} {
@@ -263,11 +282,18 @@ proc msg_PING {p c s1} {
     sendout PONG $s1
 }
 
+proc sendownping {} {
+    global ownping_every nick
+    sendout ping $nick
+    after $ownping_every sendownping
+}
+
 proc msg_001 {args} {
     global muststartby_after
     if {[info exists muststartby_after]} {
        after cancel $muststartby_after
        unset muststartby_after
+       sendownping
        connected
     }
 }