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 2010/09/17 18:58:42 UTC
svn commit: r998201 [4/4] - in /trafficserver/traffic/trunk:
contrib/perl/AdminClient/lib/Apache/TS/ doc/man/ librecords/ proxy/
proxy/api/ts/ proxy/config/ proxy/logging/ proxy/mgmt2/ proxy/mgmt2/api2/
proxy/mgmt2/api2/include/ proxy/mgmt2/api2/remote...
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc Fri Sep 17 16:58:40 2010
@@ -922,106 +922,6 @@ CmdArgs_ConfigSnmp()
}
////////////////////////////////////////////////////////////////
-// Cmd_ConfigLdap
-//
-// This is the callback function for the "config:ldap" command.
-//
-// Parameters:
-// clientData -- information about parsed arguments
-// interp -- the Tcl interpreter
-// argc -- number of command arguments
-// argv -- the command arguments
-//
-int
-Cmd_ConfigLdap(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
- /* call to processArgForCommand must appear at the beginning
- * of each command's callback function
- */
- if (processArgForCommand(interp, argc, argv) != CLI_OK) {
- return CMD_ERROR;
- }
-
- if (processHelpCommand(argc, argv) == CLI_OK)
- return CMD_OK;
-
- if (cliCheckIfEnabled("config:ldap") == CLI_ERROR) {
- return CMD_ERROR;
- }
- Cli_Debug("Cmd_ConfigLdap argc %d\n", argc);
-
- cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable;
-
- cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
-
- int action = (argc == 3) ? RECORD_SET : RECORD_GET;
-
- Cli_PrintArg(0, argtable);
- Cli_PrintArg(1, argtable);
-
- if (argtable->parsed_args != CLI_PARSED_ARGV_END) {
- switch (argtable->parsed_args) {
- case CMD_CONFIG_LDAP_STATUS:
- return (Cli_RecordOnOff_Action(action, "proxy.config.ldap.auth.enabled", argtable->arg_string));
-
- case CMD_CONFIG_LDAP_CACHE_SIZE:
- return (Cli_RecordInt_Action(action, "proxy.config.ldap.cache.size", argtable->arg_int));
-
- case CMD_CONFIG_LDAP_TTL:
- return (Cli_RecordInt_Action(action, "proxy.config.ldap.auth.ttl_value", argtable->arg_int));
-
- case CMD_CONFIG_LDAP_PURGE_FAIL:
- return (Cli_RecordOnOff_Action(action, "proxy.config.ldap.auth.purge_cache_on_auth_fail", argtable->arg_string));
-
- case CMD_CONFIG_LDAP_SERVER_NAME:
- return (Cli_RecordOnOff_Action(action, "proxy.config.ldap.proc.ldap.server.name", argtable->arg_string));
-
- case CMD_CONFIG_LDAP_SERVER_PORT:
- return (Cli_RecordOnOff_Action(action, "proxy.config.ldap.proc.ldap.server.port", argtable->arg_string));
-
- case CMD_CONFIG_LDAP_DN:
- return (Cli_RecordOnOff_Action(action, "proxy.config.ldap.proc.ldap.base.dn", argtable->arg_string));
-
- case CMD_CONFIG_LDAP_FILE:
- return (Cli_ConfigFileURL_Action(INK_FNAME_FILTER, "filter.config", argtable->arg_string));
- }
- }
- Cli_Error(ERR_COMMAND_SYNTAX, cmdCallbackInfo->command_usage);
- return CMD_ERROR;
-}
-
-////////////////////////////////////////////////////////////////
-// CmdArgs_ConfigLdap
-//
-// Register "config:ldap" arguments with the Tcl interpreter.
-//
-int
-CmdArgs_ConfigLdap()
-{
-
- createArgument("status", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_LDAP_STATUS, "Set ldap status <on | off>", (char *) NULL);
- createArgument("cache-size", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_LDAP_CACHE_SIZE, "Set cache size <int>", (char *) NULL);
- createArgument("ttl", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_LDAP_TTL, "Set ttl value <int>", (char *) NULL);
- createArgument("purge-fail", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_LDAP_PURGE_FAIL, "Set purge fail <on | off>", (char *) NULL);
- createArgument("server-name", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_LDAP_SERVER_NAME, "Set Server Name <string>", (char *) NULL);
- createArgument("server-port", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_LDAP_SERVER_PORT, "Set Server Port <int>", (char *) NULL);
- createArgument("dn", 1, CLI_ARGV_OPTION_NAME_VALUE, (char *) NULL, CMD_CONFIG_LDAP_DN, "Set DN", (char *) NULL);
- createArgument("file", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_LDAP_FILE, "Set filter.config (used for LDAP configuration) from <url>",
- (char *) NULL);
- return 0;
-}
-
-
-////////////////////////////////////////////////////////////////
// Cmd_ConfigClock
//
// This is the callback function for the "config:clock" command.
@@ -2553,180 +2453,6 @@ CmdArgs_ConfigAlarm()
////////////////////////////////////////////////////////////////
-// Cmd_ConfigNtlm
-//
-int
-Cmd_ConfigNtlm(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
- /* call to processArgForCommand must appear at the beginning
- * of each command's callback function
- */
- if (processArgForCommand(interp, argc, argv) != CLI_OK) {
- return CMD_ERROR;
- }
-
- if (processHelpCommand(argc, argv) == CLI_OK)
- return CMD_OK;
-
- if (cliCheckIfEnabled("config:ntlm") == CLI_ERROR) {
- return CMD_ERROR;
- }
- Cli_Debug("Cmd_ConfigNtlm argc %d\n", argc);
-
- cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable;
-
- cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
-
- int action = (argc == 3) ? RECORD_SET : RECORD_GET;
-
- if (argtable->parsed_args != CLI_PARSED_ARGV_END) {
- switch (argtable->parsed_args) {
- case CMD_CONFIG_NTLM_STATUS:
- return (Cli_RecordOnOff_Action(action, "proxy.config.ntlm.auth.enabled", argtable->arg_string));
-
- case CMD_CONFIG_NTLM_DOMAIN_CTRL:
- return (Cli_RecordString_Action(action, "proxy.config.ntlm.dc.list", argtable->arg_string));
-
- case CMD_CONFIG_NTLM_NTDOMAIN:
- return (Cli_RecordString_Action(action, "proxy.config.ntlm.nt_domain", argtable->arg_string));
-
- case CMD_CONFIG_NTLM_LOADBAL:
- return (Cli_RecordOnOff_Action(action, "proxy.config.ntlm.dc.load_balance", argtable->arg_string));
- }
- }
- Cli_Error(ERR_COMMAND_SYNTAX, cmdCallbackInfo->command_usage);
- return CMD_ERROR;
-}
-
-////////////////////////////////////////////////////////////////
-// CmdArgs_ConfigNtlm
-//
-// Register "config:Scheduled-Update" arguments with the Tcl interpreter.
-//
-int
-CmdArgs_ConfigNtlm()
-{
- createArgument("status", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_NTLM_STATUS,
- "Enable or disable NTLM authentication <on | off>", (char *) NULL);
-
- createArgument("domain-controller", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_NTLM_DOMAIN_CTRL,
- "Comma separated list of hostnames of domain controllers <string>", (char *) NULL);
-
- createArgument("nt-domain", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_NTLM_NTDOMAIN,
- "NT domain name that should be authenticated against <string>", (char *) NULL);
-
- createArgument("load-balancing", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_NTLM_LOADBAL,
- "Balance the load on sending requests to domain controllers <on | off>", (char *) NULL);
-
- return 0;
-}
-
-////////////////////////////////////////////////////////////////
-// Cmd_ConfigRadius
-//
-int
-Cmd_ConfigRadius(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
- /* call to processArgForCommand must appear at the beginning
- * of each command's callback function
- */
- if (processArgForCommand(interp, argc, argv) != CLI_OK) {
- return CMD_ERROR;
- }
-
- if (processHelpCommand(argc, argv) == CLI_OK)
- return CMD_OK;
-
- if (cliCheckIfEnabled("config:radius") == CLI_ERROR) {
- return CMD_ERROR;
- }
- Cli_Debug("Cmd_ConfigRadius argc %d\n", argc);
-
- cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable;
-
- cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
-
- int action = (argc == 3) ? RECORD_SET : RECORD_GET;
-
- if (argtable->parsed_args != CLI_PARSED_ARGV_END) {
- switch (argtable->parsed_args) {
- case CMD_CONFIG_RADIUS_STATUS:
- return (Cli_RecordOnOff_Action(action, "proxy.config.radius.auth.enabled", argtable->arg_string));
-
- case CMD_CONFIG_RADIUS_PRI_HOST:
- return (Cli_RecordString_Action(action,
- "proxy.config.radius.proc.radius.primary_server.name", argtable->arg_string));
-
- case CMD_CONFIG_RADIUS_PRI_PORT:
- return (Cli_RecordInt_Action(action,
- "proxy.config.radius.proc.radius.primary_server.auth_port", argtable->arg_int));
-
- case CMD_CONFIG_RADIUS_SEC_HOST:
- return (Cli_RecordString_Action(action,
- "proxy.config.radius.proc.radius.secondary_server.name", argtable->arg_string));
- case CMD_CONFIG_RADIUS_SEC_PORT:
- return (Cli_RecordInt_Action(action,
- "proxy.config.radius.proc.radius.secondary_server.auth_port", argtable->arg_int));
-
- case CMD_CONFIG_RADIUS_PRI_KEY:
- return (ConfigRadiusKeys("proxy.config.radius.proc.radius.primary_server.shared_key_file"));
-
- case CMD_CONFIG_RADIUS_SEC_KEY:
- return (ConfigRadiusKeys("proxy.config.radius.proc.radius.secondary_server.shared_key_file"));
- }
- }
- Cli_Error(ERR_COMMAND_SYNTAX, cmdCallbackInfo->command_usage);
- return CMD_ERROR;
-}
-
-////////////////////////////////////////////////////////////////
-// CmdArgs_ConfigRadius
-//
-// Register "config:radius" arguments with the Tcl interpreter.
-//
-int
-CmdArgs_ConfigRadius()
-{
- createArgument("status", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_RADIUS_STATUS,
- "Enable or disable Radius authentication <on | off>", (char *) NULL);
-
- createArgument("primary-hostname", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_RADIUS_PRI_HOST,
- "Specify the name of the primary Radius server <string>", (char *) NULL);
-
- createArgument("primary-port", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_RADIUS_PRI_PORT,
- "Specify the authentication port of the primary Radius server <integer>", (char *) NULL);
-
- createArgument("primary-key", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_RADIUS_PRI_KEY, "Specify the key to use for encoding", (char *) NULL);
-
- createArgument("secondary-hostname", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_RADIUS_SEC_HOST,
- "Specify the name of the secondary Radius server <string>", (char *) NULL);
-
- createArgument("secondary-port", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_RADIUS_SEC_PORT,
- "Specify the authentication port of the secondary Radius server <integer>", (char *) NULL);
-
- createArgument("secondary-key", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_RADIUS_SEC_KEY, "Specify the key to use for encoding", (char *) NULL);
-
- return 0;
-}
-
-
-
-////////////////////////////////////////////////////////////////
//
// "config" sub-command implementations
//
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h Fri Sep 17 16:58:40 2010
@@ -60,14 +60,6 @@ typedef enum
CMD_CONFIG_SNMP,
CMD_CONFIG_SNMP_STATUS,
CMD_CONFIG_SNMP_VALUE,
- CMD_CONFIG_LDAP_STATUS,
- CMD_CONFIG_LDAP_CACHE_SIZE,
- CMD_CONFIG_LDAP_TTL,
- CMD_CONFIG_LDAP_PURGE_FAIL,
- CMD_CONFIG_LDAP_SERVER_NAME,
- CMD_CONFIG_LDAP_SERVER_PORT,
- CMD_CONFIG_LDAP_DN,
- CMD_CONFIG_LDAP_FILE,
CMD_CONFIG_DATE,
CMD_CONFIG_TIME,
CMD_CONFIG_TIMEZONE,
@@ -270,59 +262,10 @@ typedef enum
CMD_CONFIG_NETWORK_START,
CMD_CONFIG_NETWORK_PROTOCOL,
CMD_CONFIG_GATEWAY,
- CMD_CONFIG_NTLM_STATUS,
- CMD_CONFIG_NTLM_DOMAIN_CTRL,
- CMD_CONFIG_NTLM_NTDOMAIN,
- CMD_CONFIG_NTLM_LOADBAL,
- CMD_CONFIG_RADIUS_STATUS,
- CMD_CONFIG_RADIUS_PRI_HOST,
- CMD_CONFIG_RADIUS_PRI_PORT,
- CMD_CONFIG_RADIUS_PRI_KEY,
- CMD_CONFIG_RADIUS_SEC_HOST,
- CMD_CONFIG_RADIUS_SEC_PORT,
- CMD_CONFIG_RADIUS_SEC_KEY,
CMD_CONFIG_ALARM_RESOLVE_NAME,
CMD_CONFIG_ALARM_RESOLVE_NUMBER,
CMD_CONFIG_ALARM_RESOLVE_ALL,
CMD_CONFIG_ALARM_NOTIFY,
- CMD_CONFIG_WMT_STATUS,
- CMD_CONFIG_WMT_PORT,
- CMD_CONFIG_WMT_PREBUFFERING,
- CMD_CONFIG_WMT_PREBUFFERING_TCP,
- CMD_CONFIG_WMT_LOADPATH,
- CMD_CONFIG_WMT_LOADHOST,
- CMD_CONFIG_WMT_CHUNKSIZE,
- CMD_CONFIG_WMT_OLD_ASX_BEHAV,
- CMD_CONFIG_WMT_DEBUG,
- CMD_CONFIG_WMT_ASX_WRITE,
- CMD_CONFIG_WMT_REXMIT_WIN,
- CMD_CONFIG_WMT_ORIGIN_URL,
- CMD_CONFIG_WMT_MONITOR_VERSION,
- CMD_CONFIG_WMT_MONITOR_LIVEHOSTS,
- CMD_CONFIG_WMT_MONITOR_NAME,
- CMD_CONFIG_WMT_MONITOR_PORT,
- CMD_CONFIG_WMT_REDIRECT,
- CMD_CONFIG_WMT_MEDIA_BRIDGE_NAME,
- CMD_CONFIG_WMT_MEDIA_BRIDGE_PORT,
- CMD_CONFIG_WMT_MEDIA_BRIDGE_MOUNT,
- CMD_CONFIG_WMT_PROXY_ONLY,
- CMD_CONFIG_RNI_STATUS,
- CMD_CONFIG_RNI_VERBOSITY,
- CMD_CONFIG_RNI_CACHE_PORT,
- CMD_CONFIG_RNI_WATCHER_ENABLED,
- CMD_CONFIG_RNI_CONTROL_PORT,
- CMD_CONFIG_RNI_PROXY_PORT,
- CMD_CONFIG_RNI_PID_PATH,
- CMD_CONFIG_RNI_RESTART_CMD,
- CMD_CONFIG_RNI_RESTART_INTERVAL,
- CMD_CONFIG_RNI_SERVICE_NAME,
- CMD_CONFIG_QT_STATUS,
- CMD_CONFIG_QT_PROXY_PORT,
- CMD_CONFIG_QT_MONITOR_NAME,
- CMD_CONFIG_QT_MONITOR_PORT,
- CMD_CONFIG_QT_NAME,
- CMD_CONFIG_QT_PORT,
- CMD_CONFIG_QT_MOUNT_POINT
} cliConfigCommand;
typedef struct DateTime
@@ -512,27 +455,6 @@ int CmdArgs_ConfigSnmp();
////////////////////////////////////////////////////////////////
-// Cmd_ConfigLdap
-//
-// This is the callback function for the "config:ldap" command.
-//
-// Parameters:
-// clientData -- information about parsed arguments
-// interp -- the Tcl interpreter
-// argc -- number of command arguments
-// argv -- the command arguments
-//
-int Cmd_ConfigLdap(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-
-////////////////////////////////////////////////////////////////
-// CmdArgs_ConfigLdap
-//
-// Register "config:ldap" arguments with the Tcl interpreter.
-//
-int CmdArgs_ConfigLdap();
-
-
-////////////////////////////////////////////////////////////////
// Cmd_ConfigPortTunnles
//
// This is the callback function for the "config:port-tunnels" command.
@@ -572,6 +494,7 @@ int Cmd_ConfigScheduledUpdate(ClientData
// Register "config:Scheduled-Update" arguments with the Tcl interpreter.
//
int CmdArgs_ConfigScheduledUpdate();
+
////////////////////////////////////////////////////////////////
// Cmd_ConfigSocks
//
@@ -849,11 +772,6 @@ int Cmd_ConfigAlarm(ClientData clientDat
//
int CmdArgs_ConfigAlarm();
-int Cmd_ConfigNtlm(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int CmdArgs_ConfigNtlm();
-int Cmd_ConfigRadius(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int CmdArgs_ConfigRadius();
-
////////////////////////////////////////////////////////////////
// Cmd_Enable
//
@@ -1011,6 +929,4 @@ int ConfigAlarmResolveAll();
// config:alarm notify
int ConfigAlarmNotify(char *stringval);
-// config:radius keys
-int ConfigRadiusKeys(const char *record);
#endif // __CONFIG_CMD_H__
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc Fri Sep 17 16:58:40 2010
@@ -1139,130 +1139,6 @@ Cmd_ShowAlarms(ClientData clientData, Tc
}
////////////////////////////////////////////////////////////////
-// Cmd_ShowNtlmStats
-//
-int
-Cmd_ShowRadius(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
- NOWARN_UNUSED(clientData);
- /* call to processArgForCommand must appear at the beginning
- * of each command's callback function
- */
- if (processArgForCommand(interp, argc, argv) != CLI_OK) {
- return CMD_ERROR;
- }
-
- if (processHelpCommand(argc, argv) == CLI_OK)
- return CMD_OK;
-
- INKInt radius_status = -1;
- INKString pri_host = NULL;
- INKInt pri_port = -1;
- INKString sec_host = NULL;
- INKInt sec_port = -1;
-
- Cli_RecordGetInt("proxy.config.radius.auth.enabled", &radius_status);
- Cli_RecordGetString("proxy.config.radius.proc.radius.primary_server.name", &pri_host);
- Cli_RecordGetInt("proxy.config.radius.proc.radius.primary_server.auth_port", &pri_port);
- Cli_RecordGetString("proxy.config.radius.proc.radius.secondary_server.name", &sec_host);
- Cli_RecordGetInt("proxy.config.radius.proc.radius.secondary_server.auth_port", &sec_port);
-
- Cli_Printf("\n");
- Cli_Printf("Radius Authentication -------- %s\n", radius_status == 1 ? "on" : "off");
- Cli_Printf("Primary Hostname ------------- %s\n", pri_host);
- Cli_Printf("Primary Port ----------------- %d\n", pri_port);
- Cli_Printf("Secondary Hostname ----------- %s\n", sec_host);
- Cli_Printf("Secondary Port --------------- %d\n", sec_port);
- Cli_Printf("\n");
-
- return CLI_OK;
-}
-
-////////////////////////////////////////////////////////////////
-// Cmd_ShowNtlm
-int
-Cmd_ShowNtlm(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
- NOWARN_UNUSED(clientData);
- /* call to processArgForCommand must appear at the beginning
- * of each command's callback function
- */
- if (processArgForCommand(interp, argc, argv) != CLI_OK) {
- return CMD_ERROR;
- }
-
- if (processHelpCommand(argc, argv) == CLI_OK)
- return CMD_OK;
-
- INKInt ntlm_status = -1;
- INKString domain_controller = NULL;
- INKString nt_domain = NULL;
- INKInt load_balancing = -1;
-
- Cli_RecordGetInt("proxy.config.ntlm.auth.enabled", &ntlm_status);
- Cli_RecordGetString("proxy.config.ntlm.dc.list", &domain_controller);
- Cli_RecordGetString("proxy.config.ntlm.nt_domain", &nt_domain);
- Cli_RecordGetInt("proxy.config.ntlm.dc.load_balance", &load_balancing);
-
- Cli_Printf("\n");
- Cli_Printf("NTLM Authentication ------ %s\n", ntlm_status == 1 ? "on" : "off");
- Cli_Printf("Domain Controller(s) ----- %s\n", domain_controller);
- Cli_Printf("NT Domain ---------------- %s\n", nt_domain);
- Cli_Printf("Load Balancing ----------- %s\n", load_balancing == 1 ? "on" : "off");
- Cli_Printf("\n");
-
- return CLI_OK;
-}
-
-////////////////////////////////////////////////////////////////
-// Cmd_ShowNtlmStats
-//
-// This is the callback function for the "show:ntlm-stats" command.
-//
-// Parameters:
-// clientData -- information about parsed arguments
-// interp -- the Tcl interpreter
-// argc -- number of command arguments
-// argv -- the command arguments
-//
-int
-Cmd_ShowNtlmStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[])
-{
- NOWARN_UNUSED(clientData);
- /* call to processArgForCommand must appear at the beginning
- * of each command's callback function
- */
- if (processArgForCommand(interp, argc, argv) != CLI_OK) {
- return CMD_ERROR;
- }
-
- if (processHelpCommand(argc, argv) == CLI_OK)
- return CMD_OK;
-
- INKInt cache_hits = -1;
- INKInt cache_misses = -1;
- INKInt server_errors = -1;
- INKInt auth_denied = -1;
- INKInt auth_cancelled = -1;
-
- Cli_RecordGetInt("proxy.process.ntlm.cache.hits", &cache_hits);
- Cli_RecordGetInt("proxy.process.ntlm.cache.misses", &cache_misses);
- Cli_RecordGetInt("proxy.process.ntlm.server.errors", &server_errors);
- Cli_RecordGetInt("proxy.process.ntlm.denied.authorizations", &auth_denied);
- Cli_RecordGetInt("proxy.process.ntlm.cancelled.authentications", &auth_cancelled);
-
- Cli_Printf("\n");
- Cli_Printf("Cache Hits ----------------- %d\n", cache_hits);
- Cli_Printf("Cache Misses --------------- %d\n", cache_misses);
- Cli_Printf("Server Errors -------------- %d\n", server_errors);
- Cli_Printf("Authorization Denied ------- %d\n", auth_denied);
- Cli_Printf("Authentication Cancelled --- %d\n", auth_cancelled);
- Cli_Printf("\n");
-
- return CLI_OK;
-}
-
-////////////////////////////////////////////////////////////////
// Cmd_ShowNetwork
//
// This is the callback function for the "show:network" command.
@@ -2172,99 +2048,6 @@ ShowSnmp()
return CLI_OK;
}
-// show ldap sub-command
-int
-ShowLdap()
-{
- // declare and initialize variables
-
- INKInt ldap_enable = 0;
- INKInt cache_size = -1;
- INKInt ttl_value = -1;
- INKInt auth_fail = 0;
- INKString ServerName = NULL;
- INKInt ServerPort = 0;
- INKString BaseDN = NULL;
-
- // retrieve values
-
- Cli_RecordGetInt("proxy.config.ldap.auth.enabled", &ldap_enable);
- Cli_RecordGetInt("proxy.config.ldap.cache.size", &cache_size);
- Cli_RecordGetInt("proxy.config.ldap.auth.ttl_value", &ttl_value);
- Cli_RecordGetInt("proxy.config.ldap.auth.purge_cache_on_auth_fail", &auth_fail);
- Cli_RecordGetString("proxy.config.ldap.proc.ldap.server.name", &ServerName);
- Cli_RecordGetInt("proxy.config.ldap.proc.ldap.server.port", &ServerPort);
- Cli_RecordGetString("proxy.config.ldap.proc.ldap.base.dn", &BaseDN);
-
-
- // display results
- Cli_Printf("\n");
-
- Cli_PrintEnable("LDAP ---------------------- ", ldap_enable);
- Cli_Printf("Cache Size ---------------- %d\n", cache_size);
- Cli_Printf("TTL Value ----------------- %d ms\n", ttl_value);
- Cli_PrintEnable("Purge Cache On Auth Fail -- ", auth_fail);
- Cli_Printf("Server Name --------------- %s\n", ServerName);
- Cli_Printf("Server Port --------------- %d\n", ServerPort);
- Cli_Printf("Base DN ------------------- %s\n", BaseDN);
- Cli_Printf("\n");
-
- return CLI_OK;
-}
-
-// show:ldap rules sub-command
-int
-ShowLdapRules()
-{
- // display rules from filter.config
- // since filter.config is now used for ldap configuration
- Cli_Printf("\n");
-
- Cli_Printf("filter.config rules\n" "-------------------\n");
- INKError status = Cli_DisplayRules(INK_FNAME_FILTER);
- Cli_Printf("\n");
-
- return status;
-}
-
-// show ldap sub-command
-int
-ShowLdapStats()
-{
- // declare and initialize variables
-
-
- INKInt Cache_Hits = 0;
- INKInt Cache_Misses = 0;
- INKInt Server_Errors = 0;
- INKInt Authorization_Denied = 0;
- INKInt Authorization_Timeouts = 0;
- INKInt Authorization_Cancelled = 0;
-
- // retrieve values
-
- Cli_RecordGetInt("proxy.process.ldap.cache.hits", &Cache_Hits);
- Cli_RecordGetInt("proxy.process.ldap.cache.misses", &Cache_Misses);
- Cli_RecordGetInt("proxy.process.ldap.server.errors", &Server_Errors);
- Cli_RecordGetInt("proxy.process.ldap.denied.authorizations", &Authorization_Denied);
- Cli_RecordGetInt("proxy.process.ldap.auth.timed_out", &Authorization_Timeouts);
- Cli_RecordGetInt("proxy.process.ldap.cancelled.authentications", &Authorization_Cancelled);
-
-
- // display results
- Cli_Printf("\n");
- Cli_Printf("Cache Hits---------------- %d\n", Cache_Hits);
- Cli_Printf("Cache Misses-------------- %d\n", Cache_Misses);
- Cli_Printf("Server Errors------------- %d\n", Server_Errors);
- Cli_Printf("Authorization Denied------ %d\n", Authorization_Denied);
- Cli_Printf("Authorization Timeouts---- %d\n", Authorization_Timeouts);
- Cli_Printf("Authorization Cancelled--- %d\n", Authorization_Cancelled);
- Cli_Printf("\n");
-
- return CLI_OK;
-}
-
-
// show socks sub-command
int
ShowSocks()
@@ -2278,7 +2061,6 @@ ShowSocks()
INKInt accept_port = -1;
// retrieve values
-
Cli_RecordGetInt("proxy.config.socks.socks_needed", &socks_enabled);
Cli_RecordGetInt("proxy.config.socks.socks_version", &version);
Cli_RecordGetString("proxy.config.socks.default_servers", &default_servers);
@@ -2351,6 +2133,7 @@ ShowScheduledUpdate()
Cli_RecordGetInt("proxy.config.update.force", &force);
//display values
+ // display rules from socks.config
Cli_Printf("\n");
if (Cli_PrintEnable("Scheduled Update ------------- ", enabled) == CLI_ERROR) {
@@ -2373,7 +2156,6 @@ ShowScheduledUpdate()
int
ShowScheduledUpdateRules()
{
- // display rules from socks.config
Cli_Printf("\n");
Cli_Printf("update.config rules\n" "-------------------\n");
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h Fri Sep 17 16:58:40 2010
@@ -60,9 +60,6 @@ typedef enum
CMD_SHOW_PARENT_RULES,
CMD_SHOW_REMAP,
CMD_SHOW_SNMP,
- CMD_SHOW_LDAP,
- CMD_SHOW_LDAP_RULES,
- CMD_SHOW_LDAP_STATS,
CMD_SHOW_SOCKS,
CMD_SHOW_SOCKS_RULES,
CMD_SHOW_PORT_TUNNELS,
@@ -120,10 +117,6 @@ int Cmd_ShowParents(ClientData clientDat
int CmdArgs_ShowParents();
int Cmd_ShowRemap(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int Cmd_ShowSnmp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int Cmd_ShowLdap(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int Cmd_ShowLdapStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int CmdArgs_ShowLdap();
-int CmdArgs_ShowLdapStats();
int Cmd_ShowSocks(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int CmdArgs_ShowSocks();
int Cmd_ShowPortTunnels(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
@@ -220,15 +213,6 @@ int ShowRemap();
// show snmp sub-command
int ShowSnmp();
-// show ldap sub-command
-int ShowLdap();
-
-// show ldap-stats sub-command
-int ShowLdapStats();
-
-// show:ldap rules sub-command
-int ShowLdapRules();
-
// show socks sub-command
int ShowSocks();
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt Fri Sep 17 16:58:40 2010
@@ -606,24 +606,6 @@ snmp SNMP Configuration
SNMP Agent -- on (proxy.config.snmp.master_agent_enabled)
ts>
-ldap LDAP Configuration
- syntax: show:ldap [ rules ]
- args: optional "rules" to show ldapsrvr.config rules
- behavior: Display LDAP Configuration.
-
- ts> show:ldap (proxy.config.ldap.*)
- LDAP ---------------------- on (auth.enabled)
- Cache Size ---------------- 5000 (cache.size)
- TTL Value ----------------- 3000 ms (auth.ttl_value)
- Purge Cache On Auth Fail -- off (auth.purge_cache_on_auth_fail)
- ts>
-
- ts> show:ldap rules
- ldapsrvr.config rules
- ---------------------
- (Display rules from ldapsrvr.config)
- ts>
-
socks SOCKS Configuration
(on/off, stats)
syntax: show:socks [ rules ]
@@ -675,31 +657,6 @@ scheduled-update Scheduled Update
(Display list of rules from update.config)
ts>
-radius Radius Authentication Configuration
-
- traffic_shell> show:radius
-
- Radius Authentication -------- on (proxy.config.radius.auth.enabled)
- Primary Hostname ------------- NULL (proxy.config.radius.proc.radius.primary_server.name)
- Primary Port ----------------- 1812 (proxy.config.radius.proc.radius.primary_server.auth_port)
- Primary Key ------------------ NULL (proxy.config.radius.proc.radius.primary_server.shared_key)
- Secondary Hostname ----------- NULL (proxy.config.radius.proc.radius.secondary_server.name)
- Secondary Port --------------- 1812 (proxy.config.radius.proc.radius.secondary_server.auth_port)
- Secondary Key ---------------- NULL (proxy.config.radius.proc.radius.secondary_server.shared_key)
-
- traffic_shell>
-
-ntlm NTLM Configuration
-
- traffic_shell> show:ntlm
-
- NTLM Authentication ------ on (proxy.config.ntlm.auth.enabled)
- Domain Controller(s) ----- NULL (proxy.config.ntlm.dc.list)
- NT Domain ---------------- NULL (proxy.config.ntlm.nt_domain)
- Load Balancing ----------- off (proxy.config.ntlm.dc.load_balance)
-
- traffic_shell>
-
Status subcommands
------------------
@@ -881,35 +838,6 @@ logging-stats Logging Statistics
Number of Error Events Logged ---- 0 (proxy.process.log2.event_log_error)
ts>
-ldap-stats LDAP Statistics
- syntax: show:ldap-stats
- args: none
- behavior: Display LDAP statistics.
-
- ts> show:ldap-stats
-
- Cache Hits----------------0 (proxy.process.ldap.cache.hits)
- Cache Misses--------------0 (proxy.process.ldap.cache.misses)
- Server Errors-------------0 (proxy.process.ldap.server.errors)
- Authorization Denied------0 (proxy.process.ldap.denied.authorizations)
- Authorization Timeouts----0 (proxy.process.ldap.auth.timed_out)
- Authorization Cancelled---0 (proxy.process.ldap.cancelled.authentications)
-
- ts>
-
-ntlm-stats NTLM Statistics
-
- traffic_shell> show:ntlm-stats
-
- Cache Hits ----------------- 0 (proxy.process.ntlm.cache.hits)
- Cache Misses --------------- 0 (proxy.process.ntlm.cache.misses)
- Server Errors -------------- 0 (proxy.process.ntlm.server.errors)
- Authorization Denied ------- 0 (proxy.process.ntlm.denied.authorizations)
- Authentication Cancelled --- 0 (proxy.process.ntlm.cancelled.authentications)
-
- traffic_shell>
-
-
network Network Settings
syntax: show:network
args: none
@@ -1524,42 +1452,6 @@ snmp SNMP Configuration
syntax: config:snmp status <on | off>
args: <on | off> (proxy.config.snmp.master_agent_enabled)
-ldap LDAP Configuration
- syntax: config:ldap status <on | off>
- syntax: config:ldap cache-size <cache>
- syntax: config:ldap ttl <ttl>
- syntax: config:ldap purge-fail <on | off>
- syntax: config:ldap server-name <name>
- syntax: config:ldap server-port <port_number>
- syntax: config:ldap dn <distinguished name>
-
- args: (proxy.config.ldap.*)
- ldap (auth.enabled)
- cache-size (cache.size)
- ttl (auth.ttl_value)
- purge-fail (auth.purge_cache_on_auth_fail)
- server-name (proc.ldap.server.name)
- server-port (proc.ldap.server.port)
- dn (proc.ldap.base.dn)
-
- ts# config:ldap status on
- ts#
- ts# config:ldap cache-size 5000
- ts#
- ts# config:ldap ttl 3000
- ts#
- ts# config:ldap purge-fail off
- ts#
- ts# config:ldap server-name blah
- ts# config:ldap server-port 5150
- ts# config:ldap dn blahblah
-
- syntax: config:ldap file <url>
- args <url> retrieve ldapsrvr.config file from URL.
-
- ts# config:ldap file http://example.com/ldapsrvr.config
- ts#
-
virtual-ip Virtual IP Address Configuration
syntax: config:virtual-ip status <on | off>
@@ -1640,25 +1532,6 @@ scheduled-update Scheduled Update
ts>
-ntlm NTLM Configuration
-
- config:ntlm status <on | off> (proxy.config.ntlm.auth.enabled)
- config:ntlm domain-controller <hostnames> (proxy.config.ntlm.dc.list)
- config:ntlm nt-domain <domain> (proxy.config.ntlm.nt_domain)
- config:ntlm load-balancing <on | off> (proxy.config.ntlm.dc.load_balance)
-
-
-radius Radius Configuration
-
- config:radius status <on | off> (proxy.config.radius.auth.enabled)
- config:radius primary-hostname <hostname> (proxy.config.radius.proc.radius.primary_server.name)
- config:radius primary-port <port> (proxy.config.radius.proc.radius.primary_server.auth_port)
- config:radius primary-key <key> (proxy.config.radius.proc.radius.primary_server.shared_key)
- config:radius secondary-hostname <hostname> (proxy.config.radius.proc.radius.secondary_server.name)
- config:radius secondary-port <port> (proxy.config.radius.proc.radius.secondary_server.auth_port)
- config:radius secondary-key <key> (proxy.config.radius.proc.radius.secondary_server.shared_key)
-
-
Appliance-Specific commands (Linux only)
========================================
@@ -1823,171 +1696,3 @@ config:network Make System Network confi
syntax: reboot
ts# reboot
-
-Other
-=====
-Customizable Respose Pages
-------------------------------------------------------------------------------
-PART - II
-~~~~~~~~~
-MIXT specific commands.
-------------------------
-
-Windows media configuration
-----------------------------
-
-wmt Windows Media Technologies
-config:wmt status <on | off> (proxy.config.wmt.enabled)
-config:wmt port <portno> (proxy.config.wmt.port)
-config:wmt proxy-only <on | off> (proxy.config.wmt.proxyonly)
-config:wmt prebuffering <milli seconds> (proxy.config.wmt.prebuffering_ms)
-config:wmt prebuffering-tcp <milli seconds> (proxy.config.wmt.prebuffering_ms_tcp",)
-config:wmt loadhost <string> (proxy.config.wmt.loadhost)
-config:wmt loadpath <string> (proxy.config.wmt.loadpath)
-config:wmt chunksize <seconds> (proxy.config.wmt.chunksize_sec)
-config:wmt old-asx-behavior <seconds> (proxy.config.reverse_proxy.oldasxbehavior)
-config:wmt debug <on | off> (proxy.config.wmt.debug_tags.enabled)
-config:wmt asx-rewrite <on | off> (proxy.config.wmt.asx_rewrite.enabled)
-config:wmt redirect <on | off> (proxy.config.wmt.redirect.enabled)
-config:wmt rexmit-window <integer> (proxy.config.wmt.rexmit.window)
-config:wmt monitor-version <version number> (proxy.config.wmt.media_bridge.monitor.version)
-config:wmt monitor-livehosts <string> (proxy.config.wmt.media_bridge.monitor.livehosts)
-config:wmt monitor-name <string> (proxy.config.wmt.media_bridge.monitor.name)
-config:wmt monitor-port <portno> (proxy.config.wmt.media_bridge.monitor.port)
-config:wmt media-bridge-name <string> (proxy.config.wmt.media_bridge.name)
-config:wmt media-bridge-port <portno> (proxy.config.wmt.media_bridge.port)
-config:wmt media-bridge-mount <string> (proxy.config.wmt.media_bridge.mount_point)
-
-Quick time commands
----------------------
-config:qt status <on | off> (proxy.config.qt.enabled)
-config:qt proxy-port <portno> (proxy.config.mixt.rtsp_proxy_port)
-config:qt monitor-name <string> (proxy.config.qt.media_bridge.monitor.name)
-config:qt monitor-port <portno> (proxy.config.qt.media_bridge.monitor.port)
-config:qt name <string> (proxy.config.qt.media_bridge.name)
-config:qt port <portno> (proxy.config.qt.media_bridge.port)
-config:qt mount-point <string> (proxy.config.qt.media_bridge.mount_point)
-
-
-Real config variables
-----------------------
-config:rni status <on | off> (proxy.config.rni.enabled)
-config:rni verbosity <on | off> (proxy.config.rni.verbosity)
-config:rni cache-port <portno> (proxy.config.rni.cache_port)
-config:rni watcher-enabled <on | off> (proxy.config.rni.watcher_enabled)
-config:rni control-port <portno> (proxy.config.rni.control_port)
-config:rni proxy-port <portno> (proxy.config.rni.proxy_port)
-config:rni pid-path <string> (proxy.config.rni.proxy_pid_path)
-config:rni restart-cmd <need info> (proxy.config.rni.proxy_restart_cmd)
-config:rni restart-interval <integer> (proxy.config.rni.proxy_restart_interval)
-config:rni service-name <string> (proxy.config.rni.proxy_service_name)
-
-Status commands for Real proxy
--------------------------------
-
-traffic_shell> show:rni-stats
-
-RNI:
-Object Count ---------------------- 0 (proxy.process.rni.object_count)
-Block Hit Count ------------------- 0 (proxy.process.rni.block_hit_count)
-Block Miss Count ------------------ 0 (proxy.process.rni.block_miss_count)
-Total Hits ------------------------ 0 (proxy.process.rni.byte_hit_sum)
-Total Miss ------------------------ 0 (proxy.process.rni.byte_miss_sum)
-Total Hit Time -------------------- 0 (proxy.process.rni.time_hit_sum)
-Total Miss Time ------------------- 0 (proxy.process.rni.time_miss_sum)
-Downstream Request Status --------- 0 (proxy.process.rni.downstream_requests)
-Downstream Request Bytes ---------- 0 (proxy.process.rni.downstream.request_bytes)
-Downstream Receive Bytes ---------- 0 (proxy.process.rni.downstream.response_bytes)
-Upstream Request Status ----------- 0 (proxy.process.rni.upstream_requests)
-Upstream Request Bytes ------------ 0 (proxy.process.rni.upstream.request_bytes)
-Upstream Receive Bytes ------------ 0 (proxy.process.rni.upstream.response_bytes)
-Client Connections ---------------- 0 (proxy.process.rni.current_client_connections)
-Cache Connections ----------------- 0 (proxy.process.rni.current_cache_connections)
-Server Connections ---------------- 0 (proxy.process.rni.current_server_connections)
-Total Aborts ---------------------- 0 (proxy.process.rni.errors.aborts)
-Failed Server Connections --------- 0 (proxy.process.rni.server.errors.connect_failed)
-Other Server Errors --------------- 0 (proxy.process.rni.server.errors.other)
-
-traffic_shell> show:rni
-
-RNI protocol ------- on (proxy.config.rni.enabled)
-Verbosity ---------- on (proxy.config.rni.verbosity)
-Cache port --------- 7802 (proxy.config.rni.cache_port)
-Watcher ------------ on (proxy.config.rni.watcher_enabled)
-Control Port ------- 7803 (proxy.config.rni.control_port)
-Proxy Port --------- 9231 (proxy.config.rni.proxy_port)
-PID Path ----------- /usr/local/var/log/trafficserver/rmserver.pid (proxy.config.rni.proxy_pid_path)
-Restart Command ---- /usr/local/bin/rmserver -m 94 --skip-cpu-test (proxy.config.rni.proxy_restart_cmd)
- /usr/local/etc/rmproxy/rmserver.cfg
-Restart Interval --- 10 (proxy.config.rni.proxy_restart_interval)
-Service Name ------- RMProxy (proxy.config.rni.proxy_service_name)
-
-traffic_shell>
-
-
-Status command for WMT
-----------------------
-
-traffic_shell> show:wmt-stats
-
-WMT:
-Downstream Request Bytes ------------- 0 (proxy.process.wmt.downstream.request_bytes)
-Downstream Response Bytes ------------ 0 (proxy.process.wmt.downstream.response_bytes)
-Upstream Request Bytes --------------- 0 (proxy.process.wmt.upstream.request_bytes)
-Upstream Response Bytes -------------- 0 (proxy.process.wmt.upstream.response_bytes)
-Client Connections ------------------- 0 (proxy.process.wmt.current_client_connections)
-Server Connections ------------------- 0 (proxy.process.wmt.current_server_connections)
-
-traffic_shell> show:wmt
-
-WMT Caching ------------- on (proxy.config.wmt.enabled)
-WMT Port ---------------- 1755 (proxy.config.wmt.port)
-Proxy only -------------- off (proxy.config.wmt.proxyonly)
-Prebuffering ------------ 5000 ms (proxy.config.wmt.prebuffering_ms)
-TCP Prebuffering -------- 200 ms (proxy.config.wmt.prebuffering_ms_tcp)
-Loadpath ---------------- no-file (proxy.config.wmt.loadpath)
-Loadhost ---------------- no-load-host-set.no-domain (proxy.config.wmt.loadhost)
-Chunksize --------------- 10 s (proxy.config.wmt.chunksize_sec)
-Old ASX behavior -------- 0 s (proxy.config.reverse_proxy.oldasxbehavior)
-ASX Rewrite ------------- on (proxy.config.wmt.debug_tags.enabled)
-Redirect ---------------- off (proxy.config.wmt.redirect.enabled)
-Retransmit window ------- 65 (proxy.config.wmt.rexmit.window)
-Monitor Version --------- 0 (proxy.config.wmt.media_bridge.monitor.version")
-Monitor Livehosts ------- NULL (proxy.config.wmt.media_bridge.monitor.livehosts)
-Monitor Name ------------ NULL (proxy.config.wmt.media_bridge.monitor.name)
-Monitor Port ------------ 10088 (proxy.config.wmt.media_bridge.monitor.port)
-Media Bridge Name ------- NULL (proxy.config.wmt.media_bridge.name)
-Media Bridge Port ------- 10022 (proxy.config.wmt.media_bridge.port)
-Media Bridge Mount ------ ffnet (proxy.config.wmt.media_bridge.mount_point)
-
-traffic_shell>
-
-
-Status commands for Quick time
----------------------------------
-
-traffic_shell> show:qt-stats
-
-Quicktime:
-Downstream Request Bytes ------------- 0 (proxy.process.qt.downstream.request_bytes)
-Downstream Response Bytes ------------ 0 (proxy.process.qt.downstream.response_bytes)
-Upstream Request Bytes --------------- 0 (proxy.process.qt.upstream.request_bytes)
-Upstream Response Bytes -------------- 0 (proxy.process.qt.upstream.response_bytes)
-Client Connections ------------------- 0 (proxy.process.qt.current_client_connections)
-Server Connections ------------------- 0 (proxy.process.qt.current_server_connections)
-Unique Live Streams ------------------ 0 (proxy.process.qt.unique_live_streams)
-Cache Bytes Read --------------------- 0 (proxy.process.qt.client.cache_bytes_read)
-Cache Cutoff ------------------------- 1048576 (proxy.config.cache.ram_cache_mixt_cutoffproxy.config.cache.ram_cache_mixt_cutoff)
-
-traffic_shell> show:qt
-
-Quicktime ------------ on (proxy.config.qt.enabled)
-Proxy port ----------- 554 (proxy.config.mixt.rtsp_proxy_port)
-Monitor Name --------- NULL (proxy.config.qt.media_bridge.monitor.name)
-Monitor Port --------- 10088 (proxy.config.qt.media_bridge.monitor.port)
-Media Bridge Name ---- NULL (proxy.config.qt.media_bridge.name)
-Media Bridge Port ---- 10036 (proxy.config.qt.media_bridge.port)
-Media Bridge Mount --- ffnet (proxy.config.qt.media_bridge.mount_point)
-
-traffic_shell>
-
Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt Fri Sep 17 16:58:40 2010
@@ -100,7 +100,6 @@ show:filter Filter conf
show:parent Parent configuration
show:remap Remap configuration
show:snmp SNMP configuration
-show:ldap LDAP configuration
show:socks SOCKS configuration
show:port-tunnels Port tunnels configuration
show:scheduled-update Scheduled update configuration
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml Fri Sep 17 16:58:40 2010
@@ -83,24 +83,6 @@
</ITEM>
</MENU>
- <MENU name="Streaming Media" enable_record="proxy.config.qt.enabled|proxy.config.rni.enabled|proxy.config.wmt.enabled">
- <ITEM name="QuickTime" enable_record="proxy.config.qt.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_quicktime.ink"
- help_link="/help/ts.ink?help=s_quickt.htm"/>
- </ITEM>
- <ITEM name="Real Networks" enable_record="proxy.config.rni.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_real_networks.ink"
- help_link="/help/ts.ink?help=s_real.htm"/>
- </ITEM>
- <ITEM name="Windows Media" enable_record="proxy.config.wmt.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_windows_media.ink"
- help_link="/help/ts.ink?help=s_winm.htm"/>
- </ITEM>
- </MENU>
-
<MENU name="Content Routing">
<ITEM name="ICP Peering">
<LINK name="ICP Peering" refresh="true"
@@ -109,24 +91,6 @@
</ITEM>
</MENU>
- <MENU name="Security">
- <ITEM name="LDAP" enable_record="proxy.config.ldap.auth.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_ldap.ink"
- help_link="/help/ts.ink?help=s_ldap.htm"/>
- </ITEM>
- <ITEM name="NTLM" enable_record="proxy.config.ntlm.auth.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_ntlm.ink"
- help_link="/help/ts.ink?help=s_ntlm.htm"/>
- </ITEM>
- <ITEM name="SOCKS" enable_record="proxy.config.socks.socks_needed">
- <LINK refresh="true"
- file_link="/monitor/m_socks.ink"
- help_link="/help/ts.ink?help=s_soks.htm"/>
- </ITEM>
- </MENU>
-
<MENU name="Subsystems">
<ITEM name="Cache">
<LINK refresh="true"
@@ -273,37 +237,6 @@
help_link="/help/ts.ink?help=c_httpsc.htm"/>
</ITEM>
</MENU>
- <MENU name="Streaming Media" enable_record="proxy.config.qt.enabled|proxy.config.rni.enabled|proxy.config.wmt.enabled">
- <ITEM name="Shared Settings">
- <LINK name="Common" refresh="false"
- file_link="/configure/c_media_common.ink"
- help_link="/help/ts.ink?help=c_medias.htm"/>
- </ITEM>
- <ITEM name="QuickTime" enable_record="proxy.config.qt.enabled">
- <LINK name="Media Bridge" refresh="false"
- file_link="/configure/c_quicktime_mbridge.ink"
- help_link="/help/ts.ink?help=c_quickt.htm"/>
- </ITEM>
- <ITEM name="Real Networks" enable_record="proxy.config.rni.enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_real_networks_general.ink"
- help_link="/help/ts.ink?help=c_real.htm"/>
- </ITEM>
- <ITEM name="Windows Media" enable_record="proxy.config.wmt.enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_windows_media_general.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- <LINK name="Multicast" refresh="false"
- file_link="/configure/c_windows_media_mcast.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- <LINK name="Media Push" refresh="false"
- file_link="/configure/c_media_push.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- <LINK name="Media Bridge" refresh="false"
- file_link="/configure/c_windows_media_mbridge.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- </ITEM>
- </MENU>
<MENU name="Content Routing">
<ITEM name="Hierarchies">
<LINK name="Parenting" refresh="false"
@@ -339,20 +272,6 @@
file_link="/configure/c_proxy_access.ink"
help_link="/help/ts.ink?help=c_cnct.htm"/>
</ITEM>
- <ITEM name="Access Control">
- <LINK name="Filtering" refresh="false"
- file_link="/configure/c_http_filtering.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- <LINK name="LDAP" refresh="false" enable_record="proxy.config.ldap.auth.enabled"
- file_link="/configure/c_ldap_general.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- <LINK name="Radius" refresh="false" enable_record="proxy.config.radius.auth.enabled"
- file_link="/configure/c_radius_general.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- <LINK name="NTLM" refresh="false" enable_record="proxy.config.ntlm.auth.enabled"
- file_link="/configure/c_ntlm_general.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- </ITEM>
<ITEM name="SSL Termination" enable_record="proxy.config.ssl.enabled">
<LINK name="General" refresh="false"
file_link="/configure/c_ssl_general.ink"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win Fri Sep 17 16:58:40 2010
@@ -84,14 +84,6 @@
</ITEM>
</MENU>
- <MENU name="Streaming Media" enable_record="proxy.config.wmt.enabled">
- <ITEM name="Windows Media" enable_record="proxy.config.wmt.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_windows_media.ink"
- help_link="/help/ts.ink?help=s_winm.htm"/>
- </ITEM>
- </MENU>
-
<MENU name="Content Routing">
<ITEM name="ICP Peering">
<LINK name="ICP Peering" refresh="true"
@@ -100,29 +92,6 @@
</ITEM>
</MENU>
- <MENU name="Security">
- <ITEM name="ARM Security">
- <LINK refresh="true"
- file_link="/monitor/m_arm_security.ink"
- help_link="/help/ts.ink?help=s_armsec.htm"/>
- </ITEM>
- <ITEM name="LDAP" enable_record="proxy.config.ldap.auth.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_ldap.ink"
- help_link="/help/ts.ink?help=s_ldap.htm"/>
- </ITEM>
- <ITEM name="NTLM" enable_record="proxy.config.ntlm.auth.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_ntlm.ink"
- help_link="/help/ts.ink?help=s_ntlm.htm"/>
- </ITEM>
- <ITEM name="SOCKS" enable_record="proxy.config.socks.socks_needed">
- <LINK refresh="true"
- file_link="/monitor/m_socks.ink"
- help_link="/help/ts.ink?help=s_soks.htm"/>
- </ITEM>
- </MENU>
-
<MENU name="Subsystems">
<ITEM name="Cache">
<LINK refresh="true"
@@ -258,19 +227,6 @@
help_link="/help/ts.ink?help=c_httpsc.htm"/>
</ITEM>
</MENU>
- <MENU name="Streaming Media" enable_record="proxy.config.wmt.enabled">
- <ITEM name="Windows Media" enable_record="proxy.config.wmt.enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_windows_media_general.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- <LINK name="Multicast" refresh="false"
- file_link="/configure/c_windows_media_mcast.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- <LINK name="Media Push" refresh="false"
- file_link="/configure/c_media_push.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- </ITEM>
- </MENU>
<MENU name="Content Routing">
<ITEM name="Hierarchies">
<LINK name="Parenting" refresh="false"
@@ -309,20 +265,6 @@
file_link="/configure/c_arm_security.ink"
help_link="/help/ts.ink?help=c_cnct.htm"/>
</ITEM>
- <ITEM name="Access Control">
- <LINK name="Filtering" refresh="false"
- file_link="/configure/c_http_filtering.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- <LINK name="LDAP" refresh="false" enable_record="proxy.config.ldap.auth.enabled"
- file_link="/configure/c_ldap_general.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- <LINK name="Radius" refresh="false" enable_record="proxy.config.radius.auth.enabled"
- file_link="/configure/c_radius_general.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- <LINK name="NTLM" refresh="false" enable_record="proxy.config.ntlm.auth.enabled"
- file_link="/configure/c_ntlm_general.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- </ITEM>
<ITEM name="SSL Termination" enable_record="proxy.config.ssl.enabled">
<LINK name="General" refresh="false"
file_link="/configure/c_ssl_general.ink"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp Fri Sep 17 16:58:40 2010
@@ -111,24 +111,6 @@ This text will be stripped from the buil
</ITEM>
</MENU>
- <MENU name="Streaming Media" enable_record="proxy.config.qt.enabled|proxy.config.rni.enabled|proxy.config.wmt.enabled">
- <ITEM name="QuickTime" enable_record="proxy.config.qt.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_quicktime.ink"
- help_link="/help/ts.ink?help=s_quickt.htm"/>
- </ITEM>
- <ITEM name="Real Networks" enable_record="proxy.config.rni.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_real_networks.ink"
- help_link="/help/ts.ink?help=s_real.htm"/>
- </ITEM>
- <ITEM name="Windows Media" enable_record="proxy.config.wmt.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_windows_media.ink"
- help_link="/help/ts.ink?help=s_winm.htm"/>
- </ITEM>
- </MENU>
-
<MENU name="Content Routing">
<ITEM name="ICP Peering">
<LINK name="ICP Peering" refresh="true"
@@ -137,24 +119,6 @@ This text will be stripped from the buil
</ITEM>
</MENU>
- <MENU name="Security">
- <ITEM name="LDAP" enable_record="proxy.config.ldap.auth.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_ldap.ink"
- help_link="/help/ts.ink?help=s_ldap.htm"/>
- </ITEM>
- <ITEM name="NTLM" enable_record="proxy.config.ntlm.auth.enabled">
- <LINK refresh="true"
- file_link="/monitor/m_ntlm.ink"
- help_link="/help/ts.ink?help=s_ntlm.htm"/>
- </ITEM>
- <ITEM name="SOCKS" enable_record="proxy.config.socks.socks_needed">
- <LINK refresh="true"
- file_link="/monitor/m_socks.ink"
- help_link="/help/ts.ink?help=s_soks.htm"/>
- </ITEM>
- </MENU>
-
<MENU name="Subsystems">
<ITEM name="Cache">
<LINK refresh="true"
@@ -332,42 +296,6 @@ This text will be stripped from the buil
help_link="/help/ts.ink?help=c_httpsc.htm"/>
</ITEM>
</MENU>
- <MENU name="Streaming Media" enable_record="proxy.config.qt.enabled|proxy.config.rni.enabled|proxy.config.wmt.enabled">
- <ITEM name="Shared Settings">
- <LINK name="Common" refresh="false"
- file_link="/configure/c_media_common.ink"
- help_link="/help/ts.ink?help=c_medias.htm"/>
- </ITEM>
- <ITEM name="QuickTime" enable_record="proxy.config.qt.enabled">
- <LINK name="Media Bridge" refresh="false"
- file_link="/configure/c_quicktime_mbridge.ink"
- help_link="/help/ts.ink?help=c_quickt.htm"/>
- </ITEM>
- <ITEM name="Real Networks" enable_record="proxy.config.rni.enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_real_networks_general.ink"
- help_link="/help/ts.ink?help=c_real.htm"/>
-#ifdef FTR_REAL_PROXY
- <LINK name="Real Proxy" refresh="false"
- file_link="/configure/c_real_networks_realproxy.ink"
- help_link="/help/ts.ink?help=c_real.htm"/>
-#endif
- </ITEM>
- <ITEM name="Windows Media" enable_record="proxy.config.wmt.enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_windows_media_general.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- <LINK name="Multicast" refresh="false"
- file_link="/configure/c_windows_media_mcast.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- <LINK name="Media Push" refresh="false"
- file_link="/configure/c_media_push.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- <LINK name="Media Bridge" refresh="false"
- file_link="/configure/c_windows_media_mbridge.ink"
- help_link="/help/ts.ink?help=c_winm.htm"/>
- </ITEM>
- </MENU>
<MENU name="Content Routing">
<ITEM name="Hierarchies">
<LINK name="Parenting" refresh="false"
@@ -403,20 +331,6 @@ This text will be stripped from the buil
file_link="/configure/c_proxy_access.ink"
help_link="/help/ts.ink?help=c_cnct.htm"/>
</ITEM>
- <ITEM name="Access Control">
- <LINK name="Filtering" refresh="false"
- file_link="/configure/c_http_filtering.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- <LINK name="LDAP" refresh="false" enable_record="proxy.config.ldap.auth.enabled"
- file_link="/configure/c_ldap_general.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- <LINK name="Radius" refresh="false" enable_record="proxy.config.radius.auth.enabled"
- file_link="/configure/c_radius_general.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- <LINK name="NTLM" refresh="false" enable_record="proxy.config.ntlm.auth.enabled"
- file_link="/configure/c_ntlm_general.ink"
- help_link="/help/ts.ink?help=c_auth.htm"/>
- </ITEM>
<ITEM name="SSL Termination" enable_record="proxy.config.ssl.enabled">
<LINK name="General" refresh="false"
file_link="/configure/c_ssl_general.ink"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/uistats
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/uistats?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/uistats (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/uistats Fri Sep 17 16:58:40 2010
@@ -499,90 +499,6 @@ proxy.process.icp.total_udp_send_queries
# scale: 10000
# perfmonvar: total_icp_udp_send_queries
#
-proxy.process.rni.block_miss_count
-# doc: total # of rni block misses
-# units: blocks
-# usage: counter
-# scale: 10000000
-# perfmonvar: total_rni_block_miss_count
-#
-proxy.process.rni.byte_hit_sum
-# doc: total # of rni bytes hit
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_rni_byte_hit_sum
-#
-proxy.process.rni.byte_miss_sum
-# doc: total # of rni bytes missed
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_rni_byte_miss_sum
-#
-proxy.process.rni.current_client_connections
-# doc: current # of open rni client connections
-# units: connections
-# usage: gauge
-# scale: 200
-# perfmonvar: current_rni_client_connections
-#
-proxy.process.rni.current_server_connections
-# doc: current # of open rni server connections
-# units: connections
-# usage: gauge
-# scale: 200
-# perfmonvar: current_rni_server_connections
-#
-proxy.process.rni.downstream.request_bytes
-# doc: total # of rni downstream request byte
-# units: bytes
-# usage: counter
-# scale: 10000000
-# perfmonvar: total_rni_downstream_request_bytes
-#
-proxy.process.rni.downstream.response_bytes
-# doc: total # of rni downstream response byte
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_rni_downstream_response_bytes
-#
-proxy.process.rni.downstream_requests
-# doc: total # of rni downstream requests
-# units: transactions
-# usage: counter
-# scale: 10000000
-# perfmonvar: total_rni_downstream_requests
-#
-proxy.process.rni.object_count
-# doc: total # of rni objects served
-# units: objects
-# usage: counter
-# scale: 100000
-# perfmonvar: total_rni_object_count
-#
-proxy.process.rni.upstream.request_bytes
-# doc: total # of rni upstream request byte
-# units: bytes
-# usage: counter
-# scale: 10000000
-# perfmonvar: total_rni_upstream_request_bytes
-#
-proxy.process.rni.upstream.response_bytes
-# doc: total # of rni upstream response byte
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_rni_upstream_response_bytes
-#
-proxy.process.rni.upstream_requests
-# doc: total # of rni upstream requests
-# units: transactions
-# usage: counter
-# scale: 10000000
-# perfmonvar: total_rni_upstream_requests
-#
# html/cache.stats.ink
proxy.process.cache.bytes_total CH
# doc: Total number of bytes devoted to the cache
@@ -929,111 +845,6 @@ proxy.node.http.transaction_frac_avg_10s
proxy.node.http.transaction_frac_avg_10s.miss_not_cacheable_int_pct M
proxy.node.http.transaction_frac_avg_10s.other.unclassified_int_pct M
#
-proxy.process.wmt.downstream.request_bytes
-# doc: total # of wmt downstream request byte
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_wmt_downstream_request_bytes
-#
-proxy.process.wmt.downstream.response_bytes
-# doc: total # of wmt downstream response byte
-# units: bytes
-# usage: counter
-# scale: 10000000
-# perfmonvar: total_wmt_downstream_response_bytes
-#
-proxy.process.wmt.upstream.request_bytes
-# doc: total # of wmt upstream request byte
-# units: bytes
-# usage: counter
-# scale: 10000000
-# perfmonvar: total_wmt_upstream_request_bytes
-#
-proxy.process.wmt.upstream.response_bytes
-# doc: total # of wmt upstream response byte
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_wmt_upstream_response_bytes
-#
-proxy.process.wmt.current_client_connections
-# doc: current # of open wmt client connections
-# units: connections
-# usage: gauge
-# scale: 200
-# perfmonvar: current_wmt_client_connections
-#
-proxy.process.wmt.current_server_connections
-# doc: current # of open wmt server connections
-# units: connections
-# usage: gauge
-# scale: 200
-# perfmonvar: current_wmt_server_connections
-#
-proxy.process.qt.current_unique_live_streams
-# doc: current # of open unique live streams connection
-# units: connections
-# usage: gauge
-# scale: 200
-# perfmonvar: current_qt_unique_live_streams
-#
-proxy.process.qt.client.server_bytes_read
-# doc: total # of bytes from from origin server
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_qt_server_bytes_read
-#
-proxy.process.qt.client.cache_bytes_read
-# doc: total # of bytes read from cache
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_qt_cache_bytes_read
-#
-proxy.process.qt.downstream.request_bytes
-# doc: total # of qt downstream request byte
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_qt_downstream_request_bytes
-#
-proxy.process.qt.downstream.response_bytes
-# doc: total # of qt downstream response byte
-# units: bytes
-# usage: counter
-# scale: 10000000
-# perfmonvar: total_qt_downstream_response_bytes
-#
-proxy.process.qt.upstream.request_bytes
-# doc: total # of qt upstream request byte
-# units: bytes
-# usage: counter
-# scale: 10000000
-# perfmonvar: total_qt_upstream_request_bytes
-#
-proxy.process.qt.upstream.response_bytes
-# doc: total # of qt upstream response byte
-# units: bytes
-# usage: counter
-# scale: 1000000000
-# perfmonvar: total_qt_upstream_response_bytes
-#
-proxy.process.qt.current_client_connections
-# doc: current # of open qt client connections
-# units: connections
-# usage: gauge
-# scale: 200
-# perfmonvar: current_qt_client_connections
-#
-proxy.process.qt.current_server_connections
-# doc: current # of open qt server connections
-# units: connections
-# usage: gauge
-# scale: 200
-# perfmonvar: current_qt_server_connections
-#
proxy.process.cache.read_per_sec
# doc: current # of cache read operations
# units: read/sec
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc Fri Sep 17 16:58:40 2010
@@ -649,11 +649,6 @@ convertRemapRule_xml(XMLNode * rule_node
return NULL;
}
- // process attributes, if any
- val = rule_node->getAttributeValueByName("mixt");
- if (val)
- ele->mixt = string_to_mixt_type(val);
-
// iterate through each subelement of a rule node
for (int i = 0; i < rule_node->getChildCount(); i++) {
child = rule_node->getChildNode(i);
@@ -1000,10 +995,6 @@ convertSecSpecs_xml(XMLNode * sspec_node
if (sspec_val)
sspecs->scheme = string_to_scheme_type(sspec_val);
- sspec_val = sspec_node->getAttributeValueByName("mixt");
- if (sspec_val)
- sspecs->mixt = string_to_mixt_type(sspec_val);
-
// could have a time_range or port element
for (int i = 0; i < sspec_node->getChildCount(); i++) {
child = sspec_node->getChildNode(i);
@@ -1678,14 +1669,6 @@ convertRemapRule_ts(INKCfgEle * cfg_ele,
goto Lerror;
}
- // check attributes
- strPtr = mixt_type_to_string(ele->mixt);
- if (strPtr) {
- writeXmlAttribute(xml_file, "mixt", strPtr);
- xfree(strPtr);
- }
- xml_file->copyFrom(">", 1);
-
// write Url's
writeXmlAttrStartTag(xml_file, "src_url");
strPtr = scheme_type_to_string(ele->from_scheme);
@@ -1982,7 +1965,6 @@ convertPdssFormat_ts(INKPdSsFormat * pds
if (sspec.src_ip || sspec.prefix || sspec.suffix || sspec.port > 0 ||
sspec.method != INK_METHOD_UNDEFINED ||
sspec.scheme != INK_SCHEME_UNDEFINED ||
- sspec.mixt != INK_MIXT_UNDEFINED ||
sspec.time.hour_a != 0 || sspec.time.hour_b != 0 || sspec.time.min_a != 0 || sspec.time.min_b != 0) {
writeXmlAttrStartTag(xml_file, "sec_specs");
@@ -2011,15 +1993,6 @@ convertPdssFormat_ts(INKPdSsFormat * pds
xfree(strPtr);
}
}
- if (sspec.mixt != INK_MIXT_UNDEFINED) {
- strPtr = mixt_type_to_string(sspec.mixt);
- if (strPtr) {
- writeXmlAttribute(xml_file, "mixt", strPtr);
- xfree(strPtr);
- }
- }
-
-
if (sspec.time.hour_a != 0 || sspec.time.hour_b != 0 ||
sspec.time.min_a != 0 || sspec.time.min_b != 0 || sspec.port) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc Fri Sep 17 16:58:40 2010
@@ -926,10 +926,6 @@ updateCacheConfig(char *rules[], int num
Debug("config", "[updateCacheConfig] invalid hms time - SKIP");
}
}
- // mixt tag
- if (strlen(tokens[11]) > 0) {
- pdss->sec_spec.mixt = string_to_mixt_type(tokens[11]);
- }
INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
@@ -1105,11 +1101,6 @@ updateFilterConfig(char *rules[], int nu
if (strlen(tokens[20]) > 0) {
ele->bind_pwd_file = xstrdup(tokens[20]);
}
- // mixt tag
- if (strlen(tokens[21]) > 0) {
- pdss->sec_spec.mixt = string_to_mixt_type(tokens[21]);
- }
-
INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
@@ -1382,10 +1373,6 @@ updateFilterConfigPassword(WebHttpContex
if (scheme) {
pdss->sec_spec.scheme = string_to_scheme_type(scheme);
}
- // mixt tag
- if (mixt) {
- pdss->sec_spec.mixt = string_to_mixt_type(mixt);
- }
// header type
if (hdr_type) {
ele->hdr = string_to_header_type(hdr_type);
@@ -1911,10 +1898,6 @@ updateParentConfig(char *rules[], int nu
if (strlen(tokens[8]) > 0) {
pdss->sec_spec.scheme = string_to_scheme_type(tokens[8]);
}
- // mixt tag
- if (strlen(tokens[9]) > 0) {
- pdss->sec_spec.mixt = string_to_mixt_type(tokens[9]);
- }
// parents
if (strlen(tokens[10]) > 0) {
ele->proxy_list = string_to_domain_list(tokens[10], ";");
@@ -2181,10 +2164,6 @@ updateRemapConfig(char *rules[], int num
if (strlen(tokens[8]) > 0) {
ele->to_path_prefix = xstrdup(tokens[8]);
}
- // mixt tag
- if (strlen(tokens[9]) > 0) {
- ele->mixt = string_to_mixt_type(tokens[9]);
- }
INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc Fri Sep 17 16:58:40 2010
@@ -3781,22 +3781,6 @@ writeRemapConfigForm(WebHttpContext * wh
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- // mixt tag
- HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_RIGHT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_MIXT_SCHEME);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- writeMixtSelect(output, "mixt");
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- HtmlRndrUlOpen(output);
- HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_MIXT_SCHEME_HELP_2);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
return WEB_HTTP_ERR_OKAY;
}
@@ -4339,21 +4323,6 @@ writeSecondarySpecsForm(WebHttpContext *
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_RIGHT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_MIXT_SCHEME);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- writeMixtSelect(output, "mixt");
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrUlOpen(output);
- HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_MIXT_SCHEME_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
return WEB_HTTP_ERR_OKAY;
}
@@ -4983,21 +4952,6 @@ convert_remap_ele_to_html_format(INKRema
if (ele->to_path_prefix) {
snprintf(to_path, MAX_RULE_PART_SIZE, "%s", ele->to_path_prefix);
}
- // mixt
- switch (ele->mixt) {
- case INK_MIXT_RNI:
- snprintf(mixt, MAX_RULE_PART_SIZE, "RNI");
- break;
- case INK_MIXT_QT:
- snprintf(mixt, MAX_RULE_PART_SIZE, "QT");
- break;
- case INK_MIXT_WMT:
- snprintf(mixt, MAX_RULE_PART_SIZE, "WMT");
- break;
- default:
- break;
- }
-
return WEB_HTTP_ERR_OKAY;
@@ -5347,21 +5301,6 @@ convert_pdss_to_html_format(INKPdSsForma
break;
}
- // mixt tag
- switch (info.sec_spec.mixt) {
- case INK_MIXT_RNI:
- snprintf(mixt, MAX_RULE_PART_SIZE, "RNI");
- break;
- case INK_MIXT_QT:
- snprintf(mixt, MAX_RULE_PART_SIZE, "QT");
- break;
- case INK_MIXT_WMT:
- snprintf(mixt, MAX_RULE_PART_SIZE, "WMT");
- break;
- default:
- break;
- }
-
return WEB_HTTP_ERR_OKAY;
Lerror:
@@ -5589,20 +5528,6 @@ writeSchemeSelect_remap(textBuffer * htm
}
//-------------------------------------------------------------------------
-// writeMixtSelect
-//-------------------------------------------------------------------------
-void
-writeMixtSelect(textBuffer * html, const char *listName)
-{
- const char *options[3];
- options[0] = "";
- options[1] = "RNI";
- options[2] = "QT";
-
- HtmlRndrSelectList(html, listName, options, 3);
-}
-
-//-------------------------------------------------------------------------
// writeHeaderTypeSelect
//-------------------------------------------------------------------------
void
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h Fri Sep 17 16:58:40 2010
@@ -183,7 +183,6 @@ void writeMethodSelect_push(textBuffer *
void writeSchemeSelect(textBuffer * html, const char *listName);
void writeSchemeSelect_partition(textBuffer * html, const char *listName);
void writeSchemeSelect_remap(textBuffer * html, const char *listName);
-void writeMixtSelect(textBuffer * html, const char *listName);
void writeHeaderTypeSelect(textBuffer * html, const char *listName);
void writeCacheTypeSelect(textBuffer * html, const char *listName);
void writeMcTtlSelect(textBuffer * html, const char *listName);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Fri Sep 17 16:58:40 2010
@@ -470,7 +470,6 @@ spawn_cgi(WebHttpContext * whc, const ch
// and print the key to a unique file (name assembled from timestamp and
// stored in the path specified by an auth record)
// Returns the filename of this file or NULL if the encryption failed.
-// Used for bind_pwd_file in filter.config and for radius shared keys.
//-------------------------------------------------------------------------
char *
encryptToFileAuth_malloc(const char *password)
@@ -3008,34 +3007,6 @@ handle_submit_update(WebHttpContext * wh
use_ssl_updated = true;
}
}
- // check if entering radius password
- RecString old_pwd_file;
- char *new_pwd_file;
- if (strcasecmp(record, "proxy.config.radius.proc.radius.primary_server.shared_key_file") == 0 ||
- strcasecmp(record, "proxy.config.radius.proc.radius.secondary_server.shared_key_file") == 0) {
- if (value && strcmp(value, FAKE_PASSWORD) == 0)
- continue; // no new password entered
-
- // delete the old password file and create a new one
- RecGetRecordString_Xmalloc(record, &old_pwd_file);
- if (old_pwd_file) { // remove the old_pwd_file
- if (remove(old_pwd_file) != 0)
- Debug("web2", "[handle_submit_update] Failed to remove password file %s", old_pwd_file);
- xfree(old_pwd_file);
- }
- if (value) {
- new_pwd_file = encryptToFileAuth_malloc(value); // encrypt new pwd if specified
- if (new_pwd_file) {
- set_record_value(whc, record, new_pwd_file);
- xfree(new_pwd_file);
- }
- } else {
- set_record_value(whc, record, NULL); // no pwd specified by user
- }
- }
- if (strcasecmp(record, "proxy.config.radius.proc.radius.primary_server.shared_key_file") != 0 &&
- strcasecmp(record, "proxy.config.radius.proc.radius.secondary_server.shared_key_file") != 0)
- set_record_value(whc, record, value);
}
}
// warn if out of date submission
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc Fri Sep 17 16:58:40 2010
@@ -1330,7 +1330,6 @@ overviewPage::addHostPanel(WebHttpContex
clients = servers = 0;
- // TODO add RNI here
host->varIntFromName("proxy.node.current_client_connections", &clients);
host->varIntFromName("proxy.node.current_server_connections", &servers);
@@ -1373,7 +1372,7 @@ overviewPage::addHostPanel(WebHttpContex
HtmlRndrTrClose(output);
//-----------------------------------------------------------------------
- // SET 4: TS Lite / RNI
+ // SET 4: TS Lite
//-----------------------------------------------------------------------
if (host->varStrFromName("proxy.node.cache.bytes_free\\b", tmp, 256) == false) {
@@ -2218,40 +2217,6 @@ overviewPage::doClusterAg()
clusterAgInt("proxy.cluster.http.origin_server_total_transactions_count",
"proxy.node.http.origin_server_total_transactions_count");
- // RNI
- clusterAgInt("proxy.cluster.rni.upstream_total_bytes", "proxy.node.rni.upstream_total_bytes");
- clusterAgInt("proxy.cluster.rni.downstream_total_bytes", "proxy.node.rni.downstream_total_bytes");
- clusterAgInt("proxy.cluster.rni.current_server_connections", "proxy.node.rni.current_server_connections");
- clusterAgInt("proxy.cluster.rni.current_client_connections", "proxy.node.rni.current_client_connections");
- clusterAgInt("proxy.cluster.rni.current_cache_connections", "proxy.node.rni.current_cache_connections");
- clusterAgInt("proxy.cluster.rni.user_agents_total_documents_served",
- "proxy.node.rni.user_agents_total_documents_served");
-
- clusterAgFloat("proxy.cluster.rni.user_agent_xacts_per_second", "proxy.node.rni.user_agent_xacts_per_second");
-
- // WMT
- clusterAgInt("proxy.cluster.wmt.upstream_total_bytes", "proxy.node.wmt.upstream_total_bytes");
- clusterAgInt("proxy.cluster.wmt.downstream_total_bytes", "proxy.node.wmt.downstream_total_bytes");
- clusterAgInt("proxy.cluster.wmt.current_server_connections", "proxy.node.wmt.current_server_connections");
- clusterAgInt("proxy.cluster.wmt.current_client_connections", "proxy.node.wmt.current_client_connections");
- clusterAgInt("proxy.cluster.wmt.current_cache_connections", "proxy.node.wmt.current_cache_connections");
- clusterAgInt("proxy.cluster.wmt.user_agents_total_documents_served",
- "proxy.node.wmt.user_agents_total_documents_served");
-
- clusterAgFloat("proxy.cluster.wmt.user_agent_xacts_per_second", "proxy.node.wmt.user_agent_xacts_per_second");
-
- // QT
- clusterAgInt("proxy.cluster.qt.upstream_total_bytes", "proxy.node.qt.upstream_total_bytes");
- clusterAgInt("proxy.cluster.qt.downstream_total_bytes", "proxy.node.qt.downstream_total_bytes");
- clusterAgInt("proxy.cluster.qt.current_server_connections", "proxy.node.qt.current_server_connections");
- clusterAgInt("proxy.cluster.qt.current_client_connections", "proxy.node.qt.current_client_connections");
- clusterAgInt("proxy.cluster.qt.current_cache_connections", "proxy.node.qt.current_cache_connections");
- clusterAgInt("proxy.cluster.qt.user_agents_total_documents_served",
- "proxy.node.qt.user_agents_total_documents_served");
-
- clusterAgFloat("proxy.cluster.qt.user_agent_xacts_per_second", "proxy.node.qt.user_agent_xacts_per_second");
-
-
// Cache
clusterAgInt("proxy.cluster.cache.bytes_free", "proxy.node.cache.bytes_free");
clusterAgIntScale("proxy.cluster.cache.bytes_free_mb", "proxy.node.cache.bytes_free", MB_SCALE);
Modified: trafficserver/traffic/trunk/proxy/sac.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/sac.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/sac.cc (original)
+++ trafficserver/traffic/trunk/proxy/sac.cc Fri Sep 17 16:58:40 2010
@@ -56,11 +56,6 @@
extern int CacheClusteringEnabled;
int auto_clear_cache_flag = 0;
-// ldap required externals ...
-//int gldap_auth_enable = 0;
-//int gsplit_ldap_enabled = 0;
-//int gauth_bypass_enabled = 0;
-
// sac-specific command-line flags
//
int version_flag = 0;
Modified: trafficserver/traffic/trunk/proxy/ts-instantiate.pl
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ts-instantiate.pl?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ts-instantiate.pl (original)
+++ trafficserver/traffic/trunk/proxy/ts-instantiate.pl Fri Sep 17 16:58:40 2010
@@ -176,10 +176,8 @@ our %defaults =
"proxy.config.cluster.ethernet_interface" => $eth_if,
"proxy.config.icp.icp_interface" => $eth_if,
"proxy.config.hostdb.size" => 200000,
- "proxy.config.rni.server_port" => 7802,
"proxy.config.reverse_proxy.enabled" => 0,
"proxy.config.loadshedding.max_connections" => 0,
- "proxy.config.rni.proxy_rtsp_port" => 6060,
"proxy.config.raf.enabled" => 1
);
@@ -187,9 +185,6 @@ our %export_ports =
(
"proxy.config.http.server_port" => "tsHttpPort",
"proxy.config.raf.port" => "rafPort",
- "proxy.config.mixt.rtsp_proxy_port" => "tsRtspPort",
- "proxy.config.wmt.port" => "tsWmtPort",
- "proxy.config.rni.proxy_port" => "tsRniPort"
);
our %base_port_hash =
@@ -203,12 +198,8 @@ our %base_port_hash =
"proxy.config.cluster.cluster_port" => 8,
"proxy.config.cluster.rsport" => 10,
"proxy.config.cluster.mcport" => 11,
- "proxy.config.rni.client_port" => 12,
- "proxy.config.mixt.rtsp_proxy_port" => 13,
- "proxy.config.rni.proxy_port" => 14,
"proxy.config.raf.port" => 15,
"proxy.config.raf.manager.port" => 16,
- "proxy.config.wmt.port" => 17,
);
our %config_meta = ();
@@ -550,13 +541,6 @@ sub build_port_bindings {
return $output_line;
}
-our @lib_ldap_locations =
-(
- "bin",
- "lib",
- "f_pkg/lib"
- );
-
our @populate_dirs = ( "bin", "etc/trafficserver", "etc/trafficserver/internal", "logs");
our %populate_symlinks =
@@ -580,28 +564,6 @@ our %populate_exclude_config =
"storage.config.shadow" => 1
);
-# not really needed, the ldap lib is now always in $rundir/lib/
-sub find_ldap_lib() {
- my $ldap_lib = "libldapssl40.so";
-
- my @tmp = @lib_ldap_locations;
-
- my $look_here;
- while ($look_here = shift(@tmp)) {
- my $check_path = $bin_dir . "/" . $look_here . "/" . $ldap_lib;
-
- if ( -r $check_path ) {
- my $from_key = $look_here . "/" . $ldap_lib;
- my $to_value = "bin/" . $ldap_lib;
- # Found the library
- $populate_symlinks{$from_key} = $to_value;
- return;
- }
- }
-
- warn("Could not find $ldap_lib\n");
-}
-
sub populate_run_dir() {
my ($dir, $from_file_key);
@@ -678,7 +640,6 @@ if (!$run_dir) {
}
if (! $no_run_dir) {
- # find_ldap_lib();
populate_run_dir();
}
@@ -738,9 +699,6 @@ print OUTPUT $bindings . "\n";
print OUTPUT $cmd_line . "\n";
#
-# We need to set the LD_LIBRARY_PATH for dealing with
-# the ldap.so shared object
-#
my $ld_lib_path = $ENV{"LD_LIBRARY_PATH"};
if ($ld_lib_path eq "") {
Modified: trafficserver/traffic/trunk/rc/update_records.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/rc/update_records.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/rc/update_records.cc (original)
+++ trafficserver/traffic/trunk/rc/update_records.cc Fri Sep 17 16:58:40 2010
@@ -76,9 +76,6 @@ struct RecordRenameMapElement
RecordRenameMapElement RecordRenameMap[] = {
- // 3.x to 4.x variable renamings
- {"proxy.config.log2.separate_rni_logs", "proxy.config.log2.separate_mixt_logs"},
-
// 4.x to 5.x variable renamings
{"proxy.config.cluster.type", "proxy.local.cluster.type"},
Modified: trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c (original)
+++ trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c Fri Sep 17 16:58:40 2010
@@ -59,9 +59,6 @@ const char *counterVariables[] = {
"proxy.process.log2.event_log_access",
"proxy.process.log2.event_log_access_fail",
"proxy.process.log2.event_log_access_skip",
- "proxy.process.rni.object_count",
- "proxy.process.rni.block_hit_count",
- "proxy.process.rni.block_miss_count",
'\0'
};
@@ -145,14 +142,6 @@ const char *intVariables[] = {
"proxy.config.phone_home.phone_home_send_info_enabled",
"proxy.config.phone_home.phone_home_data_encryption_enabled",
"proxy.config.phone_home.phone_home_frequency",
- "proxy.config.ldap.auth.enabled",
- "proxy.config.ldap.cache.size",
- "proxy.config.ldap.cache.storage_size",
- "proxy.config.ldap.auth.ttl_value",
- "proxy.config.ldap.auth.purge_cache_on_auth_fail",
- "proxy.config.ldap.auth.multiple.ldap_servers.enabled",
- "proxy.config.ldap.auth.bypass.enabled",
- "proxy.config.ldap.proc.ldap.server.port",
"proxy.config.http.server_port",
"proxy.config.http.insert_request_via_str",
"proxy.config.http.insert_response_via_str",
@@ -250,7 +239,6 @@ const char *intVariables[] = {
"proxy.config.log2.extended2_log_enabled",
"proxy.config.log2.extended2_log_is_ascii",
"proxy.config.log2.separate_icp_logs",
- "proxy.config.log2.separate_mixt_logs",
"proxy.config.log2.separate_host_logs",
"roxy.local.log2.collation_mode",
"proxy.config.log2.collation_port",
@@ -261,12 +249,6 @@ const char *intVariables[] = {
"proxy.config.log2.rolling_offset_hr",
"proxy.config.log2.auto_delete_rolled_files",
"proxy.config.log2.sampling_frequency",
- "proxy.config.qt.tcp_to_server",
- "proxy.config.qt.proxy_port",
- "proxy.config.rni.watcher_enabled",
- "proxy.config.rni.proxy_rtsp_port",
- "proxy.config.rni.proxy_port",
- "proxy.config.rni.proxy_restart_interval",
"proxy.config.reverse_proxy.enabled",
"proxy.config.url_remap.default_to_server_pac",
"proxy.config.url_remap.default_to_server_pac_port",
@@ -316,8 +298,6 @@ const char *stringVariables[] = {
"proxy.config.phone_home.phone_home_path",
"proxy.config.phone_home.phone_home_id",
"proxy.config.header.parse.no_host_url_redirect",
- "proxy.config.ldap.proc.ldap.server.name",
- "proxy.config.ldap.proc.ldap.base.dn",
"proxy.config.http.server_port_attr",
"proxy.config.http.server_other_ports",
"proxy.config.http.ssl_ports",
@@ -343,9 +323,6 @@ const char *stringVariables[] = {
"proxy.config.log2.extended2_log_header",
"proxy.config.log2.collation_host",
"proxy.config.log2.collation_secret",
- "proxy.config.rni.proxy_pid_path",
- "proxy.config.rni.proxy_restart_cmd",
- "proxy.config.rni.proxy_service_name",
"proxy.config.ssl.server.cert.filename",
"proxy.config.ssl.server.cert.path",
"proxy.config.ssl.server.private_key.filename",