From: Kefu Chai <kchai@redhat.com>
Date: Tue, 16 Apr 2019 14:30:12 +0000 (+0800)
Subject: crimson/auth: let AuthClient::get_auth_request return a named struct
X-Git-Tag: v15.1.0~2915^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=2d783eb0d51b781710dfa9663ecee01153f32ea5;p=ceph.git

crimson/auth: let AuthClient::get_auth_request return a named struct

better readability this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/crimson/auth/AuthClient.h b/src/crimson/auth/AuthClient.h
index f8d0685673bcb..d75e663429e59 100644
--- a/src/crimson/auth/AuthClient.h
+++ b/src/crimson/auth/AuthClient.h
@@ -26,14 +26,16 @@ class AuthClient {
 public:
   virtual ~AuthClient() {}
 
+  struct auth_request_t {
+    method_t auth_method;
+    std::vector<uint32_t> preferred_modes;
+    ceph::bufferlist auth_bl;
+  };
   /// Build an authentication request to begin the handshake
   ///
   /// @throw auth::error if unable to build the request
-  virtual std::tuple<method_t,		     // auth method
-		     std::vector<uint32_t>,  // preferred modes
-		     ceph::bufferlist>	     // auth bl
-  get_auth_request(ceph::net::ConnectionRef conn,
-		   AuthConnectionMetaRef auth_meta) = 0;
+  virtual auth_request_t get_auth_request(ceph::net::ConnectionRef conn,
+					  AuthConnectionMetaRef auth_meta) = 0;
 
   /// Handle server's request to continue the handshake
   ///
diff --git a/src/crimson/auth/DummyAuth.h b/src/crimson/auth/DummyAuth.h
index 1f51b1aa38c6b..6162af7dec383 100644
--- a/src/crimson/auth/DummyAuth.h
+++ b/src/crimson/auth/DummyAuth.h
@@ -31,7 +31,7 @@ public:
     return nullptr;
   }
 
-  std::tuple<uint32_t, std::vector<uint32_t>, bufferlist> get_auth_request(
+  AuthClient::auth_request_t get_auth_request(
     ceph::net::ConnectionRef conn,
     AuthConnectionMetaRef auth_meta) override {
     return {CEPH_AUTH_NONE, {CEPH_CON_MODE_CRC}, {}};
diff --git a/src/crimson/mon/MonClient.cc b/src/crimson/mon/MonClient.cc
index f52ce15846b5a..6676a26883a0a 100644
--- a/src/crimson/mon/MonClient.cc
+++ b/src/crimson/mon/MonClient.cc
@@ -59,7 +59,7 @@ public:
                                     uint32_t want_keys);
   // v2
   seastar::future<> authenticate_v2();
-  tuple<ceph::auth::method_t, vector<uint32_t>, bufferlist>
+  auth::AuthClient::auth_request_t
   get_auth_request(const EntityName& name,
                    uint32_t want_keys);
   using secret_t = string;
@@ -266,7 +266,7 @@ seastar::future<> Connection::authenticate_v2()
   });
 }
 
-tuple<ceph::auth::method_t, vector<uint32_t>, ceph::bufferlist>
+auth::AuthClient::auth_request_t
 Connection::get_auth_request(const EntityName& entity_name,
                              uint32_t want_keys)
 {
@@ -567,7 +567,7 @@ int Client::handle_auth_request(ceph::net::ConnectionRef con,
   }
 }
 
-tuple<uint32_t, vector<uint32_t>, ceph::bufferlist>
+auth::AuthClient::auth_request_t
 Client::get_auth_request(ceph::net::ConnectionRef con,
                          AuthConnectionMetaRef auth_meta)
 {
diff --git a/src/crimson/mon/MonClient.h b/src/crimson/mon/MonClient.h
index 5b06266a52b2c..940574eaf5350 100644
--- a/src/crimson/mon/MonClient.h
+++ b/src/crimson/mon/MonClient.h
@@ -116,9 +116,7 @@ private:
   ceph::common::AuthHandler& auth_handler;
 
   // AuthClient methods
-  std::tuple<ceph::auth::method_t,  // auth method
-	     std::vector<uint32_t>, // preferred modes
-	     ceph::bufferlist>	    // auth bl
+  ceph::auth::AuthClient::auth_request_t
   get_auth_request(ceph::net::ConnectionRef conn,
 		   AuthConnectionMetaRef auth_meta) final;