msgr: uninline operator<< on sockaddr_storage

Signed-off-by: Sage Weil <sage.weil@dreamhost.com>

diff --git a/src/msg/tcp.cc b/src/msg/tcp.cc
index 49421cedccec32d3e279f81f5ab70afe9a1077e0..7bb908b871d261e97ec4e14880d3e168de6e5f23 100644 (file)
--- a/src/msg/tcp.cc
+++ b/src/msg/tcp.cc
@@ -131,3 +131,24 @@ 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 970f70e63315102f3c81dd1b5ae5ee4280277120..29f4a626d06cedccb320f63b54c46f4a302d560b 100644 (file)
--- a/src/msg/tcp.h
+++ b/src/msg/tcp.h
@@ -14,26 +14,7 @@ using std::ostream;
 
 class CephContext;
 
-inline 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;
-}
+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);