]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
set the nonce unconditionally on bind
authorGreg Farnum <greg@inktank.com>
Mon, 19 Nov 2012 22:15:30 +0000 (14:15 -0800)
committerGreg Farnum <greg@inktank.com>
Wed, 21 Nov 2012 18:55:35 +0000 (10:55 -0800)
src/msg/Accepter.cc

index b95d26afb0853c35389e33cc9d5f6dce851fd523..3cd7991249687c2e65458976d4437d3bdd326393 100644 (file)
@@ -138,9 +138,9 @@ int Accepter::bind(const entity_addr_t &bind_addr, int avoid_port1, int avoid_po
     assert(msgr->get_need_addr());  // should still be true.
 
   if (msgr->get_myaddr().get_port() == 0) {
-    listen_addr.nonce = nonce;
     msgr->set_myaddr(listen_addr);
   }
+  msgr->get_myaddr().nonce = nonce;
 
   msgr->init_local_connection();