WIP: implement Ip::Address::asText()

src/Makefile.am

@@ -2388,12 +2388,12 @@ check_PROGRAMS += tests/testIpAddress
 tests_testIpAddress_SOURCES = \
 	tests/testIpAddress.cc
 nodist_tests_testIpAddress_SOURCES = \
-	tests/stub_SBuf.cc \
 	tests/stub_debug.cc \
 	tests/stub_libmem.cc \
 	tests/stub_tools.cc
 tests_testIpAddress_LDADD = \
 	ip/libip.la \
+	sbuf/libsbuf.la \
 	base/libbase.la \
 	$(LIBCPPUNIT_LIBS) \
 	$(COMPAT_LIB) \

src/ip/Address.cc

@@ -848,6 +848,16 @@ Ip::Address::toStr(char* buf, const unsigned int blen, int force) const
     return buf;
 }
 
+SBuf
+Ip::Address::toStrAsSBuf(int force) const
+{
+    SBuf rv;
+    auto p = rv.rawAppendStart(MAX_IPSTRLEN);
+    toStr(p, MAX_IPSTRLEN, force);
+    rv.rawAppendFinish(p,strlen(p));
+    return rv;
+}
+
 unsigned int
 Ip::Address::toHostStr(char *buf, const unsigned int blen) const
 {

src/ip/Address.h

@@ -12,6 +12,7 @@
 #define SQUID_SRC_IP_ADDRESS_H
 
 #include "ip/forward.h"
+#include "sbuf/SBuf.h"
 
 #include <iosfwd>
 #include <ostream>
@@ -211,6 +212,7 @@ class Address
      \return pointer to buffer received.
      */
     char* toStr(char *buf, const unsigned int blen, int force = AF_UNSPEC) const;
+    SBuf toStrAsSBuf(int force = AF_UNSPEC) const;
 
     /** Return the ASCII equivalent of the address:port combination
      *  Provides a URL formatted version of the content.
@@ -220,7 +222,7 @@ class Address
      \param len byte length of buffer available for writing.
      \return pointer to buffer received.
      */
-    char* toUrl(char *buf, unsigned int len) const;
+    char *toUrl(char *buf, unsigned int len) const;
 
     /** Return a properly hostname formatted copy of the address
      *  Provides a URL formatted version of the content.

src/peer_sourcehash.cc

@@ -137,28 +137,25 @@ peerSourceHashRegisterWithCacheManager(void)
 CachePeer *
 peerSourceHashSelectParent(PeerSelector *ps)
 {
-    const char *c;
     CachePeer *p = nullptr;
     unsigned int user_hash = 0;
     unsigned int combined_hash;
     double score;
     double high_score = 0;
-    const char *key = nullptr;
-    char ntoabuf[MAX_IPSTRLEN];
 
     if (SourceHashPeers().empty())
         return nullptr;
 
     assert(ps);
     HttpRequest *request = ps->request;
 
-    key = request->client_addr.toStr(ntoabuf, sizeof(ntoabuf));
+    const auto key = request->client_addr.toStrAsSBuf();
 
     /* calculate hash key */
     debugs(39, 2, "peerSourceHashSelectParent: Calculating hash for " << key);
 
-    for (c = key; *c != 0; ++c)
-        user_hash += ROTATE_LEFT(user_hash, 19) + *c;
+    for (auto c : key)
+        user_hash += ROTATE_LEFT(user_hash, 19) + c;
 
     /* select CachePeer */
     for (const auto &tp: SourceHashPeers()) {

src/proxyp/Header.cc

@@ -52,15 +52,13 @@ ProxyProtocol::Header::getValues(const uint32_t headerType, const char sep) cons
             return SBuf();
         auto logAddr = sourceAddress;
         logAddr.applyClientMask(Config.Addrs.client_netmask);
-        char ipBuf[MAX_IPSTRLEN];
-        return SBuf(logAddr.toStr(ipBuf, sizeof(ipBuf)));
+        return logAddr.toStrAsSBuf();
     }
 
     case Two::htPseudoDstAddr: {
         if (!hasAddresses())
             return SBuf();
-        char ipBuf[MAX_IPSTRLEN];
-        return SBuf(destinationAddress.toStr(ipBuf, sizeof(ipBuf)));
+        return destinationAddress.toStrAsSBuf();
     }
 
     case Two::htPseudoSrcPort: {

src/tests/testIpAddress.cc

@@ -10,6 +10,7 @@
 #include "compat/cppunit.h"
 #include "ip/Address.h"
 #include "ip/tools.h"
+#include "sbuf/SBuf.h"
 #include "unitTestMain.h"
 
 #include <cstring>
@@ -471,18 +472,20 @@ TestIpAddress::testtoStr()
     anIPA.setAnyAddr();
 
     /* test AnyAddr display values */
-    CPPUNIT_ASSERT( memcmp("::", anIPA.toStr(buf,MAX_IPSTRLEN), 2) == 0 );
+    CPPUNIT_ASSERT_EQUAL(SBuf("::"), anIPA.toStrAsSBuf());
 
     inval.s_addr = htonl(0xC0A8640C);
     anIPA = inval;
 
     /* test IP display */
     CPPUNIT_ASSERT( memcmp("192.168.100.12",anIPA.toStr(buf,MAX_IPSTRLEN), 14) == 0 );
+    CPPUNIT_ASSERT_EQUAL(SBuf("192.168.100.12"), anIPA.toStrAsSBuf());
 
     anIPA.setNoAddr();
 
     /* test NoAddr display values */
     CPPUNIT_ASSERT( memcmp("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff",anIPA.toStr(buf,MAX_IPSTRLEN), 39) == 0 );
+    CPPUNIT_ASSERT_EQUAL(SBuf("ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff"), anIPA.toStrAsSBuf());
 }
 
 void
@@ -619,6 +622,7 @@ TestIpAddress::testMasking()
     /* BUG Check: test values by display. */
     CPPUNIT_ASSERT( anIPA.toStr(buf,MAX_IPSTRLEN) != nullptr );
     CPPUNIT_ASSERT( memcmp("ffff:ffff:ffff:ffff:ffff::", buf, 26) == 0 );
+    CPPUNIT_ASSERT_EQUAL(SBuf("ffff:ffff:ffff:ffff:ffff::"), anIPA.toStrAsSBuf() );
 
     /* Test Network Bitmask from Ip::Address */
     anIPA.setNoAddr();
@@ -636,6 +640,7 @@ TestIpAddress::testMasking()
 
     /* BUG Check failing test. Masked values for display. */
     CPPUNIT_ASSERT( memcmp("255.255.240.0",anIPA.toStr(buf,MAX_IPSTRLEN), 13) == 0 );
+    CPPUNIT_ASSERT_EQUAL(SBuf("255.255.240.0"), anIPA.toStrAsSBuf());
 
     anIPA.setNoAddr();
     maskIPA.setNoAddr();