Tim Wojtulewicz
bd52ab1a55
Rework setting adding ports to map slightly
2022-11-14 09:13:31 -07:00
zeek-bot
11be8888d7
Update doc submodule [nomail] [skip ci]
2022-11-12 00:41:52 +00: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
Tomer Lev
642d44009a
Clang formatting
2022-11-11 18:54:05 +02:00
voidbar
425a9585b4
Merge pull request #1 from timwoj/master
...
Add a non-plugin version of statistics plugin
2022-11-11 18:48:14 +02:00
Tim Wojtulewicz
5996520cc7
Mask ports before inserting them into the map
2022-11-11 08:22:08 -07:00
Tim Wojtulewicz
a26e98f170
Fix compiler warning from applied patch
2022-11-10 13:37:31 -07:00
Tim Wojtulewicz
5d5f5de1d1
Remove statistics plugin in favor of stats bif
2022-11-10 13:37:31 -07:00
Tim Wojtulewicz
3a963f080e
Add EventHandler version of stats plugin
2022-11-10 12:19:12 -07:00
Tim Wojtulewicz
194960eafa
Mark a few EventHandler methods const
2022-11-10 11:17:53 -07:00
Tomer Lev
9a3855cc38
Changed implementation from std::map to std::unordered_map of Val.cc
2022-11-10 19:09:57 +02:00
Tomer Lev
d7474e2aa2
Removed const, Windows build is now working
2022-11-10 19:04:37 +02:00
Tomer Lev
e2be5ddc0c
Added fixes suggested in PR
2022-11-10 19:01:29 +02:00
voidbar
9a74be1558
Update src/packet_analysis/protocol/ip/IP.cc
...
Co-authored-by: Tim Wojtulewicz <timwoj@gmail.com>
2022-11-10 18:43:47 +02: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
cdae33fad8
Merge remote-tracking branch 'jsoref/spelling-pac'
...
* jsoref/spelling-pac:
spelling: variation
spelling: value
spelling: session
spelling: repetitions
spelling: params
spelling: further
spelling: confirm
spelling: channel
spelling: announcement
2022-11-09 18:18:22 -07:00
Tim Wojtulewicz
a85f1044eb
Merge remote-tracking branch 'jsoref/spelling-expr'
...
* jsoref/spelling-expr:
spelling: successful
spelling: deterministic
spelling: canonicalize
spelling: algorithm
2022-11-09 18:17:28 -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
Josh Soref
cd201aa24e
Spelling src
...
These are non-functional changes.
* accounting
* activation
* actual
* added
* addresult
* aggregable
* aligned
* alternatively
* ambiguous
* analysis
* analyzer
* anticlimactic
* apparently
* application
* appropriate
* arithmetic
* assignment
* assigns
* associated
* authentication
* authoritative
* barrier
* boundary
* broccoli
* buffering
* caching
* called
* canonicalized
* capturing
* certificates
* ciphersuite
* columns
* communication
* comparison
* comparisons
* compilation
* component
* concatenating
* concatenation
* connection
* convenience
* correctly
* corresponding
* could
* counting
* data
* declared
* decryption
* defining
* dependent
* deprecated
* detached
* dictionary
* directional
* directly
* directory
* discarding
* disconnecting
* distinguishes
* documentation
* elsewhere
* emitted
* empty
* endianness
* endpoint
* enumerator
* essentially
* evaluated
* everything
* exactly
* execute
* explicit
* expressions
* facilitates
* fiddling
* filesystem
* flag
* flagged
* for
* fragments
* guarantee
* guaranteed
* happen
* happening
* hemisphere
* identifier
* identifies
* identify
* implementation
* implemented
* implementing
* including
* inconsistency
* indeterminate
* indices
* individual
* information
* initial
* initialization
* initialize
* initialized
* initializes
* instantiate
* instantiated
* instantiates
* interface
* internal
* interpreted
* interpreter
* into
* it
* iterators
* length
* likely
* log
* longer
* mainly
* mark
* maximum
* message
* minimum
* module
* must
* name
* namespace
* necessary
* nonexistent
* not
* notifications
* notifier
* number
* objects
* occurred
* operations
* original
* otherwise
* output
* overridden
* override
* overriding
* overwriting
* ownership
* parameters
* particular
* payload
* persistent
* potential
* precision
* preexisting
* preservation
* preserved
* primarily
* probably
* procedure
* proceed
* process
* processed
* processes
* processing
* propagate
* propagated
* prototype
* provides
* publishing
* purposes
* queue
* reached
* reason
* reassem
* reassemble
* reassembler
* recommend
* record
* reduction
* reference
* regularly
* representation
* request
* reserved
* retrieve
* returning
* separate
* should
* shouldn't
* significant
* signing
* simplified
* simultaneously
* single
* somebody
* sources
* specific
* specification
* specified
* specifies
* specify
* statement
* subdirectories
* succeeded
* successful
* successfully
* supplied
* synchronization
* tag
* temporarily
* terminating
* that
* the
* transmitted
* true
* truncated
* try
* understand
* unescaped
* unforwarding
* unknown
* unknowndata
* unspecified
* update
* usually
* which
* wildcard
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
2022-11-09 12:08:15 -05:00
voidbar
2e3425000f
Apply suggestions from code review
...
Co-authored-by: Tim Wojtulewicz <timwoj@gmail.com>
2022-11-09 18:56:00 +02:00
Tomer Lev
73e749a162
Clang format again but now with v13.0.1
2022-11-09 18:56:00 +02:00
Tomer Lev
a105ea9d80
Rewrote usages of define(_MSC_VER) to ifdef _MSC_VER
2022-11-09 18:56:00 +02:00
Tomer Lev
5cdc6e150e
Clang format it all
2022-11-09 18:55:51 +02:00
Tomer Lev
12494aac45
Fixed initial CR comments
2022-11-09 18:54:42 +02:00
Tim Wojtulewicz
7d55057d88
Add NEWS entry about Windows port
2022-11-09 18:54:26 +02:00
Tim Wojtulewicz
af947ae000
Add a couple of extra unistd.h includes to fix a build failure
2022-11-09 18:17:11 +02:00
Tim Wojtulewicz
fbcb7bd2ec
Use std::chrono instead of gettimeofday
2022-11-09 18:17:11 +02:00
Tim Wojtulewicz
ef096eedf3
Update libkqueue submodule [nomail]
2022-11-09 18:17:11 +02:00
Tim Wojtulewicz
359b5547cd
Don't call tokenize_string if the input string is empty
2022-11-09 18:17:10 +02:00
Tim Wojtulewicz
2e457eb3ea
Fix a few compiler warnings from MSVC
2022-11-09 18:17:07 +02:00
Tim Wojtulewicz
6bf469b7a8
Remove extra <filesystem> include from util.cc
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
baee0d8026
Replace uses of std::filesystem with zeek::filesystem
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
42575a63db
Add src/include to hilti include paths
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
5494e4e6fd
Fix relative path checking in get_exe_path, plus a signed comparison
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
d3baa0d1f7
Temporarily move cmake directive into MSVC section
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
2bdc8dd3a4
Cirrus configuration for Windows builds
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
bf06cc9c2f
Turn on unit tests by default, and ifdef out a few of them
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
88b3a449a7
Use the right avx/sse flags when building highwayhash
2022-11-09 18:16:13 +02:00
Tomer Lev
6307158b04
Updating dependencies in the dockerfile and removing redundant from conanfile.txt
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
90dc9509f7
Changes needed to make plugin btests pass on UNIX platforms
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
e39e1df0a2
Ensure src/include exists and add a comment
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
f35c66ebc7
Updating submodules [nomail]
2022-11-09 18:16:13 +02:00
Tomer Lev
9535729949
Creating a symlink src/include/zeek -> src/
2022-11-09 18:16:13 +02:00
Tomer Lev
71540c5eff
introduced pthread.h include in util.h for MSVC. Squashed warnning originated from this file and also merged a few ifdefs into one place
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
78fb845f63
Rework change to util::vfmt to fix strings getting truncated
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
77c555a3a8
Fixing some issues from rebasing
2022-11-09 18:16:13 +02:00
Tim Wojtulewicz
45fa4c0dc4
Disable Manager::ActivateDynamicPluginInternal if building on Windows
2022-11-09 18:16:13 +02:00
Tomer Lev
0c61bcbfcd
Fixed extern C issue with windows headers, fixed a GEN-ZAM regex issue, fixd compilation with c-ares
2022-11-09 18:16:04 +02:00
Elad Solomon
98a0e242ad
Fixed invokation of make_enum__CPP
2022-11-09 18:15:34 +02:00