update sources to 12.2.7

[ceph.git] / ceph / src / msg / simple / SimpleMessenger.h

diff --git a/ceph/src/msg/simple/SimpleMessenger.h b/ceph/src/msg/simple/SimpleMessenger.h
index 9c5f43e89ba83e226da20bc3f3177dc89cb659e6..aebc190e14e38fc8ffe3f6a495dbee1dae3e9eb6 100644 (file)
--- a/ceph/src/msg/simple/SimpleMessenger.h
+++ b/ceph/src/msg/simple/SimpleMessenger.h
@@ -25,7 +25,6 @@ using namespace std;
 #include "include/unordered_set.h"
 
 #include "common/Mutex.h"
-#include "include/atomic.h"
 #include "include/Spinlock.h"
 #include "common/Cond.h"
 #include "common/Thread.h"
@@ -94,6 +93,7 @@ public:
    * @{
    */
   void set_addr_unknowns(const entity_addr_t& addr) override;
+  void set_addr(const entity_addr_t &addr) override;
 
   int get_dispatch_queue_len() override {
     return dispatch_queue.get_queue_len();
@@ -322,7 +322,7 @@ private:
     if (p == rank_pipe.end())
       return NULL;
     // see lock cribbing in Pipe::fault()
-    if (p->second->state_closed.read())
+    if (p->second->state_closed)
       return NULL;
     return p->second;
   }
@@ -346,8 +346,10 @@ public:
   /**
    * This wraps ms_deliver_verify_authorizer; we use it for Pipe.
    */
-  bool verify_authorizer(Connection *con, int peer_type, int protocol, bufferlist& auth, bufferlist& auth_reply,
-                         bool& isvalid,CryptoKey& session_key);
+  bool verify_authorizer(Connection *con, int peer_type, int protocol, bufferlist& auth,
+                        bufferlist& auth_reply,
+                         bool& isvalid,CryptoKey& session_key,
+                        std::unique_ptr<AuthAuthorizerChallenge> *challenge);
   /**
    * Increment the global sequence for this SimpleMessenger and return it.
    * This is for the connect protocol, although it doesn't hurt if somebody