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 2010/11/30 02:43:06 UTC
svn commit: r1040383 [21/38] - in /trafficserver/traffic/branches/wccp: ./
build/ contrib/ contrib/perl/AdminClient/lib/Apache/TS/ example/
example/add-header/ example/app-template/ example/append-transform/
example/basic-auth/ example/blacklist-0/ exa...
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.cc Tue Nov 30 01:42:55 2010
@@ -775,7 +775,7 @@ Cmd_ConfigPorts(ClientData clientData, T
} else { // set
switch (argtable->parsed_args) {
case CMD_CONFIG_PORTS_HTTP_OTHER:
- case CMD_CONFIG_PORTS_SSL:
+ case CMD_CONFIG_PORTS_CONNECT:
return (ConfigPortsSet(argtable[0].parsed_args, argtable[0].data));
break;
case CMD_CONFIG_PORTS_HTTP_SERVER:
@@ -818,8 +818,8 @@ CmdArgs_ConfigPorts()
(char *) NULL, CMD_CONFIG_PORTS_CLUSTER_RS, "Set Ports for cluster-rs", (char *) NULL);
createArgument("cluster-mc", 1, CLI_ARGV_OPTION_INT_VALUE,
(char *) NULL, CMD_CONFIG_PORTS_CLUSTER_MC, "Set Ports for cluster-mc", (char *) NULL);
- createArgument("ssl", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_PORTS_SSL, "Set Ports for ssl", (char *) NULL);
+ createArgument("connect", 1, CLI_ARGV_OPTION_NAME_VALUE,
+ (char *) NULL, CMD_CONFIG_PORTS_CONNECT, "Set Ports for allowed CONNECT", (char *) NULL);
createArgument("socks-server", 1, CLI_ARGV_OPTION_INT_VALUE,
(char *) NULL, CMD_CONFIG_PORTS_SOCKS_SERVER, "Set Ports for socks-server", (char *) NULL);
return 0;
@@ -2002,13 +2002,13 @@ Cmd_ConfigLogging(ClientData clientData,
}
return (ConfigLoggingEvent(argtable[1].parsed_args, setvar));
case CMD_CONFIG_LOGGING_MGMT_DIRECTORY:
- return (Cli_RecordString_Action((argc == 3), "proxy.config.log2.logfile_dir", argtable->arg_string));
+ return (Cli_RecordString_Action((argc == 3), "proxy.config.log.logfile_dir", argtable->arg_string));
case CMD_CONFIG_LOGGING_SPACE_LIMIT:
- return (Cli_RecordInt_Action((argc == 3), "proxy.config.log2.max_space_mb_for_logs", argtable->arg_int));
+ return (Cli_RecordInt_Action((argc == 3), "proxy.config.log.max_space_mb_for_logs", argtable->arg_int));
case CMD_CONFIG_LOGGING_SPACE_HEADROOM:
- return (Cli_RecordInt_Action((argc == 3), "proxy.config.log2.max_space_mb_headroom", argtable->arg_int));
+ return (Cli_RecordInt_Action((argc == 3), "proxy.config.log.max_space_mb_headroom", argtable->arg_int));
case CMD_CONFIG_LOGGING_COLLATION_STATUS:
if (argc == 3) {
@@ -2016,7 +2016,7 @@ Cmd_ConfigLogging(ClientData clientData,
}
return (ConfigLoggingCollationStatus(argtable[1].parsed_args, setvar));
case CMD_CONFIG_LOGGING_COLLATION_HOST:
- return (Cli_RecordString_Action((argc == 3), "proxy.config.log2.collation_host", argtable->arg_string));
+ return (Cli_RecordString_Action((argc == 3), "proxy.config.log.collation_host", argtable->arg_string));
case CMD_CONFIG_LOGGING_COLLATION:
if (argc == 8) {
@@ -2177,14 +2177,7 @@ CmdArgs_ConfigLogging()
createArgument("custom", 1, CLI_ARGV_CONST_OPTION,
(char *) NULL, CMD_CONFIG_LOGGING_CUSTOM,
- "Custom Logging <on | off> format <traditional | xml>", (char *) NULL);
-
- createArgument("traditional", CMD_CONFIG_LOGGING_AND_CUSTOM_FORMAT, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_LOGGING_CUSTOM_FORMAT_TRADITIONAL,
- "Custom logging in traditional format", (char *) NULL);
-
- createArgument("xml", CMD_CONFIG_LOGGING_AND_CUSTOM_FORMAT, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_LOGGING_CUSTOM_FORMAT_XML, "Custom logging in XML", (char *) NULL);
+ "Custom Logging <on | off>", (char *) NULL);
createArgument("rolling", 1, CLI_ARGV_CONST_OPTION,
(char *) NULL, CMD_CONFIG_LOGGING_ROLLING,
@@ -2516,7 +2509,7 @@ ConfigPortsSet(int arg_ref, void *valueP
switch (arg_ref) {
case CMD_CONFIG_PORTS_HTTP_OTHER:
- case CMD_CONFIG_PORTS_SSL:
+ case CMD_CONFIG_PORTS_CONNECT:
Cli_Debug("ConfigPortsSet: arg_ref %d value %s\n", arg_ref, (char *) valuePtr);
break;
default:
@@ -2549,8 +2542,8 @@ ConfigPortsSet(int arg_ref, void *valueP
case CMD_CONFIG_PORTS_CLUSTER_MC:
status = Cli_RecordSetInt("proxy.config.cluster.mcport", *(INKInt *) valuePtr, &action_need);
break;
- case CMD_CONFIG_PORTS_SSL:
- status = Cli_RecordSetString("proxy.config.http.ssl_ports", (INKString) valuePtr, &action_need);
+ case CMD_CONFIG_PORTS_CONNECT:
+ status = Cli_RecordSetString("proxy.config.http.connect_ports", (INKString) valuePtr, &action_need);
break;
case CMD_CONFIG_PORTS_SOCKS_SERVER:
status = Cli_RecordSetInt("proxy.config.socks.socks_server_port", *(INKInt *) valuePtr, &action_need);
@@ -2634,8 +2627,8 @@ ConfigPortsGet(int arg_ref)
}
Cli_Printf("%d\n", int_val);
break;
- case CMD_CONFIG_PORTS_SSL:
- status = Cli_RecordGetString("proxy.config.http.ssl_ports", &str_val);
+ case CMD_CONFIG_PORTS_CONNECT:
+ status = Cli_RecordGetString("proxy.config.http.connect_ports", &str_val);
if (status) {
return status;
}
@@ -4338,7 +4331,7 @@ ConfigLoggingEvent(int arg_ref, int setv
switch (setvar) {
case 0: //get
- status = Cli_RecordGetInt("proxy.config.log2.logging_enabled", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.logging_enabled", &int_val);
if (status) {
return status;
}
@@ -4378,7 +4371,7 @@ ConfigLoggingEvent(int arg_ref, int setv
default:
Cli_Printf("ERROR in arg\n");
}
- status = Cli_RecordSetInt("proxy.config.log2.logging_enabled", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.logging_enabled", (INKInt) int_val, &action_need);
if (status) {
return status;
}
@@ -4406,7 +4399,7 @@ ConfigLoggingCollationStatus(int arg_ref
switch (setvar) {
case 0: //get
- status = Cli_RecordGetInt("proxy.local.log2.collation_mode", &int_val);
+ status = Cli_RecordGetInt("proxy.local.log.collation_mode", &int_val);
if (status) {
return status;
}
@@ -4453,7 +4446,7 @@ ConfigLoggingCollationStatus(int arg_ref
Cli_Printf("ERROR in arg\n");
}
Cli_Debug("ConfigLoggingCollationStatus: %d set?%d\n", int_val, setvar);
- status = Cli_RecordSetInt("proxy.local.log2.collation_mode", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.local.log.collation_mode", (INKInt) int_val, &action_need);
if (status) {
return status;
}
@@ -4481,7 +4474,7 @@ ConfigLoggingCollation(INKString secret,
switch (setvar) {
case 0: //get
- status = Cli_RecordGetString("proxy.config.log2.collation_secret", &str_val);
+ status = Cli_RecordGetString("proxy.config.log.collation_secret", &str_val);
if (status) {
return status;
}
@@ -4490,7 +4483,7 @@ ConfigLoggingCollation(INKString secret,
else
Cli_Printf("none\n");
- status = Cli_RecordGetInt("proxy.config.log2.collation_host_tagged", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.collation_host_tagged", &int_val);
if (status) {
return status;
}
@@ -4499,7 +4492,7 @@ ConfigLoggingCollation(INKString secret,
return CLI_ERROR;
}
- status = Cli_RecordGetInt("proxy.config.log2.collation_port", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.collation_port", &int_val);
if (status) {
return status;
}
@@ -4510,7 +4503,7 @@ ConfigLoggingCollation(INKString secret,
case 1: //set
{
- status = Cli_RecordSetString("proxy.config.log2.collation_secret", (INKString) secret, &action_need);
+ status = Cli_RecordSetString("proxy.config.log.collation_secret", (INKString) secret, &action_need);
if (status) {
return status;
}
@@ -4525,12 +4518,12 @@ ConfigLoggingCollation(INKString secret,
Cli_Printf("ERROR in arg\n");
}
- status = Cli_RecordSetInt("proxy.config.log2.collation_host_tagged", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.collation_host_tagged", (INKInt) int_val, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetInt("proxy.config.log2.collation_port", (INKInt) orphan, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.collation_port", (INKInt) orphan, &action_need);
if (status) {
return status;
}
@@ -4562,14 +4555,14 @@ ConfigLoggingFormatTypeFile(int arg_ref_
switch (arg_ref_format) {
case CMD_CONFIG_LOGGING_FORMAT_SQUID:
- status = Cli_RecordGetInt("proxy.config.log2.squid_log_enabled", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.squid_log_enabled", &int_val);
if (status) {
return status;
}
if (Cli_PrintEnable("", int_val) == CLI_ERROR) {
return CLI_ERROR;
}
- status = Cli_RecordGetInt("proxy.config.log2.squid_log_is_ascii", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.squid_log_is_ascii", &int_val);
if (status) {
return status;
}
@@ -4581,7 +4574,7 @@ ConfigLoggingFormatTypeFile(int arg_ref_
Cli_Printf("ascii\n");
break;
}
- status = Cli_RecordGetString("proxy.config.log2.squid_log_name", &str_val);
+ status = Cli_RecordGetString("proxy.config.log.squid_log_name", &str_val);
if (status) {
return status;
}
@@ -4591,7 +4584,7 @@ ConfigLoggingFormatTypeFile(int arg_ref_
Cli_Printf("none\n");
}
- status = Cli_RecordGetString("proxy.config.log2.squid_log_header", &str_val);
+ status = Cli_RecordGetString("proxy.config.log.squid_log_header", &str_val);
if (status) {
return status;
}
@@ -4603,14 +4596,14 @@ ConfigLoggingFormatTypeFile(int arg_ref_
return CLI_OK;
case CMD_CONFIG_LOGGING_FORMAT_NETSCAPE_COMMON:
- status = Cli_RecordGetInt("proxy.config.log2.common_log_enabled", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.common_log_enabled", &int_val);
if (status) {
return status;
}
if (Cli_PrintEnable("", int_val) == CLI_ERROR) {
return CLI_ERROR;
}
- status = Cli_RecordGetInt("proxy.config.log2.common_log_is_ascii", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.common_log_is_ascii", &int_val);
if (status) {
return status;
}
@@ -4622,26 +4615,26 @@ ConfigLoggingFormatTypeFile(int arg_ref_
Cli_Printf("ascii\n");
break;
}
- status = Cli_RecordGetString("proxy.config.log2.common_log_name", &str_val);
+ status = Cli_RecordGetString("proxy.config.log.common_log_name", &str_val);
if (status) {
return status;
}
Cli_Printf("%s\n", str_val);
- status = Cli_RecordGetString("proxy.config.log2.common_log_header", &str_val);
+ status = Cli_RecordGetString("proxy.config.log.common_log_header", &str_val);
if (status) {
return status;
}
Cli_Printf("%s\n", str_val);
return CLI_OK;
case CMD_CONFIG_LOGGING_FORMAT_NETSCAPE_EXT:
- status = Cli_RecordGetInt("proxy.config.log2.extended_log_enabled", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.extended_log_enabled", &int_val);
if (status) {
return status;
}
if (Cli_PrintEnable("", int_val) == CLI_ERROR) {
return CLI_ERROR;
}
- status = Cli_RecordGetInt("proxy.config.log2.extended_log_is_ascii", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.extended_log_is_ascii", &int_val);
if (status) {
return status;
}
@@ -4653,12 +4646,12 @@ ConfigLoggingFormatTypeFile(int arg_ref_
Cli_Printf("ascii\n");
break;
}
- status = Cli_RecordGetString("proxy.config.log2.extended_log_name", &str_val);
+ status = Cli_RecordGetString("proxy.config.log.extended_log_name", &str_val);
if (status) {
return status;
}
Cli_Printf("%s\n", str_val);
- status = Cli_RecordGetString("proxy.config.log2.extended_log_header", &str_val);
+ status = Cli_RecordGetString("proxy.config.log.extended_log_header", &str_val);
if (status) {
return status;
}
@@ -4666,14 +4659,14 @@ ConfigLoggingFormatTypeFile(int arg_ref_
return CLI_OK;
case CMD_CONFIG_LOGGING_FORMAT_NETSCAPE_EXT2:
- status = Cli_RecordGetInt("proxy.config.log2.extended2_log_enabled", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.extended2_log_enabled", &int_val);
if (status) {
return status;
}
if (Cli_PrintEnable("", int_val) == CLI_ERROR) {
return CLI_ERROR;
}
- status = Cli_RecordGetInt("proxy.config.log2.extended2_log_is_ascii", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.extended2_log_is_ascii", &int_val);
if (status) {
return status;
}
@@ -4685,12 +4678,12 @@ ConfigLoggingFormatTypeFile(int arg_ref_
Cli_Printf("ascii\n");
break;
}
- status = Cli_RecordGetString("proxy.config.log2.extended2_log_name", &str_val);
+ status = Cli_RecordGetString("proxy.config.log.extended2_log_name", &str_val);
if (status) {
return status;
}
Cli_Printf("%s\n", str_val);
- status = Cli_RecordGetString("proxy.config.log2.extended2_log_header", &str_val);
+ status = Cli_RecordGetString("proxy.config.log.extended2_log_header", &str_val);
if (status) {
return status;
}
@@ -4715,7 +4708,7 @@ ConfigLoggingFormatTypeFile(int arg_ref_
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.squid_log_enabled", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.squid_log_enabled", (INKInt) int_val, &action_need);
if (status) {
return status;
}
@@ -4731,18 +4724,18 @@ ConfigLoggingFormatTypeFile(int arg_ref_
Cli_Printf("ERROR in arg\n");
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.squid_log_is_ascii", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.squid_log_is_ascii", (INKInt) int_val, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetString("proxy.config.log2.squid_log_name", (INKString) file, &action_need);
+ status = Cli_RecordSetString("proxy.config.log.squid_log_name", (INKString) file, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetString("proxy.config.log2.squid_log_header", (INKString) header, &action_need);
+ status = Cli_RecordSetString("proxy.config.log.squid_log_header", (INKString) header, &action_need);
if (status) {
return status;
}
@@ -4761,7 +4754,7 @@ ConfigLoggingFormatTypeFile(int arg_ref_
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.common_log_enabled", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.common_log_enabled", (INKInt) int_val, &action_need);
if (status) {
return status;
}
@@ -4778,18 +4771,18 @@ ConfigLoggingFormatTypeFile(int arg_ref_
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.common_log_is_ascii", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.common_log_is_ascii", (INKInt) int_val, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetString("proxy.config.log2.common_log_name", (INKString) file, &action_need);
+ status = Cli_RecordSetString("proxy.config.log.common_log_name", (INKString) file, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetString("proxy.config.log2.common_log_header", (INKString) header, &action_need);
+ status = Cli_RecordSetString("proxy.config.log.common_log_header", (INKString) header, &action_need);
if (status) {
return status;
}
@@ -4810,7 +4803,7 @@ ConfigLoggingFormatTypeFile(int arg_ref_
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.extended_log_enabled", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.extended_log_enabled", (INKInt) int_val, &action_need);
if (status) {
return status;
@@ -4826,18 +4819,18 @@ ConfigLoggingFormatTypeFile(int arg_ref_
Cli_Printf("ERROR in arg\n");
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.extended_log_is_ascii", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.extended_log_is_ascii", (INKInt) int_val, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetString("proxy.config.log2.extended_log_name", (INKString) file, &action_need);
+ status = Cli_RecordSetString("proxy.config.log.extended_log_name", (INKString) file, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetString("proxy.config.log2.extended_log_header", (INKString) header, &action_need);
+ status = Cli_RecordSetString("proxy.config.log.extended_log_header", (INKString) header, &action_need);
if (status) {
return status;
}
@@ -4856,7 +4849,7 @@ ConfigLoggingFormatTypeFile(int arg_ref_
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.extended2_log_enabled", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.extended2_log_enabled", (INKInt) int_val, &action_need);
if (status) {
return status;
}
@@ -4871,18 +4864,18 @@ ConfigLoggingFormatTypeFile(int arg_ref_
Cli_Printf("ERROR in arg\n");
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.extended2_log_is_ascii", (INKInt) int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.extended2_log_is_ascii", (INKInt) int_val, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetString("proxy.config.log2.extended2_log_name", (INKString) file, &action_need);
+ status = Cli_RecordSetString("proxy.config.log.extended2_log_name", (INKString) file, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetString("proxy.config.log2.extended2_log_header", (INKString) header, &action_need);
+ status = Cli_RecordSetString("proxy.config.log.extended2_log_header", (INKString) header, &action_need);
if (status) {
return status;
}
@@ -4910,7 +4903,7 @@ ConfigLoggingSplitting(int arg_ref_proto
switch (arg_ref_protocol) {
case CMD_CONFIG_LOGGING_SPLITTING_ICP:
- status = Cli_RecordGetInt("proxy.config.log2.separate_icp_logs", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.separate_icp_logs", &int_val);
if (status) {
return status;
}
@@ -4919,7 +4912,7 @@ ConfigLoggingSplitting(int arg_ref_proto
}
return CLI_OK;
case CMD_CONFIG_LOGGING_SPLITTING_HTTP:
- status = Cli_RecordGetInt("proxy.config.log2.separate_host_logs", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.separate_host_logs", &int_val);
if (status) {
return status;
}
@@ -4949,14 +4942,14 @@ ConfigLoggingSplitting(int arg_ref_proto
switch (arg_ref_protocol) {
case CMD_CONFIG_LOGGING_SPLITTING_ICP:
- status = Cli_RecordSetInt("proxy.config.log2.separate_icp_logs", int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.separate_icp_logs", int_val, &action_need);
if (status) {
return status;
}
return (Cli_ConfigEnactChanges(action_need));
case CMD_CONFIG_LOGGING_SPLITTING_HTTP:
- status = Cli_RecordSetInt("proxy.config.log2.separate_host_logs", int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.separate_host_logs", int_val, &action_need);
if (status) {
return status;
}
@@ -4984,22 +4977,14 @@ ConfigLoggingCustomFormat(int arg_ref_on
switch (setvar) {
case 0: //get
- status = Cli_RecordGetInt("proxy.config.log2.custom_logs_enabled", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.custom_logs_enabled", &int_val);
if (status) {
return status;
}
if (Cli_PrintEnable("", int_val) == CLI_ERROR) {
return CLI_ERROR;
}
- status = Cli_RecordGetInt("proxy.config.log2.xml_logs_config", &int_val);
- switch (int_val) {
- case 0:
- Cli_Printf("traditional\n");
- break;
- case 1:
- Cli_Printf("xml\n");
- break;
- }
+ Cli_Printf("xml\n");
return CLI_OK;
case 1:
{
@@ -5015,24 +5000,11 @@ ConfigLoggingCustomFormat(int arg_ref_on
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.custom_logs_enabled", int_val, &action_need);
- if (status) {
- return status;
- }
- switch (arg_ref_format) {
- case CMD_CONFIG_LOGGING_CUSTOM_FORMAT_TRADITIONAL:
- int_val = 0;
- break;
- case CMD_CONFIG_LOGGING_CUSTOM_FORMAT_XML:
- int_val = 1;
- break;
- }
- status = Cli_RecordSetInt("proxy.config.log2.xml_logs_config", int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.custom_logs_enabled", int_val, &action_need);
if (status) {
return status;
}
return (Cli_ConfigEnactChanges(action_need));
-
}
default:
@@ -5059,24 +5031,24 @@ ConfigLoggingRollingOffsetIntervalAutode
switch (setvar) {
case 0: //get
- status = Cli_RecordGetInt("proxy.config.log2.rolling_enabled", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.rolling_enabled", &int_val);
if (status) {
return status;
}
if (Cli_PrintEnable("", int_val) == CLI_ERROR) {
return CLI_ERROR;
}
- status = Cli_RecordGetInt("proxy.config.log2.rolling_offset_hr", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.rolling_offset_hr", &int_val);
if (status) {
return status;
}
Cli_Printf("%d\n", int_val);
- status = Cli_RecordGetInt("proxy.config.log2.rolling_interval_sec", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.rolling_interval_sec", &int_val);
if (status) {
return status;
}
Cli_Printf("%d\n", int_val);
- status = Cli_RecordGetInt("proxy.config.log2.auto_delete_rolled_files", &int_val);
+ status = Cli_RecordGetInt("proxy.config.log.auto_delete_rolled_files", &int_val);
if (status) {
return status;
}
@@ -5099,15 +5071,15 @@ ConfigLoggingRollingOffsetIntervalAutode
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.rolling_enabled", int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.rolling_enabled", int_val, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetInt("proxy.config.log2.rolling_offset_hr", offset, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.rolling_offset_hr", offset, &action_need);
if (status) {
return status;
}
- status = Cli_RecordSetInt("proxy.config.log2.rolling_interval_sec", num_hours, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.rolling_interval_sec", num_hours, &action_need);
if (status) {
return status;
}
@@ -5124,7 +5096,7 @@ ConfigLoggingRollingOffsetIntervalAutode
return CLI_ERROR;
}
- status = Cli_RecordSetInt("proxy.config.log2.auto_delete_rolled_files", int_val, &action_need);
+ status = Cli_RecordSetInt("proxy.config.log.auto_delete_rolled_files", int_val, &action_need);
if (status) {
return status;
}
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ConfigCmd.h Tue Nov 30 01:42:55 2010
@@ -54,7 +54,7 @@ typedef enum
CMD_CONFIG_PORTS_CLUSTER,
CMD_CONFIG_PORTS_CLUSTER_RS,
CMD_CONFIG_PORTS_CLUSTER_MC,
- CMD_CONFIG_PORTS_SSL,
+ CMD_CONFIG_PORTS_CONNECT,
CMD_CONFIG_PORTS_SOCKS_SERVER,
CMD_CONFIG_PORTS_ICP,
CMD_CONFIG_DATE,
@@ -239,8 +239,6 @@ typedef enum
CMD_CONFIG_LOGGING_SPLITTING_ICP,
CMD_CONFIG_LOGGING_SPLITTING_HTTP,
CMD_CONFIG_LOGGING_CUSTOM,
- CMD_CONFIG_LOGGING_CUSTOM_FORMAT_TRADITIONAL,
- CMD_CONFIG_LOGGING_CUSTOM_FORMAT_XML,
CMD_CONFIG_LOGGING_ROLLING,
CMD_CONFIG_LOGGING_OFFSET,
CMD_CONFIG_LOGGING_INTERVAL,
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ShowCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ShowCmd.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ShowCmd.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/ShowCmd.cc Tue Nov 30 01:42:55 2010
@@ -1231,7 +1231,7 @@ ShowPorts()
INKInt cluster_mc = -1;
INKInt socks_server = -1;
INKInt icp = -1;
- INKString ssl = NULL;
+ INKString connect = NULL;
// retrieve values
@@ -1242,7 +1242,7 @@ ShowPorts()
Cli_RecordGetInt("proxy.config.cluster.cluster_port", &cluster);
Cli_RecordGetInt("proxy.config.cluster.rsport", &cluster_rs);
Cli_RecordGetInt("proxy.config.cluster.mcport", &cluster_mc);
- Cli_RecordGetString("proxy.config.http.ssl_ports", &ssl);
+ Cli_RecordGetString("proxy.config.http.connect_ports", &connect);
Cli_RecordGetInt("proxy.config.socks.socks_server_port", &socks_server);
Cli_RecordGetInt("proxy.config.icp.icp_port", &icp);
@@ -1255,7 +1255,7 @@ ShowPorts()
Cli_Printf("Cluster Port ----------- %d\n", cluster);
Cli_Printf("Cluster RS Port -------- %d\n", cluster_rs);
Cli_Printf("Cluster MC Port -------- %d\n", cluster_mc);
- Cli_Printf("SSL Ports -------------- %s\n", (ssl != NULL) ? ssl : "none");
+ Cli_Printf("Allowed CONNECT Ports -- %s\n", (connect != NULL) ? connect : "none");
Cli_Printf("SOCKS Server Port ------ %d\n", socks_server);
Cli_Printf("ICP Port --------------- %d\n", icp);
Cli_Printf("\n");
@@ -1756,45 +1756,44 @@ ShowLogging()
INKInt auto_delete = 0;
// retrieve value
- Cli_RecordGetInt("proxy.config.log2.logging_enabled", &logging_enabled);
- Cli_RecordGetInt("proxy.config.log2.max_space_mb_for_logs", &log_space);
- Cli_RecordGetInt("proxy.config.log2.max_space_mb_headroom", &headroom_space);
- Cli_RecordGetInt("proxy.local.log2.collation_mode", &collation_mode);
- Cli_RecordGetString("proxy.config.log2.collation_host", (char**)&collation_host);
- Cli_RecordGetInt("proxy.config.log2.collation_port", &collation_port);
- Cli_RecordGetString("proxy.config.log2.collation_secret", &collation_secret);
- Cli_RecordGetInt("proxy.config.log2.collation_host_tagged", &host_tag);
- Cli_RecordGetInt("proxy.config.log2.max_space_mb_for_orphan_logs", &orphan_space);
-
- Cli_RecordGetInt("proxy.config.log2.squid_log_enabled", &squid_log);
- Cli_RecordGetInt("proxy.config.log2.squid_log_is_ascii", &is_ascii);
- Cli_RecordGetString("proxy.config.log2.squid_log_name", &file_name);
- Cli_RecordGetString("proxy.config.log2.squid_log_header", &file_header);
-
- Cli_RecordGetInt("proxy.config.log2.common_log_enabled", &common_log);
- Cli_RecordGetInt("proxy.config.log2.common_log_is_ascii", &common_is_ascii);
- Cli_RecordGetString("proxy.config.log2.common_log_name", &common_file_name);
- Cli_RecordGetString("proxy.config.log2.common_log_header", &common_file_header);
-
- Cli_RecordGetInt("proxy.config.log2.extended_log_enabled", &extended_log);
- Cli_RecordGetInt("proxy.config.log2.extended_log_is_ascii", &extended_is_ascii);
- Cli_RecordGetString("proxy.config.log2.extended_log_name", &extended_file_name);
- Cli_RecordGetString("proxy.config.log2.extended_log_header", &extended_file_header);
-
- Cli_RecordGetInt("proxy.config.log2.extended2_log_enabled", &extended2_log);
- Cli_RecordGetInt("proxy.config.log2.extended2_log_is_ascii", &extended2_is_ascii);
- Cli_RecordGetString("proxy.config.log2.extended2_log_name", &extended2_file_name);
- Cli_RecordGetString("proxy.config.log2.extended2_log_header", &extended2_file_header);
-
- Cli_RecordGetInt("proxy.config.log2.separate_icp_logs", &icp_log);
- Cli_RecordGetInt("proxy.config.log2.separate_host_logs", &http_host_log);
- Cli_RecordGetInt("proxy.config.log2.separate_host_logs", &custom_log);
- Cli_RecordGetInt("proxy.config.log2.xml_logs_config", &xml_log);
-
- Cli_RecordGetInt("proxy.config.log2.rolling_enabled", &rolling);
- Cli_RecordGetInt("proxy.config.log2.rolling_offset_hr", &roll_offset_hr);
- Cli_RecordGetInt("proxy.config.log2.rolling_interval_sec", &roll_interval);
- Cli_RecordGetInt("proxy.config.log2.auto_delete_rolled_files", &auto_delete);
+ Cli_RecordGetInt("proxy.config.log.logging_enabled", &logging_enabled);
+ Cli_RecordGetInt("proxy.config.log.max_space_mb_for_logs", &log_space);
+ Cli_RecordGetInt("proxy.config.log.max_space_mb_headroom", &headroom_space);
+ Cli_RecordGetInt("proxy.local.log.collation_mode", &collation_mode);
+ Cli_RecordGetString("proxy.config.log.collation_host", (char**)&collation_host);
+ Cli_RecordGetInt("proxy.config.log.collation_port", &collation_port);
+ Cli_RecordGetString("proxy.config.log.collation_secret", &collation_secret);
+ Cli_RecordGetInt("proxy.config.log.collation_host_tagged", &host_tag);
+ Cli_RecordGetInt("proxy.config.log.max_space_mb_for_orphan_logs", &orphan_space);
+
+ Cli_RecordGetInt("proxy.config.log.squid_log_enabled", &squid_log);
+ Cli_RecordGetInt("proxy.config.log.squid_log_is_ascii", &is_ascii);
+ Cli_RecordGetString("proxy.config.log.squid_log_name", &file_name);
+ Cli_RecordGetString("proxy.config.log.squid_log_header", &file_header);
+
+ Cli_RecordGetInt("proxy.config.log.common_log_enabled", &common_log);
+ Cli_RecordGetInt("proxy.config.log.common_log_is_ascii", &common_is_ascii);
+ Cli_RecordGetString("proxy.config.log.common_log_name", &common_file_name);
+ Cli_RecordGetString("proxy.config.log.common_log_header", &common_file_header);
+
+ Cli_RecordGetInt("proxy.config.log.extended_log_enabled", &extended_log);
+ Cli_RecordGetInt("proxy.config.log.extended_log_is_ascii", &extended_is_ascii);
+ Cli_RecordGetString("proxy.config.log.extended_log_name", &extended_file_name);
+ Cli_RecordGetString("proxy.config.log.extended_log_header", &extended_file_header);
+
+ Cli_RecordGetInt("proxy.config.log.extended2_log_enabled", &extended2_log);
+ Cli_RecordGetInt("proxy.config.log.extended2_log_is_ascii", &extended2_is_ascii);
+ Cli_RecordGetString("proxy.config.log.extended2_log_name", &extended2_file_name);
+ Cli_RecordGetString("proxy.config.log.extended2_log_header", &extended2_file_header);
+
+ Cli_RecordGetInt("proxy.config.log.separate_icp_logs", &icp_log);
+ Cli_RecordGetInt("proxy.config.log.separate_host_logs", &http_host_log);
+ Cli_RecordGetInt("proxy.config.log.separate_host_logs", &custom_log);
+
+ Cli_RecordGetInt("proxy.config.log.rolling_enabled", &rolling);
+ Cli_RecordGetInt("proxy.config.log.rolling_offset_hr", &roll_offset_hr);
+ Cli_RecordGetInt("proxy.config.log.rolling_interval_sec", &roll_interval);
+ Cli_RecordGetInt("proxy.config.log.auto_delete_rolled_files", &auto_delete);
// display results
Cli_Printf("\n");
@@ -1890,15 +1889,15 @@ ShowSsl()
{
// declare and initialize variables
- INKString ssl_ports = NULL;
+ INKString connect_ports = NULL;
// retrieve value
- Cli_RecordGetString("proxy.config.http.ssl_ports", &ssl_ports);
+ Cli_RecordGetString("proxy.config.http.connect_ports", &connect_ports);
// display results
Cli_Printf("\n");
- Cli_Printf("Restrict SSL Connections to Ports -- %s\n", ssl_ports);
+ Cli_Printf("Restrict CONNECT connections to Ports -- %s\n", connect_ports);
Cli_Printf("\n");
return CLI_OK;
@@ -2454,11 +2453,11 @@ ShowLoggingStats()
INKCounter event_log_access_skip = -1;
INKCounter event_log_error = -1;
- Cli_RecordGetCounter("proxy.process.log2.log_files_open", &log_file_open);
- Cli_RecordGetInt("proxy.process.log2.log_files_space_used", &log_files_space_used);
- Cli_RecordGetCounter("proxy.process.log2.event_log_access", &event_log_access);
- Cli_RecordGetCounter("proxy.process.log2.event_log_access_skip", &event_log_access_skip);
- Cli_RecordGetCounter("proxy.process.log2.event_log_error", &event_log_error);
+ Cli_RecordGetCounter("proxy.process.log.log_files_open", &log_file_open);
+ Cli_RecordGetInt("proxy.process.log.log_files_space_used", &log_files_space_used);
+ Cli_RecordGetCounter("proxy.process.log.event_log_access", &event_log_access);
+ Cli_RecordGetCounter("proxy.process.log.event_log_access_skip", &event_log_access_skip);
+ Cli_RecordGetCounter("proxy.process.log.event_log_error", &event_log_error);
Cli_Printf("\n");
Cli_Printf("Current Open Log Files ----------- %d\n", log_file_open);
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/cli_detailed_command_list.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/cli_detailed_command_list.txt?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/cli_detailed_command_list.txt (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/cli_detailed_command_list.txt Tue Nov 30 01:42:55 2010
@@ -499,50 +499,49 @@ logging Logging Configuration
behavior: Display Logging Configuration
ts> show:logging
- Logging Mode ------------- xxx (proxy.config.log2.logging_enabled)
+ Logging Mode ------------- xxx (proxy.config.log.logging_enabled)
Management
- Log Space Limit -------- 2000 MB (proxy.config.log2.max_space_mb_for_logs)
- Log Space Headroom ----- 10 MB (proxy.config.log2.max_space_mb_headroom)
+ Log Space Limit -------- 2000 MB (proxy.config.log.max_space_mb_for_logs)
+ Log Space Headroom ----- 10 MB (proxy.config.log.max_space_mb_headroom)
- Log Collation ------------ off (proxy.local.log2.collation_mode)
- Host ------------------- NULL (proxy.config.log2.collation_host)
- Port ------------------- 8085 (proxy.config.log2.collation_port)
- Secret ----------------- foobar (proxy.config.log2.collation_secret)
- Host Tagged ------------ off (proxy.config.log2.collation_host_tagged)
- Space Limit for Orphan Files -- 25 MB (proxy.config.log2.max_space_mb_for_orphan_logs)
-
- Squid Format ---- on (proxy.config.log2.squid_log_enabled)
- File Type ----- ASCII (proxy.config.log2.squid_log_is_ascii)
- File Name ----- squid (proxy.config.log2.squid_log_name)
- File Header --- NULL (proxy.config.log2.squid_log_header)
-
- Netscape Common -- off (proxy.config.log2.common_log_enabled)
- File Type ------ ASCII (proxy.config.log2.common_log_is_ascii)
- File Name ------ common (proxy.config.log2.common_log_name)
- File Header ---- NULL (proxy.config.log2.common_log_header)
-
- Netscape Extended -- off (proxy.config.log2.extended_log_enabled)
- File Type -------- ASCII (proxy.config.log2.extended_log_is_ascii)
- File Name -------- extended (proxy.config.log2.extended_log_name)
- File Header ------ NULL (proxy.config.log2.extended_log_header)
-
- Netscape Extended2 -- off (proxy.config.log2.extended2_log_enabled)
- File Type --------- ASCII (proxy.config.log2.extended2_log_is_ascii)
- File Name --------- extended2 (proxy.config.log2.extended2_log_name)
- File Header ------- NULL (proxy.config.log2.extended2_log_header)
+ Log Collation ------------ off (proxy.local.log.collation_mode)
+ Host ------------------- NULL (proxy.config.log.collation_host)
+ Port ------------------- 8085 (proxy.config.log.collation_port)
+ Secret ----------------- foobar (proxy.config.log.collation_secret)
+ Host Tagged ------------ off (proxy.config.log.collation_host_tagged)
+ Space Limit for Orphan Files -- 25 MB (proxy.config.log.max_space_mb_for_orphan_logs)
+
+ Squid Format ---- on (proxy.config.log.squid_log_enabled)
+ File Type ----- ASCII (proxy.config.log.squid_log_is_ascii)
+ File Name ----- squid (proxy.config.log.squid_log_name)
+ File Header --- NULL (proxy.config.log.squid_log_header)
+
+ Netscape Common -- off (proxy.config.log.common_log_enabled)
+ File Type ------ ASCII (proxy.config.log.common_log_is_ascii)
+ File Name ------ common (proxy.config.log.common_log_name)
+ File Header ---- NULL (proxy.config.log.common_log_header)
+
+ Netscape Extended -- off (proxy.config.log.extended_log_enabled)
+ File Type -------- ASCII (proxy.config.log.extended_log_is_ascii)
+ File Name -------- extended (proxy.config.log.extended_log_name)
+ File Header ------ NULL (proxy.config.log.extended_log_header)
+
+ Netscape Extended2 -- off (proxy.config.log.extended2_log_enabled)
+ File Type --------- ASCII (proxy.config.log.extended2_log_is_ascii)
+ File Name --------- extended2 (proxy.config.log.extended2_log_name)
+ File Header ------- NULL (proxy.config.log.extended2_log_header)
Splitting
- ICP Log Splitting -- off (proxy.config.log2.separate_icp_logs)
- HTTP Host Log Splitting -- off (proxy.config.log2.separate_host_logs)
+ ICP Log Splitting -- off (proxy.config.log.separate_icp_logs)
+ HTTP Host Log Splitting -- off (proxy.config.log.separate_host_logs)
- Custom Logs -- off (proxy.config.log2.custom_logs_enabled)
- Custom Log Definition Format -- Traditional (proxy.config.log2.xml_logs_config)
+ Custom Logs -- off (proxy.config.log.custom_logs_enabled)
- Rolling -------- on (proxy.config.log2.rolling_enabled)
- Roll Offset Hour --- 0 (proxy.config.log2.rolling_offset_hr)
- Roll Interval ------ 86400 s (proxy.config.log2.rolling_interval_sec)
- Auto-delete rolled files when space is low -- on (proxy.config.log2.auto_delete_rolled_files)
+ Rolling -------- on (proxy.config.log.rolling_enabled)
+ Roll Offset Hour --- 0 (proxy.config.log.rolling_offset_hr)
+ Roll Interval ------ 86400 s (proxy.config.log.rolling_interval_sec)
+ Auto-delete rolled files when space is low -- on (proxy.config.log.auto_delete_rolled_files)
ts>
ssl SSL Ports
@@ -551,7 +550,7 @@ ssl SSL Ports
behavior: Display SSL Port related configuration.
ts> show:ssl
- Restrict SSL Connections to Ports -- 443 563 (proxy.config.http.ssl_ports)
+ Restrict CONNECT connections to Ports -- 443 563 (proxy.config.http.connect_ports)
ts>
parent Parent Configuration
@@ -810,11 +809,11 @@ logging-stats Logging Statistics
behavior: Display Logging statistics.
ts> show:logging-stats
- Currently Open Log Files --------- 0 (proxy.process.log2.log_files_open)
- Space Used For Log Files --------- 0 (proxy.process.log2.log_files_space_used)
- Number of Access Events Logged --- 0 (proxy.process.log2.event_log_access)
- Number of Access Events Skipped -- 0 (proxy.process.log2.event_log_access_skip)
- Number of Error Events Logged ---- 0 (proxy.process.log2.event_log_error)
+ Currently Open Log Files --------- 0 (proxy.process.log.log_files_open)
+ Space Used For Log Files --------- 0 (proxy.process.log.log_files_space_used)
+ Number of Access Events Logged --- 0 (proxy.process.log.event_log_access)
+ Number of Access Events Skipped -- 0 (proxy.process.log.event_log_access_skip)
+ Number of Error Events Logged ---- 0 (proxy.process.log.event_log_error)
ts>
network Network Settings
@@ -1242,7 +1241,7 @@ dns DNS Configuration
logging Logging Configuration
syntax: config:logging event <enabled | trans-only | error-only | disabled>
- records: proxy.config.log2.logging_enabled
+ records: proxy.config.log.logging_enabled
ts# config:logging event enabled
+OK
@@ -1253,7 +1252,7 @@ logging Logging Configuration
ts#
syntax: config:logging mgmt-directory <dir>
- records: proxy.config.log2.logfile_dir
+ records: proxy.config.log.logfile_dir
ts# config:logging mgmt-directory /usr/local/var/log/trafficserver
+OK
@@ -1261,7 +1260,7 @@ logging Logging Configuration
syntax: config:logging space-limit <mb>
args: <mb> = log space limit (MB)
- records: proxy.config.log2.max_space_mb_for_logs
+ records: proxy.config.log.max_space_mb_for_logs
ts# config:logging space-limit 10
+OK
@@ -1269,7 +1268,7 @@ logging Logging Configuration
syntax: config:logging space-headroom <mb>
args: <mb> = log space headroom (MB)
- records: proxy.config.log2.max_space_mb_headroom
+ records: proxy.config.log.max_space_mb_headroom
ts# config:logging space-headroom 100
+OK
@@ -1277,7 +1276,7 @@ logging Logging Configuration
syntax: config:logging collation-status <inactive | host | send-standard | send-custom | send-all>
args: inactive = 0, host = 1, send-standard = 2, send-custom = 3, send-all = 4
- records: proxy.local.log2.collation_mode
+ records: proxy.local.log.collation_mode
ts# config:logging collation-status inactive
+OK
@@ -1289,7 +1288,7 @@ logging Logging Configuration
syntax: config:logging collation-host <host>
args: <host> is a remote collation host
- records: proxy.config.log2.collation_host
+ records: proxy.config.log.collation_host
ts# config:log collation-host config1
+OK
@@ -1298,9 +1297,9 @@ logging Logging Configuration
syntax: config:logging collation secret <secret> tagged <on | off> orphan-limit <orphan>
args: <secret> = string
<orphan> = size in MB
- records: <secret> = proxy.config.log2.collation_port
- tagged = proxy.config.log2.collation_host_tagged
- <orphan> = proxy.config.log2.collation_secret
+ records: <secret> = proxy.config.log.collation_port
+ tagged = proxy.config.log.collation_host_tagged
+ <orphan> = proxy.config.log.collation_secret
ts# config:logging collation secret foobar tagged on orphan-limit 10
+OK
@@ -1310,50 +1309,49 @@ logging Logging Configuration
<on | off> type <ascii | binary> file <file> header <header>
squid
- args: <on | off> = proxy.config.log2.squid_log_enabled
- type = proxy.config.log2.squid_log_is_ascii <ascii=1, binary=0>
- file = proxy.config.log2.squid_log_name
- header = proxy.config.log2.squid_log_header
+ args: <on | off> = proxy.config.log.squid_log_enabled
+ type = proxy.config.log.squid_log_is_ascii <ascii=1, binary=0>
+ file = proxy.config.log.squid_log_name
+ header = proxy.config.log.squid_log_header
netscape-common
- args: <on | off> = proxy.config.log2.common_log_enabled
- type = proxy.config.log2.common_log_is_ascii <ascii=1, binary=0>
- file = proxy.config.log2.common_log_name
- header = proxy.config.log2.common_log_header
+ args: <on | off> = proxy.config.log.common_log_enabled
+ type = proxy.config.log.common_log_is_ascii <ascii=1, binary=0>
+ file = proxy.config.log.common_log_name
+ header = proxy.config.log.common_log_header
netscape-ext
- args: <on | off> = proxy.config.log2.extended_log_enabled
- type = proxy.config.log2.extended_log_is_ascii <ascii=1, binary=0>
- file = proxy.config.log2.extended_log_name
- header = proxy.config.log2.extended_log_header
+ args: <on | off> = proxy.config.log.extended_log_enabled
+ type = proxy.config.log.extended_log_is_ascii <ascii=1, binary=0>
+ file = proxy.config.log.extended_log_name
+ header = proxy.config.log.extended_log_header
netscape-ext2
- args: <on | off> = proxy.config.log2.extended2_log_enabled
- type = proxy.config.log2.extended2_log_is_ascii <ascii=1, binary=0>
- file = proxy.config.log2.extended2_log_name
- header = proxy.config.log2.extended2_log_header
+ args: <on | off> = proxy.config.log.extended2_log_enabled
+ type = proxy.config.log.extended2_log_is_ascii <ascii=1, binary=0>
+ file = proxy.config.log.extended2_log_name
+ header = proxy.config.log.extended2_log_header
ts# config:log format squid on type ascii file squid.log
+OK
ts#
syntax: config:logging splitting <icp | http> <on | off>
- records: proxy.config.log2.separate_icp_logs <icp>
- proxy.config.log2.separate_host_logs <http>
+ records: proxy.config.log.separate_icp_logs <icp>
+ proxy.config.log.separate_host_logs <http>
ts# config:log split icp on
+OK
ts#
syntax: config:logging custom <on | off> format <traditional | xml>
- records: proxy.config.log2.custom_logs_enabled
- proxy.config.log2.xml_logs_config <traditional=0, xml=1>
+ records: proxy.config.log.custom_logs_enabled
ts# config:logging custom on format xml
+OK
ts#
syntax: config:logging rolling <on | off> offset <hour> interval <num-hours> auto-delete <on | off>
- records: proxy.config.log2.rolling_enabled
- proxy.config.log2.rolling_offset_hr (24hour format)
- proxy.config.log2.rolling_interval_sec (seconds)
+ records: proxy.config.log.rolling_enabled
+ proxy.config.log.rolling_offset_hr (24hour format)
+ proxy.config.log.rolling_interval_sec (seconds)
ts# config:logging rolling on offset 0 interval 1 auto-delete off
+OK
@@ -1417,7 +1415,7 @@ ports Ports used by Traffic Server
<cluster> (proxy.config.cluster_port) single
<cluster-rs> (proxy.config.cluster.rsport) single
<cluster-mc> (proxy.config.cluster.mcport) single
- <ssl> (proxy.config.http.ssl_ports) list
+ <connect> (proxy.config.http.connect_ports) list
<socks-server> (proxy.config.socks.socks_server_port) single
<icp> (proxy.config.icp.icp_port) single
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.sh
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.sh?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.sh (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.sh Tue Nov 30 01:42:55 2010
@@ -62,7 +62,7 @@ export TS_CONFIG_SECONDARY_MTPT="/mnt/ts
export SYSTEM_CONFIG_FILES="/etc/resolv.conf /etc/hosts ${NETWORK_P2FILE} ${NETWORK_PARMSFILE}"
-export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config filter.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
+export TS_CONFIG_FILES="storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
export FLOPPY_DEVICE="/dev/fd0"
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.tcl
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.tcl?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.tcl (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cli2/script_configs.tcl Tue Nov 30 01:42:55 2010
@@ -62,7 +62,7 @@ export TS_CONFIG_SECONDARY_MTPT="/mnt/ts
export SYSTEM_CONFIG_FILES="/etc/resolv.conf /etc/hosts ${NETWORK_P2FILE} ${NETWORK_PARMSFILE}"
-export TS_CONFIG_FILES="logs.config storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config filter.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
+export TS_CONFIG_FILES="storage.config socks.config proxy.pac lm.config vaddrs.config cache.config icp.config mgmt_allow.config ip_allow.config parent.config remap.config mgr.cnf update.config ${MAIN_CONFIG_FILE}"
export FLOPPY_DEVICE="/dev/fd0"
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/cop/TrafficCop.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/cop/TrafficCop.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/cop/TrafficCop.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/cop/TrafficCop.cc Tue Nov 30 01:42:55 2010
@@ -74,7 +74,6 @@ static int check_memory_min_memfree_kb =
static int syslog_facility = LOG_DAEMON;
static char syslog_fac_str[PATH_MAX];
-//static int rni_killsig = SIGTERM;
static int killsig = SIGKILL;
static int coresig = 0;
@@ -655,13 +654,13 @@ read_config()
cop_log(COP_FATAL, "please set 'proxy.config.bin_path' \n");
}
}
- read_config_string("proxy.config.log2.logfile_dir", log_dir, sizeof(log_dir));
+ read_config_string("proxy.config.log.logfile_dir", log_dir, sizeof(log_dir));
Layout::get()->relative(log_dir, sizeof(log_dir), log_dir);
if (access(log_dir, W_OK) == -1) {
ink_strlcpy(log_dir, Layout::get()->logdir, sizeof(log_dir));
if (access(log_dir, W_OK) == -1) {
cop_log(COP_FATAL, "could not access() \"%s\"\n", log_dir);
- cop_log(COP_FATAL, "please set 'proxy.config.log2.logfile_dir' \n");
+ cop_log(COP_FATAL, "please set 'proxy.config.log.logfile_dir' \n");
}
}
read_config_string("proxy.config.output.logfile", log_filename, sizeof(log_filename));
@@ -848,9 +847,12 @@ static int
open_socket(int port, const char *ip = NULL, char *ip_to_bind = NULL)
{
- int sock;
- struct sockaddr_in name;
- int err;
+ int sock = 0;
+ struct addrinfo hints;
+ struct addrinfo *result = NULL;
+ struct addrinfo *result_to_bind = NULL;
+ char port_str[8] = {'\0'};
+ int err = 0;
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "Entering open_socket(%d, %s, %s)\n", port, ip, ip_to_bind);
@@ -858,9 +860,21 @@ open_socket(int port, const char *ip = N
if (!ip) {
ip = "127.0.0.1";
}
+
+ snprintf(port_str, sizeof(port_str), "%d", port);
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = AF_UNSPEC;
+ hints.ai_socktype = SOCK_STREAM;
+
+ err = getaddrinfo(ip, port_str, &hints, &result);
+ if (err != 0) {
+ cop_log (COP_WARNING, "(test) unable to get address info [%d %s] at ip %s, port %s\n", err, gai_strerror(err), ip, port_str);
+ goto getaddrinfo_error;
+ }
+
// Create a socket
do {
- sock = socket(AF_INET, SOCK_STREAM, 0);
+ sock = socket(result->ai_family, result->ai_socktype, 0);
} while ((sock < 0) && (transient_error(errno, TRANSIENT_ERROR_WAIT_MS)));
if (sock < 0) {
@@ -869,13 +883,22 @@ open_socket(int port, const char *ip = N
}
if (ip_to_bind) {
- memset(&name, 0, sizeof(name));
- name.sin_family = AF_INET;
- name.sin_addr.s_addr = inet_addr(ip_to_bind);
- name.sin_port = 0;
- if (safe_bind(sock, (struct sockaddr *) &name, sizeof(name)) < 0) {
- cop_log(COP_WARNING, "(test) unable to bind socket [%d '%s']\n", errno, strerror(errno));
+ memset(&hints, 0, sizeof(hints));
+ hints.ai_family = result->ai_family;
+ hints.ai_socktype = result->ai_socktype;
+
+ err = getaddrinfo(ip_to_bind, NULL, &hints, &result_to_bind);
+ if (err != 0) {
+ cop_log (COP_WARNING, "(test) unable to get address info [%d %s] at ip %s\n", err, gai_strerror(err), ip_to_bind);
+ freeaddrinfo(result_to_bind);
+ goto error;
+ }
+
+ if (safe_bind(sock, result_to_bind->ai_addr, result_to_bind->ai_addrlen) < 0) {
+ cop_log (COP_WARNING, "(test) unable to bind socket [%d '%s']\n", errno, strerror (errno));
}
+
+ freeaddrinfo(result_to_bind);
}
// Put the socket in non-blocking mode...just to be extra careful
@@ -889,13 +912,8 @@ open_socket(int port, const char *ip = N
goto error;
}
// Connect to the specified port on the machine we're running on.
- memset(&name, 0, sizeof(name));
- name.sin_family = AF_INET;
- name.sin_port = htons(port);
- name.sin_addr.s_addr = inet_addr(ip);
-
do {
- err = connect(sock, (struct sockaddr *) &name, sizeof(name));
+ err = connect(sock, result->ai_addr, result->ai_addrlen);
} while ((err < 0) && (transient_error(errno, TRANSIENT_ERROR_WAIT_MS)));
if ((err < 0) && (errno != EINPROGRESS)) {
@@ -905,6 +923,7 @@ open_socket(int port, const char *ip = N
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "Leaving open_socket(%d, %s, %s) --> %d\n", port, ip, ip_to_bind, sock);
#endif
+ freeaddrinfo(result);
return sock;
error:
@@ -914,6 +933,8 @@ error:
#ifdef TRACE_LOG_COP
cop_log(COP_DEBUG, "Leaving open_socket(%d, %s, %s) --> %d\n", port, ip, ip_to_bind, -1);
#endif
+getaddrinfo_error:
+ freeaddrinfo(result);
return -1;
}
@@ -1197,14 +1218,15 @@ test_http_port(int port, char *request,
static int
test_server_http_port()
{
- char request[1024];
- char *ip;
+ char request[1024] = {'\0'};
+ char *ip = NULL;
+ char localhost[] = "127.0.0.1";
// Generate a request for a the 'synthetic.txt' document the manager
// servers up on the autoconf port.
snprintf(request, sizeof(request), "GET http://127.0.0.1:%d/synthetic.txt HTTP/1.0\r\n\r\n", autoconf_port);
- ip = (strcmp(http_backdoor_ip, "NULL") == 0) ? NULL : http_backdoor_ip;
+ ip = (strcmp(http_backdoor_ip, "NULL") == 0) ? localhost : http_backdoor_ip;
return test_http_port(http_backdoor_port, request, server_timeout * 1000, ip, ip);
}
@@ -1280,9 +1302,6 @@ heartbeat_manager()
static int
heartbeat_server()
{
-// Don't heartbeat the server if we
-// are running in rni only mode
-#ifndef RNI_ONLY
int err;
#ifdef TRACE_LOG_COP
@@ -1326,14 +1345,6 @@ heartbeat_server()
cop_log(COP_DEBUG, "Leaving heartbeat_server() --> %d\n", err);
#endif
return err;
-
-#else
-#ifdef TRACE_LOG_COP
- cop_log(COP_DEBUG, "Leaving heartbeat_server() --> 1\n");
-#endif
- return 1;
-
-#endif // !RNI_ONLY
}
static int
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/html2/english.dict
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/html2/english.dict?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/html2/english.dict (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/html2/english.dict Tue Nov 30 01:42:55 2010
@@ -151,8 +151,6 @@ s_text_633=Method
s_text_634=Specifies the method of a requested URL
s_text_635=Scheme
s_text_636=Specifies the protocol of a requested URL.
-s_text_637=MIXT Scheme
-s_text_638=Specifies the media protocol type of a requested URL.
s_text_640=Time Period
s_text_641=Specifies the amount of time that applies to the selected rule type. (Only applies to 'revalidate', 'pin-in-cache', and 'ttl-in-cache' rule types.)
s_text_642=Example: 2h or 5d10h15m30s (d:days, h:hours, m:minutes, s:secs)
@@ -211,7 +209,6 @@ s_text_710=To Port (Optional)
s_text_711=Specifies the port number of the url to map to.
s_text_712=To Path Prefix (Optional)
s_text_713=Specifies the path prefix of the url to map to.
-s_text_714=Specifies the media protocol type of the mapping rule.
s_text_715=From Scheme
s_text_716=To Scheme
@@ -275,35 +272,6 @@ s_text_795=Proxy Hostname
s_text_796=Specifies the hostname or IP address assigned to <@record proxy.config.product_name>.
s_text_797=Proxy Port
-s_text_809=Authentication and Authorization Specifiers
-s_text_810=Specifies the rule action to define how <@record proxy.config.product_name> denies or allows particular URL requests, keeps or strips header information from client requests, and authenticates users.
-s_text_811=Specifies the primary destination type of the rule.
-s_text_812=Specifies the primary destination value that the rule applies to.
-s_text_813=Header Type
-s_text_814=Specifies the client request header information that you want to keep/strip. (Only applies to 'keep_hdr' or 'strip_hdr' rule types)
-s_text_815=Server Name
-s_text_816=Specifies the server.
-s_text_817=Example: ldap.foo.com:12345 or ldap.foo.com
-s_text_818=Base Distinguished Name
-s_text_819=Specifies the base distinguished name.
-s_text_820=UID Filter
-s_text_821=Specifies the UID filter.
-s_text_822=Attribute Name
-s_text_823=Specifies the attribute name.
-s_text_824=Attribute Value
-s_text_825=Specifies the attribute value.
-s_text_826=Realm (Optional)
-s_text_827=Specifies the realm.
-s_text_828=LDAP and NTLM Group Authorization Specifiers (Optional)
-s_text_829=Bind DN
-s_text_830=Specifies the DN of an authorized user.
-s_text_831=Bind Password
-s_text_832=Specifies the password to use when binding to the server or Domain Controller. Please hit "Apply Password" to commit a new password rule based on the values currently entered on the form.
-s_text_833=Bind Password File
-s_text_834=Specifies the password file to use when binding to the LDAP or NTLM server.
-s_text_835=Redirect URL (Optional)
-s_text_836=Specifies the url to redirect to when an error occurs.
-
s_text_837=Client Group Value
s_text_838=Specifies the value of the client group.
s_text_839=Example: 0.0.0.0 or 0.0.0.0-255.255.255.255 (IP) or domain.com (domain) or x.y.com (hostname)
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/preparse/RemapReadConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/preparse/RemapReadConfig.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/preparse/RemapReadConfig.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/preparse/RemapReadConfig.cc Tue Nov 30 01:42:55 2010
@@ -167,16 +167,6 @@ parseRemapFile(int fd)
toPath++;
toPathLen--;
}
-
- // INKqa09603
- // check to see if there's an extra tag(RNI/QT/WMT) for Media-IXT
- if (numToks == 4) { // there's a tag
- if (strcmp(whiteTok[3], "RNI") != 0 && strcmp(whiteTok[3], "QT") != 0 && strcmp(whiteTok[3], "WMT") != 0) {
- err = "Invalid Tag";
- goto FAIL;
- }
- }
-
}
}
}
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/tools/ConfigAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/tools/ConfigAPI.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/tools/ConfigAPI.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/tools/ConfigAPI.cc Tue Nov 30 01:42:55 2010
@@ -80,8 +80,6 @@ Config_SetHostname(char *hostname)
int status = -1;
#if !defined(freebsd) && !defined(darwin) && !defined(solaris)
char old_hostname[256];
- INKInt val;
- bool rni = false;
//printf("Inside Config_SetHostname(), hostname = %s\n", hostname);
@@ -113,41 +111,7 @@ Config_SetHostname(char *hostname)
return -1;
}
- //check if rmserver is installed
- INKRecordGetInt("proxy.config.rni.enabled", &val);
- rni = val;
- if (rni) {
- DPRINTF(("Config_SetHostname: calling INKSetRmRealm\n"));
- status = INKSetRmRealm(hostname);
- //status = rm_change_hostname(hostname); This is the old way
- if (status) {
- // If this fails, we need to restore old machine hostname
- // at this poing we already have TS and network configured
- Net_GetHostname(old_hostname, sizeof(old_hostname));
- if (!strlen(old_hostname)) {
- DPRINTF(("Config_SetHostname: FATAL: recovery failed - failed to get old_hostname\n"));
- return -1;
- }
- DPRINTF(("Config_SetHostname: new hostname setup failed - reverting to old hostname\n"));
- status = Net_SetHostname(old_hostname);
- if (status) {
- DPRINTF(("Config_SetHostname: FATAL: failed reverting to old hostname - network\n"));
- return status;
- }
- status = INKSetHostname(old_hostname);
- if (status) {
- DPRINTF(("Config_SetHostname: FATAL: failed reverting to old hostname - TS\n"));
- return status;
- }
- return -1;
- }
- DPRINTF(("Config_SetHostname: calling rm_start_proxy\n"));
- status = rm_start_proxy();
- if (status) {
- DPRINTF(("Config_SetHostname: Failed starting rm proxy in rm_start_proxy\n"));
- }
- }
#endif /* !freebsd && !darwin */
return status;
}
@@ -489,8 +453,6 @@ Config_SetNIC_Up(char *interface, char *
int status = -1;
#if !defined(freebsd) && !defined(darwin)
char old_ip[80];
- INKInt val;
- bool rni = false;
Config_GetNIC_IP(interface, old_ip, sizeof(old_ip));
@@ -513,25 +475,6 @@ Config_SetNIC_Up(char *interface, char *
//roll back??
return status;
}
- //check if real proxy is installed
- INKRecordGetInt("proxy.config.rni.enabled", &val);
- rni = val;
-
- if ((strcmp(interface, "eth0") == 0) && rni) {
- DPRINTF(("Config_SetNIC_Up: calling INKSetRmPNA_RDT_IP %s\n", ip));
-
- status = INKSetRmPNA_RDT_IP(ip);
- //status = rm_change_ip(1, &ip); This is the old way
- if (status) {
- DPRINTF(("Config_SetNIC_Up: Failed chaging ip for rm proxy\n")); //roll back?
- return -1;
- }
- status = rm_start_proxy();
- if (status) {
- DPRINTF(("Config_SetNIC_Up: FATAL: Failed starting rm_proxy after ip change - %s\n", ip)); //roll back?
- return -1;
- }
- }
#endif /* !freebsd && !darwin */
return status;
}
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/uistats
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/uistats?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/uistats (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/uistats Tue Nov 30 01:42:55 2010
@@ -697,44 +697,44 @@ proxy.process.hostdb.ttl
# doc: average TTL of HostDB entries (minutes)
# perfmonvar: hostdb_ttl
#
-proxy.process.log2.event_log_access
+proxy.process.log.event_log_access
# usage: counter
# units: events
# scale: 100000
# doc: The current number of access events that have been written to log files. This counter represents one entry in one file, so that if multiple formats are being written, a single access will create multiple access event log entries.
# shortdoc: # of events written to log files
-# perfmonvar: log2_event_log_access
+# perfmonvar: log_event_log_access
#
-proxy.process.log2.event_log_access_skip
+proxy.process.log.event_log_access_skip
# usage: counter
# units: events
# scale: 100000
# doc: # of events skipped instead of written to log files
# shortdoc: # of events not written to log files
-# perfmonvar: log2_event_log_access_skip
+# perfmonvar: log_event_log_access_skip
#
-proxy.process.log2.event_log_error
+proxy.process.log.event_log_error
# usage: counter
# units: events
# scale: 100000
# doc: # of events written to error log
-# perfmonvar: log2_event_log_error
+# perfmonvar: log_event_log_error
#
-proxy.process.log2.log_files_open
+proxy.process.log.log_files_open
# usage: gauge
# units: files
# scale: 10
# doc: How many access log files (formats) are currently being written
# shortdoc: # of log files being written to
-# perfmonvar: log2_log_files_open
+# perfmonvar: log_log_files_open
#
-proxy.process.log2.log_files_space_used
+proxy.process.log.log_files_space_used
# usage: gauge
# units: bytes
# scale: 1000000
# doc: The current amount of space being used by the logging directory, which contains all of the access and error logs
# shortdoc: # of bytes used by logging directory
-# perfmonvar: log2_log_files_space_used
+# perfmonvar: log_log_files_space_used
#
proxy.process.socks.connections_currently_open
# usage: gauge
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/utils/MgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/utils/MgmtUtils.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/utils/MgmtUtils.cc Tue Nov 30 01:42:55 2010
@@ -785,9 +785,7 @@ mgmt_sleep_sec(int seconds)
void
mgmt_sleep_msec(int msec)
{
-#if !defined (alpha) && !defined(__alpha)
usleep(msec * 1000);
-#endif
}
#else
void
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfig.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfig.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfig.cc Tue Nov 30 01:42:55 2010
@@ -243,9 +243,6 @@ formatCacheRule(char *rule)
if (strlen(tokens[9]) > 0) {
snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "Scheme=%s%s", tokens[9], HTML_DELIM);
}
- if (strlen(tokens[11]) > 0) {
- snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "MIXT Scheme=%s", tokens[11]);
- }
return xstrdup(buf);
}
@@ -474,9 +471,6 @@ formatParentRule(char *rule)
if (strlen(tokens[8]) > 0) {
snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "Scheme=%s%s", tokens[8], HTML_DELIM);
}
- if (strlen(tokens[9]) > 0) {
- snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "MIXT Scheme=%s", tokens[9]);
- }
return xstrdup(buf);
}
@@ -560,9 +554,6 @@ formatRemapRule(char *rule)
snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "/%s", tokens[7]);
}
- if (strlen(tokens[8]) > 0) {
- snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "MIXT Scheme=%s", tokens[8]);
- }
return xstrdup(buf);
}
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfigRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfigRender.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfigRender.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebConfigRender.cc Tue Nov 30 01:42:55 2010
@@ -861,10 +861,6 @@ writeRemapConfigTable(WebHttpContext * w
HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_TO_PATH);
HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_LABEL_SMALL, HTML_ALIGN_CENTER, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_MIXT_SCHEME);
- HtmlRndrTdClose(output);
-
HtmlRndrTrClose(output);
count = INKCfgContextGetCount(ctx);
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebGlobals.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebGlobals.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebGlobals.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebGlobals.h Tue Nov 30 01:42:55 2010
@@ -147,7 +147,6 @@ extern WebContext autoconfContext;
#define WEB_HTTP_SERVER_STATE_WIN32 0x01
#define WEB_HTTP_SERVER_STATE_UNIX 0x02
-#define WEB_HTTP_SERVER_STATE_MIXT_ENABLED 0x04
#define WEB_HTTP_SERVER_STATE_AUTH_ENABLED 0x08
#define WEB_HTTP_SERVER_STATE_SSL_ENABLED 0x10
#define WEB_HTTP_SERVER_STATE_AUTOCONF 0x20
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpLog.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpLog.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpLog.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpLog.cc Tue Nov 30 01:42:55 2010
@@ -53,7 +53,7 @@ WebHttpLogInit()
char log_file[PATH_NAME_MAX+1];
if ((err = stat(system_log_dir, &s)) < 0) {
- ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &log_dir)
+ ink_assert(RecGetRecordString_Xmalloc("proxy.config.log.logfile_dir", &log_dir)
== REC_ERR_OKAY);
if ((err = stat(log_dir, &s)) < 0) {
// Try 'system_root_dir/var/log/trafficserver' directory
@@ -62,7 +62,7 @@ WebHttpLogInit()
if ((err = stat(system_log_dir, &s)) < 0) {
mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
system_log_dir, err, errno, strerror(errno));
- mgmt_elog("please set 'proxy.config.log2.logfile_dir'\n");
+ mgmt_elog("please set 'proxy.config.log.logfile_dir'\n");
//_exit(1);
}
} else {
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.cc Tue Nov 30 01:42:55 2010
@@ -1570,7 +1570,7 @@ handle_select_access_logs(WebHttpContext
== REC_ERR_OKAY);
if ((err = stat(system_log_dir, &s)) < 0) {
- ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &logdir)
+ ink_assert(RecGetRecordString_Xmalloc("proxy.config.log.logfile_dir", &logdir)
== REC_ERR_OKAY);
if ((err = stat(logdir, &s)) < 0) {
// Try 'system_root_dir/var/log/trafficserver' directory
@@ -1579,7 +1579,7 @@ handle_select_access_logs(WebHttpContext
if ((err = stat(system_log_dir, &s)) < 0) {
mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
system_log_dir, err, errno, strerror(errno));
- mgmt_elog("please set 'proxy.config.log2.logfile_dir'\n");
+ mgmt_elog("please set 'proxy.config.log.logfile_dir'\n");
//_exit(1);
}
} else {
@@ -1652,7 +1652,7 @@ handle_select_debug_logs(WebHttpContext
== REC_ERR_OKAY);
if ((err = stat(system_log_dir, &s)) < 0) {
- ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &logdir)
+ ink_assert(RecGetRecordString_Xmalloc("proxy.config.log.logfile_dir", &logdir)
== REC_ERR_OKAY);
if ((err = stat(logdir, &s)) < 0) {
// Try 'system_root_dir/var/log/trafficserver' directory
@@ -1661,7 +1661,7 @@ handle_select_debug_logs(WebHttpContext
if ((err = stat(system_log_dir, &s)) < 0) {
mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
system_log_dir, err, errno, strerror(errno));
- mgmt_elog("please set 'proxy.config.log2.logfile_dir'\n");
+ mgmt_elog("please set 'proxy.config.log.logfile_dir'\n");
//_exit(1);
}
} else {
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebHttpRender.h Tue Nov 30 01:42:55 2010
@@ -171,8 +171,6 @@
#define HTML_ID_CFG_EDIT_METHOD_HELP "s_text_634"
#define HTML_ID_CFG_EDIT_SCHEME "s_text_635"
#define HTML_ID_CFG_EDIT_SCHEME_HELP "s_text_636"
-#define HTML_ID_CFG_EDIT_MIXT_SCHEME "s_text_637"
-#define HTML_ID_CFG_EDIT_MIXT_SCHEME_HELP "s_text_638"
#define HTML_ID_CFG_EDIT_TIME_PERIOD "s_text_640"
#define HTML_ID_CFG_EDIT_TIME_PERIOD_HELP "s_text_641"
#define HTML_ID_CFG_EDIT_TIME_PERIOD_EG "s_text_642"
@@ -234,7 +232,6 @@
#define HTML_ID_CFG_EDIT_TO_PORT_HELP "s_text_711"
#define HTML_ID_CFG_EDIT_TO_PATH "s_text_712"
#define HTML_ID_CFG_EDIT_TO_PATH_HELP "s_text_713"
-#define HTML_ID_CFG_EDIT_MIXT_SCHEME_HELP_2 "s_text_714"
#define HTML_ID_CFG_EDIT_FROM_SCHEME "s_text_715"
#define HTML_ID_CFG_EDIT_TO_SCHEME "s_text_716"
@@ -302,36 +299,6 @@
#define HTML_ID_CFG_EDIT_SEARCH_LIST_HELP "s_text_788"
#define HTML_ID_CFG_EDIT_SEARCH_LIST_EG "s_text_789"
-// filter.config
-#define HTML_ID_CFG_EDIT_AUTH_SPEC "s_text_809"
-#define HTML_ID_CFG_EDIT_RULE_TYPE_HELP_5 "s_text_810"
-#define HTML_ID_CFG_EDIT_PDEST_TYPE_HELP_4 "s_text_811"
-#define HTML_ID_CFG_EDIT_PDEST_VALUE_HELP_4 "s_text_812"
-#define HTML_ID_CFG_EDIT_HEADER_TYPE "s_text_813"
-#define HTML_ID_CFG_EDIT_HEADER_TYPE_HELP "s_text_814"
-#define HTML_ID_CFG_EDIT_LDAP_SERVER "s_text_815"
-#define HTML_ID_CFG_EDIT_LDAP_SERVER_HELP "s_text_816"
-#define HTML_ID_CFG_EDIT_LDAP_SERVER_EG "s_text_817"
-#define HTML_ID_CFG_EDIT_LDAP_BASE_DN "s_text_818"
-#define HTML_ID_CFG_EDIT_LDAP_BASE_DN_HELP "s_text_819"
-#define HTML_ID_CFG_EDIT_LDAP_UID "s_text_820"
-#define HTML_ID_CFG_EDIT_LDAP_UID_HELP "s_text_821"
-#define HTML_ID_CFG_EDIT_LDAP_ATTR_NAME "s_text_822"
-#define HTML_ID_CFG_EDIT_LDAP_ATTR_NAME_HELP "s_text_823"
-#define HTML_ID_CFG_EDIT_LDAP_ATTR_VALUE "s_text_824"
-#define HTML_ID_CFG_EDIT_LDAP_ATTR_VALUE_HELP "s_text_825"
-#define HTML_ID_CFG_EDIT_LDAP_REALM "s_text_826"
-#define HTML_ID_CFG_EDIT_LDAP_REALM_HELP "s_text_827"
-#define HTML_ID_CFG_EDIT_LDAP_OPTIONS "s_text_828"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_DN "s_text_829"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_DN_HELP "s_text_830"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_PWD "s_text_831"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_PWD_HELP "s_text_832"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_PWD_FILE "s_text_833"
-#define HTML_ID_CFG_EDIT_LDAP_BIND_PWD_FILE_HELP "s_text_834"
-#define HTML_ID_CFG_EDIT_LDAP_RDR_URL "s_text_835"
-#define HTML_ID_CFG_EDIT_LDAP_RDR_URL_HELP "s_text_836"
-
#define HTML_ID_CFG_EDIT_USER "s_text_844"
#define HTML_ID_CFG_EDIT_USER_HELP "s_text_845"
#define HTML_ID_CFG_EDIT_PASSWORD "s_text_846"
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebIntrMain.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebIntrMain.cc Tue Nov 30 01:42:55 2010
@@ -237,14 +237,14 @@ setUpLogging()
char log_file[PATH_NAME_MAX+1];
if ((err = stat(system_log_dir, &s)) < 0) {
- ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &log_dir)
+ ink_assert(RecGetRecordString_Xmalloc("proxy.config.log.logfile_dir", &log_dir)
== REC_ERR_OKAY);
Layout::relative_to(system_log_dir, sizeof(system_log_dir),
Layout::get()->prefix, log_dir);
if ((err = stat(log_dir, &s)) < 0) {
mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
system_log_dir, err, errno, strerror(errno));
- mgmt_elog("please set 'proxy.config.log2.logfile_dir'\n");
+ mgmt_elog("please set 'proxy.config.log.logfile_dir'\n");
//_exit(1);
} else {
ink_strncpy(system_log_dir,log_dir,sizeof(system_log_dir));
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.cc Tue Nov 30 01:42:55 2010
@@ -71,11 +71,15 @@ overviewRecord::overviewRecord(unsigned
node_rec_data.num_recs = 0;
node_rec_data.recs = NULL;
recordArraySize = 0;
+ node_rec_first_ix = 0;
} else {
node_rec_data.num_recs = cpi->node_rec_data.num_recs;
recordArraySize = node_rec_data.num_recs * sizeof(RecRecord);
node_rec_data.recs = new RecRecord[recordArraySize];
memcpy(node_rec_data.recs, cpi->node_rec_data.recs, recordArraySize);
+
+ // Recaculate the old relative index
+ RecGetRecordOrderAndId(node_rec_data.recs[0].name, &node_rec_first_ix, NULL);
}
@@ -192,6 +196,7 @@ overviewRecord::updateStatus(time_t curr
// (remote nodes only)
if (localNode == false) {
memcpy(node_rec_data.recs, cpi->node_rec_data.recs, recordArraySize);
+ RecGetRecordOrderAndId(node_rec_data.recs[0].name, &node_rec_first_ix, NULL);
}
}
@@ -274,9 +279,9 @@ overviewRecord::readCounter(const char *
int rec_status = REC_ERR_OKAY;
int order = -1;
if (localNode == false) {
- // TODO: Not sure if this is correct now after we eliminated the relative order. Do we care?
rec_status = RecGetRecordOrderAndId(name, &order, NULL);
if (rec_status == REC_ERR_OKAY) {
+ order -= node_rec_first_ix; // Offset
ink_release_assert(order < node_rec_data.num_recs);
ink_debug_assert(order < node_rec_data.num_recs);
rec = node_rec_data.recs[order].data.rec_counter;
@@ -300,9 +305,9 @@ overviewRecord::readInteger(const char *
int rec_status = REC_ERR_OKAY;
int order = -1;
if (localNode == false) {
- // TODO: Not sure if this is correct now after we eliminated the relative order. Do we care?
rec_status = RecGetRecordOrderAndId(name, &order, NULL);
if (rec_status == REC_ERR_OKAY) {
+ order -= node_rec_first_ix; // Offset
ink_release_assert(order < node_rec_data.num_recs);
ink_debug_assert(order < node_rec_data.num_recs);
rec = node_rec_data.recs[order].data.rec_int;
@@ -326,9 +331,9 @@ overviewRecord::readFloat(const char *na
int rec_status = REC_ERR_OKAY;
int order = -1;
if (localNode == false) {
- // TODO: Not sure if this is correct now after we eliminated the relative order. Do we care?
rec_status = RecGetRecordOrderAndId(name, &order, NULL);
if (rec_status == REC_ERR_OKAY) {
+ order -= node_rec_first_ix; // Offset
ink_release_assert(order < node_rec_data.num_recs);
ink_debug_assert(order < node_rec_data.num_recs);
rec = node_rec_data.recs[order].data.rec_float;
@@ -352,9 +357,10 @@ overviewRecord::readString(const char *n
int rec_status = REC_ERR_OKAY;
int order = -1;
if (localNode == false) {
- // TODO: Not sure if this is correct now after we eliminated the relative order. Do we care?
rec_status = RecGetRecordOrderAndId(name, &order, NULL);
if (rec_status == REC_ERR_OKAY) {
+ order -= node_rec_first_ix; // Offset
+ printf("LOCAL NAME IS %s\n", node_rec_data.recs[order].name);
ink_release_assert(order < node_rec_data.num_recs);
ink_debug_assert(order < node_rec_data.num_recs);
rec = xstrdup(node_rec_data.recs[order].data.rec_string);
Modified: trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.h?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.h (original)
+++ trafficserver/traffic/branches/wccp/proxy/mgmt2/web2/WebOverview.h Tue Nov 30 01:42:55 2010
@@ -111,9 +111,10 @@ public:
bool varCounterFromName(const char *varName, RecCounter * value);
private:
- RecRecords node_rec_data; // a copy from ClusterPeerInfo
+ RecRecords node_rec_data; // a copy from ClusterPeerInfo
int recordArraySize; // the size of node_data.recs
- overviewRecord(const overviewRecord &);
+ int node_rec_first_ix; // Kludge, but store the first order ix for later use
+ overviewRecord(const overviewRecord &);
};
// information about the entire cluster
Modified: trafficserver/traffic/branches/wccp/proxy/signals.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/wccp/proxy/signals.cc?rev=1040383&r1=1040382&r2=1040383&view=diff
==============================================================================
--- trafficserver/traffic/branches/wccp/proxy/signals.cc (original)
+++ trafficserver/traffic/branches/wccp/proxy/signals.cc Tue Nov 30 01:42:55 2010
@@ -38,16 +38,6 @@
// For backtraces on crash
#include "ink_stack_trace.h"
-
-#ifdef __alpha
-#include <obj.h>
-#include <sym.h>
-#include <demangle.h>
-#include <ucontext.h>
-#include <excpt.h>
-struct obj_list *ObjList;
-#endif
-
#if TS_HAS_PROFILER
#include <google/profiler.h>
#endif
@@ -152,87 +142,6 @@ public:
}
};
-#if defined (__alpha)
-
-void
-print_context(sigcontext & c, int frame)
-{
- unsigned long pc = c.sc_pc;
-
- //
- // Get the object corresponding to this PC
- //
- struct obj *obj = address_to_obj(ObjList, pc);
- char *procedure_name = "<unknown>";
- char *filename = "<unknown>";
- int line_number = -1;
-
- if (obj) {
- //
- // Get the procedure in this object corresponding to this PC.
- //
- unsigned long mldproc = address_to_procedure(obj, pc);
- if (mldproc != OBJ_FAIL) {
- //
- // Get the procedure name
- //
- unsigned long mldsym = procedure_symbol(obj, mldproc);
- if (mldsym != OBJ_FAIL) {
- char proc_name_buf[1024];
-
- procedure_name = symbol_name(obj, mldsym);
-
- //
- // And try to demangle it..
- //
- int result = MLD_demangle_string(procedure_name,
- proc_name_buf, sizeof(proc_name_buf),
- MLD_SHOW_DEMANGLED_NAME | MLD_SHOW_INFO);
-
- if (result == MLD_SOMETHING_RECOGNIZED) {
- procedure_name = proc_name_buf;
- }
- }
-
- long mldfile = procedure_to_file(obj, mldproc);
- if (mldfile != OBJ_FAIL) {
- filename = file_name(obj, mldfile);
- }
-
- long mldline = address_to_line(obj, pc);
- if (mldline != OBJ_FAIL) {
- line_number = mldline;
- }
- }
- }
-
- //
- // See /usr/include/machine/context.h for structure
- //
- fprintf(stderr, "[%d]: '%s', line '%d', file '%s' (0x%x)\n", frame, procedure_name, line_number, filename, c.sc_pc);
-
- fprintf(stderr, "");
- for (int i = 0; i < 32; i++) {
-
- if (((i + 1) % 4) == 0) {
-
- fprintf(stderr, "\tReg[%d] = 0x%x\n", i, c.sc_regs[i]);
-
- } else {
-
- if (c.sc_regs[i] > 0xff || c.sc_regs[i] < 0) {
- fprintf(stderr, "\tReg[%d] = 0x%x", i, c.sc_regs[i]);
- } else {
- fprintf(stderr, "\tReg[%d] = 0x%x\t", i, c.sc_regs[i]);
- }
- }
- }
- fprintf(stderr, "\n");
-}
-
-#endif
-
-
static void
interrupt_handler(int sig)
@@ -255,44 +164,6 @@ signal_handler(int sig, siginfo_t * t, v
sigusr1_received = 1;
return;
}
-#if defined (__alpha)
- sigcontext starting_context;
-
- //
- // Establish the current context. We ought to be
- // able to extract this from the signal handler arguments
- // but the expirements to do so failed for unknown
- // reasons
- //
- exc_capture_context(&starting_context);
-#endif
-
-#ifdef __alpha
- if (sig == SIGUSR2) {
- fprintf(stderr, "Entering pthreads debugger\n");
- pthread_debug();
- return;
- }
-#endif
-
-#ifdef __alpha
- // If stack trace of fatal errors is enabled, dump it out and
- // exit the process
- if (stack_trace_flag) {
- int cur_frame = 0;
- print_context(starting_context, cur_frame++);
-
- for (;;) {
- exc_virtual_unwind(NULL, &starting_context);
- print_context(starting_context, cur_frame++);
- if (starting_context.sc_pc == NULL) {
- fprintf(stderr, "Stack completely unwound\n");
- break;
- }
- }
- _exit(1);
- }
-#endif
char sig_msg[2048];
#if !defined(linux) && !defined(freebsd)
@@ -368,7 +239,6 @@ static void
child_signal_handler(int sig)
{
(void) sig;
-/* No forked children in VxWorks */
int pid;
int saved_errno = errno;
while ((pid = waitpid(-1, 0, WNOHANG)) > 0) {
@@ -437,21 +307,8 @@ check_signals()
check_signal(SIGPIPE, (SigActionFunc_t) SIG_IGN);
check_signal(SIGQUIT, (SigActionFunc_t) signal_handler);
check_signal(SIGHUP, (SigActionFunc_t) interrupt_handler);
-
-#if defined (__alpha)
- if (stack_trace_flag) {
- set_signal(SIGABRT, (SigActionFunc_t) signal_handler);
- set_signal(SIGILL, (SigActionFunc_t) signal_handler);
- set_signal(SIGBUS, (SigActionFunc_t) signal_handler);
- set_signal(SIGSEGV, (SigActionFunc_t) signal_handler);
- }
-#endif
-
check_signal(SIGTERM, (SigActionFunc_t) signal_handler);
check_signal(SIGUSR1, (SigActionFunc_t) signal_handler);
-#ifdef __alpha
- check_signal(SIGUSR2, (SigActionFunc_t) signal_handler);
-#endif
}
@@ -501,23 +358,10 @@ init_signals(bool do_stackdump)
// // SIGABRT loop on solaris assert() failures
// set_signal(SIGABRT,(SigActionFunc_t)signal_handler);
//
-#if defined (__alpha)
- if (stack_trace_flag) {
- set_signal(SIGABRT, (SigActionFunc_t) signal_handler);
- set_signal(SIGILL, (SigActionFunc_t) signal_handler);
- set_signal(SIGBUS, (SigActionFunc_t) signal_handler);
- set_signal(SIGSEGV, (SigActionFunc_t) signal_handler);
- }
-#endif
-
#if !defined(freebsd)
set_signal(SIGUSR1, (SigActionFunc_t) signal_handler);
#endif
-#ifdef __alpha
- set_signal(SIGUSR2, (SigActionFunc_t) signal_handler);
-#endif
-
#if defined(linux)
set_signal(SIGUSR2, (SigActionFunc_t) signal_handler);
#endif