[Sguil-cvs] sguil/server sguild,1.102,1.103

[Bamm V. <ba...@us...>]

Update of /cvsroot/sguil/sguil/server
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10076

Modified Files:
	sguild 
Log Message:
Added "sensors" and "agents" command to user msgs for listing connected sensors.


Index: sguild
===================================================================
RCS file: /cvsroot/sguil/sguil/server/sguild,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** sguild	29 Jun 2004 21:42:23 -0000	1.102
--- sguild	30 Jun 2004 14:53:47 -0000	1.103
***************
*** 103,106 ****
--- 103,108 ----
    LoadAccessFile $ACCESS_FILE
  }
+ # Format for the autocat file is:
+ # <erase time>||<sensorName>||<src_ip>||<src_port>||<dst_ip>||<dst_port>||<proto>||<sig msg>||<cat value>
  proc LoadAutoCatFile { filename } {
    set i 0
***************
*** 700,711 ****
  
  proc UserMsgRcvd { socketID userMsg } {
!   global socketInfo clientList
  
    set userMsg [lindex $userMsg 0]
  
!   # Simple command crap.
    if { $userMsg == "who" } {
       foreach client $clientList { lappend usersList [lindex $socketInfo($client) 2] }
!      SendSocket $socketID "UserMessage sguild \{Connected users: $usersList\}" 
    } else {
      foreach client $clientList {
--- 702,718 ----
  
  proc UserMsgRcvd { socketID userMsg } {
!   global socketInfo clientList connectedAgents
  
    set userMsg [lindex $userMsg 0]
  
!   # Simple command stuff.
!   # Who returns a list of connected users
    if { $userMsg == "who" } {
       foreach client $clientList { lappend usersList [lindex $socketInfo($client) 2] }
!      SendSocket $socketID [list UserMessage sguild "Connected users: $usersList"] 
!   } elseif { $userMsg == "sensors" || $userMsg == "agents" } {
!     if { [info exists connectedAgents] } {
!       SendSocket $socketID [list UserMessage sguild "Connected sensors: $connectedAgents"]
!     }
    } else {
      foreach client $clientList {