[Sguil-cvs] sguil/server/lib SguildPadsLib.tcl,1.6,1.7

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

Update of /cvsroot/sguil/sguil/server/lib
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv26002

Modified Files:
	SguildPadsLib.tcl 
Log Message:
Modifed [InsertAsset] to return an error code for calling procs. Calling
procs report the error via [LogMessage] and try to reprocess the asset.
Tks for the bug report Hanashi


Index: SguildPadsLib.tcl
===================================================================
RCS file: /cvsroot/sguil/sguil/server/lib/SguildPadsLib.tcl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SguildPadsLib.tcl	20 Feb 2008 06:06:19 -0000	1.6
--- SguildPadsLib.tcl	20 Mar 2008 17:51:21 -0000	1.7
***************
*** 15,19 ****
  
      # Check for new assest
!     set tmpQuery "SELECT timestamp, application FROM pads WHERE sid=$sid AND ip=$d_intIP AND port=$d_port AND ip_proto=$ip_proto ORDER BY timestamp DESC"
      set results [MysqlSelect $tmpQuery]
  
--- 15,24 ----
  
      # Check for new assest
!     set tmpQuery \
!       "SELECT timestamp, application \
!       FROM pads \
!       WHERE sid=$sid AND ip=$d_intIP AND port=$d_port AND ip_proto=$ip_proto \
!       ORDER BY timestamp DESC"
! 
      set results [MysqlSelect $tmpQuery]
  
***************
*** 32,38 ****
          incr PADS_CID($sid)
  
!         InsertAsset $sensorName $sid $PADS_CID($sid) $timestamp $d_intIP $service $d_port $ip_proto $app $hex_payload
!         # RT Alert
!         AlertAsset new-asset $sensorName $sid $PADS_CID($sid) $timestamp $intTime $s_inetIP $s_intIP $d_inetIP $d_intIP $s_port $d_port $service $ip_proto $app
  
      } else {
--- 37,54 ----
          incr PADS_CID($sid)
  
!         # Insert data into the asset DB
!         if { [catch {InsertAsset $sensorName $sid $PADS_CID($sid) $timestamp \
!          $d_intIP $service $d_port $ip_proto $app $hex_payload} insertError] } {
! 
!             # INSERT failed. Log a message and try reprocess the asset.
!             LogMessage "Error inserting PADS data: $insertError"
!             ProcessPadsAsset $dataList
!             return
!             
!         }
! 
!         # Send RT Alert
!         AlertAsset new-asset $sensorName $sid $PADS_CID($sid) $timestamp \
!          $intTime $s_inetIP $s_intIP $d_inetIP $d_intIP $s_port $d_port $service $ip_proto $app
  
      } else {
***************
*** 58,63 ****
              incr PADS_CID($sid)
  
!             InsertAsset $sensorName $sid $PADS_CID($sid) $timestamp $d_intIP $service $d_port $ip_proto $app $hex_payload
!             AlertAsset changed-asset $sensorName $sid $PADS_CID($sid) $timestamp $intTime $s_inetIP $s_intIP $d_inetIP $d_intIP $s_port $d_port $service $ip_proto $app
  
          }
--- 74,91 ----
              incr PADS_CID($sid)
  
!             # Insert data into the asset DB
!             if { [catch {InsertAsset $sensorName $sid $PADS_CID($sid) $timestamp \
!              $d_intIP $service $d_port $ip_proto $app $hex_payload} insertError] } {
! 
!                 # INSERT failed. Log a message and try reprocess the asset.
!                 LogMessage "Error inserting PADS data: $insertError"
!                 ProcessPadsAsset $dataList
!                 return
!             
!             }
! 
!             # Send RT Alert
!             AlertAsset changed-asset $sensorName $sid $PADS_CID($sid) $timestamp \
!              $intTime $s_inetIP $s_intIP $d_inetIP $d_intIP $s_port $d_port $service $ip_proto $app
  
          }
***************
*** 120,125 ****
      if { [catch {SafeMysqlExec $tmpQuery} tmpError] } {
  
!         # ErrorMessage calls exit
!         ErrorMessage $tmpError
  
      }
--- 148,153 ----
      if { [catch {SafeMysqlExec $tmpQuery} tmpError] } {
  
!         # INSERT failed
!         return -code error $tmpError
  
      }