import 15.2.0 Octopus source

[ceph.git] / ceph / src / msg / Dispatcher.h

diff --git a/ceph/src/msg/Dispatcher.h b/ceph/src/msg/Dispatcher.h
index fef5e3203ffa4e7f8c0004ce483df1421b8d430d..5e025437b53570ad78844cb38e7e6c3c6bfeab74 100644 (file)
--- a/ceph/src/msg/Dispatcher.h
+++ b/ceph/src/msg/Dispatcher.h
@@ -19,14 +19,12 @@
 #include <memory>
 #include "include/buffer_fwd.h"
 #include "include/ceph_assert.h"
+#include "include/common_fwd.h"
 #include "msg/MessageRef.h"
 
 class Messenger;
 class Connection;
-class AuthAuthorizer;
 class CryptoKey;
-class CephContext;
-class AuthAuthorizerChallenge;
 class KeyStore;
 
 class Dispatcher {
@@ -216,46 +214,12 @@ public:
     return 0;
   }
 
-  /**
-   * get authentication keyring
-   *
-   * Return the keyring to use for authentication with msgr1.  Remove me
-   * someday.
-   */
-  virtual KeyStore* ms_get_auth1_authorizer_keystore() {
-    return nullptr;
-  }
-
-  /**
-   * Retrieve the AuthAuthorizer for the given peer type. It might not
-   * provide one if it knows there is no AuthAuthorizer for that type.
-   *
-   * @param dest_type The peer type we want the authorizer for.
-   * @param a Double pointer to an AuthAuthorizer. The Dispatcher will fill
-   * in *a with the correct AuthAuthorizer, if it can. Make sure that you have
-   * set *a to NULL before calling in.
-   * @param force_new Force the Dispatcher to wait for a new set of keys before
-   * returning the authorizer.
-   *
-   * @return True if this function call properly filled in *a, false otherwise.
-   */
-  virtual bool ms_get_authorizer(int dest_type, AuthAuthorizer **a) {
-    return false;
-  }
   /**
    * @} //Authentication
    */
 
-  void ms_set_require_authorizer(bool b) {
-    require_authorizer = b;
-  }
 protected:
   CephContext *cct;
-public:
-  // allow unauthenticated connections.  This is needed for
-  // compatibility with pre-nautilus OSDs, which do not authenticate
-  // the heartbeat sessions.
-  bool require_authorizer = true;
 private:
   explicit Dispatcher(const Dispatcher &rhs);
   Dispatcher& operator=(const Dispatcher &rhs);