Christian Kreibich
38d6b6a98b
Skip negative integers in input framework where not type-permissible
...
Script-layer counts, when provided as negative integers in an input
file, got cast to unsigned values because strtoull() does not complain
about negative values. For example, input string "-1" would lead to
value 18446744073709551615 (an all-ones 64-bit int) on x86_64. This is
more likely to be an error than an intent to get very large,
platform-dependent values, so these input lines are now skipped with
according messaging in the reporter.log/stderr.
This also affected ports: -1/tcp got cast to unsigned and only thrown
out because PortVal rejects values > 65535, mapping them to 0. We now
skip such inputs as well.
Updates existing input framework tests to capture the new behavior.
2021-01-28 23:46:43 -08:00
Vern Paxson
7f92a573d2
Remove BroValUnion by hoisting underlying Val subclass values into subclasses
2021-01-14 11:58:59 -07:00
Tim Wojtulewicz
96d9115360
GH-1079: Use full paths starting with zeek/ when including files
2020-11-12 12:15:26 -07:00
Jon Siwek
427a7de411
Merge remote-tracking branch 'origin/topic/timw/266-namespaces-part5'
...
- Did a few whitespace re-adjustments during merge
* origin/topic/timw/266-namespaces-part5:
Update plugin btests for namespace changes
Plugins: Clean up explicit uses of namespaces in places where they're not necessary.
Base: Clean up explicit uses of namespaces in places where they're not necessary.
2020-08-25 19:51:42 -07:00
Tim Wojtulewicz
fe0c22c789
Base: Clean up explicit uses of namespaces in places where they're not necessary.
...
This commit covers all of the common and base classes.
2020-08-24 12:07:00 -07:00
Tim Wojtulewicz
0ac3fafe13
Move zeek::net namespace to zeek::run_state namespace.
...
This also moves all of the code from Net.{h,cc} to RunState.{h,cc} and marks Net.h as deprecated
2020-08-20 16:11:47 -07:00
Tim Wojtulewicz
4b61d60e80
Fix indentation of namespaced aliases
2020-08-20 16:11:46 -07:00
Tim Wojtulewicz
db36688bf0
Move a few smaller files to zeek namespaces
2020-08-20 16:11:46 -07:00
Tim Wojtulewicz
812ac5536d
Tag the end of some namespaces for consistency
2020-08-20 16:11:46 -07:00
Tim Wojtulewicz
ddf48d7529
Move a few of the zeek::util methods and variables to zeek::util::detail
2020-08-20 16:11:44 -07:00
Tim Wojtulewicz
8d2d867a65
Move everything in util.h to zeek::util namespace.
...
This commit includes renaming a number of methods prefixed with bro_ to be prefixed with zeek_.
2020-08-20 16:00:33 -07:00
Tim Wojtulewicz
e7c6d51ae7
Move the functions and variables in Net.h to the zeek::net namespace. This includes moving network_time out of util.h.
2020-08-20 15:55:17 -07:00
Tim Wojtulewicz
1262109e5a
Move threading classes to zeek namespaces
2020-08-20 15:55:17 -07:00
Tim Wojtulewicz
be92bd536f
Move iosource code to zeek namespaces
2020-08-20 15:55:17 -07:00
Johanna Amann
7f267d3e87
Merge remote-tracking branch 'origin/topic/jazoff/gh-1105'
...
* origin/topic/jazoff/gh-1105:
Accept bracketed ipv6 addresses
2020-08-12 20:04:37 +00:00
Justin Azoff
211789bbb3
Accept bracketed ipv6 addresses
2020-08-05 17:18:36 -04:00
Johanna Amann
22b401f52f
Merge remote-tracking branch 'origin/topic/johanna/1095-just-get-rid-of-it'
...
* origin/topic/johanna/1095-just-get-rid-of-it:
Re-add TYPE_COUNTER without function and deprecation marker.
Completely remove all traces of the COUNTER type.
2020-08-03 10:44:43 -07:00
Tim Wojtulewicz
4e9a5e9d98
Move ODesc to zeek namespace
2020-07-31 16:25:54 -04:00
Tim Wojtulewicz
c9ab1f93e7
Move a few low-use classes to namespaces
2020-07-31 16:25:47 -04:00
Tim Wojtulewicz
886fc102b8
Move DebugLogger to zeek namespaces
2020-07-31 16:23:34 -04:00
Tim Wojtulewicz
45b5a98420
Move EventMgr, EventHandler, and EventRegistry code to zeek namespace. Rename mgr to event_mgr.
2020-07-31 16:23:32 -04:00
Tim Wojtulewicz
1c17700c48
Move Timer and PriorityQueue classes to namespaces
2020-07-31 16:23:02 -04:00
Tim Wojtulewicz
bfab224d7c
Move Reporter to zeek namespace
2020-07-31 16:22:41 -04:00
Tim Wojtulewicz
c7dc7fc955
Move regex matching code to zeek namespaces
2020-07-31 16:22:39 -04:00
Tim Wojtulewicz
25c0fc7ab2
Move IP Addr/Prefix/Header classes into namespaces
2020-07-31 16:22:04 -04:00
Johanna Amann
417a6eb1e9
Completely remove all traces of the COUNTER type.
...
Relates to GH-1095
2020-07-30 12:11:05 -07:00
Tim Wojtulewicz
1248411a2f
Use properly-sized loop variables or convert to ranged-for (bugprone-too-small-loop-variable)
2020-07-28 12:36:40 -07:00
Tim Wojtulewicz
118605f4ac
Add deprecated version of EnumType::GetVal() to returns EnumVal*, rename IntrusivePtr version to GetEnumVal
2020-07-15 14:56:05 -07:00
Tim Wojtulewicz
45d2c96643
Rename BroString files to ZeekString
2020-07-02 17:24:22 -07:00
Tim Wojtulewicz
02cef05f93
Rename BroObj to Obj
2020-07-02 16:15:01 -07:00
Tim Wojtulewicz
736a3f53d4
Rename BroString to zeek::String
2020-07-02 16:15:01 -07:00
Tim Wojtulewicz
86fdf0eaa9
Mark global val_mgr as deprecated and fix uses of it to use namespaced version
2020-07-02 16:15:00 -07:00
Tim Wojtulewicz
40ecede4ea
Move Location to zeek::detail and BroObj to zeek
2020-06-30 21:12:26 -07:00
Tim Wojtulewicz
58c6e10b62
Move BroString to zeek namespace
2020-06-30 21:12:26 -07:00
Tim Wojtulewicz
937a462e70
Move Frame and Scope to zeek::detail namespace
2020-06-30 20:51:53 -07:00
Tim Wojtulewicz
64332ca22c
Move all Val classes to the zeek namespaces
2020-06-30 20:48:09 -07:00
Tim Wojtulewicz
ec9eff0bd5
Use type aliases for IntrusivePtr definitions
2020-06-30 20:37:30 -07:00
Tim Wojtulewicz
9364e6a5b7
Move IntrusivePtr and utility methods to the zeek namespace
2020-06-30 20:19:12 -07:00
Tim Wojtulewicz
361ad8f2f7
Deprecate TypeTag and friends in a different way
2020-06-30 12:48:07 -07:00
Jon Siwek
946ceba832
Fix "possibly-truncated" compiler warning in BuildJSON snprintf()
2020-06-24 17:59:28 -07:00
Tim Wojtulewicz
149e3b3c32
Disable some deprecation diagnostics for GCC
...
Clang automatically disables deprecation warnings for types used within
already-deprecated contexts, such as if you use a deprecated type inside
of a method that's beeen marked as deprecated. GCC doesn't have this
feature so it spews a lot more warnings. These functions are now wrapped
in pragmas that disable the warnings for the usage.
2020-06-11 15:43:11 -07:00
Tim Wojtulewicz
137e416a03
Rename BroType to Type
2020-06-10 14:27:36 -07:00
Tim Wojtulewicz
ed13972924
Move Type types to zeek namespace
2020-06-09 17:20:45 -07:00
Tim Wojtulewicz
4a1b39a2be
Move Flare/Pipe from the bro namespace to zeek::detail
2020-06-03 15:16:19 -07:00
Jon Siwek
5b4313b593
Deprecate Val(double, TypeTag) ctor, add TimeVal/DoubleVal subclasses
...
This also updates all usages of the deprecated Val ctor to use
either IntervalVal, TimeVal, or DoubleVal ctors. The reason for
doing away with the old constructor is that using it with TYPE_INTERVAL
isn't strictly correct since there exists a more specific subclass,
IntervalVal, with overriden ValDescribe() method that ought to be used
to print such values in a more descriptive way.
2020-06-02 23:33:40 -07:00
Tim Wojtulewicz
c558d771e4
Remove IPAddr.h from Reporter.h
2020-06-01 15:00:39 -07:00
Jon Siwek
6a1c312451
Add same_type() overloads for IntrusivePtr args
2020-05-21 21:33:02 -07:00
Jon Siwek
4b17929b6b
Deprecate IndexType::Indices(), replace with GetIndices()
2020-05-21 19:46:57 -07:00
Jon Siwek
de1e3d7d6d
Deprecate VectorVal::Assign methods taking raw Val*
...
And adapt usages to pass in to alternate method taking IntrusivePtr
2020-05-21 15:31:04 -07:00
Jon Siwek
2cbf36721c
Merge remote-tracking branch 'origin/master' into topic/jsiwek/gh-893-intrusive-ptr-migration
2020-05-21 14:44:55 -07:00