Fixup after merge.
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2ea3cf36 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2ea3cf36 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2ea3cf36 Branch: refs/heads/master Commit: 2ea3cf36a41e671ff7ead470adeab3691bffc418 Parents: f1e4bbb Author: Alan M. Carroll <[email protected]> Authored: Tue Feb 21 13:19:51 2012 -0600 Committer: Alan M. Carroll <[email protected]> Committed: Tue Feb 21 13:19:51 2012 -0600 ---------------------------------------------------------------------- iocore/net/SSLNetVConnection.cc | 4 ++-- lib/ts/ink_inet.h | 2 +- proxy/logging/LogAccess.cc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2ea3cf36/iocore/net/SSLNetVConnection.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index 76f6564..e5991c9 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -443,7 +443,7 @@ SSLNetVConnection::free(EThread * t) { int SSLNetVConnection::sslStartHandShake(int event, int &err) { - ts_ip_endpoint ip; + IpEndpoint ip; int namelen = sizeof(ip); if (event == SSL_EVENT_SERVER) { @@ -453,7 +453,7 @@ SSLNetVConnection::sslStartHandShake(int event, int &err) if (sslCertLookup.hasMultipleCerts()) { char buff[INET6_ADDRSTRLEN]; safe_getsockname(get_socket(), &ip.sa, &namelen); - ink_inet_ntop(&ip.sa, buff, sizeof(buff)); + ats_ip_ntop(&ip.sa, buff, sizeof(buff)); ctx = sslCertLookup.findInfoInHash(buff); if (ctx == NULL) { ctx = ssl_NetProcessor.ctx; http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2ea3cf36/lib/ts/ink_inet.h ---------------------------------------------------------------------- diff --git a/lib/ts/ink_inet.h b/lib/ts/ink_inet.h index cc46cc1..3de71e9 100644 --- a/lib/ts/ink_inet.h +++ b/lib/ts/ink_inet.h @@ -45,7 +45,7 @@ static inline bool IN6_IS_ADDR_UNSPECIFIED(in6_addr const* addr) { } #endif -struct InkInetAddr; // forward declare. +struct IpAddr; // forward declare. /** A union to hold the standard IP address structures. By standard we mean @c sockaddr compliant. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2ea3cf36/proxy/logging/LogAccess.cc ---------------------------------------------------------------------- diff --git a/proxy/logging/LogAccess.cc b/proxy/logging/LogAccess.cc index 816d756..2bf3e70 100644 --- a/proxy/logging/LogAccess.cc +++ b/proxy/logging/LogAccess.cc @@ -1178,7 +1178,7 @@ LogAccess::unmarshal_ip_to_str(char **buf, char *dest, int len) IpEndpoint ip; unmarshal_ip(buf, &ip); - return ink_inet_ntop(&ip, dest, len) ? static_cast<int>(::strlen(dest)) : -1; + return ats_ip_ntop(&ip, dest, len) ? static_cast<int>(::strlen(dest)) : -1; } /*-------------------------------------------------------------------------
