You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by am...@apache.org on 2011/12/05 19:12:43 UTC

svn commit: r1210553 - in /trafficserver/traffic/trunk: CHANGES iocore/utils/Machine.cc

Author: amc
Date: Mon Dec  5 18:12:43 2011
New Revision: 1210553

URL: http://svn.apache.org/viewvc?rev=1210553&view=rev
Log:
TS-1037: stop ignoring general addresses for local machine address.

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/iocore/utils/Machine.cc

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1210553&r1=1210552&r2=1210553&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Mon Dec  5 18:12:43 2011
@@ -1,5 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.2
+
+  *) [TS-1037] Fix for computing local machine address (was ignoring
+   general addresses).
+
   *) [TS-1030] Improve hashing mechanism on WKS.
 
   *) [TS-1028] Avoid triggering assert when running debug build and enabling

Modified: trafficserver/traffic/trunk/iocore/utils/Machine.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/iocore/utils/Machine.cc?rev=1210553&r1=1210552&r2=1210553&view=diff
==============================================================================
--- trafficserver/traffic/trunk/iocore/utils/Machine.cc (original)
+++ trafficserver/traffic/trunk/iocore/utils/Machine.cc Mon Dec  5 18:12:43 2011
@@ -122,6 +122,7 @@ Machine::Machine(char const* the_hostnam
         else if (ink_inet_is_loopback(ifip)) spot_type = LO;
         else if (ink_inet_is_nonroutable(ifip)) spot_type = NR;
         else if (ink_inet_is_multicast(ifip)) spot_type = MC;
+        else spot_type = GA;
 
         if (spot_type == NA) continue; // Next!