[Tcldrop/CVS] tcldrop/modules core.tcl dcc.tcl idx.tcl

[Philip Moore]

CVSROOT:        /cvsroot/tcldrop
Module name:    tcldrop
Branch:         
Changes by:     Philip Moore <address@hidden>   03/12/02 04:27:14

Modified files:
        modules        : core.tcl dcc.tcl idx.tcl 

Log message:
        <shrug>

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/modules/core.tcl.diff?tr1=1.30&tr2=1.31&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/modules/dcc.tcl.diff?tr1=1.32&tr2=1.33&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/tcldrop/tcldrop/modules/idx.tcl.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: tcldrop/modules/core.tcl
diff -u tcldrop/modules/core.tcl:1.30 tcldrop/modules/core.tcl:1.31
--- tcldrop/modules/core.tcl:1.30       Tue Dec  2 01:54:32 2003
+++ tcldrop/modules/core.tcl    Tue Dec  2 04:27:14 2003
@@ -1,6 +1,6 @@
 # core.tcl --
 #
-# $Id: core.tcl,v 1.30 2003/12/02 06:54:32 fireegl Exp $
+# $Id: core.tcl,v 1.31 2003/12/02 09:27:14 fireegl Exp $
 #
 # Copyright (C) 2003 FireEgl (Philip Moore) <address@hidden>
 #
@@ -47,7 +47,7 @@
        # Provide the users module:
        variable version {0.4}
        package provide tcldrop::core $version
-       variable rcsid {$Id: core.tcl,v 1.30 2003/12/02 06:54:32 fireegl Exp $}
+       variable rcsid {$Id: core.tcl,v 1.31 2003/12/02 09:27:14 fireegl Exp $}
        # Initialize variables:
        variable Binds
        variable Timers
@@ -492,7 +492,7 @@
                        array set info [list total-in 0 total-out 0 daily-in 0 
daily-out 0 restart [unixtime]]
                }
                # Increase the counters:
-               if {($bytes) && ($direction == {in} || $direction == {out})} {
+               if {$bytes} {
                        incr info(total-$direction) $bytes
                        incr info(daily-$direction) $bytes
                }
@@ -502,7 +502,7 @@
                }
                # Write the new counts back to the Traffic variable:
                set Traffic($type) [array get info]
-               if {$direction == {in} || $direction == {out}} {
+               if {$direction != {}} {
                        # Return either in or out for $type:
                        list $info(daily-$direction) $info(total-$direction)
                } else {
@@ -520,8 +520,7 @@
                        incr total(daily-out) $info(daily-out)
                        incr total(daily-in) $info(daily-in)
                }
-               lappend out [list Total $total(daily-in) $total(total-in) 
$total(daily-out) $total(total-out)]
-               return $out
+               list Total $total(daily-in) $total(total-in) $total(daily-out) 
$total(total-out)
        }
 }
 
Index: tcldrop/modules/dcc.tcl
diff -u tcldrop/modules/dcc.tcl:1.32 tcldrop/modules/dcc.tcl:1.33
--- tcldrop/modules/dcc.tcl:1.32        Tue Dec  2 01:54:33 2003
+++ tcldrop/modules/dcc.tcl     Tue Dec  2 04:27:14 2003
@@ -1,6 +1,6 @@
 # dcc.tcl --
 #
-# $Id: dcc.tcl,v 1.32 2003/12/02 06:54:33 fireegl Exp $
+# $Id: dcc.tcl,v 1.33 2003/12/02 09:27:14 fireegl Exp $
 #
 # Copyright (C) 2003 FireEgl (Philip Moore) <address@hidden>
 #
@@ -32,7 +32,7 @@
        # Provide the users module:
        variable version {0.4}
        package provide tcldrop::dcc $version
-       variable rcsid {$Id: dcc.tcl,v 1.32 2003/12/02 06:54:33 fireegl Exp $}
+       variable rcsid {$Id: dcc.tcl,v 1.33 2003/12/02 09:27:14 fireegl Exp $}
        #checkmodule console
        # Export all the commands that should be available to 3rd-party 
scripters:
        namespace export dcclist listen putdcc getchan setchan console echo 
strip idx2hand hand2idx link bots islinked putbot putallbots sock2idx idx2sock
@@ -805,12 +805,11 @@
 bind dcc n dccstat ::tcldrop::dcc::DCCSTAT
 proc ::tcldrop::dcc::DCCSTAT {handle idx text} {
        putcmdlog "#$handle# dccstat $text"
-       putdcc $idx {IDX SOCKET PORT  HANDLE    HOSTNAME or IP                  
 TYPE}
-       putdcc $idx {--- ------ ----- --------- 
-------------------------------- ----}
+       putdcc $idx {IDX      SOCKET PORT  HANDLE    REMOTE                     
      TYPE}
+       putdcc $idx {-------- ------ ----- --------- 
-------------------------------- ----}
        foreach {a d} [::tcldrop::idx::Info] {
-               array unset idxinfo
                array set idxinfo $d
-               putdcc $idx "[format {%-3.3s %-6.6s %-5.5s %-9.9s %-32.32s 
%-4.4s} $a $idxinfo(sock) $idxinfo(port) $idxinfo(handle) $idxinfo(remote) 
$idxinfo(other)]"
+               putdcc $idx "[format {%-8.8s %-6.6s %-5.5s %-9.9s %-32.32s 
%-4.4s} $a $idxinfo(sock) $idxinfo(port) $idxinfo(handle) $idxinfo(remote) 
$idxinfo(other)]"
        }
 }
 
Index: tcldrop/modules/idx.tcl
diff -u tcldrop/modules/idx.tcl:1.10 tcldrop/modules/idx.tcl:1.11
--- tcldrop/modules/idx.tcl:1.10        Sun Nov 30 20:59:51 2003
+++ tcldrop/modules/idx.tcl     Tue Dec  2 04:27:14 2003
@@ -1,6 +1,6 @@
 # idx.tcl --
 #
-# $Id: idx.tcl,v 1.10 2003/12/01 01:59:51 fireegl Exp $
+# $Id: idx.tcl,v 1.11 2003/12/02 09:27:14 fireegl Exp $
 #
 # Copyright (C) 2003 FireEgl (Philip Moore) <address@hidden>
 #
@@ -26,7 +26,7 @@
 #      This module is required.
 
 namespace eval ::tcldrop::idx {
-       variable rcsid {$id}
+       variable rcsid {$id$}
        variable version {0.6}
        package provide tcldrop::idx $version
        variable idxlist