Fixes zeek#4076; update BIFs to_int() and to_count() to accept option…

…al 'base' argument for more easy conversions of strings representing (for example) hexadecimal, octal, or binary numbers

src/zeek.bif

@@ -2606,12 +2606,12 @@ function enum_to_int%(e: any%): int
 ## Returns: The :zeek:type:`string` *str* as :zeek:type:`int`.
 ##
 ## .. zeek:see:: to_addr to_port to_subnet
-function to_int%(str: string%): int
+function to_int%(str: string, base: count &default=10%): int
 	%{
 	const char* s = str->CheckString();
 	char* end_s;
 
-	zeek_int_t i = strtoll(s, &end_s, 10);
+	zeek_int_t i = strtoll(s, &end_s, base);
 
 #if 0
 	// Not clear we should complain.  For example, is " 205 "
@@ -2675,12 +2675,12 @@ function double_to_count%(d: double%): count
 ##          an invalid format.
 ##
 ## .. zeek:see:: to_addr to_int to_port to_subnet
-function to_count%(str: string%): count
+function to_count%(str: string, base: count &default=10%): count
 	%{
 	const char* s = str->CheckString();
 	char* end_s;
 
-	uint64_t u = (uint64_t) strtoull(s, &end_s, 10);
+	uint64_t u = (uint64_t) strtoull(s, &end_s, base);
 
 	if ( s[0] == '\0' || end_s[0] != '\0' )
     	{

testing/btest/Baseline/bifs.to_count/out

@@ -6,6 +6,9 @@
 7
 0
 18446744073709551611
+172
+35
+195
 0
 123
 9223372036854775808 and 9223372036854775808 are the same

testing/btest/Baseline/bifs.to_int/out

@@ -1,6 +1,9 @@
 ### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
 1
 -1
+188
+39
+243
 4294967296
 0
 3

testing/btest/bifs/to_count.zeek

@@ -19,6 +19,9 @@ event zeek_init()
 	print to_count("7");
 	print to_count("");
 	print to_count("-5");
+	print to_int("10101100", 2);
+	print to_int("43", 8);
+	print to_int("C3", 16);
 	print to_count("not a count");
 
 	local e: port = 123/tcp;

testing/btest/bifs/to_int.zeek

@@ -6,6 +6,9 @@ event zeek_init()
 	{
 	print to_int("1");
 	print to_int("-1");
+	print to_int("10111100", 2);
+	print to_int("47", 8);
+	print to_int("F3", 16);
 	print to_int("4294967296");
 	print to_int("not an int");