From d918e675a21964441b27d1d0d2b29cdc3d7eace5 Mon Sep 17 00:00:00 2001 From: Greg Farnum Date: Wed, 29 Jun 2011 11:00:08 -0700 Subject: [PATCH] msgr: simply set_ip by using is_blank_ip Signed-off-by: Greg Farnum --- src/msg/SimpleMessenger.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/msg/SimpleMessenger.cc b/src/msg/SimpleMessenger.cc index 40f2a4fa0cfe2..3e8fbf503e246 100644 --- a/src/msg/SimpleMessenger.cc +++ b/src/msg/SimpleMessenger.cc @@ -489,15 +489,10 @@ entity_addr_t SimpleMessenger::get_myaddr() */ void SimpleMessenger::set_ip(entity_addr_t &addr) { - entity_addr_t blank_ip; - blank_ip.set_family(ms_addr.get_family()); - blank_ip.set_port(ms_addr.get_port()); - blank_ip.set_nonce(ms_addr.get_nonce()); - blank_ip.type = ms_addr.type; - - if (ms_addr.probably_equals(blank_ip)) { + if (ms_addr.is_blank_ip()) { + int port = ms_addr.get_port(); ms_addr.addr = addr.addr; - ms_addr.set_port(blank_ip.get_port()); + ms_addr.set_port(port); } } -- 2.39.5