Convert more redef-able constants to runtime options

scripts/base/files/extract/main.bro

@@ -9,7 +9,7 @@ export {
 
 	## The default max size for extracted files (they won't exceed this
 	## number of bytes). A value of zero means unlimited.
-	const default_limit = 0 &redef;
+	option default_limit = 0;
 
 	redef record Files::Info += {
 		## Local filename of extracted file.

scripts/base/frameworks/input/main.bro

@@ -24,10 +24,10 @@ export {
 	};
 
 	## The default input reader used. Defaults to `READER_ASCII`.
-	const default_reader = READER_ASCII &redef;
+	option default_reader = READER_ASCII;
 
 	## The default reader mode used. Defaults to `MANUAL`.
-	const default_mode = MANUAL &redef;
+	option default_mode = MANUAL;
 
 	## Separator between fields.
 	## Please note that the separator has to be exactly one character long.

scripts/base/frameworks/netcontrol/types.bro

@@ -7,7 +7,7 @@ module NetControl;
 
 export {
 	## The default priority that is used when creating rules.
-	const default_priority: int = +0 &redef;
+	option default_priority: int = +0;
 
 	## The default priority that is used when using the high-level functions to
 	## push whitelist entries to the backends (:bro:see:`NetControl::whitelist_address` and

scripts/base/frameworks/notice/main.bro

@@ -53,7 +53,7 @@ export {
 	## utilizing the *identifier* field in :bro:type:`Notice::Info` records.
 	## Set this to "0secs" to completely disable automated notice
 	## suppression.
-	const default_suppression_interval = 1hrs &redef;
+	option default_suppression_interval = 1hrs;
 
 	## The record type that is used for representing and logging notices.
 	type Info: record {

scripts/base/init-bare.bro

@@ -383,12 +383,12 @@ type connection: record {
 
 ## Default amount of time a file can be inactive before the file analysis
 ## gives up and discards any internal state related to the file.
-const default_file_timeout_interval: interval = 2 mins &redef;
+option default_file_timeout_interval: interval = 2 mins;
 
 ## Default amount of bytes that file analysis will buffer in order to use
 ## for mime type matching.  File analyzers attached at the time of mime type
 ## matching or later, will receive a copy of this buffer.
-const default_file_bof_buffer_size: count = 4096 &redef;
+option default_file_bof_buffer_size: count = 4096;
 
 ## A file that Bro is analyzing.  This is Bro's type for describing the basic
 ## internal metadata collected about a "file", which is essentially just a

scripts/base/protocols/conn/contents.bro

@@ -22,7 +22,7 @@ export {
 	
 	## If this variable is set to ``T``, then all contents of all
 	## connections will be extracted.
-	const default_extract = F &redef;
+	option default_extract = F;
 }
 
 redef record connection += {

scripts/base/protocols/ftp/info.bro

@@ -8,7 +8,7 @@ export {
 
 	## This setting changes if passwords used in FTP sessions are
 	## captured or not.
-	const default_capture_password = F &redef;
+	option default_capture_password = F;
 
 	## The expected endpoints of an FTP data channel.
 	type ExpectedDataChannel: record {

scripts/base/protocols/http/main.bro

@@ -19,7 +19,7 @@ export {
 
 	## This setting changes if passwords used in Basic-Auth are captured or
 	## not.
-	const default_capture_password = F &redef;
+	option default_capture_password = F;
 
 	## The record type which contains the fields of the HTTP log.
 	type Info: record {

scripts/base/protocols/socks/main.bro

@@ -7,7 +7,7 @@ export {
 	redef enum Log::ID += { LOG };
 
 	## Whether passwords are captured or not.
-	const default_capture_password = F &redef;
+	option default_capture_password = F;
 
 	## The record type which contains the fields of the SOCKS log.
 	type Info: record {

scripts/base/utils/active-http.bro

@@ -7,10 +7,10 @@ module ActiveHTTP;
 
 export {
 	## The default timeout for HTTP requests.
-	const default_max_time = 1min &redef;
+	option default_max_time = 1min;
 
 	## The default HTTP method/verb to use for requests.
-	const default_method = "GET" &redef;
+	option default_method = "GET";
 
 	type Response: record {
 		## Numeric response code from the server.

scripts/base/utils/dir.bro

@@ -7,7 +7,7 @@ module Dir;
 export {
 	## The default interval this module checks for files in directories when
 	## using the :bro:see:`Dir::monitor` function.
-	const polling_interval = 30sec &redef;
+	option polling_interval = 30sec;
 
 	## Register a directory to monitor with a callback that is called
 	## every time a previously unseen file is seen.  If a file is deleted