Convert many IPAddress to IpAddress

diff --git a/src/ACLIP.cc b/src/ACLIP.cc
index d7fc8795b848dbfe5c3fe0d993d3ed1755e2f76f..6ce3f27c087e945e31d6f532af06bd2efe36906e 100644 (file)
--- a/src/ACLIP.cc
+++ b/src/ACLIP.cc
@@ -462,4 +462,4 @@ ACLIP::match(IpAddress &clientip)
 
 acl_ip_data::acl_ip_data () :addr1(), addr2(), mask(), next (NULL) {}
 
-acl_ip_data::acl_ip_data (IpAddress const &anAddress1, IPAddress const &anAddress2, IPAddress const &aMask, acl_ip_data *aNext) : addr1(anAddress1), addr2(anAddress2), mask(aMask), next(aNext) {}
+acl_ip_data::acl_ip_data (IpAddress const &anAddress1, IpAddress const &anAddress2, IPAddress const &aMask, acl_ip_data *aNext) : addr1(anAddress1), addr2(anAddress2), mask(aMask), next(aNext) {}

diff --git a/src/ACLIP.h b/src/ACLIP.h
index 4d1b7a5614d4f274380bf0cac64fd8994dab330f..8e53f4c0ba82996b787dbe22b052a218c1e1fc51 100644 (file)
--- a/src/ACLIP.h
+++ b/src/ACLIP.h
@@ -50,7 +50,7 @@ public:
 
     acl_ip_data ();
 
-    acl_ip_data (IpAddress const &, IPAddress const &, IPAddress const &, acl_ip_data *);
+    acl_ip_data (IpAddress const &, IpAddress const &, IPAddress const &, acl_ip_data *);
     void toStr(char *buf, int len) const;
 
     IpAddress addr1;

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 566902e5ee15852ea0008e0e30e247fcc3eaf2fc..c48cceaf2cd4a7315ec86a594763eebe2332f1b4 100644 (file)
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -142,11 +142,11 @@ static void dump_denyinfo(StoreEntry * entry, const char *name, acl_deny_info_li
 static void free_denyinfo(acl_deny_info_list ** var);
 
 #if USE_WCCPv2
-static void parse_IpAddress_list(IPAddress_list **);
-static void dump_IpAddress_list(StoreEntry *, const char *, const IPAddress_list *);
-static void free_IpAddress_list(IPAddress_list **);
+static void parse_IpAddress_list(IpAddress_list **);
+static void dump_IpAddress_list(StoreEntry *, const char *, const IpAddress_list *);
+static void free_IpAddress_list(IpAddress_list **);
 #if CURRENTLY_UNUSED
-static int check_null_IpAddress_list(const IPAddress_list *);
+static int check_null_IpAddress_list(const IpAddress_list *);
 #endif /* CURRENTLY_UNUSED */
 #endif /* USE_WCCPv2 */
 
@@ -2750,7 +2750,7 @@ parseNeighborType(const char *s)
 
 #if USE_WCCPv2
 void
-parse_IpAddress_list_token(IPAddress_list ** head, char *token)
+parse_IpAddress_list_token(IpAddress_list ** head, char *token)
 {
     char *t;
     char *host;
@@ -2811,7 +2811,7 @@ parse_IpAddress_list_token(IPAddress_list ** head, char *token)
 }
 
 static void
-parse_IpAddress_list(IPAddress_list ** head)
+parse_IpAddress_list(IpAddress_list ** head)
 {
     char *token;
 
@@ -2821,7 +2821,7 @@ parse_IpAddress_list(IPAddress_list ** head)
 }
 
 static void
-dump_IpAddress_list(StoreEntry * e, const char *n, const IPAddress_list * s)
+dump_IpAddress_list(StoreEntry * e, const char *n, const IpAddress_list * s)
 {
     char ntoabuf[MAX_IPSTRLEN];
 
@@ -2834,7 +2834,7 @@ dump_IpAddress_list(StoreEntry * e, const char *n, const IPAddress_list * s)
 }
 
 static void
-free_IpAddress_list(IPAddress_list ** head)
+free_IpAddress_list(IpAddress_list ** head)
 {
     if (*head) delete *head;
     *head = NULL;

diff --git a/src/client_side.cc b/src/client_side.cc
index 42ca7e027b73f2e1ce84fe9a256deac1e377cc20..553435b9bbe33a7a323f704ac4aad6bc065747e7 100644 (file)
--- a/src/client_side.cc
+++ b/src/client_side.cc
@@ -166,7 +166,7 @@ static void connNoteUseOfBuffer(ConnStateData* conn, size_t byteCount);
 static int connKeepReadingIncompleteRequest(ConnStateData * conn);
 static void connCancelIncompleteRequests(ConnStateData * conn);
 
-static ConnStateData *connStateCreate(const IpAddress &peer, const IPAddress &me, int fd, http_port_list *port);
+static ConnStateData *connStateCreate(const IpAddress &peer, const IpAddress &me, int fd, http_port_list *port);
 
 
 int
@@ -2765,7 +2765,7 @@ okToAccept()
 }
 
 ConnStateData *
-connStateCreate(const IpAddress &peer, const IPAddress &me, int fd, http_port_list *port)
+connStateCreate(const IpAddress &peer, const IpAddress &me, int fd, http_port_list *port)
 {
     ConnStateData *result = new ConnStateData;
 

diff --git a/src/icmp/net_db.cc b/src/icmp/net_db.cc
index 989f69741331acba4181e55512ab0ac8afbeb84b..ada63ca311562e21b41c4896fe966939f04d2d0a 100644 (file)
--- a/src/icmp/net_db.cc
+++ b/src/icmp/net_db.cc
@@ -83,7 +83,7 @@ typedef struct {
 static hash_table *addr_table = NULL;
 static hash_table *host_table = NULL;
 
-IpAddress networkFromInaddr(const IPAddress &a);
+IpAddress networkFromInaddr(const IpAddress &a);
 static void netdbRelease(netdbEntry * n);
 
 static void netdbHashInsert(netdbEntry * n, IpAddress &addr);

diff --git a/src/ident.cc b/src/ident.cc
index 06dc2292bf1fbf1835f8743e69bef501a3ab97ba..45624cc5539b433a2ccd06712cb3879a69e67295 100644 (file)
--- a/src/ident.cc
+++ b/src/ident.cc
@@ -202,7 +202,7 @@ CBDATA_TYPE(IdentStateData);
  * start a TCP connection to the peer host on port 113
  */
 void
-identStart(IpAddress &me, IPAddress &my_peer, IDCB * callback, void *data)
+identStart(IpAddress &me, IpAddress &my_peer, IDCB * callback, void *data)
 {
     IdentStateData *state;
     int fd;

diff --git a/src/ident.h b/src/ident.h
index a0736dc64c39cc86d61a317e3d3dacdb7cd83a6d..0c9f9bdcd1ab47789a479eb42d5218e9448a97cc 100644 (file)
--- a/src/ident.h
+++ b/src/ident.h
@@ -19,7 +19,7 @@
 class IpAddress;
 
 /// \ingroup IdentAPI
-SQUIDCEXTERN void identStart(IpAddress &me, IPAddress &my_peer, IDCB * callback, void *cbdata);
+SQUIDCEXTERN void identStart(IpAddress &me, IpAddress &my_peer, IDCB * callback, void *cbdata);
 
 /// \ingroup IdentAPI
 SQUIDCEXTERN void identInit(void);

diff --git a/src/ip/IpAddress.cc b/src/ip/IpAddress.cc
index ae8a018ea000fe6cec6912298759486e764d8195..b5539ad10ca4ffff4a3e972ef4ce5f8fc6e87413 100644 (file)
--- a/src/ip/IpAddress.cc
+++ b/src/ip/IpAddress.cc
@@ -1,6 +1,4 @@
 /*
- * $Id: IpAddress.cc,v 1.4 2008/02/15 09:45:57 amosjeffries Exp $
- *
  * DEBUG: section 14   IP Storage and Handling
  * AUTHOR: Amos Jeffries
  *
@@ -106,12 +104,12 @@ static const unsigned int MAX_IP6_STRLEN = STRLEN_IP6R;
        }
 #endif
 
-IpAddress::IPAddress()
+IpAddress::IpAddress()
 {
     SetEmpty();
 }
 
-IpAddress::~IPAddress()
+IpAddress::~IpAddress()
 {
     memset(this,0,sizeof(IpAddress));
 }
@@ -166,7 +164,7 @@ IpAddress::GetCIDR() const
     return len;
 }
 
-const int IpAddress::ApplyMask(IPAddress const &mask_addr)
+const int IpAddress::ApplyMask(IpAddress const &mask_addr)
 {
     uint32_t *p1 = (uint32_t*)(&m_SocketAddr.sin6_addr);
     uint32_t const *p2 = (uint32_t const *)(&mask_addr.m_SocketAddr.sin6_addr);
@@ -468,13 +466,13 @@ bool IpAddress::GetReverseString(char buf[MAX_IPSTRLEN], int show_type) const
     return false;
 }
 
-IpAddress& IPAddress::operator =(const IPAddress &s)
+IpAddress& IpAddress::operator =(const IPAddress &s)
 {
     memcpy(this, &s, sizeof(IpAddress));
     return *this;
 };
 
-IpAddress::IPAddress(const char*s)
+IpAddress::IpAddress(const char*s)
 {
     SetEmpty();
     operator=(s);
@@ -534,13 +532,13 @@ bool IpAddress::LookupHostIP(const char *s, bool nodns)
     return true;
 }
 
-IpAddress::IPAddress(struct sockaddr_in const &s)
+IpAddress::IpAddress(struct sockaddr_in const &s)
 {
     SetEmpty();
     operator=(s);
 };
 
-IpAddress& IPAddress::operator =(struct sockaddr_in const &s)
+IpAddress& IpAddress::operator =(struct sockaddr_in const &s)
 {
 #if USE_IPV6
     Map4to6((const in_addr)s.sin_addr, m_SocketAddr.sin6_addr);
@@ -557,7 +555,7 @@ IpAddress& IPAddress::operator =(struct sockaddr_in const &s)
     return *this;
 };
 
-IpAddress& IPAddress::operator =(const struct sockaddr_storage &s)
+IpAddress& IpAddress::operator =(const struct sockaddr_storage &s)
 {
 #if USE_IPV6
     /* some AF_* magic to tell socket types apart and what we need to do */
@@ -581,13 +579,13 @@ void IpAddress::check4Mapped()
 }
 
 #if USE_IPV6
-IpAddress::IPAddress(struct sockaddr_in6 const &s)
+IpAddress::IpAddress(struct sockaddr_in6 const &s)
 {
     SetEmpty();
     operator=(s);
 };
 
-IpAddress& IPAddress::operator =(struct sockaddr_in6 const &s)
+IpAddress& IpAddress::operator =(struct sockaddr_in6 const &s)
 {
     memcpy(&m_SocketAddr, &s, sizeof(struct sockaddr_in6));
 
@@ -598,13 +596,13 @@ IpAddress& IPAddress::operator =(struct sockaddr_in6 const &s)
 
 #endif
 
-IpAddress::IPAddress(struct in_addr const &s)
+IpAddress::IpAddress(struct in_addr const &s)
 {
     SetEmpty();
     operator=(s);
 };
 
-IpAddress& IPAddress::operator =(struct in_addr const &s)
+IpAddress& IpAddress::operator =(struct in_addr const &s)
 {
 #if USE_IPV6
     Map4to6((const in_addr)s, m_SocketAddr.sin6_addr);
@@ -624,13 +622,13 @@ IpAddress& IPAddress::operator =(struct in_addr const &s)
 
 #if USE_IPV6
 
-IpAddress::IPAddress(struct in6_addr const &s)
+IpAddress::IpAddress(struct in6_addr const &s)
 {
     SetEmpty();
     operator=(s);
 };
 
-IpAddress& IPAddress::operator =(struct in6_addr const &s)
+IpAddress& IpAddress::operator =(struct in6_addr const &s)
 {
 
     memcpy(&m_SocketAddr.sin6_addr, &s, sizeof(struct in6_addr));
@@ -644,19 +642,19 @@ IpAddress& IPAddress::operator =(struct in6_addr const &s)
 
 #endif
 
-IpAddress::IPAddress(const IPAddress &s)
+IpAddress::IpAddress(const IPAddress &s)
 {
     SetEmpty();
     operator=(s);
 }
 
-IpAddress::IPAddress(IPAddress *s)
+IpAddress::IpAddress(IPAddress *s)
 {
     SetEmpty();
     operator=(s);
 }
 
-IpAddress& IPAddress::operator =(IPAddress *s)
+IpAddress& IpAddress::operator =(IPAddress *s)
 {
     IpAddress *tmp = NULL;
     if (!s) return *this;
@@ -665,7 +663,7 @@ IpAddress& IPAddress::operator =(IPAddress *s)
     return operator=(*tmp);
 }
 
-IpAddress::IPAddress(const struct hostent &s)
+IpAddress::IpAddress(const struct hostent &s)
 {
     SetEmpty();
     operator=(s);
@@ -717,7 +715,7 @@ bool IpAddress::operator =(const struct hostent &s)
     return true;
 }
 
-IpAddress::IPAddress(const struct addrinfo &s)
+IpAddress::IpAddress(const struct addrinfo &s)
 {
     SetEmpty();
     operator=(s);
@@ -891,7 +889,7 @@ void IpAddress::FreeAddrInfo(struct addrinfo *&ai) const
     ai = NULL;
 }
 
-int IpAddress::matchIPAddr(const IPAddress &rhs) const
+int IpAddress::matchIPAddr(const IpAddress &rhs) const
 {
 #if USE_IPV6
     uint8_t *l = (uint8_t*)m_SocketAddr.sin6_addr.s6_addr;
@@ -916,17 +914,17 @@ int IpAddress::matchIPAddr(const IPAddress &rhs) const
     return 0;
 }
 
-bool IpAddress::operator ==(const IPAddress &s) const
+bool IpAddress::operator ==(const IpAddress &s) const
 {
     return (0 == matchIPAddr(s));
 }
 
-bool IpAddress::operator !=(const IPAddress &s) const
+bool IpAddress::operator !=(const IpAddress &s) const
 {
     return ! ( operator==(s) );
 }
 
-bool IpAddress::operator <=(const IPAddress &rhs) const
+bool IpAddress::operator <=(const IpAddress &rhs) const
 {
     if (IsAnyAddr() && !rhs.IsAnyAddr())
         return true;
@@ -934,7 +932,7 @@ bool IpAddress::operator <=(const IPAddress &rhs) const
     return (matchIPAddr(rhs) <= 0);
 }
 
-bool IpAddress::operator >=(const IPAddress &rhs) const
+bool IpAddress::operator >=(const IpAddress &rhs) const
 {
     if (IsNoAddr() && !rhs.IsNoAddr())
         return true;
@@ -942,7 +940,7 @@ bool IpAddress::operator >=(const IPAddress &rhs) const
     return ( matchIPAddr(rhs) >= 0);
 }
 
-bool IpAddress::operator >(const IPAddress &rhs) const
+bool IpAddress::operator >(const IpAddress &rhs) const
 {
     if (IsNoAddr() && !rhs.IsNoAddr())
         return true;
@@ -950,7 +948,7 @@ bool IpAddress::operator >(const IPAddress &rhs) const
     return ( matchIPAddr(rhs) > 0);
 }
 
-bool IpAddress::operator <(const IPAddress &rhs) const
+bool IpAddress::operator <(const IpAddress &rhs) const
 {
     if (IsNoAddr() && !rhs.IsNoAddr())
         return true;

diff --git a/src/ip/IpAddress.h b/src/ip/IpAddress.h
index e3d1503d66b56e7d85347c891620799a253708c0..4c40ac2b2e1830f09e2a1894a74b876c83ce1c4f 100644 (file)
--- a/src/ip/IpAddress.h
+++ b/src/ip/IpAddress.h
@@ -1,6 +1,4 @@
 /*
- * $Id: IpAddress.h,v 1.3 2008/02/05 22:39:42 amosjeffries Exp $
- *
  * DEBUG: section 14    IP Storage and Handling
  * AUTHOR: Amos Jeffries
  *
@@ -104,7 +102,7 @@ public:
     /** @name Constructors and Destructor */
     /*@{*/
     IpAddress();
-    IpAddress(const IPAddress &);
+    IpAddress(const IpAddress &);
 
     /**
      * This constructor takes its own copy of the object pointed to for memory-safe usage later.
@@ -113,7 +111,7 @@ public:
      \deprecated Use of pointers can be nasty. Consider this a last-resort.
      *           Prefer the by-reference (&) version instead.
      */
-    IpAddress(IPAddress *);
+    IpAddress(IpAddress *);
 
     IpAddress(const struct in_addr &);
 
@@ -134,8 +132,8 @@ public:
 
     /** @name Assignment Operators */
     /*@{*/
-    IpAddress& operator =(const IPAddress &s);
-    IpAddress& operator =(IPAddress *s);
+    IpAddress& operator =(const IpAddress &s);
+    IpAddress& operator =(IpAddress *s);
     IpAddress& operator =(struct sockaddr_in const &s);
     IpAddress& operator =(struct sockaddr_storage const &s);
     IpAddress& operator =(struct in_addr const &s);
@@ -321,7 +319,7 @@ public:
      *  Some situations may also require an actual call to the system getaddrinfo()
      *  to pull relevant OS details for the socket.
      \par
-     *  IpAddress allocated objects MUST be destructed by IPAddress::FreeAddrInfo
+     *  IpAddress allocated objects MUST be destructed by IpAddress::FreeAddrInfo
      *  System getaddrinfo() allocated objects MUST be freed with system freeaddrinfo()
      \par
      *  Some OS require that IPv4 addresses are pre-mapped by the client.

diff --git a/src/ip/IpIntercept.cc b/src/ip/IpIntercept.cc
index 4091c6f93021bab9a3b7368631b54d535309f45b..c37f74491aba5baab17a175fe955df3e9679b032 100644 (file)
--- a/src/ip/IpIntercept.cc
+++ b/src/ip/IpIntercept.cc
@@ -118,7 +118,7 @@ IpIntercept::StopInterception(const char *str)
 }
 
 int
-IpIntercept::NetfilterInterception(int fd, const IpAddress &me, IPAddress &dst, int silent)
+IpIntercept::NetfilterInterception(int fd, const IpAddress &me, IpAddress &dst, int silent)
 {
 #if LINUX_NETFILTER
     struct addrinfo *lookup = NULL;
@@ -149,7 +149,7 @@ IpIntercept::NetfilterInterception(int fd, const IpAddress &me, IPAddress &dst,
 }
 
 int
-IpIntercept::NetfilterTransparent(int fd, const IpAddress &me, IPAddress &client, int silent)
+IpIntercept::NetfilterTransparent(int fd, const IpAddress &me, IpAddress &client, int silent)
 {
 #if LINUX_NETFILTER
 
@@ -165,7 +165,7 @@ IpIntercept::NetfilterTransparent(int fd, const IpAddress &me, IPAddress &client
 }
 
 int
-IpIntercept::IpfwInterception(int fd, const IpAddress &me, IPAddress &dst, int silent)
+IpIntercept::IpfwInterception(int fd, const IpAddress &me, IpAddress &dst, int silent)
 {
 #if IPFW_TRANSPARENT
     struct addrinfo *lookup = NULL;
@@ -196,7 +196,7 @@ IpIntercept::IpfwInterception(int fd, const IpAddress &me, IPAddress &dst, int s
 }
 
 int
-IpIntercept::NatLookup(int fd, const IpAddress &me, const IPAddress &peer, IPAddress &client, IPAddress &dst)
+IpIntercept::NatLookup(int fd, const IpAddress &me, const IpAddress &peer, IPAddress &client, IPAddress &dst)
 {
 #if IPF_TRANSPARENT  /* --enable-ipf-transparent */
     client = me;

diff --git a/src/ip/IpIntercept.h b/src/ip/IpIntercept.h
index 747dd5490cf0dc13b81214d12240828e3f3e431e..fe38eeb65041daa0a8942195f894ba1c2a6d2d3a 100644 (file)
--- a/src/ip/IpIntercept.h
+++ b/src/ip/IpIntercept.h
@@ -27,7 +27,7 @@ public:
     ~IpIntercept() {};
 
     /** Perform NAT lookups */
-    int NatLookup(int fd, const IpAddress &me, const IPAddress &peer, IPAddress &client, IPAddress &dst);
+    int NatLookup(int fd, const IpAddress &me, const IpAddress &peer, IPAddress &client, IPAddress &dst);
 
 #if LINUX_TPROXY2
     // only relevant to TPROXY v2 connections.
@@ -87,7 +87,7 @@ private:
      \retval 0     Successfuly located the new address.
      \retval -1    An error occured during NAT lookups.
      */
-    int NetfilterInterception(int fd, const IpAddress &me, IPAddress &client, int silent);
+    int NetfilterInterception(int fd, const IpAddress &me, IpAddress &client, int silent);
 
     /**
      * perform Lookups on Netfilter fully-transparent interception targets (TPROXY).
@@ -96,7 +96,7 @@ private:
      \retval 0     Successfuly located the new address.
      \retval -1    An error occured during NAT lookups.
      */
-    int NetfilterTransparent(int fd, const IpAddress &me, IPAddress &dst, int silent);
+    int NetfilterTransparent(int fd, const IpAddress &me, IpAddress &dst, int silent);
 
     /**
      * perform Lookups on IPFW interception.
@@ -105,7 +105,7 @@ private:
      \retval 0     Successfuly located the new address.
      \retval -1    An error occured during NAT lookups.
      */
-    int IpfwInterception(int fd, const IpAddress &me, IPAddress &client, int silent);
+    int IpfwInterception(int fd, const IpAddress &me, IpAddress &client, int silent);
 
 
     int transparent_active;

diff --git a/src/ipcache.cc b/src/ipcache.cc
index c54cc1a5c4bc8a8fe89dd31e5125f234f4a2158c..eb47c967d718aed81b73d9ffcbf715e0166a1990 100644 (file)
--- a/src/ipcache.cc
+++ b/src/ipcache.cc
@@ -420,7 +420,7 @@ ipcacheParse(ipcache_entry *i, const char *inbuf)
     if (ipcount > 0) {
         int j, k;
 
-        i->addrs.in_addrs = (IpAddress *)xcalloc(ipcount, sizeof(IPAddress));
+        i->addrs.in_addrs = (IpAddress *)xcalloc(ipcount, sizeof(IpAddress));
         for (int l = 0; l < ipcount; l++)
             i->addrs.in_addrs[l].SetEmpty(); // perform same init actions as constructor would.
         i->addrs.bad_mask = (unsigned char *)xcalloc(ipcount, sizeof(unsigned char));
@@ -555,7 +555,7 @@ ipcacheParse(ipcache_entry *i, rfc1035_rr * answers, int nr, const char *error_m
         return 0;
     }
 
-    i->addrs.in_addrs = (IpAddress *)xcalloc(na, sizeof(IPAddress));
+    i->addrs.in_addrs = (IpAddress *)xcalloc(na, sizeof(IpAddress));
     for (int l = 0; l < na; l++)
         i->addrs.in_addrs[l].SetEmpty(); // perform same init actions as constructor would.
     i->addrs.bad_mask = (unsigned char *)xcalloc(na, sizeof(unsigned char));
@@ -780,7 +780,7 @@ ipcache_init(void)
     memset(&lru_list, '\0', sizeof(lru_list));
     memset(&static_addrs, '\0', sizeof(ipcache_addrs));
 
-    static_addrs.in_addrs = (IpAddress *)xcalloc(1, sizeof(IPAddress));
+    static_addrs.in_addrs = (IpAddress *)xcalloc(1, sizeof(IpAddress));
     static_addrs.in_addrs->SetEmpty(); // properly setup the IpAddress!
     static_addrs.bad_mask = (unsigned char *)xcalloc(1, sizeof(unsigned char));
     ipcache_high = (long) (((float) Config.ipcache.size *
@@ -1039,7 +1039,7 @@ ipcacheMergeIPLists(const IpAddress *aaddrs, const int alen,
     debugs(14, 5, "ipcacheMergeIPLists: Merge " << alen << "+" << blen << " into " << fc << " unique IPs.");
 
     // copy the old IPs into the new list buffer.
-    (*out) = (IpAddress*)xcalloc(fc, sizeof(IPAddress));
+    (*out) = (IpAddress*)xcalloc(fc, sizeof(IpAddress));
     outlen=0;
 
     assert(out != NULL);
@@ -1459,7 +1459,7 @@ ipcacheAddEntryFromHosts(const char *name, const char *ipaddr)
     i->addrs.cur = 0;
     i->addrs.badcount = 0;
 
-    i->addrs.in_addrs = (IpAddress *)xcalloc(1, sizeof(IPAddress));
+    i->addrs.in_addrs = (IpAddress *)xcalloc(1, sizeof(IpAddress));
     i->addrs.bad_mask = (unsigned char *)xcalloc(1, sizeof(unsigned char));
     i->addrs.in_addrs[0] = ip;
     i->addrs.bad_mask[0] = FALSE;

diff --git a/src/protos.h b/src/protos.h
index e688dbae2a245d29dc8bde26141823b554bb626f..f5dec386080bb686325e5fa7f3f3873854efa904 100644 (file)
--- a/src/protos.h
+++ b/src/protos.h
@@ -76,7 +76,7 @@ SQUIDCEXTERN void parse_wordlist(wordlist ** list);
 SQUIDCEXTERN void requirePathnameExists(const char *name, const char *path);
 SQUIDCEXTERN void parse_time_t(time_t * var);
 
-SQUIDCEXTERN void parse_IpAddress_list_token(IPAddress_list **, char *);
+SQUIDCEXTERN void parse_IpAddress_list_token(IpAddress_list **, char *);
 
 
 /* client_side.c - FD related client side routines */
@@ -301,7 +301,7 @@ SQUIDCEXTERN void snmpDebugOid(int lvl, oid * Name, snint Len);
 SQUIDCEXTERN void addr2oid(IpAddress &addr, oid *Dest);
 SQUIDCEXTERN void oid2addr(oid *Dest, IpAddress &addr, u_int code);
 
-SQUIDCEXTERN IpAddress *client_entry(IPAddress *current);
+SQUIDCEXTERN IpAddress *client_entry(IpAddress *current);
 SQUIDCEXTERN variable_list *snmp_basicFn(variable_list *, snint *);
 SQUIDCEXTERN variable_list *snmp_confFn(variable_list *, snint *);
 SQUIDCEXTERN variable_list *snmp_sysFn(variable_list *, snint *);