diff options
author | Yuri Wiitala <miu@chromium.org> | 2019-12-20 20:26:40 -0800 |
---|---|---|
committer | Commit Bot <commit-bot@chromium.org> | 2019-12-21 08:46:52 +0000 |
commit | 80ed3d779e3e38de94656bf59ff4b62534c797fe (patch) | |
tree | 7e5272420823e8f7a6bca54df9f259179d3fe126 /cast/sender/channel/message_util.cc | |
parent | 14e7402b939822d20a2cf72e84cb72136301c4aa (diff) | |
download | openscreen-80ed3d779e3e38de94656bf59ff4b62534c797fe.tar.gz |
Replace namespace cast::something with openscreen::cast.
...and fixed a few C++ style issues around use of rvals in files
touched.
Bug: openscreen:90
Change-Id: Ib14fb1c47dfafec1fefe0cad31bce764aae0272e
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1959204
Commit-Queue: Yuri Wiitala <miu@chromium.org>
Reviewed-by: Jordan Bayles <jophba@chromium.org>
Diffstat (limited to 'cast/sender/channel/message_util.cc')
-rw-r--r-- | cast/sender/channel/message_util.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/cast/sender/channel/message_util.cc b/cast/sender/channel/message_util.cc index ab3ed5d8..48623cee 100644 --- a/cast/sender/channel/message_util.cc +++ b/cast/sender/channel/message_util.cc @@ -6,8 +6,12 @@ #include "cast/sender/channel/cast_auth_util.h" +namespace openscreen { namespace cast { -namespace channel { + +using ::cast::channel::AuthChallenge; +using ::cast::channel::CastMessage; +using ::cast::channel::DeviceAuthMessage; CastMessage CreateAuthChallengeMessage(const AuthContext& auth_context) { CastMessage message; @@ -15,7 +19,7 @@ CastMessage CreateAuthChallengeMessage(const AuthContext& auth_context) { AuthChallenge* challenge = auth_message.mutable_challenge(); challenge->set_sender_nonce(auth_context.nonce()); - challenge->set_hash_algorithm(SHA256); + challenge->set_hash_algorithm(::cast::channel::SHA256); std::string auth_message_string; auth_message.SerializeToString(&auth_message_string); @@ -24,11 +28,11 @@ CastMessage CreateAuthChallengeMessage(const AuthContext& auth_context) { message.set_source_id(kPlatformSenderId); message.set_destination_id(kPlatformReceiverId); message.set_namespace_(kAuthNamespace); - message.set_payload_type(CastMessage_PayloadType_BINARY); + message.set_payload_type(::cast::channel::CastMessage_PayloadType_BINARY); message.set_payload_binary(auth_message_string); return message; } -} // namespace channel } // namespace cast +} // namespace openscreen |