msgr: include port when printing sockaddrs!

diff --git a/src/msg/tcp.h b/src/msg/tcp.h
index 37ce8f598f9161965315bb7c32e37e3f67d6f9db..6a0c60cee676f276d96a91c9f1cfc4badc220e0d 100644 (file)
--- 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;
 }