You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2012/03/02 01:33:34 UTC
git commit: TS-1126 Fix problems on OSX. Author: amc + leif
Updated Branches:
refs/heads/master eee291309 -> 457f85b71
TS-1126 Fix problems on OSX. Author: amc + leif
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/457f85b7
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/457f85b7
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/457f85b7
Branch: refs/heads/master
Commit: 457f85b71de4776da461eae9ce8226a5b157321d
Parents: eee2913
Author: Leif Hedstrom <le...@ogre.com>
Authored: Thu Mar 1 17:33:24 2012 -0700
Committer: Leif Hedstrom <le...@ogre.com>
Committed: Thu Mar 1 17:33:24 2012 -0700
----------------------------------------------------------------------
lib/ts/ink_inet.h | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/457f85b7/lib/ts/ink_inet.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_inet.h b/lib/ts/ink_inet.h
index 3de71e9..9c5ab5f 100644
--- a/lib/ts/ink_inet.h
+++ b/lib/ts/ink_inet.h
@@ -1151,16 +1151,24 @@ inline bool IpEndpoint::isIp6() const { return AF_INET6 == sa.sa_family; }
inline IpEndpoint&
IpEndpoint::setToAnyAddr(int family) {
sa.sa_family = family;
- if (AF_INET == family) ats_ip4_addr_cast(this) = INADDR_ANY;
- else if (AF_INET6 == family) ats_ip6_addr_cast(this) = in6addr_any;
+ if (AF_INET == family) {
+ sin.sin_addr.s_addr = INADDR_ANY;
+ ink_zero(sin.sin_zero);
+ } else if (AF_INET6 == family) {
+ sin6.sin6_addr = in6addr_any;
+ }
return *this;
}
inline IpEndpoint&
IpEndpoint::setToLoopback(int family) {
sa.sa_family = family;
- if (AF_INET == family) ats_ip4_addr_cast(this) = htonl(INADDR_LOOPBACK);
- else if (AF_INET6 == family) ats_ip6_addr_cast(this) = in6addr_loopback;
+ if (AF_INET == family) {
+ sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ ink_zero(sin.sin_zero);
+ } else if (AF_INET6 == family) {
+ sin6.sin6_addr = in6addr_loopback;
+ }
return *this;
}