trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a..@apache.org
Subject svn commit: r1187988 - in /trafficserver/traffic/trunk: mgmt/utils/MgmtUtils.cc proxy/ICPConfig.cc
Date Sun, 23 Oct 2011 22:11:05 GMT
Author: amc
Date: Sun Oct 23 22:11:05 2011
New Revision: 1187988

URL: http://svn.apache.org/viewvc?rev=1187988&view=rev
Log:
TS-988 fixup - seems to work better now.

Modified:
    trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
    trafficserver/traffic/trunk/proxy/ICPConfig.cc

Modified: trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc?rev=1187988&r1=1187987&r2=1187988&view=diff
==============================================================================
--- trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/mgmt/utils/MgmtUtils.cc Sun Oct 23 22:11:05 2011
@@ -594,7 +594,6 @@ mgmt_getAddrForIntr(char *intrName, sock
 #if !defined(_WIN32)
 
   int fakeSocket;               // a temporary socket to pass to ioctl
-  struct sockaddr_in *tmp;      // a tmp ptr for addresses
   struct ifconf ifc;            // ifconf information
   char *ifbuf;                  // ifconf buffer
   struct ifreq *ifr, *ifend;    // pointer to individual inferface info
@@ -644,8 +643,7 @@ mgmt_getAddrForIntr(char *intrName, sock
       } else {
         // Only look at the address if it an internet address
         if (ifr->ifr_ifru.ifru_addr.sa_family == AF_INET) {
-          tmp = (struct sockaddr_in *) &ifr->ifr_ifru.ifru_addr;
-          ink_inet_ip4_cast(addr)->sin_addr = tmp->sin_addr;
+          ink_inet_copy(addr, &ifr->ifr_ifru.ifru_addr);
           found = true;
 
           if (mtu)

Modified: trafficserver/traffic/trunk/proxy/ICPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ICPConfig.cc?rev=1187988&r1=1187987&r2=1187988&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ICPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/ICPConfig.cc Sun Oct 23 22:11:05 2011
@@ -573,14 +573,6 @@ ICPConfiguration::icp_config_change_call
   //***********************************************************************
   const int colons_per_entry = 8;       // expected ':' separators per entry
 
-  // TODO: These are never used.
-#if 0
-  struct in_addr mc_min_ip_addr;
-  struct in_addr mc_max_ip_addr;
-  mc_min_ip_addr.s_addr = inet_addr("224.0.0.0");
-  mc_max_ip_addr.s_addr = inet_addr("239.255.255.255");
-#endif
-
   int error = 0;
   int ln = 0;
   int n_colons;



Mime
View raw message