commit 4dda54715b8e01540c0fec758b77acc16ed17061
author Alexei Frolov <frolv@google.com> Tue Aug 17 14:06:23 2021 -0700
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Aug 17 23:42:37 2021 +0000
tree 13f6c4aac5af08e4e568d7069b579846c711d2f5
parent 27ab4e1e03f5f8e5a370d84d830191bf6bd277dc

pw_rpc: Expose channel_id in Responders

This updates all of the derived responder classes to expose the channel
ID of their call context as this is useful for service implementers.

Change-Id: I464027c0e362b2725ed6e4019317a7ae06c4a227
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/57523
Reviewed-by: Wyatt Hepler <hepler@google.com>
Commit-Queue: Alexei Frolov <frolv@google.com>

pw_rpc/nanopb/public/pw_rpc/nanopb/server_reader_writer.h

diff --git a/pw_rpc/nanopb/public/pw_rpc/nanopb/server_reader_writer.h b/pw_rpc/nanopb/public/pw_rpc/nanopb/server_reader_writer.h
index 47b75a7..613d701 100644
--- a/pw_rpc/nanopb/public/pw_rpc/nanopb/server_reader_writer.h
+++ b/pw_rpc/nanopb/public/pw_rpc/nanopb/server_reader_writer.h
@@ -98,6 +98,8 @@
 
   using internal::GenericNanopbResponder::open;
 
+  using internal::GenericNanopbResponder::channel_id;
+
   // Writes a response struct. Returns the following Status codes:
   //
   //   OK - the response was successfully sent
@@ -136,6 +138,8 @@
   NanopbServerReader(NanopbServerReader&&) = default;
   NanopbServerReader& operator=(NanopbServerReader&&) = default;
 
+  using internal::GenericNanopbResponder::channel_id;
+
   // Functions for setting RPC event callbacks.
   using NanopbServerReaderWriter<Request, Response>::set_on_client_stream_end;
   using NanopbServerReaderWriter<Request, Response>::set_on_error;
@@ -162,6 +166,8 @@
 
   using internal::GenericNanopbResponder::open;
 
+  using internal::GenericNanopbResponder::channel_id;
+
   // Writes a response struct. Returns the following Status codes:
   //
   //   OK - the response was successfully sent

pw_rpc/raw/public/pw_rpc/raw/server_reader_writer.h

diff --git a/pw_rpc/raw/public/pw_rpc/raw/server_reader_writer.h b/pw_rpc/raw/public/pw_rpc/raw/server_reader_writer.h
index ee8b335..9213bc5 100644
--- a/pw_rpc/raw/public/pw_rpc/raw/server_reader_writer.h
+++ b/pw_rpc/raw/public/pw_rpc/raw/server_reader_writer.h
@@ -52,6 +52,8 @@
 
   using internal::Responder::open;
 
+  using internal::Responder::channel_id;
+
   // Functions for setting the callbacks.
   using internal::Responder::set_on_client_stream_end;
   using internal::Responder::set_on_error;
@@ -107,6 +109,8 @@
 
   using RawServerReaderWriter::open;
 
+  using RawServerReaderWriter::channel_id;
+
   using RawServerReaderWriter::set_on_client_stream_end;
   using RawServerReaderWriter::set_on_error;
   using RawServerReaderWriter::set_on_next;
@@ -139,6 +143,8 @@
 
   using RawServerReaderWriter::open;
 
+  using RawServerReaderWriter::channel_id;
+
   using RawServerReaderWriter::set_on_error;
 
   using RawServerReaderWriter::Finish;