Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-04 07:38:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin/fastpath'

Browse source 
* origin/fastpath:
  Fix timer type enum and timer name array mismatch.
This commit is contained in:
Robin Sommer 2013-08-14 10:29:54 -07:00
commit f7a31ab004
4 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
2.1-1074 | 2013-08-14 10:29:54 -0700
* Fix timer type enum and timer name array mismatch. (Jon Siwek)
2.1-1072 | 2013-08-14 10:28:51 -0700 2.1-1072 | 2013-08-14 10:28:51 -0700
* Adding the unified2 analyzer that reads unified2 files from disk, * Adding the unified2 analyzer that reads unified2 files from disk,

2
VERSION
View file

@ -1 +1 @@
2.1-1072 2.1-1074

1
src/Timer.cc
View file

@ -16,6 +16,7 @@ const char* TimerNames[] = {
"ConnectionInactivityTimer", "ConnectionInactivityTimer",
"ConnectionStatusUpdateTimer", "ConnectionStatusUpdateTimer",
"DNSExpireTimer", "DNSExpireTimer",
"FileAnalysisInactivityTimer",
"FragTimer", "FragTimer",
"IncrementalSendTimer", "IncrementalSendTimer",
"IncrementalWriteTimer", "IncrementalWriteTimer",

1
src/Timer.h
View file

@ -23,7 +23,6 @@ enum TimerType {
TIMER_CONN_STATUS_UPDATE, TIMER_CONN_STATUS_UPDATE,
TIMER_DNS_EXPIRE, TIMER_DNS_EXPIRE,
TIMER_FILE_ANALYSIS_INACTIVITY, TIMER_FILE_ANALYSIS_INACTIVITY,
TIMER_FILE_ANALYSIS_DRAIN,
TIMER_FRAG, TIMER_FRAG,
TIMER_INCREMENTAL_SEND, TIMER_INCREMENTAL_SEND,
TIMER_INCREMENTAL_WRITE, TIMER_INCREMENTAL_WRITE,