diff --git a/CHANGES b/CHANGES index 427de7098b..5f73bfa690 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,8 @@ +2.6-576 | 2019-07-10 18:38:54 -0700 + + * Remove unused option: chunked_io_buffer_soft_cap (Jon Siwek, Corelight) + 2.6-575 | 2019-07-09 18:28:03 -0700 * Avoid a null dereference (Coverity-1402816) (Tim Wojtulewicz, Corelight) diff --git a/NEWS b/NEWS index acd25aff53..f59147d173 100644 --- a/NEWS +++ b/NEWS @@ -479,6 +479,7 @@ Removed Functionality - ``backdoor_stat_period`` - ``backdoor_stat_backoff`` - ``backdoor_endp_stats`` + - ``chunked_io_buffer_soft_cap`` - The following constants were used as part of deprecated functionality in version 2.6 or below and are removed from this release: diff --git a/VERSION b/VERSION index 159139a67e..e16e9a62a0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6-575 +2.6-576 diff --git a/doc b/doc index 80c0cb3d9d..fb4942d261 160000 --- a/doc +++ b/doc @@ -1 +1 @@ -Subproject commit 80c0cb3d9db1cea6661b3d3c79d17e3b67533507 +Subproject commit fb4942d261ebd2c8160a0862b527f3639ebf1245 diff --git a/scripts/base/init-bare.zeek b/scripts/base/init-bare.zeek index bfb49579cd..7d539f3948 100644 --- a/scripts/base/init-bare.zeek +++ b/scripts/base/init-bare.zeek @@ -4608,11 +4608,6 @@ const sig_max_group_size = 50 &redef; ## Description transmitted to remote communication peers for identification. const peer_description = "zeek" &redef; -## The number of IO chunks allowed to be buffered between the child -## and parent process of remote communication before Zeek starts dropping -## connections to remote peers in an attempt to catch up. -const chunked_io_buffer_soft_cap = 800000 &redef; - ## Reassemble the beginning of all TCP connections before doing ## signature matching. Enabling this provides more accurate matching at the ## expense of CPU cycles. diff --git a/src/NetVar.cc b/src/NetVar.cc index c256cfd496..981ca005ff 100644 --- a/src/NetVar.cc +++ b/src/NetVar.cc @@ -141,7 +141,6 @@ RecordType* rotate_info; StringVal* log_rotate_base_time; StringVal* peer_description; -bro_uint_t chunked_io_buffer_soft_cap; Val* profiling_file; double profiling_interval; @@ -213,7 +212,6 @@ void init_general_global_var() peer_description = internal_val("peer_description")->AsStringVal(); - chunked_io_buffer_soft_cap = opt_internal_unsigned("chunked_io_buffer_soft_cap"); packet_filter_default = opt_internal_int("packet_filter_default"); diff --git a/src/NetVar.h b/src/NetVar.h index 5dc5fcfb79..41b2028064 100644 --- a/src/NetVar.h +++ b/src/NetVar.h @@ -144,7 +144,6 @@ extern RecordType* rotate_info; extern StringVal* log_rotate_base_time; extern StringVal* peer_description; -extern bro_uint_t chunked_io_buffer_soft_cap; extern Val* profiling_file; extern double profiling_interval;