You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/19 13:44:16 UTC
svn commit: r946134 -
/trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc
Author: mturk
Date: Wed May 19 11:44:16 2010
New Revision: 946134
URL: http://svn.apache.org/viewvc?rev=946134&view=rev
Log:
Code comment and cleanup. No functional change
Modified:
trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc?rev=946134&r1=946133&r2=946134&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/SysAPI.cc Wed May 19 11:44:16 2010
@@ -1789,7 +1789,7 @@ Net_SNMPGetInfo(char *sys_location, size
#include "ink_string.h"
-#include "../api2/include/INKMgmtAPI.h"
+#include "INKMgmtAPI.h"
#include <arpa/inet.h>
#include <netinet/in.h>
@@ -1797,13 +1797,6 @@ Net_SNMPGetInfo(char *sys_location, size
#include "ParseRules.h"
-// TODO: consolidate location of these defaults
-#define DEFAULT_ROOT_DIRECTORY PREFIX
-#define DEFAULT_LOCAL_STATE_DIRECTORY "var/trafficserver"
-#define DEFAULT_SYSTEM_CONFIG_DIRECTORY "etc/trafficserver"
-#define DEFAULT_LOG_DIRECTORY "var/log/trafficserver"
-#define DEFAULT_TS_DIRECTORY_FILE PREFIX "/etc/traffic_server"
-
#define NETCONFIG_HOSTNAME 0
#define NETCONFIG_GATEWAY 1
#define NETCONFIG_DOMAIN 2
@@ -2551,6 +2544,9 @@ int
Net_SetNIC_IP(char *interface, char *nic_ip)
{
//int status;
+ // XXX: Why this test?
+ // We are inside #define HOST_OS == solaris
+ //
#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
char nic_boot[80], nic_protocol[80], nic_netmask[80], nic_gateway[80], old_ip[80];
Net_GetNIC_IP(interface, old_ip, sizeof(old_ip));
@@ -2568,6 +2564,9 @@ Net_SetNIC_IP(char *interface, char *nic
int
Net_SetNIC_Netmask(char *interface, char *nic_netmask)
{
+ // XXX: Why this test?
+ // We are inside #define HOST_OS == solaris
+ //
#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
char nic_boot[80], nic_protocol[80], nic_ip[80], nic_gateway[80];
Net_GetNIC_Start(interface, nic_boot);
@@ -2584,6 +2583,9 @@ Net_SetNIC_Netmask(char *interface, char
int
Net_SetNIC_Gateway(char *interface, char *nic_gateway)
{
+ // XXX: Why this test?
+ // We are inside #define HOST_OS == solaris
+ //
#if (HOST_OS != freebsd) && (HOST_OS != darwin) && (HOST_OS != solaris)
char nic_boot[80], nic_protocol[80], nic_ip[80], nic_netmask[80];
Net_GetNIC_Start(interface, nic_boot);