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/04/30 05:14:22 UTC
svn commit: r939548 [5/6] - in /incubator/trafficserver/traffic/trunk: ./
doc/man/ iocore/cache/ iocore/eventsystem/ iocore/net/ libinktomi++/
librecords/ proxy/ proxy/api/include/ proxy/config/
proxy/config/body_factory/default/ proxy/hdrs/ proxy/http...
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc Fri Apr 30 03:14:19 2010
@@ -844,7 +844,6 @@ Cmd_ConfigPorts(ClientData clientData, T
case CMD_CONFIG_PORTS_CLUSTER:
case CMD_CONFIG_PORTS_CLUSTER_RS:
case CMD_CONFIG_PORTS_CLUSTER_MC:
- case CMD_CONFIG_PORTS_FTP_SERVER:
case CMD_CONFIG_PORTS_SOCKS_SERVER:
case CMD_CONFIG_PORTS_ICP:
return (ConfigPortsSet(argtable[0].parsed_args, &argtable[0].arg_int));
@@ -852,7 +851,7 @@ Cmd_ConfigPorts(ClientData clientData, T
}
}
Cli_Error(ERR_COMMAND_SYNTAX,
- "\n\nconfig:ports <http-server | http-other | webui | \n overseer | cluster-rs | cluster-mc | \n ftp-server | ssl | \n socks-server | icp > \n <port | ports list>\n");
+ "\n\nconfig:ports <http-server | http-other | webui | \n overseer | cluster-rs | cluster-mc | \n ssl | \n socks-server | icp > \n <port | ports list>\n");
return CMD_ERROR;
}
@@ -879,8 +878,6 @@ 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("ftp-server", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_PORTS_FTP_SERVER, "Set Ports for ftp-server", (char *) NULL);
createArgument("ssl", 1, CLI_ARGV_OPTION_NAME_VALUE,
(char *) NULL, CMD_CONFIG_PORTS_SSL, "Set Ports for ssl", (char *) NULL);
createArgument("socks-server", 1, CLI_ARGV_OPTION_INT_VALUE,
@@ -1377,104 +1374,6 @@ CmdArgs_ConfigHttp()
}
////////////////////////////////////////////////////////////////
-// Cmd_ConfigFtp
-//
-// This is the callback function for the "config:ftp" command.
-//
-// Parameters:
-// clientData -- information about parsed arguments
-// interp -- the Tcl interpreter
-// argc -- number of command arguments
-// argv -- the command arguments
-//
-int
-Cmd_ConfigFtp(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:ftp") == CLI_ERROR) {
- return CMD_ERROR;
- }
- Cli_Debug("Cmd_ConfigFtp argc %d\n", argc);
-
- cli_cmdCallbackInfo *cmdCallbackInfo;
- cli_parsedArgInfo *argtable, *infoPtr;
-
- cmdCallbackInfo = (cli_cmdCallbackInfo *) clientData;
- argtable = cmdCallbackInfo->parsedArgTable;
- infoPtr = argtable;
-
-
- int setvar = 0;
-
- if (argc == 3) {
- setvar = 1;
- }
-
- if (argtable->parsed_args != CLI_PARSED_ARGV_END) {
- switch (argtable->parsed_args) {
- case CMD_CONFIG_FTP_MODE:
- return (ConfigFtpMode(argtable[1].parsed_args, setvar));
- case CMD_CONFIG_FTP_INACT_TIMEOUT:
- return (ConfigFtpInactTimeout(argtable->arg_int, setvar));
- case CMD_CONFIG_FTP_ANON_PASSWD:
- return (Cli_RecordString_Action(setvar, "proxy.config.http.ftp.anonymous_passwd", argtable->arg_string));
- case CMD_CONFIG_FTP_EXPIRE_AFTER:
- return (ConfigFtpExpireAfter(argtable->arg_int, setvar));
- case CMD_CONFIG_FTP_PROXY:
- return (ConfigFtpProxy(argtable[1].parsed_args, setvar));
- }
- }
- Cli_Error(ERR_COMMAND_SYNTAX, cmdCallbackInfo->command_usage);
- return CMD_ERROR;
-}
-
-////////////////////////////////////////////////////////////////
-// CmdArgs_ConfigFtp
-//
-// Register "config:ftp" arguments with the Tcl interpreter.
-//
-int
-CmdArgs_ConfigFtp()
-{
- createArgument("mode", 1, CLI_ARGV_CONST_OPTION,
- (char *) NULL, CMD_CONFIG_FTP_MODE, "FTP Mode <pasv-port | port | pasv>", (char *) NULL);
-
- createArgument("pasv-port", CMD_CONFIG_FTP_MODE, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_FTP_MODE_PASVPORT, "Specify ftp mode to be pasv-port", (char *) NULL);
-
- createArgument("pasv", CMD_CONFIG_FTP_MODE, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_FTP_MODE_PASV, "Specify ftp mode to be pasv", (char *) NULL);
-
- createArgument("port", CMD_CONFIG_FTP_MODE, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_FTP_MODE_PORT, "Specify ftp mode to be port", (char *) NULL);
-
- createArgument("inactivity-timeout", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_FTP_INACT_TIMEOUT, "Inactive timeout <seconds>", (char *) NULL);
- createArgument("anonymous-password", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_FTP_ANON_PASSWD, "FTP password <string>", (char *) NULL);
- createArgument("expire-after", 1, CLI_ARGV_OPTION_INT_VALUE,
- (char *) NULL, CMD_CONFIG_FTP_EXPIRE_AFTER, "Expire after value <seconds>", (char *) NULL);
- createArgument("proxy", 1, CLI_ARGV_CONST_OPTION,
- (char *) NULL, CMD_CONFIG_FTP_PROXY, "Proxy Mode <fwd | rev | fwd-rev>", (char *) NULL);
- createArgument("fwd", CMD_CONFIG_FTP_PROXY, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_FTP_FWD, "Specify proxy mode to be forward", (char *) NULL);
- createArgument("rev", CMD_CONFIG_FTP_PROXY, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_FTP_REV, "Specify proxy mode to be reverse", (char *) NULL);
- createArgument("fwd-rev", CMD_CONFIG_FTP_PROXY, CLI_ARGV_CONSTANT,
- (char *) NULL, CMD_CONFIG_FTP_FWD_REV, "Specify proxy mode to be both)", (char *) NULL);
- return 0;
-}
-
-////////////////////////////////////////////////////////////////
// Cmd_ConfigIcp
//
// This is the callback function for the "config:icp" command.
@@ -1854,9 +1753,6 @@ Cmd_ConfigCache(ClientData clientData, T
case CMD_CONFIG_CACHE_HTTP:
return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.http.cache.http", argtable->arg_string));
- case CMD_CONFIG_CACHE_FTP:
- return (Cli_RecordOnOff_Action((argc == 3), "proxy.config.http.cache.ftp", argtable->arg_string));
-
case CMD_CONFIG_CACHE_IGNORE_BYPASS:
return (Cli_RecordOnOff_Action((argc == 3),
"proxy.config.http.cache.ignore_client_no_cache", argtable->arg_string));
@@ -1941,8 +1837,6 @@ CmdArgs_ConfigCache()
{
createArgument("http", 1, CLI_ARGV_OPTION_NAME_VALUE,
(char *) NULL, CMD_CONFIG_CACHE_HTTP, "HTTP Protocol caching <on|off>", (char *) NULL);
- createArgument("ftp", 1, CLI_ARGV_OPTION_NAME_VALUE,
- (char *) NULL, CMD_CONFIG_CACHE_FTP, "FTP Protocol caching <on|off>", (char *) NULL);
createArgument("ignore-bypass", 1, CLI_ARGV_OPTION_NAME_VALUE,
(char *) NULL, CMD_CONFIG_CACHE_IGNORE_BYPASS, "Ignore Bypass <on|off>", (char *) NULL);
createArgument("max-object-size", 1, CLI_ARGV_OPTION_INT_VALUE,
@@ -3074,9 +2968,6 @@ 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_FTP_SERVER:
- status = Cli_RecordSetInt("proxy.config.ftp.proxy_server_port", *(INKInt *) valuePtr, &action_need);
- break;
case CMD_CONFIG_PORTS_SSL:
status = Cli_RecordSetString("proxy.config.http.ssl_ports", (INKString) valuePtr, &action_need);
break;
@@ -3162,13 +3053,6 @@ ConfigPortsGet(int arg_ref)
}
Cli_Printf("%d\n", int_val);
break;
- case CMD_CONFIG_PORTS_FTP_SERVER:
- status = Cli_RecordGetInt("proxy.config.ftp.proxy_server_port", &int_val);
- if (status) {
- return status;
- }
- Cli_Printf("%d\n", int_val);
- break;
case CMD_CONFIG_PORTS_SSL:
status = Cli_RecordGetString("proxy.config.http.ssl_ports", &str_val);
if (status) {
@@ -3196,7 +3080,7 @@ ConfigPortsGet(int arg_ref)
break;
default:
Cli_Error(ERR_COMMAND_SYNTAX,
- "\n\nconfig:ports <http-server | http-other | webui | \n overseer | cluster-rs | cluster-mc | \n ftp-server | ssl | \n socks-server | icp > \n <port | ports list>\n");
+ "\n\nconfig:ports <http-server | http-other | webui | \n overseer | cluster-rs | cluster-mc | \n ssl | \n socks-server | icp > \n <port | ports list>\n");
return CLI_ERROR;
}
@@ -3721,202 +3605,6 @@ ConfigHttpProxy(int arg_ref, int setvar)
}
}
-// config ftp proxy sub-command
-int
-ConfigFtpProxy(int arg_ref, int setvar)
-{
- Cli_Debug("ConfigFtpProxy: proxy %d\n", arg_ref);
-
- INKInt fwd_val = 0;
- INKInt rev_val = 0;
- INKActionNeedT action_need = INK_ACTION_UNDEFINED;
- INKError status = INK_ERR_OKAY;
-
- switch (setvar) {
- case 0: //get
-
- status = Cli_RecordGetInt("proxy.config.ftp.ftp_enabled", &fwd_val);
- if (status) {
- return status;
- }
- status = Cli_RecordGetInt("proxy.config.ftp.reverse_ftp_enabled", &rev_val);
- if (status) {
- return status;
- }
- if ((fwd_val) && (!rev_val))
- Cli_Printf("fwd\n");
- if ((!fwd_val) && (rev_val))
- Cli_Printf("rev\n");
- if ((fwd_val) && (rev_val))
- Cli_Printf("fwd-rev\n");
- if ((!fwd_val) && (!rev_val)) {
- Cli_Printf("invalid value retrieved\n");
- return CLI_ERROR;
- }
- return CLI_OK;
-
-
- case 1: //set
- {
- switch (arg_ref) {
- case CMD_CONFIG_FTP_FWD:
- status = Cli_RecordSetInt("proxy.config.ftp.ftp_enabled", (INKInt) 1, &action_need);
- status = Cli_RecordSetInt("proxy.config.ftp.reverse_ftp_enabled", (INKInt) 0, &action_need);
- if (status) {
- return status;
- }
- return (Cli_ConfigEnactChanges(action_need));
- case CMD_CONFIG_FTP_REV:
- status = Cli_RecordSetInt("proxy.config.ftp.ftp_enabled", (INKInt) 0, &action_need);
- status = Cli_RecordSetInt("proxy.config.ftp.reverse_ftp_enabled", (INKInt) 1, &action_need);
- if (status) {
- return status;
- }
- return (Cli_ConfigEnactChanges(action_need));
- case CMD_CONFIG_FTP_FWD_REV:
- status = Cli_RecordSetInt("proxy.config.ftp.ftp_enabled", (INKInt) 1, &action_need);
- status = Cli_RecordSetInt("proxy.config.ftp.reverse_ftp_enabled", (INKInt) 1, &action_need);
- if (status) {
- return status;
- }
- return (Cli_ConfigEnactChanges(action_need));
- }
- return CLI_ERROR;
- }
- default:
- return CLI_ERROR;
- }
-}
-
-// config ftp mode sub-command
-int
-ConfigFtpMode(int arg_ref, int setvar)
-{
- int mode_num = -1;
- Cli_Debug("ConfigFtpMode: mode %d\n", arg_ref);
-
- if (setvar == 1) {
-
- // convert string into mode number
- if (arg_ref == CMD_CONFIG_FTP_MODE_PASVPORT) {
- mode_num = 1;
- } else if (arg_ref == CMD_CONFIG_FTP_MODE_PORT) {
- mode_num = 2;
- } else if (arg_ref == CMD_CONFIG_FTP_MODE_PASV) {
- mode_num = 3;
- } else {
- mode_num = -1;
- }
-
- Cli_Debug("ConfigFtpMode: mode_num %d\n", mode_num);
-
- if (mode_num == -1) {
- return CLI_ERROR;
- }
-
- INKActionNeedT action_need = INK_ACTION_UNDEFINED;
- INKError status = Cli_RecordSetInt("proxy.config.ftp.data_connection_mode",
- mode_num, &action_need);
- if (status) {
- return status;
- }
-
- return (Cli_ConfigEnactChanges(action_need));
-
- } else {
-
- INKInt value_in = -1;
- INKError status = Cli_RecordGetInt("proxy.config.ftp.data_connection_mode",
- &value_in);
-
- if (status) {
- return status;
- }
-
- switch (value_in) {
- case 1:
- Cli_Printf("pasv-port\n");
- break;
- case 2:
- Cli_Printf("port\n");
- break;
- case 3:
- Cli_Printf("pasv\n");
- break;
- default:
- Cli_Printf("?\n");
- break;
- }
- return CLI_OK;
- }
-}
-
-// config ftp inactivity-timeout sub-command
-int
-ConfigFtpInactTimeout(int timeout, int setvar)
-{
- if (setvar) {
-
- Cli_Debug("ConfigFtpInactTimeout: timeout %d\n", timeout);
-
- INKActionNeedT action_need = INK_ACTION_UNDEFINED;
- INKError status = Cli_RecordSetInt("proxy.config.ftp.control_connection_timeout",
- timeout, &action_need);
-
- if (status) {
- return status;
- }
-
- return (Cli_ConfigEnactChanges(action_need));
-
- } else {
-
- INKInt value_in = -1;
- INKError status = Cli_RecordGetInt("proxy.config.ftp.control_connection_timeout",
- &value_in);
-
- if (status) {
- return status;
- }
-
- Cli_Printf("%d\n", value_in);
-
- return CLI_OK;
- }
-}
-
-// config ftp expire-after sub-command
-int
-ConfigFtpExpireAfter(int limit, int setvar)
-{
- if (setvar) {
-
- Cli_Debug("ConfigFtpExpireAfter: expire-after %d\n", limit);
-
- INKActionNeedT action_need = INK_ACTION_UNDEFINED;
- INKError status = Cli_RecordSetInt("proxy.config.http.ftp.cache.document_lifetime",
- limit, &action_need);
-
- if (status) {
- return status;
- }
- return (Cli_ConfigEnactChanges(action_need));
-
- } else {
- INKInt value_in = -1;
- INKError status = Cli_RecordGetInt("proxy.config.http.ftp.cache.document_lifetime",
- &value_in);
-
- if (status) {
- return status;
- }
-
- Cli_Printf("%d\n", value_in);
-
- return CLI_OK;
- }
-}
-
// config icp mode sub-command
int
ConfigIcpMode(int arg_ref, int setvar)
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h Fri Apr 30 03:14:19 2010
@@ -54,7 +54,6 @@ typedef enum
CMD_CONFIG_PORTS_CLUSTER,
CMD_CONFIG_PORTS_CLUSTER_RS,
CMD_CONFIG_PORTS_CLUSTER_MC,
- CMD_CONFIG_PORTS_FTP_SERVER,
CMD_CONFIG_PORTS_SSL,
CMD_CONFIG_PORTS_SOCKS_SERVER,
CMD_CONFIG_PORTS_ICP,
@@ -144,18 +143,6 @@ typedef enum
CMD_CONFIG_HTTP_FWD,
CMD_CONFIG_HTTP_REV,
CMD_CONFIG_HTTP_FWD_REV,
- CMD_CONFIG_FTP,
- CMD_CONFIG_FTP_MODE,
- CMD_CONFIG_FTP_MODE_PASVPORT,
- CMD_CONFIG_FTP_MODE_PASV,
- CMD_CONFIG_FTP_MODE_PORT,
- CMD_CONFIG_FTP_INACT_TIMEOUT,
- CMD_CONFIG_FTP_ANON_PASSWD,
- CMD_CONFIG_FTP_EXPIRE_AFTER,
- CMD_CONFIG_FTP_PROXY,
- CMD_CONFIG_FTP_FWD,
- CMD_CONFIG_FTP_REV,
- CMD_CONFIG_FTP_FWD_REV,
CMD_CONFIG_ICP,
CMD_CONFIG_ICP_MODE,
CMD_CONFIG_ICP_MODE_RECEIVE,
@@ -181,7 +168,6 @@ typedef enum
CMD_CONFIG_CACHE_ON,
CMD_CONFIG_CACHE_OFF,
CMD_CONFIG_CACHE_HTTP,
- CMD_CONFIG_CACHE_FTP,
CMD_CONFIG_CACHE_IGNORE_BYPASS,
CMD_CONFIG_CACHE_MAX_OBJECT_SIZE,
CMD_CONFIG_CACHE_MAX_ALTERNATES,
@@ -668,26 +654,6 @@ int Cmd_ConfigHttp(ClientData clientData
int CmdArgs_ConfigHttp();
////////////////////////////////////////////////////////////////
-// Cmd_ConfigFtp
-//
-// This is the callback function for the "config:ftp" command.
-//
-// Parameters:
-// clientData -- information about parsed arguments
-// interp -- the Tcl interpreter
-// argc -- number of command arguments
-// argv -- the command arguments
-//
-int Cmd_ConfigFtp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-
-////////////////////////////////////////////////////////////////
-// CmdArgs_ConfigFtp
-//
-// Register "config:ftp" arguments with the Tcl interpreter.
-//
-int CmdArgs_ConfigFtp();
-
-////////////////////////////////////////////////////////////////
// Cmd_ConfigIcp
//
// This is the callback function for the "config:icp" command.
@@ -976,18 +942,6 @@ int ConfigRemap(const char *url);
// config http proxy sub-command
int ConfigHttpProxy(int arg_ref, int setvar);
-// config ftp mode sub-command
-int ConfigFtpProxy(int arg_ref, int setvar);
-
-// config ftp mode sub-command
-int ConfigFtpMode(int arg_ref, int setvar);
-
-// config ftp inactivity-timeout sub-command
-int ConfigFtpInactTimeout(int timeout, int setvar);
-
-// config ftp expire-after sub-command
-int ConfigFtpExpireAfter(int limit, int setvar);
-
// config icp mode sub-command
int ConfigIcpMode(int arg_ref, int setvar);
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc Fri Apr 30 03:14:19 2010
@@ -273,35 +273,6 @@ Cmd_ShowHttp(ClientData clientData, Tcl_
}
////////////////////////////////////////////////////////////////
-// Cmd_ShowFtp
-//
-// This is the callback function for the "show:ftp" command.
-//
-// Parameters:
-// clientData -- information about parsed arguments
-// interp -- the Tcl interpreter
-// argc -- number of command arguments
-// argv -- the command arguments
-//
-int
-Cmd_ShowFtp(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;
-
- Cli_Debug("Cmd_ShowFtp\n");
-
- return (ShowFtp());
-}
-
-////////////////////////////////////////////////////////////////
// Cmd_ShowIcp
//
// This is the callback function for the "show:icp" command.
@@ -1064,35 +1035,6 @@ Cmd_ShowHttpStats(ClientData clientData,
}
////////////////////////////////////////////////////////////////
-// Cmd_ShowFtpStats
-//
-// This is the callback function for the "show:ftp-stats" command.
-//
-// Parameters:
-// clientData -- information about parsed arguments
-// interp -- the Tcl interpreter
-// argc -- number of command arguments
-// argv -- the command arguments
-//
-int
-Cmd_ShowFtpStats(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;
-
- Cli_Debug("Cmd_ShowFtpStats\n");
-
- return (ShowFtpStats());
-}
-
-////////////////////////////////////////////////////////////////
// Cmd_ShowIcpStats
//
// This is the callback function for the "show:icp-stats" command.
@@ -1536,7 +1478,6 @@ ShowPorts()
INKInt cluster = -1;
INKInt cluster_rs = -1;
INKInt cluster_mc = -1;
- INKInt ftp_server = -1;
INKInt socks_server = -1;
INKInt icp = -1;
INKString ssl = NULL;
@@ -1550,7 +1491,6 @@ 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_RecordGetInt("proxy.config.ftp.proxy_server_port", &ftp_server);
Cli_RecordGetString("proxy.config.http.ssl_ports", &ssl);
Cli_RecordGetInt("proxy.config.socks.socks_server_port", &socks_server);
Cli_RecordGetInt("proxy.config.icp.icp_port", &icp);
@@ -1564,7 +1504,6 @@ 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("FTP Proxy Server Port -- %d\n", ftp_server);
Cli_Printf("SSL Ports -------------- %s\n", (ssl != NULL) ? ssl : "none");
Cli_Printf("SOCKS Server Port ------ %d\n", socks_server);
Cli_Printf("ICP Port --------------- %d\n", icp);
@@ -1715,55 +1654,6 @@ ShowHttp()
return CLI_OK;
}
-// show ftp sub-command
-int
-ShowFtp()
-{
- // declare and initialize variables
-
- INKInt cache_ftp = 0;
- INKInt document_lifetime = -1;
- INKInt data_connection_mode = -1;
- INKInt control_connection_timeout = -1;
- INKString passwd = NULL;
-
- // retrieve value
-
- Cli_RecordGetInt("proxy.config.http.cache.ftp", &cache_ftp);
- Cli_RecordGetInt("proxy.config.http.ftp.cache.document_lifetime", &document_lifetime);
- Cli_RecordGetInt("proxy.config.ftp.data_connection_mode", &data_connection_mode);
- Cli_RecordGetInt("proxy.config.ftp.control_connection_timeout", &control_connection_timeout);
- Cli_RecordGetString("proxy.config.http.ftp.anonymous_passwd", &passwd);
- // display results
- Cli_Printf("\n");
-
- if (Cli_PrintEnable("FTP Caching ----------------------- ", cache_ftp) == CLI_ERROR) {
- return CLI_ERROR;
- }
- Cli_Printf("FTP Cached Objects Expired After -- %d s\n", document_lifetime);
-
- switch (data_connection_mode) {
- case 1:
- Cli_Printf("FTP Connection Mode --------------- %s\n", "PASV/PORT");
- break;
- case 2:
- Cli_Printf("FTP Connection Mode --------------- %s\n", "PORT ONLY");
- break;
- case 3:
- Cli_Printf("FTP Connection Mode --------------- %s\n", "PASV ONLY");
- break;
- default:
- Cli_Printf("FTP Connection Mode --------------- %s\n", "NOT SET");
-
- }
-
- Cli_Printf("FTP Inactivity Timeout ------------ %d s\n", control_connection_timeout);
- Cli_Printf("Anonymous FTP password ------------ %s\n", passwd);
- Cli_Printf("\n");
-
- return CLI_OK;
-}
-
// show icp sub-command
int
ShowIcp()
@@ -1829,14 +1719,12 @@ ShowCache()
// declare and initialize variables
INKInt cache_http = -1;
- INKInt cache_ftp = -1;
INKInt cache_bypass = -1;
INKInt max_doc_size = -1;
INKInt when_to_reval = -1;
INKInt reqd_headers = -1;
INKInt min_life = -1;
INKInt max_life = -1;
- INKInt doc_life = -1;
INKInt dynamic_urls = -1;
INKInt alternates = -1;
const char *vary_def_text = "NONE";
@@ -1847,13 +1735,11 @@ ShowCache()
// retrieve values
Cli_RecordGetInt("proxy.config.http.cache.http", &cache_http);
- Cli_RecordGetInt("proxy.config.http.cache.ftp", &cache_ftp);
Cli_RecordGetInt("proxy.config.cache.max_doc_size", &max_doc_size);
Cli_RecordGetInt("proxy.config.http.cache.when_to_revalidate", &when_to_reval);
Cli_RecordGetInt("proxy.config.http.cache.required_headers", &reqd_headers);
Cli_RecordGetInt("proxy.config.http.cache.heuristic_min_lifetime", &min_life);
Cli_RecordGetInt("proxy.config.http.cache.heuristic_max_lifetime", &max_life);
- Cli_RecordGetInt("proxy.config.http.ftp.cache.document_lifetime", &doc_life);
Cli_RecordGetInt("proxy.config.http.cache.cache_urls_that_look_dynamic", &dynamic_urls);
Cli_RecordGetInt("proxy.config.http.cache.enable_default_vary_headers", &alternates);
Cli_RecordGetString("proxy.config.http.cache.vary_default_text", (char**)&vary_def_text);
@@ -1868,14 +1754,12 @@ ShowCache()
Cli_PrintEnable("HTTP Caching --------------------------- ", cache_http);
- Cli_PrintEnable("FTP Caching ---------------------------- ", cache_ftp);
-
Cli_PrintEnable("Ignore User Requests To Bypass Cache --- ", cache_bypass);
if (max_doc_size == 0)
- Cli_Printf("Maximum HTTP/FTP Object Size ----------- NONE\n");
+ Cli_Printf("Maximum HTTP Object Size ----------- NONE\n");
else
- Cli_Printf("Maximum HTTP/FTP Object Size ----------- %d\n", max_doc_size);
+ Cli_Printf("Maximum HTTP Object Size ----------- %d\n", max_doc_size);
Cli_Printf("Freshness\n");
Cli_Printf(" Verify Freshness By Checking --------- ");
@@ -1917,7 +1801,6 @@ ShowCache()
Cli_Printf(" If Object has no Expiration Date: \n" " Leave it in Cache for at least ----- %d s\n", min_life);
Cli_Printf(" but no more than ------------------- %d s\n", max_life);
- Cli_Printf(" FTP Cached Objects Expire After ------ %d s\n", doc_life);
Cli_Printf("Variable Content\n");
@@ -2771,37 +2654,6 @@ ShowHttpStats()
// show proxy-stats sub-command
int
-ShowFtpStats()
-{
- //variable declaration
-
- INKInt connections_currently_open = -1;
- INKInt connections_successful_pasv = -1;
- INKInt connections_failed_pasv = -1;
- INKInt connections_successful_port = -1;
- INKInt connections_failed_port = -1;
-
- //get value
- Cli_RecordGetInt("proxy.process.ftp.connections_currently_open", &connections_currently_open);
- Cli_RecordGetInt("proxy.process.ftp.connections_successful_pasv", &connections_successful_pasv);
- Cli_RecordGetInt("proxy.process.ftp.connections_failed_pasv", &connections_failed_pasv);
- Cli_RecordGetInt("proxy.process.ftp.connections_successful_port", &connections_successful_port);
- Cli_RecordGetInt("proxy.process.ftp.connections_failed_port", &connections_failed_port);
-
- //display values
- Cli_Printf("\n");
- Cli_Printf("Open Connections ------------ %d\n", connections_currently_open);
- Cli_Printf("PASV Connections Successes -- %d\n", connections_successful_pasv);
- Cli_Printf("PASV Connections Failure ---- %d\n", connections_failed_pasv);
- Cli_Printf("PORT Connections Successes -- %d\n", connections_successful_port);
- Cli_Printf("PORT Connections Failure ---- %d\n", connections_failed_port);
- Cli_Printf("\n");
-
- return CLI_OK;
-}
-
-// show proxy-stats sub-command
-int
ShowIcpStats()
{
//variable declaration
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h Fri Apr 30 03:14:19 2010
@@ -44,7 +44,6 @@ typedef enum
CMD_SHOW_CLUSTER,
CMD_SHOW_SECURITY,
CMD_SHOW_HTTP,
- CMD_SHOW_FTP,
CMD_SHOW_ICP,
CMD_SHOW_ICP_PEER,
CMD_SHOW_PROXY,
@@ -72,7 +71,6 @@ typedef enum
CMD_SHOW_PROXY_STATS,
CMD_SHOW_HTTP_TRANS_STATS,
CMD_SHOW_HTTP_STATS,
- CMD_SHOW_FTP_STATS,
CMD_SHOW_ICP_STATS,
CMD_SHOW_CACHE_STATS,
CMD_SHOW_HOSTDB_STATS,
@@ -107,7 +105,6 @@ int Cmd_ShowPorts(ClientData clientData,
int Cmd_ShowCluster(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int Cmd_ShowSecurity(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int Cmd_ShowHttp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int Cmd_ShowFtp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int Cmd_ShowIcp(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int CmdArgs_ShowIcp();
int Cmd_ShowProxy(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
@@ -135,7 +132,6 @@ int CmdArgs_ShowScheduledUpdate();
int Cmd_ShowProxyStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int Cmd_ShowHttpTransStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int Cmd_ShowHttpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
-int Cmd_ShowFtpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int Cmd_ShowIcpStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int Cmd_ShowCacheStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
int Cmd_ShowHostDbStats(ClientData clientData, Tcl_Interp * interp, int argc, const char *argv[]);
@@ -176,9 +172,6 @@ int ShowSecurity();
// show http sub-command
int ShowHttp();
-// show ftp sub-command
-int ShowFtp();
-
// show icp sub-command
int ShowIcp();
@@ -265,9 +258,6 @@ int ShowHttpTransStats();
int ShowHttpStats();
// show proxy-stats sub-command
-int ShowFtpStats();
-
-// show proxy-stats sub-command
int ShowIcpStats();
// show proxy-stats sub-command
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt Fri Apr 30 03:14:19 2010
@@ -384,19 +384,6 @@ http HTTP Configuration
Remove (proxy.config.http.anonymize_remove_client_ip)
ts>
-ftp FTP Configuration
- syntax: show:ftp
- args: none
- behavior: Display FTP Configuration
-
- ts> show:ftp
- FTP Caching ---------------------- on (proxy.config.http.cache.ftp)
- FTP Cached Objects Expire After -- 259200 s (proxy.config.http.ftp.cache.document_lifetime)
- FTP Connection Mode -------------- PASV/PORT (proxy.config.ftp.data_connection_mode)
- FTP Inactivity Timeout ----------- 300 s (proxy.config.ftp.control_connection_timeout)
- Anonymous FTP password ----------- admin (proxy.config.http.ftp.anonymous_passwd)
- ts>
-
icp ICP Configuration
(on/off, rules, port, timeouts)
syntax: show:icp [ peers ]
@@ -434,9 +421,8 @@ cache Cache Configuration
ts> show:cache
HTTP Caching ------------------- on (proxy.config.http.cache.http)
- FTP Caching -------------------- on (proxy.config.http.cache.ftp)
Ignore User Requests To Bypass Cache --- off (proxy.config.http.cache.ignore_client_no_cache)
- Maximum HTTP/FTP Object Size --- NONE (proxy.config.cache.max_doc_size)
+ Maximum HTTP Object Size --- NONE (proxy.config.cache.max_doc_size)
Freshness
Verify Freshness By Checking -- (proxy.config.http.cache.when_to_revalidate)
@@ -446,7 +432,6 @@ cache Cache Configuration
If object has no expiration date:
leave it in cache for at least ---- 3600 s (proxy.config.http.cache.heuristic_min_lifetime)
but no more than ------------------ 86400 s (proxy.config.http.cache.heuristic_max_lifetime)
- FTP cached objects expire after ----- 259200 s (proxy.config.http.ftp.cache.document_lifetime)
Variable Content
Do not cache responses to URLs that contain "?", ";", "cgi" or end in ".asp" (proxy.config.http.cache.cache_urls_that_look_dynamic value)
@@ -806,19 +791,6 @@ http-stats HTTP Protocol Summary
Transactions In Progress -- 0 (current_server_transactions)
ts>
-ftp-stats FTP Statistics
- syntax: show:ftp-stats
- args: none
- behavior: Display FTP statistics.
-
- ts> show:ftp-stats
- Open Connections ------------ 0 (proxy.process.ftp.connections_currently_open)
- PASV Connections Successes -- 1592 (proxy.process.ftp.connections_successful_pasv)
- PASV Connections Failures --- 0 (proxy.process.ftp.connections_failed_pasv)
- PORT Connections Successes -- 1 (proxy.process.ftp.connections_successful_port)
- PORT Connections Failures --- 0 (proxy.process.ftp.connections_failed_port)
- ts>
-
icp-stats ICP Statistics
syntax: show:icp-stats
args: none
@@ -1145,33 +1117,6 @@ ssl SSL Configuration
ts#
-ftp FTP Configuration
- syntax: config:ftp mode <pasv-port | pasv | port>
- record: (proxy.config.ftp.data_connection_mode value)
- pasv-port = 1, pasv = 3, port = 2
-
- ts# config:ftp mode pasv-port
- ts#
-
- syntax: config:ftp inactive-timeout <seconds>
- record: (proxy.config.ftp.control_connection_timeout)
-
- ts# config:ftp inactive-timeout 500
- ts#
-
- syntax: config:ftp anonymous-password <password>
- record: (proxy.config.http.ftp.anonymous_passwd)
- NOTE: anonymous ftp password can be in cleartext
-
- ts# config:ftp anonymous-password admin@
- ts#
-
- syntax: config:ftp expire-after <seconds>
- record: (proxy.config.http.ftp.cache.document_lifetime)
-
- ts# config:ftp expire-after 50000
- ts#
-
icp ICP Configuration
(on/off, rules, port, timeouts)
syntax: config:icp mode <receive | send-receive | disabled>
@@ -1209,7 +1154,7 @@ cache Cache Configuration
(active protocols, bypass, storage, freshness,
expires, variable content, rules, clear)
syntax: config:cache <protocol> <on | off>
- args: <protocol> = <http | ftp>
+ args: <protocol> = <http>
<on | off> specifies the given protocol is cached
behavior: Enable/Disable caching of various protocols.
@@ -1221,14 +1166,6 @@ cache Cache Configuration
on
ts#
- ts# config:cache ftp on (proxy.config.http.cache.ftp)
- +OK
- ts#
-
- ts# config:cache ftp
- on
- ts#
-
syntax: config:cache ignore-bypass <on | off>
args: <on | off> turn ignore-bypass on/off.
@@ -1582,7 +1519,7 @@ ports Ports used by Traffic Server
*** config:ports command is not implemented or supported ***
(including mgmt port)
syntax: config:ports <http-server | http-other | webui | overseer | cluster
- cluster-rs | cluster-mc | ftp-server |
+ cluster-rs | cluster-mc |
ssl | socks-server | icp> <port | ports>
args: some variables are single-port while other can be a list of ports
<http-server> (proxy.config.http.server_port) single
@@ -1592,7 +1529,6 @@ 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
- <ftp-server> (proxy.config.ftp.proxy_server_port) single
<ssl> (proxy.config.http.ssl_ports) list
<socks-server> (proxy.config.socks.socks_server_port) single
<icp> (proxy.config.icp.icp_port) single
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt Fri Apr 30 03:14:19 2010
@@ -88,7 +88,6 @@ show:status Proxy statu
show:version Version information
show:security Security information
show:http HTTP protocol configuration
-show:ftp FTP protocol configuration
show:icp [peer] ICP protocol configuration
show:proxy Proxy configuration
show:cache [rules|storage] Cache configuration
@@ -108,7 +107,6 @@ show:scheduled-update Scheduled u
show:proxy-stats Proxy statistics
show:http-trans-stats HTTP transaction statistics
show:http-stats HTTP statistics
-show:ftp-stats FTP statistics
show:icp-stats ICP statistics
show:cache-stats Cache statistics
show:hostdb-stats Host database statistics
@@ -156,11 +154,6 @@ config:http <remove-header> <string>
config:http <insert-ip | remove-ip> <on | off>
config:http proxy <fwd | rev | fwd-rev>
-config:ftp mode <pasv-port | port | pasv>
-config:ftp <inactivity-timeout | expire-after> <seconds>
-config:ftp anonymous-password <string>
-config:ftp proxy <fwd | rev | fwd-rev>
-
config:icp mode <disabled | receive | send-receive>
config:icp port <int>
config:icp multicast <on | off>
@@ -182,7 +175,7 @@ config:socks timeout <seconds>
config:cache <on | off>
-config:cache <http | ftp> <on | off>
+config:cache <http> <on | off>
config:cache ignore-bypass <on | off>
config:cache <max-object-size | max-alternates> <int>
config:cache file <url-config-file>
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/agent-installer/Makefile.am Fri Apr 30 03:14:19 2010
@@ -17,7 +17,5 @@
webuidir = $(DESTDIR)$(pkgdatadir)/agent-installer
dist_webui_DATA = \
- ftp.exp \
- ftp.pl \
installer.cgi \
installer.html
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am Fri Apr 30 03:14:19 2010
@@ -35,9 +35,6 @@ dist_webui_DATA = \
c_dns_resolver.ink \
c_dns_split.ink \
c_footer.ink \
- c_ftp_cachability.ink \
- c_ftp_general.ink \
- c_ftp_timeout.ink \
c_header.ink \
c_http_cachability.ink \
c_http_dyn_cache.ink \
@@ -60,7 +57,6 @@ dist_webui_DATA = \
c_logging_general.ink \
c_logging_search.ink \
c_logging_splitting.ink \
- c_mapping_ftp.ink \
c_mapping.ink \
c_media_common.ink \
c_media_push.ink \
@@ -79,11 +75,9 @@ dist_webui_DATA = \
c_quicktime_mbridge.ink \
c_radius_general.ink \
c_real_networks_general.ink \
- c_reverse_proxy_ftp.ink \
c_reverse_proxy.ink \
c_snapshot_filesystem.ink \
c_snapshot_floppy.ink \
- c_snapshot_ftpsystem.ink \
c_snapshot.ink \
c_socks_general.ink \
c_socks_proxy.ink \
@@ -105,7 +99,6 @@ dist_webui_DATA = \
f_cache_config.ink \
f_configs.ink \
f_filter_config.ink \
- f_ftp_remap_config.ink \
f_hosting_config.ink \
f_icp_config.ink \
f_ip_allow_config.ink \
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink Fri Apr 30 03:14:19 2010
@@ -125,18 +125,6 @@
</tr>
<tr>
- <td height="2" colspan="3" class="configureLabelSmall">Protocols</td>
- </tr>
- <tr>
- <td class="bodyText" align=left> <@submit_error_flg proxy.config.ftp.ftp_enabled>FTP</td>
- <td>
- <input type="radio" name="proxy.config.ftp.ftp_enabled" value="1" <@checked proxy.config.ftp.ftp_enabled\1>>
- </td>
- <td>
- <input type="radio" name="proxy.config.ftp.ftp_enabled" value="0" <@checked proxy.config.ftp.ftp_enabled\0>>
- </td>
- </tr>
- <tr>
<td height="2" colspan="3" class="configureLabelSmall">Streaming Media</td>
</tr>
<tr>
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink.win
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink.win?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink.win (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_basic.ink.win Fri Apr 30 03:14:19 2010
@@ -111,18 +111,6 @@
</tr>
<tr>
- <td height="2" colspan="3" class="configureLabelSmall">Protocols</td>
- </tr>
- <tr>
- <td class="bodyText" align=left> <@submit_error_flg proxy.config.ftp.ftp_enabled>FTP</td>
- <td>
- <input type="radio" name="proxy.config.ftp.ftp_enabled" value="1" <@checked proxy.config.ftp.ftp_enabled\1>>
- </td>
- <td>
- <input type="radio" name="proxy.config.ftp.ftp_enabled" value="0" <@checked proxy.config.ftp.ftp_enabled\0>>
- </td>
- </tr>
- <tr>
<td height="2" colspan="3" class="configureLabelSmall">Streaming Media</td>
</tr>
<tr>
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_cachability.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_cachability.ink?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_cachability.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_cachability.ink Fri Apr 30 03:14:19 2010
@@ -61,22 +61,6 @@
</ul>
</td>
</tr>
- <tr>
- <td height="2" colspan="2" class="configureLabelSmall"><@submit_error_flg proxy.config.http.cache.ftp>FTP over HTTP Caching</td>
- </tr>
- <tr>
- <td nowrap class="bodyText">
- <input type="radio" name="proxy.config.http.cache.ftp" value="1" <@checked proxy.config.http.cache.ftp\1>>
- Enabled <br>
- <input type="radio" name="proxy.config.http.cache.ftp" value="0" <@checked proxy.config.http.cache.ftp\0>>
- Disabled
- </td>
- <td class="configureHelp" valign="top" align="left">
- <ul>
- <li>Enables/Disables caching of FTP requests sent via HTTP.
- </ul>
- </td>
- </tr>
</table>
</td>
</tr>
@@ -212,20 +196,6 @@
</ul>
</td>
</tr>
- <tr>
- <td height="2" colspan="2" class="configureLabelSmall"><@submit_error_flg proxy.config.http.ftp.cache.document_lifetime>FTP Document Lifetime</td>
- </tr>
- <tr>
- <td nowrap class="bodyText">
- <input type="text" size="6" name="proxy.config.http.ftp.cache.document_lifetime" value="<@record proxy.config.http.ftp.cache.document_lifetime>">
- </td>
- <td class="configureHelp" valign="top" align="left">
- <ul>
- <li>Specifies the maximum amount of time that an FTP document
- can stay in the <@record proxy.config.product_name> cache.
- </ul>
- </td>
- </tr>
</table>
</td>
</tr>
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_general.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_general.ink?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_general.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_general.ink Fri Apr 30 03:14:19 2010
@@ -110,56 +110,6 @@
</ul>
</td>
</tr>
-
- <tr>
- <td height="2" colspan="2" class="configureLabel">FTP over HTTP</td>
- </tr>
- <tr>
- <td colspan="2">
- <table border="1" cellspacing="0" cellpadding="0" bordercolor=#CCCCCC width="100%">
- <tr>
- <td>
- <table border="0" cellspacing="0" cellpadding="5" width="100%">
- <tr>
- <td height="2" colspan="2" class="configureLabelSmall"><@submit_error_flg proxy.config.http.ftp.anonymous_passwd>Anonymous Password</td>
- </tr>
- <tr>
- <td nowrap class="bodyText">
- <input type="text" size="18" name="proxy.config.http.ftp.anonymous_passwd" value="<@record proxy.config.http.ftp.anonymous_passwd>">
- </td>
- <td class="configureHelp" valign="top" align="left">
- <ul>
- <li>Specifies the anonymous password for FTP servers that
- require a password for access.
- </ul>
- </td>
- </tr>
-
- <tr>
- <td height="2" colspan="2" class="configureLabelSmall"><@submit_error_flg proxy.config.ftp.data_connection_mode>Data Connection Mode</td>
- </tr>
- <tr>
- <td nowrap class="bodyText">
- <input type="radio" name="proxy.config.ftp.data_connection_mode" value="1" <@checked proxy.config.ftp.data_connection_mode\1>>
- PASV then PORT <br>
- <input type="radio" name="proxy.config.ftp.data_connection_mode" value="2" <@checked proxy.config.ftp.data_connection_mode\2>>
- PORT Only <br>
- <input type="radio" name="proxy.config.ftp.data_connection_mode" value="3" <@checked proxy.config.ftp.data_connection_mode\3>>
- PASV Only
- </td>
- <td width="100%" class="configureHelp" valign="top" align="left">
- <ul>
- <li>Specifies the FTP connection mode over HTTP.
- </ul>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
-
</table>
<@include /configure/c_buttons.ink>
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_timeout.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_timeout.ink?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_timeout.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_timeout.ink Fri Apr 30 03:14:19 2010
@@ -172,20 +172,6 @@
</table>
</td>
</tr>
- <tr>
- <td height="2" colspan="2" class="configureLabel"><@submit_error_flg proxy.config.ftp.control_connection_timeout>FTP Control Connection Timeout</td>
- </tr>
- <tr>
- <td nowrap class="bodyText">
- <input type="text" size="6" name="proxy.config.ftp.control_connection_timeout" value="<@record proxy.config.ftp.control_connection_timeout>">
- </td>
- <td class="configureHelp" valign="top" align="left">
- <ul>
- <li>Specifies how long <@record proxy.config.product_name>
- waits for a response from the FTP server.
- </ul>
- </td>
- </tr>
</table>
<@include /configure/c_buttons.ink>
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/f_configs.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/f_configs.ink?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/f_configs.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/f_configs.ink Fri Apr 30 03:14:19 2010
@@ -68,25 +68,6 @@
</td>
</tr>
-
- <tr>
- <td class="blackLabel">
- <@record proxy.config.ftp.reverse_ftp_remap_file_name>
- </td>
- </tr>
- <tr>
- <td width="100%" class="configureHelp" valign="top" align="left">
- <@config_table_object /configure/f_ftp_remap_config.ink>
- </td>
- </tr>
- <tr>
- <td colspan="2" align="right">
- <input class="configureButton" type=button name="refresh" value="Refresh" onclick="window.location='/configure/f_configs.ink'">
- <input class="configureButton" type=button name="editFile" value="Edit File" target="displayWin" onclick="window.open('/configure/submit_config_display.cgi?filename=/configure/f_ftp_remap_config.ink&fname=<@record proxy.config.ftp.reverse_ftp_remap_file_name>&frecord=proxy.config.ftp.reverse_ftp_remap_file_name', 'displayWin');">
- </td>
- </tr>
-
-
<tr>
<td class="blackLabel">
<@record proxy.config.cache.hosting_filename>
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/helper/Makefile.am Fri Apr 30 03:14:19 2010
@@ -17,7 +17,6 @@
webuidir = $(DESTDIR)$(pkgdatadir)/configure/helper
dist_webui_DATA = \
INKMgmtAPICheckTcl.sh \
- INKMgmtAPIFtp.tcl \
log.sh \
otwu.tcl \
traffic_shell.cgi
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/english.dict Fri Apr 30 03:14:19 2010
@@ -274,11 +274,6 @@ s_text_789=Example: ab.c.com a.bc.com
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_798=Specifies the proxy port used by <@record proxy.config.product_name> to listen to FTP traffic.
-s_text_799=FTP Server
-s_text_800=Specifies the hostname or IP address assigned to the FTP server to which you want to redirect requests.
-s_text_801=FTP Server Port
-s_text_802=Specifies the port number used by the FTP server to handle requests.
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.
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/monitor/Makefile.am Fri Apr 30 03:14:19 2010
@@ -23,8 +23,6 @@ dist_webui_DATA = \
m_dns.ink \
m_dns_proxy.ink \
m_footer.ink \
- m_ftp_http.ink \
- m_ftp.ink \
m_graphs.ink \
m_header.ink \
m_http.ink \
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/detailed.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/detailed.ink?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/detailed.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/detailed.ink Fri Apr 30 03:14:19 2010
@@ -558,43 +558,6 @@
</tr>
<!-- realmem end -->
- <!--------------------------- PROTOCOLS -------------------------->
- <!-- FTP -->
-<!-- fccon start -->
- <tr align="center">
- <td align=center class="bodyText">
- FTP Client Connections:<BR>
- <A HREF="fccon.html"><IMG HEIGHT=135 WIDTH=500 SRC="fccon-<@query mrtg>.png"></A>
- </td>
- <td align=left class="bodyText">
- This is an instantaneous snapshot of the FTP client/server connection count.
- The blue curve and the orange line represent the client/server connection count, respectively. <i>(not including FTP over HTTP traffic)</i>
- </td>
- </tr>
-<!-- fccon end -->
-<!-- fdoc start -->
- <tr align="center">
- <td align=center class="bodyText">
- FTP Hit Rate:<BR>
- <A HREF="fdoc.html"><IMG HEIGHT=135 WIDTH=500 SRC="fdoc-<@query mrtg>.png"></A>
- </td>
- <td align=left class="bodyText">
- The blue curve shows the 5 minute average FTP hit rate. <i>(not including FTP over HTTP traffic)</i>
- </td>
- </tr>
-<!-- fdoc end -->
-<!-- fbw start -->
- <tr align="center">
- <td align=center class="bodyText">
- FTP Bandwidth Savings:<BR>
- <A HREF="fbw.html"><IMG HEIGHT=135 WIDTH=500 SRC="fbw-<@query mrtg>.png"></A>
- </td>
- <td align=left class="bodyText">
- This shows the FTP bandwidth savings percentage. <i>(not including FTP over HTTP traffic)</i>
- </td>
- </tr>
-<!-- fbw end -->
-
<!--------------------- MIXT TPROTOCOLS -------------------------->
<tr>
<td height="2" colspan="2" class="configureLabel">Media Protocols</td>
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/overview.ink
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/overview.ink?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/overview.ink (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/mrtg/overview.ink Fri Apr 30 03:14:19 2010
@@ -99,20 +99,6 @@
</tr>
<tr>
- <td height="2" colspan="2" class="configureLabel">Protocols</td>
- </tr>
- <tr align="center">
- <td align=center class="bodyText">
- FTP Client / Server Connections:<BR>
- <A HREF="fccon.html"><IMG HEIGHT=88 WIDTH=325 SRC="fccon-day.png"></A>
- </td>
- <td align=center class="bodyText">
- FTP Hit Rate:<BR>
- <A HREF="fdoc.html"><IMG HEIGHT=88 WIDTH=325 SRC="fdoc-day.png"></A>
- </td>
- </tr>
-
- <tr>
<td height="2" colspan="2" class="configureLabel">Media Protocols</td>
</tr>
<tr align="center">
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml Fri Apr 30 03:14:19 2010
@@ -80,14 +80,6 @@
<LINK name="Transaction" refresh="true"
file_link="/monitor/m_http_trans.ink"
help_link="/help/ts.ink?help=s_http.htm"/>
- <LINK name="FTP over HTTP" refresh="true"
- file_link="/monitor/m_ftp_http.ink"
- help_link="/help/ts.ink?help=s_http.htm"/>
- </ITEM>
- <ITEM name="FTP" enable_record="proxy.config.ftp.ftp_enabled">
- <LINK refresh="true"
- file_link="/monitor/m_ftp.ink"
- help_link="/help/ts.ink?help=s_ftp.htm"/>
</ITEM>
</MENU>
@@ -232,9 +224,6 @@
<LINK name="File System" refresh="false"
file_link="/configure/c_snapshot_filesystem.ink"
help_link="/help/ts.ink?help=c_snap.htm"/>
- <LINK name="FTP Server" refresh="false"
- file_link="/configure/c_snapshot_ftpsystem.ink"
- help_link="/help/ts.ink?help=c_snap.htm"/>
<LINK name="Floppy Disk" refresh="false"
file_link="/configure/c_snapshot_floppy.ink"
help_link="/help/ts.ink?help=c_snap.htm"/>
@@ -288,17 +277,6 @@
file_link="/configure/c_http_update_urls.ink"
help_link="/help/ts.ink?help=c_httpsc.htm"/>
</ITEM>
- <ITEM name="FTP" enable_record="proxy.config.ftp.ftp_enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_ftp_general.ink"
- help_link="/help/ts.ink?help=c_ftp.htm"/>
- <LINK name="Cacheability" refresh="false"
- file_link="/configure/c_ftp_cachability.ink"
- help_link="/help/ts.ink?help=c_ftp.htm"/>
- <LINK name="Timeouts" refresh="false"
- file_link="/configure/c_ftp_timeout.ink"
- help_link="/help/ts.ink?help=c_ftp.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">
@@ -344,17 +322,11 @@
<LINK name="General" refresh="false"
file_link="/configure/c_reverse_proxy.ink"
help_link="/help/ts.ink?help=c_revp.htm"/>
- <LINK name="FTP" refresh="false" enable_record="proxy.config.ftp.ftp_enabled"
- file_link="/configure/c_reverse_proxy_ftp.ink"
- help_link="/help/ts.ink?help=c_revp.htm"/>
</ITEM>
<ITEM name="Mapping and Redirection">
<LINK name="General" refresh="false"
file_link="/configure/c_mapping.ink"
help_link="/help/ts.ink?help=c_map.htm"/>
- <LINK name="FTP" refresh="false" enable_record="proxy.config.ftp.ftp_enabled"
- file_link="/configure/c_mapping_ftp.ink"
- help_link="/help/ts.ink?help=c_map.htm"/>
</ITEM>
<ITEM name="Browser Auto-Config">
<LINK name="PAC" refresh="false"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win Fri Apr 30 03:14:19 2010
@@ -81,14 +81,6 @@
<LINK name="Transaction" refresh="true"
file_link="/monitor/m_http_trans.ink"
help_link="/help/ts.ink?help=s_http.htm"/>
- <LINK name="FTP over HTTP" refresh="true"
- file_link="/monitor/m_ftp_http.ink"
- help_link="/help/ts.ink?help=s_http.htm"/>
- </ITEM>
- <ITEM name="FTP" enable_record="proxy.config.ftp.ftp_enabled">
- <LINK refresh="true"
- file_link="/monitor/m_ftp.ink"
- help_link="/help/ts.ink?help=s_ftp.htm"/>
</ITEM>
</MENU>
@@ -265,17 +257,6 @@
file_link="/configure/c_http_update_urls.ink"
help_link="/help/ts.ink?help=c_httpsc.htm"/>
</ITEM>
- <ITEM name="FTP" enable_record="proxy.config.ftp.ftp_enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_ftp_general.ink"
- help_link="/help/ts.ink?help=c_ftp.htm"/>
- <LINK name="Cacheability" refresh="false"
- file_link="/configure/c_ftp_cachability.ink"
- help_link="/help/ts.ink?help=c_ftp.htm"/>
- <LINK name="Timeouts" refresh="false"
- file_link="/configure/c_ftp_timeout.ink"
- help_link="/help/ts.ink?help=c_ftp.htm"/>
- </ITEM>
</MENU>
<MENU name="Streaming Media" enable_record="proxy.config.wmt.enabled">
<ITEM name="Windows Media" enable_record="proxy.config.wmt.enabled">
@@ -303,17 +284,11 @@
<LINK name="General" refresh="false"
file_link="/configure/c_reverse_proxy.ink"
help_link="/help/ts.ink?help=c_revp.htm"/>
- <LINK name="FTP" refresh="false" enable_record="proxy.config.ftp.ftp_enabled"
- file_link="/configure/c_reverse_proxy_ftp.ink"
- help_link="/help/ts.ink?help=c_revp.htm"/>
</ITEM>
<ITEM name="Mapping and Redirection">
<LINK name="General" refresh="false"
file_link="/configure/c_mapping.ink"
help_link="/help/ts.ink?help=c_map.htm"/>
- <LINK name="FTP" refresh="false" enable_record="proxy.config.ftp.ftp_enabled"
- file_link="/configure/c_mapping_ftp.ink"
- help_link="/help/ts.ink?help=c_map.htm"/>
</ITEM>
<ITEM name="Browser Auto-Config">
<LINK name="PAC" refresh="false"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp Fri Apr 30 03:14:19 2010
@@ -108,14 +108,6 @@ This text will be stripped from the buil
<LINK name="Transaction" refresh="true"
file_link="/monitor/m_http_trans.ink"
help_link="/help/ts.ink?help=s_http.htm"/>
- <LINK name="FTP over HTTP" refresh="true"
- file_link="/monitor/m_ftp_http.ink"
- help_link="/help/ts.ink?help=s_http.htm"/>
- </ITEM>
- <ITEM name="FTP" enable_record="proxy.config.ftp.ftp_enabled">
- <LINK refresh="true"
- file_link="/monitor/m_ftp.ink"
- help_link="/help/ts.ink?help=s_ftp.htm"/>
</ITEM>
</MENU>
@@ -344,17 +336,6 @@ This text will be stripped from the buil
file_link="/configure/c_http_update_urls.ink"
help_link="/help/ts.ink?help=c_httpsc.htm"/>
</ITEM>
- <ITEM name="FTP" enable_record="proxy.config.ftp.ftp_enabled">
- <LINK name="General" refresh="false"
- file_link="/configure/c_ftp_general.ink"
- help_link="/help/ts.ink?help=c_ftp.htm"/>
- <LINK name="Cacheability" refresh="false"
- file_link="/configure/c_ftp_cachability.ink"
- help_link="/help/ts.ink?help=c_ftp.htm"/>
- <LINK name="Timeouts" refresh="false"
- file_link="/configure/c_ftp_timeout.ink"
- help_link="/help/ts.ink?help=c_ftp.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">
@@ -405,17 +386,11 @@ This text will be stripped from the buil
<LINK name="General" refresh="false"
file_link="/configure/c_reverse_proxy.ink"
help_link="/help/ts.ink?help=c_revp.htm"/>
- <LINK name="FTP" refresh="false" enable_record="proxy.config.ftp.ftp_enabled"
- file_link="/configure/c_reverse_proxy_ftp.ink"
- help_link="/help/ts.ink?help=c_revp.htm"/>
</ITEM>
<ITEM name="Mapping and Redirection">
<LINK name="General" refresh="false"
file_link="/configure/c_mapping.ink"
help_link="/help/ts.ink?help=c_map.htm"/>
- <LINK name="FTP" refresh="false" enable_record="proxy.config.ftp.ftp_enabled"
- file_link="/configure/c_mapping_ftp.ink"
- help_link="/help/ts.ink?help=c_map.htm"/>
</ITEM>
<ITEM name="Browser Auto-Config">
<LINK name="PAC" refresh="false"
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/preparse/RemapReadConfig.cc Fri Apr 30 03:14:19 2010
@@ -115,12 +115,12 @@ parseRemapFile(int fd)
fromScheme = fromURL.scheme_get(&fromSchemeLen);
toScheme = toURL.scheme_get(&toSchemeLen);
- if ((fromScheme != URL_SCHEME_HTTP && fromScheme != URL_SCHEME_FTP
+ if ((fromScheme != URL_SCHEME_HTTP
&& fromScheme != URL_SCHEME_HTTPS
&& fromScheme != URL_SCHEME_MMS && fromScheme != URL_SCHEME_RTSP) ||
- (toScheme != URL_SCHEME_HTTP && toScheme != URL_SCHEME_FTP
+ (toScheme != URL_SCHEME_HTTP
&& toScheme != URL_SCHEME_HTTPS && toScheme != URL_SCHEME_MMS && toScheme != URL_SCHEME_RTSP)) {
- err = "Only http, https, ftp, mms, and rtsp remappings are supported";
+ err = "Only http, https, mms, and rtsp remappings are supported";
goto FAIL;
}
// Check to see if we have a complete URL, if not
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/uistats
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/uistats?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/uistats (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/uistats Fri Apr 30 03:14:19 2010
@@ -64,14 +64,14 @@
#
# html/everything.ink
proxy.node.cache_total_hits
-# derived: sum of proxy.process.http.cache_hit_fresh, proxy.process.http.cache_hit_revalidated, proxy.process.ftp.cache_hits
+# derived: sum of proxy.process.http.cache_hit_fresh, proxy.process.http.cache_hit_revalidated
# usage: counter
# units: objects
# scale: 1000
# doc: # of objects served from cache
# perfmonvar: cache_total_hits
proxy.node.cache_total_misses
-# derived: sum of proxy.process.http.cache_miss_cold, proxy.process.http.cache_miss_changed, proxy.process.http.cache_miss_not_cacheable, proxy.process.http.cache_miss_client_no_cache, proxy.process.ftp.cache_misses
+# derived: sum of proxy.process.http.cache_miss_cold, proxy.process.http.cache_miss_changed, proxy.process.http.cache_miss_not_cacheable, proxy.process.http.cache_miss_client_no_cache
# usage: counter
# units: objects
# scale: 1000
@@ -161,7 +161,7 @@ proxy.cluster.current_server_connections
# perfmonvar: cluster_cur_server_conn
#
proxy.node.bandwidth_hit_ratio CH
-# doc: The ratio of bytes served from the cache to total requested bytes (HTTP and FTP) since installation).
+# doc: The ratio of bytes served from the cache to total requested bytes (HTTP) since installation).
# proxy.node.http.user_agent_total_request_bytes = proxy.process.http.user_agent_request_document_total_size + proxy.process.http.user_agent_request_header_total_size
# proxy.node.http.user_agent_total_response_bytes = proxy.process.http.user_agent_response_document_total_size + proxy.process.http.user_agent_response_header_total_size
# proxy.node.http.origin_server_total_request_bytes = proxy.process.http.origin_server_request_document_total_size + proxy.process.http.origin_server_request_header_total_size
@@ -182,7 +182,7 @@ proxy.cluster.cache_hit_ratio CH
# scale: 100
# usage: gauge
proxy.node.client_throughput_out CH
-# doc: Number of HTTP and FTP bytes per second through node (and cluster).
+# doc: Number of HTTP bytes per second through node (and cluster).
# usage: gauge
# units: bytes/second
# scale: 100000
@@ -246,8 +246,8 @@ proxy.cluster.http.throughput
# perfmonvar: cluster_http_throughput
#
proxy.cluster.http.user_agent_current_connections_count
-# doc: Number of currently open HTTP and FTP client connections (cluster).
-# shortdoc: # cur open HTTP & FTP cli conn (clstr)
+# doc: Number of currently open HTTP client connections (cluster).
+# shortdoc: # cur open HTTP conn (clstr)
# scale: 100
# units: connections
# usage: gauge
@@ -280,32 +280,32 @@ proxy.node.hostdb.hit_ratio CH
# scale: 100
proxy.node.hostname CH
proxy.node.http.bandwidth_hit_ratio CH
-# doc: The ratio of bytes served from the cache to total requested bytes (HTTP and FTP) since installation).
+# doc: The ratio of bytes served from the cache to total requested bytes (HTTP) since installation).
# units: %
# scale: 100
# usage: gauge
proxy.node.http.cache_current_connections_count
-# doc: Number of HTTP and FTP cache transfers (cache reads and writes) in progress.
-# shortdoc: # HTTP & FTP cache xfrs in prgrss
+# doc: Number of HTTP cache transfers (cache reads and writes) in progress.
+# shortdoc: # HTTP cache xfrs in prgrss
# scale: 100
# units: connections
# usage: gauge
# perfmonvar: cur_http_cache_conn
proxy.node.http.cache_hit_ratio CH
-# doc: Ratio of cache hits to total cache requests (HTTP and FTP), since installation.
+# doc: Ratio of cache hits to total cache requests (HTTP), since installation.
# units: %
# scale: 100
# usage: gauge
proxy.node.http.cache_total_hits
-# doc: Total number of HTTP and FTP objects served from the cache since installation.
-# shortdoc: Tot # HTTP & FTP obj srvd frm cache
+# doc: Total number of HTTP objects served from the cache since installation.
+# shortdoc: Tot # HTTP obj srvd frm cache
# units: documents
# scale: 10000
# usage: counter
# perfmonvar: http_cache_hits_total
proxy.node.http.origin_server_current_connections_count
-# doc: Number of currently open HTTP and FTP server connections.
-# shortdoc: # cur open HTTP & FTP srvr conn
+# doc: Number of currently open HTTP server connections.
+# shortdoc: # cur open HTTP srvr conn
# scale: 100
# units: connections
# usage: gauge
@@ -320,8 +320,8 @@ proxy.node.http.throughput
# perfmonvar: cur_http_throughput
#
proxy.node.http.user_agent_current_connections_count
-# doc: Number of currently open HTTP and FTP client connections.
-# shortdoc: # cur open HTTP & FTP cli conn
+# doc: Number of currently open HTTP client connections.
+# shortdoc: # cur open HTTP cli conn
# scale: 100
# units: connections
# usage: gauge
@@ -370,40 +370,6 @@ proxy.node.http.transaction_msec_avg_10s
proxy.node.http.transaction_msec_avg_10s.miss_cold
proxy.node.http.transaction_msec_avg_10s.miss_not_cacheable
proxy.node.http.transaction_msec_avg_10s.other.unclassified
-proxy.process.ftp.connections_currently_open
-# doc: Number of open FTP connections
-# units: connections
-# usage: gauge
-# scale: 100
-# perfmonvar: cur_ftp_conn
-proxy.process.ftp.connections_failed_pasv
-# doc: Number of failed PASV FTP connections
-# shortdoc: # of failed PASV FTP connections
-# units: connections
-# usage: counter
-# scale: 100
-# perfmonvar: ftp_pasv_conn_failed
-proxy.process.ftp.connections_failed_port
-# doc: Number of failed PORT FTP connections
-# shortdoc: # of failed PORT FTP connections
-# units: connections
-# usage: counter
-# scale: 100
-# perfmonvar: ftp_port_conn_failed
-proxy.process.ftp.connections_successful_pasv
-# doc: Number of successful PASV FTP connections
-# shortdoc: # of successful PASV FTP conn
-# units: connections
-# usage: counter
-# scale: 100
-# perfmonvar: ftp_pasv_conn_sucess
-proxy.process.ftp.connections_successful_port
-# doc: Number of successful PORT FTP connections
-# shortdoc: # of successful PORT FTP conn
-# units: connections
-# usage: counter
-# scale: 100
-# perfmonvar: ftp_port_conn_success
proxy.process.http.current_client_connections
# doc: Total HTTP client connections currently active
# shortdoc: Tot HTTP cli conn cur active
@@ -883,16 +849,16 @@ proxy.node.client_throughput_out_kbit M
proxy.cluster.client_throughput_out_kbit M
proxy.node.bandwidth_hit_ratio_int_pct MP
# derived: proxy.node.bandwidth_hit_ratio * 100
-# doc: The ratio of bytes served from the cache to total requested bytes (HTTP and FTP) since installation).
-# shortdoc: % FTP/HTTP bytes served from cache
+# doc: The ratio of bytes served from the cache to total requested bytes (HTTP) since installation).
+# shortdoc: % HTTP bytes served from cache
# units: %
# scale: 100
# usage: gauge
# perfmonvar: bw_hit_ratio
proxy.cluster.bandwidth_hit_ratio_int_pct MP
# derived: proxy.cluster.bandwidth_hit_ratio * 100
-# doc: The ratio of bytes served from the cache to total requested bytes (HTTP and FTP) since installation).
-# shortdoc: % FTP/HTTP bytes srvd frm cache (cluster)
+# doc: The ratio of bytes served from the cache to total requested bytes (HTTP) since installation).
+# shortdoc: % HTTP bytes srvd frm cache (cluster)
# units: %
# scale: 100
# usage: gauge
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc Fri Apr 30 03:14:19 2010
@@ -43,8 +43,6 @@ FileInfo file_info_entries[] = {
{"proxy.config.icp.icp_configuration", INK_FNAME_ICP_PEER, &convertIcpRule_ts, &convertIcpRule_xml},
{"proxy.config.url_remap.filename", INK_FNAME_REMAP, &convertRemapRule_ts, &convertRemapRule_xml},
{"proxy.config.dns.splitdns.filename", INK_FNAME_SPLIT_DNS, &convertSplitDnsRule_ts, &convertSplitDnsRule_xml},
- {"proxy.config.ftp.reverse_ftp_remap_file_name", INK_FNAME_FTP_REMAP, &convertFtpRemapRule_ts,
- &convertFtpRemapRule_xml},
{"proxy.config.cache.hosting_filename", INK_FNAME_HOSTING, &convertHostingRule_ts, &convertHostingRule_xml},
{"proxy.config.cache.ip_allow.filename", INK_FNAME_IP_ALLOW, &convertIpAllowRule_ts, &convertIpAllowRule_xml},
{"proxy.config.admin.ip_allow.filename", INK_FNAME_MGMT_ALLOW, &convertMgmtAllowRule_ts, &convertMgmtAllowRule_xml},
@@ -70,7 +68,6 @@ const char *config_files[] = {
"bypass.config",
"cache.config",
"congestion.config",
- "ftp_remap.config",
"hosting.config",
"icp.config",
"ip_allow.config",
@@ -369,49 +366,6 @@ convertCongestionRule_xml(XMLNode * rule
return rule;
}
-// ---------------------------------------------------------------------
-// convertFtpRemapRule_xml
-// ---------------------------------------------------------------------
-char *
-convertFtpRemapRule_xml(XMLNode * rule_node)
-{
- INKFtpRemapEle *ele = NULL;
- XMLNode *child;
- char *name, *tempStr;
-
- if (!rule_node)
- return NULL;
-
- ele = INKFtpRemapEleCreate();
-
- // iterate through each subelement of a rule node
- for (int i = 0; i < rule_node->getChildCount(); i++) {
- child = rule_node->getChildNode(i);
- name = child->getNodeName();
-
- if (strcmp(name, "src") == 0) {
- tempStr = child->getAttributeValueByName("port");
- if (tempStr) {
- ele->from_port = ink_atoi(tempStr);
- }
- tempStr = child->getAttributeValueByName("host");
- ele->from_val = xstrdup(tempStr);
- } else if (strcmp(name, "dest") == 0) {
- tempStr = child->getAttributeValueByName("port");
- if (tempStr) {
- ele->to_port = ink_atoi(tempStr);
- }
- tempStr = child->getAttributeValueByName("host");
- ele->to_val = xstrdup(tempStr);
- }
- }
-
- // convert Ele into "one-liner" text format
- FtpRemapObj ele_obj(ele);
- char *rule = ele_obj.formatEleToRule();
-
- return rule;
-}
// ---------------------------------------------------------------------
// convertHostingRule_xml
@@ -1462,30 +1416,6 @@ Lerror:
return INK_ERR_FAIL;
}
-// ---------------------------------------------------------------------
-// convertFtpRemapRule_ts
-// ---------------------------------------------------------------------
-int
-convertFtpRemapRule_ts(INKCfgEle * cfg_ele, textBuffer * xml_file)
-{
- INKFtpRemapEle *ele = (INKFtpRemapEle *) cfg_ele;
-
- writeXmlStartTag(xml_file, "rule");
-
- writeXmlAttrStartTag(xml_file, "src");
- writeXmlAttribute(xml_file, "host", ele->from_val);
- writeXmlAttribute_int(xml_file, "port", ele->from_port);
- writeXmlClose(xml_file);
-
- writeXmlAttrStartTag(xml_file, "dest");
- writeXmlAttribute(xml_file, "host", ele->to_val);
- writeXmlAttribute_int(xml_file, "port", ele->to_port);
- writeXmlClose(xml_file);
-
- writeXmlEndTag(xml_file, "rule");
-
- return INK_ERR_OKAY;
-}
// ---------------------------------------------------------------------
// convertHostingRule_ts
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.h?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.h Fri Apr 30 03:14:19 2010
@@ -57,7 +57,6 @@ char *convertArmSecurityRule_xml(XMLNode
char *convertBypassRule_xml(XMLNode * rule_node);
char *convertCacheRule_xml(XMLNode * rule_node);
char *convertCongestionRule_xml(XMLNode * rule_node);
-char *convertFtpRemapRule_xml(XMLNode * rule_node);
char *convertHostingRule_xml(XMLNode * rule_node);
char *convertIcpRule_xml(XMLNode * rule_node);
char *convertIpAllowRule_xml(XMLNode * rule_node);
@@ -92,7 +91,6 @@ int convertArmSecurityRule_ts(INKCfgEle
int convertBypassRule_ts(INKCfgEle * cfg_ele, textBuffer * xml_file);
int convertCacheRule_ts(INKCfgEle * cfg_ele, textBuffer * xml_file);
int convertCongestionRule_ts(INKCfgEle * cfg_ele, textBuffer * xml_file);
-int convertFtpRemapRule_ts(INKCfgEle * cfg_ele, textBuffer * xml_file);
int convertHostingRule_ts(INKCfgEle * cfg_ele, textBuffer * xml_file);
int convertIcpRule_ts(INKCfgEle * cfg_ele, textBuffer * xml_file);
int convertIpAllowRule_ts(INKCfgEle * cfg_ele, textBuffer * xml_file);
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc Fri Apr 30 03:14:19 2010
@@ -75,9 +75,6 @@ convertRules(INKFileNameT file, INKIntLi
case INK_FNAME_FILTER:
rule = formatFilterRule(rules[*index]);
break;
- case INK_FNAME_FTP_REMAP:
- rule = formatFtpRemapRule(rules[*index]);
- break;
case INK_FNAME_HOSTING:
rule = formatHostingRule(rules[*index]);
break;
@@ -347,41 +344,6 @@ formatFilterRule(char *rule)
}
//-------------------------------------------------------------------------
-// formatFtpRemapRule
-//-------------------------------------------------------------------------
-//
-char *
-formatFtpRemapRule(char *rule)
-{
- Tokenizer tokens(CFG_RULE_DELIMITER);
- tokens.Initialize(rule, ALLOW_EMPTY_TOKS);
- char buf[MAX_RULE_LENGTH];
-
- if (!rule)
- return NULL;
- memset(buf, 0, MAX_RULE_LENGTH);
-
- ink_snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "Traffic Server=");
- if (strlen(tokens[0]) > 0) {
- ink_snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "%s", tokens[0], HTML_DELIM);
- }
- if (strlen(tokens[1]) > 0) {
- ink_snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), ":%s%s", tokens[1], HTML_DELIM);
- } else {
- ink_snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "%s", HTML_DELIM);
- }
- ink_snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "FTP Server=");
- if (strlen(tokens[2]) > 0) {
- ink_snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), "%s", tokens[2], HTML_DELIM);
- }
- if (strlen(tokens[3]) > 0) {
- ink_snprintf(buf + strlen(buf), MAX_RULE_LENGTH - strlen(buf), ":%s", tokens[3]);
- }
-
- return xstrdup(buf);
-}
-
-//-------------------------------------------------------------------------
// formatHostingRule
//-------------------------------------------------------------------------
//
@@ -1494,73 +1456,6 @@ Lend:
INKCfgContextDestroy(ctx);
return err;
}
-
-//-------------------------------------------------------------------------
-// updateFtpRemapConfig
-//-------------------------------------------------------------------------
-int
-updateFtpRemapConfig(char *rules[], int numRules, char **errBuff)
-{
- INKCfgContext ctx = NULL;
- INKFtpRemapEle *ele;
- Tokenizer tokens(CFG_RULE_DELIMITER);
- INKActionNeedT action_need;
- INKError response;
- int i, err = WEB_HTTP_ERR_OKAY;
- INKIntList errRules = NULL;
-
- ctx = INKCfgContextCreate(INK_FNAME_FTP_REMAP);
- if (!ctx) {
- Debug("config", "[updateFtpRemapConfig] can't allocate ctx memory");
- err = WEB_HTTP_ERR_FAIL;
- goto Lerror;
- }
- // since we want to preserve comments, we need to read in the
- // file using INKCfgContextGet and remove all the rules; starting from scratch
- if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
- Debug("config", "[updateFtpRemapConfig] Failed to Get and Clear CfgContext");
- err = WEB_HTTP_ERR_FAIL;
- goto Lerror;
- }
- // create Ele's by parsing the rules in the rules array
- // insert the Ele's into a Cfg Context; if invalid formatted rule, just skip it
- for (i = 0; i < numRules; i++) {
- tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
-
- ele = INKFtpRemapEleCreate();
-
- if (strlen(tokens[0]) <= 0 || strlen(tokens[1]) <= 0 ||
- strlen(tokens[2]) <= 0 || strlen(tokens[3]) <= 0 || !isNumber(tokens[1]) || !isNumber(tokens[3])) {
- ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
- Debug("config", "[updateFtpRemapConfig] Invalid rule - SKIP");
- } else {
- ele->from_val = xstrdup(tokens[0]);
- ele->from_port = ink_atoi(tokens[1]);
- ele->to_val = xstrdup(tokens[2]);
- ele->to_port = ink_atoi(tokens[3]);
- }
- INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
- }
-
- // commit the CfgContext to write a new version of the file
- errRules = INKIntListCreate();
- response = INKCfgContextCommit(ctx, &action_need, errRules);
- if (response == INK_ERR_INVALID_CONFIG_RULE) {
- err = WEB_HTTP_ERR_INVALID_CFG_RULE;
- *errBuff = convertRules(INK_FNAME_FTP_REMAP, errRules, rules);
- } else if (response != INK_ERR_OKAY) {
- err = WEB_HTTP_ERR_FAIL;
- goto Lerror;
- }
-
-Lerror:
- if (errRules)
- INKIntListDestroy(errRules);
- if (ctx)
- INKCfgContextDestroy(ctx);
- return err;
-}
-
//-------------------------------------------------------------------------
// updateHostingConfig
//-------------------------------------------------------------------------
Modified: incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h?rev=939548&r1=939547&r2=939548&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h (original)
+++ incubator/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h Fri Apr 30 03:14:19 2010
@@ -38,7 +38,6 @@ char *convertRules(INKFileNameT file, IN
char *formatCacheRule(char *rule);
char *formatFilterRule(char *rule);
-char *formatFtpRemapRule(char *rule);
char *formatHostingRule(char *rule);
char *formatIcpRule(char *rule);
char *formatIpAllowRule(char *rule);
@@ -54,7 +53,6 @@ char *formatVaddrsRule(char *rule);
int updateCacheConfig(char *rules[], int numRules, char **errBuff);
int updateFilterConfig(char *rules[], int numRules, char **errBuff);
int updateFilterConfigPassword(WebHttpContext * whc, char **errBuff);
-int updateFtpRemapConfig(char *rules[], int numRules, char **errBuff);
int updateHostingConfig(char *rules[], int numRules, char **errBuff);
int updateIcpConfig(char *rules[], int numRules, char **errBuff);
int updateIpAllowConfig(char *rules[], int numRules, char **errBuff);