Merge remote-tracking branch 'origin/topic/robin/change-port'

* origin/topic/robin/change-port:
  Fix problem with column caching.
  Adapt to package's new default listening port.

Author: rsmmr

CHANGES

@@ -1,3 +1,9 @@
+2.0.3 | 2022-02-22 13:36:47 +0100
+
+  * Adapt to package's new default listening port.
+
+  * Fix problem with column caching.
+
 2.0.2 | 2022-02-21 16:36:16 +0100
 
   * Push all asynchronous activity to the main thread to avoid most

VERSION

@@ -1 +1 @@
-2.0.2
+2.0.3

src/core/database.cc

@@ -259,10 +259,13 @@ Interval Database::Implementation::timerCallback(timer::ID id) {
         else
             cannot_be_reached();
 
-        if ( sql_result->columns.empty() )
-            // If a result is empty, columns won't be set. Reuse the previous one then because for diffs we may still be
-            // sending (removed) rows back.
-            sql_result->columns = (*i)->previous_result->columns;
+        if ( sql_result->columns.empty() ) {
+            if ( (*i)->previous_result )
+                // If a result is empty, columns won't be set. Reuse the previous
+                // one then because for diffs we may still be
+                // sending (removed) rows back.
+                sql_result->columns = (*i)->previous_result->columns;
+        }
 
 #ifndef NDEBUG
         else if ( (*i)->previous_result ) {

src/io/zeek.cc

@@ -136,7 +136,7 @@ class BrokerConnection {
 Result<Nothing> BrokerConnection::connect(const std::string& destination) {
     // Parse "host[:port]".
     std::string address;
-    unsigned long port = 9999; // default Broker port
+    unsigned long port = 9998; // default port used by the zeek-agent package
 
     try {
         auto m = split(trim(destination), ":");