From: Sage Weil <sage@newdream.net>
Date: Fri, 6 Jun 2008 19:18:53 +0000 (-0700)
Subject: kclient: tolerate starting peer with 0.0.0.0 addr
X-Git-Tag: v0.3~150
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ba8507a4ebfb8867745d262c9b754ef50c6e834e;p=ceph.git

kclient: tolerate starting peer with 0.0.0.0 addr
---

diff --git a/src/kernel/messenger.c b/src/kernel/messenger.c
index 05eefa5c182..63e0f5fcccf 100644
--- a/src/kernel/messenger.c
+++ b/src/kernel/messenger.c
@@ -974,7 +974,8 @@ static void reset_connection(struct ceph_connection *con)
 static void process_connect(struct ceph_connection *con)
 {
 	dout(20, "process_connect on %p tag %d\n", con, (int)con->in_tag);
-	if (!ceph_entity_addr_is_local(con->peer_addr, con->actual_peer_addr)) {
+	if (!ceph_entity_addr_is_local(con->peer_addr, con->actual_peer_addr) &&
+	    con->actual_peer_addr.ipaddr.sin_addr.s_addr != 0) {
 		derr(1, "process_connect wrong peer, want %u.%u.%u.%u:%u/%d, "
 		     "got %u.%u.%u.%u:%u/%d, wtf\n",
 		     IPQUADPORT(con->peer_addr.ipaddr),