msgr: move operator<< for sockaddr_storage to msg_types.cc

tcp.{cc,h} aren't built/linked cleanly.

Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc
index 1fb645f93e42e7bb11db447c1e1618753a2c6b75..35da88b8b0f3e4e677f0142fa72f36981d39abff 100644 (file)
--- a/src/msg/msg_types.cc
+++ b/src/msg/msg_types.cc
@@ -88,3 +88,26 @@ bool entity_addr_t::parse(const char *s, const char **end)
   //cout << *this << std::endl;
   return true;
 }
+
+
+
+ostream& operator<<(ostream& out, const sockaddr_storage &ss)
+{
+  char buf[NI_MAXHOST] = { 0 };
+  char serv[20] = { 0 };
+  size_t hostlen;
+
+  if (ss.ss_family == AF_INET)
+    hostlen = sizeof(struct sockaddr_in);
+  else if (ss.ss_family == AF_INET6)
+    hostlen = sizeof(struct sockaddr_in6);
+  else
+    hostlen = sizeof(struct sockaddr_storage);
+  getnameinfo((struct sockaddr *)&ss, hostlen, buf, sizeof(buf),
+             serv, sizeof(serv),
+             NI_NUMERICHOST | NI_NUMERICSERV);
+  if (ss.ss_family == AF_INET6)
+    return out << '[' << buf << "]:" << serv;
+  return out //<< ss.ss_family << ":"
+            << buf << ':' << serv;
+}

diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h
index b727d268ad9f02fcce38ffd831ba2a39919ec971..679869511ad6a5923ca9c377d46adc6450da80fd 100644 (file)
--- a/src/msg/msg_types.h
+++ b/src/msg/msg_types.h
@@ -20,6 +20,10 @@
 #include "tcp.h"
 #include "include/encoding.h"
 
+
+extern ostream& operator<<(ostream& out, const sockaddr_storage &ss);
+
+
 class entity_name_t {
 public:
   __u8 _type;
@@ -407,4 +411,6 @@ inline ostream& operator<<(ostream& out, const ceph_entity_inst &i)
 
 
 
+
+
 #endif

diff --git a/src/msg/tcp.cc b/src/msg/tcp.cc
index 7bb908b871d261e97ec4e14880d3e168de6e5f23..49421cedccec32d3e279f81f5ab70afe9a1077e0 100644 (file)
--- a/src/msg/tcp.cc
+++ b/src/msg/tcp.cc
@@ -131,24 +131,3 @@ int tcp_write(CephContext *cct, int sd, const char *buf, int len)
   }
   return 0;
 }
-
-ostream& operator<<(ostream& out, const sockaddr_storage &ss)
-{
-  char buf[NI_MAXHOST] = { 0 };
-  char serv[20] = { 0 };
-  size_t hostlen;
-
-  if (ss.ss_family == AF_INET)
-    hostlen = sizeof(struct sockaddr_in);
-  else if (ss.ss_family == AF_INET6)
-    hostlen = sizeof(struct sockaddr_in6);
-  else
-    hostlen = sizeof(struct sockaddr_storage);
-  getnameinfo((struct sockaddr *)&ss, hostlen, buf, sizeof(buf),
-             serv, sizeof(serv),
-             NI_NUMERICHOST | NI_NUMERICSERV);
-  if (ss.ss_family == AF_INET6)
-    return out << '[' << buf << "]:" << serv;
-  return out //<< ss.ss_family << ":"
-            << buf << ':' << serv;
-}

diff --git a/src/msg/tcp.h b/src/msg/tcp.h
index 29f4a626d06cedccb320f63b54c46f4a302d560b..f98c1702a55f4998c029e9fb752ffd46651c391f 100644 (file)
--- a/src/msg/tcp.h
+++ b/src/msg/tcp.h
@@ -14,8 +14,6 @@ using std::ostream;
 
 class CephContext;
 
-extern ostream& operator<<(ostream& out, const sockaddr_storage &ss);
-
 extern int tcp_read(CephContext *cct, int sd, char *buf, int len, int timeout=-1);
 extern int tcp_read_wait(int sd, int timeout);
 extern int tcp_read_nonblocking(CephContext *cct, int sd, char *buf, int len);