Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
14097 commits 387 branches 195 tags 255 MiB
Commit graph

2582 commits

Author SHA1 Message Date
Tim Wojtulewicz
f810f78e3e Merge remote-tracking branch 'origin/topic/awelzel/fix-zeek-see-get-event-handler-call-counts' 
* origin/topic/awelzel/fix-zeek-see-get-event-handler-call-counts:
  init-bare: Fix zeek:see after bif renaming
 2022-11-15 11:35:08 -07:00
Tim Wojtulewicz
ee8e2decec Merge remote-tracking branch 'origin/topic/timw/broker-sanity-check' 
* origin/topic/timw/broker-sanity-check:
  Update broker submodule [nomail]
 2022-11-14 13:19:43 -07:00
Tim Wojtulewicz
e2d46ea6b7 Merge remote-tracking branch 'origin/topic/timw/windows-follow-ups' 
* origin/topic/timw/windows-follow-ups:
  Re-enable strcasestr on Windows, fix linking error
  Minor renaming changes to event handler stats bif, plus a test
  Remove unneeded forward-declaration of select()
  Rework setting adding ports to map slightly
 2022-11-14 09:42:03 -07:00
Tim Wojtulewicz
a8fc63e182 Merge remote-tracking branch 'microsoft/master' 
* microsoft/master: (71 commits)
  Clang formatting
  Mask ports before inserting them into the map
  Fix compiler warning from applied patch
  Remove statistics plugin in favor of stats bif
  Add EventHandler version of stats plugin
  Mark a few EventHandler methods const
  Changed implementation from std::map to std::unordered_map of Val.cc
  Removed const, Windows build is now working
  Added fixes suggested in PR
  Update src/packet_analysis/protocol/ip/IP.cc
  Apply suggestions from code review
  Clang format again but now with v13.0.1
  Rewrote usages of define(_MSC_VER) to ifdef _MSC_VER
  Clang format it all
  Fixed initial CR comments
  Add NEWS entry about Windows port
  Add a couple of extra unistd.h includes to fix a build failure
  Use std::chrono instead of gettimeofday
  Update libkqueue submodule [nomail]
  Don't call tokenize_string if the input string is empty
  ...
 2022-11-11 15:23:21 -07:00
Tim Wojtulewicz
2739275b88 Merge remote-tracking branch 'jsoref/spelling-src' 
* jsoref/spelling-src:
  Spelling src
 2022-11-11 12:49:15 -07:00
Tim Wojtulewicz
951250b753 Merge remote-tracking branch 'origin/topic/vern/script-opt-Nov22-maint' 
* origin/topic/vern/script-opt-Nov22-maint:
  Script optimization maintenance and updates:   maintenance fixes for variadic run-time checks, '_' placeholder identifier   "-O allow-cond" permits compiling scripts to C++ when influenced by @if conditionals   more robust standalone compile-to-C++ properties   fix for nested "when" statements   test suite updates
 2022-11-09 18:24:03 -07:00
Tim Wojtulewicz
c3b3056e68 Merge remote-tracking branch 'origin/topic/neverlord/gh-2524' 
* origin/topic/neverlord/gh-2524:
  Configure script: drop --with-caf, add -D option
 2022-11-09 11:03:54 -07:00
Tim Wojtulewicz
ec43a9360d Merge remote-tracking branch 'origin/topic/timw/static-kqueue-warning' 
* origin/topic/timw/static-kqueue-warning:
  Update cmake submodule to remove STATIC_KQUEUE variable
 2022-11-09 08:51:25 -07:00
Arne Welzel
8b04868de3 {http,smtp}/entities: Align header regexes with extract_filename_from_content_disposition() 2022-11-08 16:45:25 -07:00
Robin Sommer
62a52be314
Bump documentation. 2022-11-07 11:48:35 +01:00
Robin Sommer
2a36441b8e
Merge remote-tracking branch 'origin/topic/awelzel/2483-builtin-plugin-includes' 
* origin/topic/awelzel/2483-builtin-plugin-includes:
  zeek-setup: Load builtin-plugins/__preload__.zeek before initializing bifs
  cmake: Introduce bro_PLUGIN_LINK_LIBS and add to link command.
  cmake: Do not use include_directories() for included plugins
  cmake: Bump submodule
 2022-11-07 11:25:03 +01:00
Tim Wojtulewicz
2975468060 Merge remote-tracking branch 'origin/topic/awelzel/2540-fuzzer-zeekpath-builtin-plugins' 
* origin/topic/awelzel/2540-fuzzer-zeekpath-builtin-plugins:
  fuzzer-setup: Update ZEEKPATH to align with DEFAULT_ZEEKPATH
 2022-11-04 09:16:08 -07:00
Tim Wojtulewicz
1a81e0d3a3 Merge branch 'topic/timw/lgtm-fixes' 
* topic/timw/lgtm-fixes:
  Add a missing deletion in ZAM code
  Add a couple of mising assignment operators to match copy constructors
  Fix a bunch of variable shadowing issues from LGTM
 2022-11-03 09:22:21 -07:00
Tim Wojtulewicz
a61352c5dd Merge remote-tracking branch 'origin/topic/timw/display-cmake' 
* origin/topic/timw/display-cmake:
  Add configure --display-cmake argument
 2022-11-03 08:58:09 -07:00
Tim Wojtulewicz
68450eac47 Merge remote-tracking branch 'origin/topic/timw/update-dns-types' 
* origin/topic/timw/update-dns-types:
  Update external test hashes
  Update DNS type strings to match correct mappings
 2022-11-03 08:57:19 -07:00
Tim Wojtulewicz
3fafe5c19f Merge remote-tracking branch 'origin/topic/johanna/ubuntu2210ci' 
* origin/topic/johanna/ubuntu2210ci:
  Add Ubuntu 22.10 to ci
 2022-11-03 08:56:43 -07:00
Tim Wojtulewicz
d65c75e2ad Merge remote-tracking branch 'jsoref/spelling-scripts' 
* jsoref/spelling-scripts:
  Spelling fixes: scripts
 2022-11-02 16:56:27 -07:00
Robin Sommer
f8eb2d9241
Merge remote-tracking branch 'origin/topic/awelzel/2440-break-next-usage-validation' 
* origin/topic/awelzel/2440-break-next-usage-validation:
  parse.y: Traverse AST post parsing to detect break/next usage issues
 2022-11-02 10:59:29 +01:00
Tim Wojtulewicz
bc0284aefa Merge remote-tracking branch 'origin/topic/awelzel/2446-runtime-error-for-variadic-functions' 
* origin/topic/awelzel/2446-runtime-error-for-variadic-functions:
  Func: Do not crash on va_args confusion for script funcs
 2022-11-01 07:47:50 -07:00
Tim Wojtulewicz
6dec7d6027 Merge remote-tracking branch 'origin/topic/awelzel/record-fields-not-just-enum' 
* origin/topic/awelzel/record-fields-not-just-enum:
  bifs/record_fields: Include actual enum name in type_name
 2022-10-31 15:18:11 -07:00
Tim Wojtulewicz
352705d316 Merge remote-tracking branch 'origin/topic/awelzel/no-reassembly-for-known-ports' 
* origin/topic/awelzel/no-reassembly-for-known-ports:
  IPBasedAnalyzer/TCPSessionAdapter: Fix TCP reassembly decision for known port analyzers
 2022-10-31 14:57:39 -07:00
Christian Kreibich
95151e1da9 Merge remote-tracking branch 'origin/topic/awelzel/2425-cat-sep-fully-varargs' 
* origin/topic/awelzel/2425-cat-sep-fully-varargs:
  cat_sep: Make fully vararg and do explicit runtime type checks
 2022-10-28 16:55:29 -07:00
Tim Wojtulewicz
28c3cd086a Merge remote-tracking branch 'origin/topic/bbannier/spicy-bumps' 
* origin/topic/bbannier/spicy-bumps:
  Update Spicy to the latest development snapshot.
  Bump spicy-plugin to v1.4.0.
 2022-10-28 15:45:08 -07:00
Tim Wojtulewicz
2ed42ef771 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-plugin' 
* origin/topic/bbannier/bump-spicy-plugin:
  Bump spicy-plugin to v1.3.21.
 2022-10-27 17:11:21 -07:00
Tim Wojtulewicz
3891a113dd Merge remote-tracking branch 'origin/topic/timw/btest-egrep-obsolete' 
* origin/topic/timw/btest-egrep-obsolete:
  egrep reported as obsolete by opensuse-tumbleweed builds
 2022-10-27 17:10:17 -07:00
Christian Kreibich
3237ad0ba2 Merge remote-tracking branch 'origin/topic/awelzel/builtin-af-packet' 
* origin/topic/awelzel/builtin-af-packet:
  Include in Jan's AF_PACKET plugin as builtin plugin
 2022-10-26 16:48:37 -07:00
Robin Sommer
2959afba8a
Merge branch 'topic/amazingpp/broker-debug-output-truncated' of ssh://github.com/AmazingPP/zeek 
* 'topic/amazingpp/broker-debug-output-truncated' of ssh://github.com/AmazingPP/zeek:
  Use json_escape_utf8 in broker debug output
 2022-10-26 11:38:41 +02:00
Robin Sommer
c44899156a
Merge remote-tracking branch 'origin/topic/awelzel/event-groups-v2' 
* origin/topic/awelzel/event-groups-v2:
  Reintroduce event groups
 2022-10-26 10:58:59 +02:00
Robin Sommer
5aa7d80e88
Merge remote-tracking branch 'origin/topic/awelzel/enum-names-with-strings' 
* origin/topic/awelzel/enum-names-with-strings:
  enum_names: Support naming types with a string
 2022-10-25 12:37:33 +02:00
Robin Sommer
9f3a234f40
Merge remote-tracking branch 'origin/topic/awelzel/blank-identifer' 
* origin/topic/awelzel/blank-identifer:
  scripts: Migrate table iteration to blank identifiers
  Introduce special treatment for the blank identifier _
 2022-10-25 12:36:23 +02:00
Tim Wojtulewicz
aa00a5cf20 Merge remote-tracking branch 'origin/topic/timw/ci-benchmarks' 
* origin/topic/timw/ci-benchmarks:
  Re-enable ci-based benchmarking
 2022-10-24 08:10:16 -07:00
Christian Kreibich
0a7e64c316 Merge branch 'topic/christian/coverity-drop-external-caf' 
* topic/christian/coverity-drop-external-caf:
  Remove external CAF build for Coverity setup
 2022-10-21 16:29:55 -07:00
Tim Wojtulewicz
d116983d04 Merge remote-tracking branch 'origin/topic/timw/2132-bpf-filtering-error-messages' 
* origin/topic/timw/2132-bpf-filtering-error-messages:
  Remove cmake tests for LIBPCAP_PCAP_COMPILE_NOPCAP_HAS_ERROR_PARAMETER
  Rework the non-pcap version of BPF_Program::Compile
  Add btest that exercises the pcap filter warnings
  Update docs submodule
  Restore reporting messages for pcap filter issues
  Add column to packet_filter.log for failure reason
  Store error message from BPF compilation
  Minor cleanup in BPF filtering code
 2022-10-21 12:24:39 -07:00
Tim Wojtulewicz
072158d4b6 Merge remote-tracking branch 'origin/topic/timw/remove-nbdns-leftovers' 
* origin/topic/timw/remove-nbdns-leftovers:
  Reorder includes in Options.cc
  Remove some leftover nb_dns stuff from the DNS_Mgr rework
 2022-10-21 10:09:24 -07:00
Tim Wojtulewicz
0e8318ff1a Merge remote-tracking branch 'origin/topic/timw/ms-testing' 
* origin/topic/timw/ms-testing:
  Update bifcl, binpac, broker, cmake, gen-zam, and paraglob submodules
 2022-10-20 13:03:58 -07:00
Tim Wojtulewicz
2159df41cb Merge remote-tracking branch 'jasonlue/topic/jasonlu/dict-clone-performance' 
* jasonlue/topic/jasonlu/dict-clone-performance:
  reset performance metrics every SizeUp()
  reduce space_distance_samples from int64_6 to uint32_t
  add performance based growth strategy
 2022-10-18 08:53:38 -07:00
Tim Wojtulewicz
0143d0cb86 Merge remote-tracking branch 'origin/topic/vern/CPP-Oct22-maint' 
* origin/topic/vern/CPP-Oct22-maint:
  -O C++ maintenance updates to test suite
  -O gen-C++ maintenance: fixes for attributes & initializing globals
 2022-10-17 16:19:04 -07:00
Tim Wojtulewicz
ea57cac871 Merge remote-tracking branch 'origin/topic/timw/surface-better-sanitizer-flag-error' 
* origin/topic/timw/surface-better-sanitizer-flag-error:
  Surface a better CMake error if the user passes an invalid sanitizer name
 2022-10-17 08:50:17 -07:00
Tim Wojtulewicz
3656699e2f Merge remote-tracking branch 'origin/topic/awelzel/2403-reject-conflicting-plugins' 
* origin/topic/awelzel/2403-reject-conflicting-plugins:
  plugins: Reject dynamic plugins matching names of built-in ones
 2022-10-16 17:49:32 -07:00
Tim Wojtulewicz
5dbe98290b Merge remote-tracking branch 'origin/topic/timw/2208-ordered-tables' 
* origin/topic/timw/2208-ordered-tables:
  Add &ordered attribute for tables/sets
 2022-10-16 17:48:36 -07:00
Tim Wojtulewicz
e3682a09e0 Merge remote-tracking branch 'origin/topic/timw/update-kqueue-rapidjson' 
* origin/topic/timw/update-kqueue-rapidjson:
  Update zeek-3rdparty submodule for doctest/sqlite updates
  Update libkqueue submodule to latest upstream master
  Update rapidjson submodule to latest upstream master
  Update highwayhash submodule to latest upstream master
 2022-10-16 15:30:38 -07:00
Tim Wojtulewicz
ad8e829a49 Merge remote-tracking branch 'origin/topic/bbannier/zeek-config_dev_path' 
* origin/topic/bbannier/zeek-config_dev_path:
  Add toplevel build dir to `PATH` for dev helper scripts.
 2022-10-13 15:12:30 -05:00
Tim Wojtulewicz
1d6cad635f Merge remote-tracking branch 'origin/topic/timw/fix-bif-dwarf-information-for-debugger-line-contexts' 
* origin/topic/timw/fix-bif-dwarf-information-for-debugger-line-contexts:
  Update bifcl submodule to get fixes for DWARF information for lldb
 2022-10-13 15:10:59 -05:00
Tim Wojtulewicz
16601eafa2 Merge remote-tracking branch 'origin/topic/vern/ZAM-Oct22-maint' 
* origin/topic/vern/ZAM-Oct22-maint:
  ZAM maintenance for recent test suite changes (and fixups missed last time)
 2022-10-13 08:57:59 -05:00
Tim Wojtulewicz
a53aa11eb9 Updating CHANGES and VERSION. 2022-10-12 15:57:19 -05:00
Robin Sommer
f35e337746 Merge remote-tracking branch 'origin/topic/robin/disable-packet-analyzers-in-component' 
* origin/topic/robin/disable-packet-analyzers-in-component:
  Move API for disabling packet analyzers into component.
  Suppress warning on an existing packet analyzer being remapped.
 2022-10-12 20:07:55 +02:00
Tim Wojtulewicz
c2159eaa93 Merge remote-tracking branch 'origin/topic/timw/avoid-smtp-entity-errors' 
* origin/topic/timw/avoid-smtp-entity-errors:
  smtp: Prevent script errors when smtp$entity is not set
 2022-10-12 09:32:48 -07:00
Tim Wojtulewicz
a4ad4a34b2 Merge remote-tracking branch 'origin/topic/timw/2392-ordered-dict-iteration' 
* origin/topic/timw/2392-ordered-dict-iteration:
  Disable robust iteration for ordered dictionaries
  Add support for itertors with ordered dictionaries
  Add equality, inequality, copy, and move operators to HashKey
 2022-10-10 11:10:45 -07:00
Tim Wojtulewicz
541f450581 Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-plugin' 
* origin/topic/bbannier/bump-spicy-plugin:
  Remove stray `/` at the end of directory name.
  Remove commented out code.
  Bump spicy-plugin to v1.3.19.
 2022-10-06 14:18:29 -07:00
Tim Wojtulewicz
2fce5b3a34 Merge remote-tracking branch 'origin/topic/johanna/update-certificate-transparency-log-list-again-this-time-for-the-first-time-using-the-v3-json-provided-by-google--also-we-have-to-adjust-the-test-because-google-removed-some-old-logs' 
* origin/topic/johanna/update-certificate-transparency-log-list-again-this-time-for-the-first-time-using-the-v3-json-provided-by-google--also-we-have-to-adjust-the-test-because-google-removed-some-old-logs:
  Update CT log list.
 2022-10-06 14:16:41 -07:00