Merge remote-tracking branch 'origin/topic/timw/non-routeable-subnets'

* origin/topic/timw/non-routeable-subnets: Update command.print btest for additional public subnets
zeek · Jan 13, 2025 · e4879e1 · e4879e1
2 parents 78e9729 + ac89234
commit e4879e1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/CHANGES b/CHANGES
@@ -1,3 +1,7 @@
+2.6.0-2 | 2025-01-13 08:16:57 -0700
+
+  * Update command.print btest for additional public subnets (Tim Wojtulewicz)
+
 2.6.0 | 2024-12-13 08:12:09 -0700
 
   * Updating submodule(s) [nomail] (Tim Wojtulewicz, Corelight)

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.6.0
+2.6.0-2
diff --git a/doc/main.rst b/doc/main.rst
@@ -3,7 +3,7 @@
 .. Note: This file includes further autogenerated ones.
 ..
 .. Version number is filled in automatically.
-.. |version| replace:: 2.6.0
+.. |version| replace:: 2.6.0-2
 
 ===========
 ZeekControl

diff --git a/testing/Baseline/command.print/onenode.out b/testing/Baseline/command.print/onenode.out
@@ -5,6 +5,7 @@
 	fc00::/7,
 	::/128,
 	100.64.0.0/10,
+	fec0::/10,
 	::1/128,
 	2002:ffff:ffff::/48,
 	2002:cb00:7100::/40,
@@ -15,26 +16,30 @@
 	255.255.255.255/32,
 	192.0.0.0/24,
 	0.0.0.0/8,
+	239.0.0.0/8,
 	2001:2::/48,
-	2002:c000:200::/40,
 	172.16.0.0/12,
+	2002:c000:200::/40,
 	2002:f000::/20,
 	2002:7f00::/24,
 	2001::/23,
 	2002:6440::/26,
 	10.0.0.0/8,
 	2002:c000::/40,
 	127.0.0.0/8,
+	224.0.0.0/24,
 	192.0.2.0/24,
-	2002:ac10::/28,
 	192.168.0.0/16,
+	2002:ac10::/28,
 	2002:a9fe::/32,
-	2002:c612::/31,
 	169.254.0.0/16,
+	2002:c612::/31,
 	2002::/24,
 	fe80::/10,
 	2001:db8::/32,
+	2002:ef00::/24,
 	203.0.113.0/24,
+	2002:e000::/40,
 	2002:c0a8::/32,
 	198.51.100.0/24
 }