From 97464bcabe59aa54e922dfbc4ae763d5b44ce286 Mon Sep 17 00:00:00 2001
From: Tommi Virtanen <tv@eagain.net>
Date: Mon, 21 Nov 2011 10:12:29 -0800
Subject: [PATCH] msg: Move public_addr use outside ->bind()

---
 src/ceph_mds.cc           | 4 ++--
 src/ceph_syn.cc           | 2 +-
 src/msg/SimpleMessenger.h | 3 ---
 src/testmsgr.cc           | 2 +-
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/ceph_mds.cc b/src/ceph_mds.cc
index 35150db24c0f8..1ba4389453730 100644
--- a/src/ceph_mds.cc
+++ b/src/ceph_mds.cc
@@ -63,7 +63,7 @@ static int do_cmds_special_action(const std::string &action,
 				  const std::string &dump_file, int rank)
 {
   SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context);
-  messenger->bind(getpid());
+  messenger->bind(g_conf->public_addr, getpid());
   MonClient mc(g_ceph_context);
   if (mc.build_initial_monmap() < 0)
     return -1;
@@ -206,7 +206,7 @@ int main(int argc, const char **argv)
   }
 
   SimpleMessenger *messenger = new SimpleMessenger(g_ceph_context);
-  messenger->bind(getpid());
+  messenger->bind(g_conf->public_addr, getpid());
   cout << "starting " << g_conf->name << " at " << messenger->get_ms_addr()
        << std::endl;
   messenger->register_entity(entity_name_t::MDS(-1));
diff --git a/src/ceph_syn.cc b/src/ceph_syn.cc
index 7879dcfefd5a5..09ab7db1c28a8 100644
--- a/src/ceph_syn.cc
+++ b/src/ceph_syn.cc
@@ -67,7 +67,7 @@ int main(int argc, const char **argv, char *envp[])
   for (int i=0; i<g_conf->num_client; i++) {
     messengers[i] = new SimpleMessenger(g_ceph_context);
     messengers[i]->register_entity(entity_name_t(entity_name_t::TYPE_CLIENT,-1));
-    messengers[i]->bind(i * 1000000 + getpid());
+    messengers[i]->bind(g_conf->public_addr, i * 1000000 + getpid());
     mclients[i] = new MonClient(g_ceph_context);
     mclients[i]->build_initial_monmap();
     Client *client = new Client(messengers[i], mclients[i]);
diff --git a/src/msg/SimpleMessenger.h b/src/msg/SimpleMessenger.h
index 10583501e89a1..4b52b2dc11f15 100644
--- a/src/msg/SimpleMessenger.h
+++ b/src/msg/SimpleMessenger.h
@@ -577,9 +577,6 @@ public:
   //void set_listen_addr(tcpaddr_t& a);
 
   int bind(entity_addr_t bind_addr, int64_t nonce);
-  int bind(uint64_t nonce) {
-    return bind(cct->_conf->public_addr, nonce);
-  }
   int start_with_nonce(uint64_t nonce);  // if we didn't bind
   int start() {                 // if we did
     assert(did_bind);
diff --git a/src/testmsgr.cc b/src/testmsgr.cc
index 823b176a02fa0..313d4a5596a7e 100644
--- a/src/testmsgr.cc
+++ b/src/testmsgr.cc
@@ -97,7 +97,7 @@ int main(int argc, const char **argv, const char *envp[]) {
   g_ceph_context->_conf->set_val("public_addr", sss.c_str());
   g_ceph_context->_conf->apply_changes(NULL);
   SimpleMessenger *rank = new SimpleMessenger(g_ceph_context);
-  int err = rank->bind(getpid());
+  int err = rank->bind(g_ceph_context->_conf->public_addr, getpid());
   if (err < 0)
     return 1;
 
-- 
2.39.5