From: Sage Weil <sage@redhat.com>
Date: Thu, 7 Feb 2019 23:04:03 +0000 (-0600)
Subject: doc/dev/msgr2: bring up to date with new HELLO, different RECONNECT
X-Git-Tag: v14.1.0~171^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2e9c61de4956fb22341f007b47b0629aee8a5fd7;p=ceph.git

doc/dev/msgr2: bring up to date with new HELLO, different RECONNECT

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/doc/dev/msgr2.rst b/doc/dev/msgr2.rst
index 72979a2b732c..5e47b0f48aac 100644
--- a/doc/dev/msgr2.rst
+++ b/doc/dev/msgr2.rst
@@ -101,6 +101,17 @@ the form::
   has completed (TAG_AUTH_DONE has been sent) and signatures are
   enabled.
 
+Hello
+-----
+
+* TAG_HELLO: client->server and server->client::
+
+    __u8 entity_type
+    entity_addr_t peer_socket_address
+
+  - We immediately share our entity type and the address of the peer (which can be useful
+    for detecting our effective IP address, especially in the presence of NAT).
+
 
 Authentication
 --------------
@@ -276,13 +287,19 @@ an established session.
   - The cookie can be used by the client if it is later disconnected and wants to
     reconnect and resume the session.
 
+* TAG_RECONNECT (client->server): reconnect to an established session::
 
+    __le32 num_addrs
+    entity_addr_t * num_addrs
     __le64 cookie
+    __le64 id (of name.id, e.g., osd.123 -> 123)
     __le64 global_seq
     __le64 connect_seq
+    __le64 supported_features
+    __le64 required_features
     __le64 msg_seq (the last msg seq received)
 
-* TAG_RECONNECT_OK (server only): acknowledge a reconnect attempt::
+* TAG_RECONNECT_OK (server->client): acknowledge a reconnect attempt::
 
     __le64 msg_seq (last msg seq received)