From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 9 Sep 2021 14:42:04 +0000 (+0000)
Subject: crimson/net: assert the address is v2 on attempt to bind.
X-Git-Tag: v17.1.0~910^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=334bbad469dfafb45db9089f53bbc49a323c4ef8;p=ceph-ci.git

crimson/net: assert the address is v2 on attempt to bind.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/net/SocketMessenger.cc b/src/crimson/net/SocketMessenger.cc
index 12010b8625f..6b5dd19f1e7 100644
--- a/src/crimson/net/SocketMessenger.cc
+++ b/src/crimson/net/SocketMessenger.cc
@@ -88,7 +88,11 @@ SocketMessenger::bind_ertr::future<>
 SocketMessenger::try_bind(const entity_addrvec_t& addrs,
                           uint32_t min_port, uint32_t max_port)
 {
-  auto addr = addrs.front();
+  // the classical OSD iterates over the addrvec and tries to listen on each
+  // addr. crimson doesn't need to follow as there is a consensus we need to
+  // worry only about proto v2.
+  assert(addrs.size() == 1);
+  auto addr = addrs.msgr2_addr();
   if (addr.get_port() != 0) {
     return do_bind(addrs).safe_then([this] {
       logger().info("{} try_bind: done", *this);