From: Sage Weil <sage@newdream.net>
Date: Thu, 8 Oct 2009 18:41:32 +0000 (-0700)
Subject: msgr: include port when printing sockaddrs!
X-Git-Tag: v0.17~111
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=94f99053ca4de1c0ce78891e77498854be6e392b;p=ceph.git

msgr: include port when printing sockaddrs!
---

diff --git a/src/msg/tcp.h b/src/msg/tcp.h
index 37ce8f598f9..6a0c60cee67 100644
--- a/src/msg/tcp.h
+++ b/src/msg/tcp.h
@@ -15,15 +15,21 @@ using std::ostream;
 inline ostream& operator<<(ostream& out, const sockaddr_storage &ss)
 {
   char buf[NI_MAXHOST] = { 0 };
-  getnameinfo((struct sockaddr *)&ss, sizeof(ss), buf, sizeof(buf), 0, 0, NI_NUMERICHOST);
-  return out << buf;
+  char serv[20] = { 0 };
+  getnameinfo((struct sockaddr *)&ss, sizeof(ss), buf, sizeof(buf),
+	      serv, sizeof(serv),
+	      NI_NUMERICHOST | NI_NUMERICSERV);
+  return out << buf << ':' << serv;
 }
 
 inline ostream& operator<<(ostream& out, const sockaddr_in &ss)
 {
   char buf[NI_MAXHOST] = { 0 };
-  getnameinfo((struct sockaddr *)&ss, sizeof(ss), buf, sizeof(buf), 0, 0, NI_NUMERICHOST);
-  return out << buf;
+  char serv[20] = { 0 };
+  getnameinfo((struct sockaddr *)&ss, sizeof(ss), buf, sizeof(buf),
+	      serv, sizeof(serv),
+	      NI_NUMERICHOST | NI_NUMERICSERV);
+  return out << buf << ':' << serv;
 }