From: Zhao Junwang <zhjwpku@gmail.com>
Date: Tue, 17 May 2016 05:29:57 +0000 (-0400)
Subject: msg: encode msg/simple and msg/async with features 0
X-Git-Tag: v11.0.0~270^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8eb094ad414d5106c8cdbf3327070aea818e7e5b;p=ceph.git

msg: encode msg/simple and msg/async with features 0

msg/simple and msg/async should explicitly encode with features 0
since the protocol is defined in terms of the legacy encoding.

Signed-off-by: Zhao Junwang <zhjwpku@gmail.com>
---

diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc
index bcf8e6a3f672..5ce6bea7fbbf 100644
--- a/src/msg/async/AsyncConnection.cc
+++ b/src/msg/async/AsyncConnection.cc
@@ -1177,7 +1177,7 @@ ssize_t AsyncConnection::_process_connection()
           return 0;
         }
 
-        ::encode(async_msgr->get_myaddr(), myaddrbl);
+        ::encode(async_msgr->get_myaddr(), myaddrbl, 0); // legacy
         r = try_send(myaddrbl);
         if (r == 0) {
           state = STATE_CONNECTING_SEND_CONNECT_MSG;
@@ -1392,7 +1392,7 @@ ssize_t AsyncConnection::_process_connection()
 
         bl.append(CEPH_BANNER, strlen(CEPH_BANNER));
 
-        ::encode(async_msgr->get_myaddr(), bl);
+        ::encode(async_msgr->get_myaddr(), bl, 0); // legacy
         port = async_msgr->get_myaddr().get_port();
         // and peer's socket addr (they might not know their ip)
 	sockaddr_storage ss;
@@ -1404,7 +1404,7 @@ ssize_t AsyncConnection::_process_connection()
           goto fail;
         }
 	socket_addr.set_sockaddr((sockaddr*)&ss);
-        ::encode(socket_addr, bl);
+        ::encode(socket_addr, bl, 0); // legacy
         ldout(async_msgr->cct, 1) << __func__ << " sd=" << sd << " " << socket_addr << dendl;
 
         r = try_send(bl);
diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc
index 7c30cd4602f2..a9ff49b29a10 100644
--- a/src/msg/simple/Pipe.cc
+++ b/src/msg/simple/Pipe.cc
@@ -300,7 +300,7 @@ int Pipe::accept()
   }
 
   // and my addr
-  ::encode(msgr->my_inst.addr, addrs);
+  ::encode(msgr->my_inst.addr, addrs, 0);  // legacy
 
   port = msgr->my_inst.addr.get_port();
 
@@ -313,7 +313,7 @@ int Pipe::accept()
     goto fail_unlocked;
   }
   socket_addr.set_sockaddr((sockaddr*)&ss);
-  ::encode(socket_addr, addrs);
+  ::encode(socket_addr, addrs, 0);  // legacy
 
   r = tcp_write(addrs.c_str(), addrs.length());
   if (r < 0) {
@@ -994,7 +994,7 @@ int Pipe::connect()
 
   msgr->learned_addr(peer_addr_for_me);
 
-  ::encode(msgr->my_inst.addr, myaddrbl);
+  ::encode(msgr->my_inst.addr, myaddrbl, 0);  // legacy
 
   memset(&msg, 0, sizeof(msg));
   msgvec[0].iov_base = myaddrbl.c_str();