commit f08994415fc5eb8094e99c0d9c6c29a14cc60d74
author Sarah Newman <sarah.newman@bluerivertech.com> Wed Apr 06 14:54:25 2022 -0700
committer James Kuszmaul <james.kuszmaul@bluerivertech.com> Tue May 03 15:48:54 2022 -0700
tree c7b889c4e8988e1d2fbac7f888cb7695f5d116ff
parent 2f98cf0980fd1bf13c47e66b1dabf77dafe2634a

message_bridge_server_lib: stream ids must match despite errors

It's arguable whether we should accept config mismatches.
However, if we're going to allow it, we should at least make
it work.

Only incrementing the channel_count for matching channels breaks
the stream->channel mapping from the clients perspective, since
channel_count is used as the stream id.

Change-Id: Ie9d24c81e925528510c8bbb665d3c6f9a71c86d6
Signed-off-by: James Kuszmaul <james.kuszmaul@bluerivertech.com>

aos/network/message_bridge_server_lib.cc

diff --git a/aos/network/message_bridge_server_lib.cc b/aos/network/message_bridge_server_lib.cc
index e8e0261..7c0e468 100644
--- a/aos/network/message_bridge_server_lib.cc
+++ b/aos/network/message_bridge_server_lib.cc
@@ -487,9 +487,8 @@
       if (!matched) {
         LOG(ERROR) << "Remote tried registering for unknown channel "
                    << FlatbufferToJson(channel);
-      } else {
-        ++channel_index;
       }
+      ++channel_index;
     }
     // TODO(sarah.newman): what if node_index is -1?
     server_status_.ResetFilter(node_index);