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/10/14 06:36:17 UTC
svn commit: r1022377 - in /trafficserver/traffic/trunk/proxy/mgmt2: ./ api2/
api2/include/ api2/remote/ html2/configure/ web2/
Author: zwoop
Date: Thu Oct 14 04:36:16 2010
New Revision: 1022377
URL: http://svn.apache.org/viewvc?rev=1022377&view=rev
Log:
TS-486 Also remove ARM and bypass configs (no longer supported)
Removed:
trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/c_http_filtering.ink
trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/f_bypass_config.ink
Modified:
trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc
trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h
trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
Modified: trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc?rev=1022377&r1=1022376&r2=1022377&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/AddConfigFilesHere.cc Thu Oct 14 04:36:16 2010
@@ -80,18 +80,13 @@ initializeRegistry()
configFiles->addFile("mgmt_allow.config", false);
configFiles->addFile("ip_allow.config", false);
configFiles->addFile("parent.config", false);
- configFiles->addFile("filter.config", false);
configFiles->addFile("remap.config", false);
configFiles->addFile("update.config", false);
configFiles->addFile("admin_access.config", false);
configFiles->addFile("partition.config", false);
configFiles->addFile("hosting.config", false);
- configFiles->addFile("bypass.config", false);
configFiles->addFile("congestion.config", false);
configFiles->addFile("plugin.config", false);
- configFiles->addFile("ipnat.conf", false);
- configFiles->addFile("bypass.config", false);
-
configFiles->addFile("splitdns.config", false);
configFiles->addFile("ssl_multicert.config", false);
configFiles->addFile("stats.config.xml", false);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/Main.cc?rev=1022377&r1=1022376&r2=1022377&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/Main.cc Thu Oct 14 04:36:16 2010
@@ -1316,8 +1316,6 @@ fileUpdated(char *fname)
} else if (strcmp(fname, "logs_xml.config") == 0) {
lmgmt->signalFileChange("proxy.config.log2.xml_config_file");
-
-// INKqa10113
} else if (strcmp(fname, "splitdns.config") == 0) {
mgmt_log(stderr, "[fileUpdated] splitdns.config file has been modified\n");
@@ -1327,10 +1325,6 @@ fileUpdated(char *fname)
} else if (strcmp(fname, "ssl_multicert.config") == 0) {
mgmt_log(stderr, "[fileUpdated] ssl_multicert.config file has been modified\n");
- } else if (strcmp(fname, "ipnat.conf") == 0) {
- mgmt_log(stderr, "[fileUpdated] ipnat.conf file has been modified\n");
-
-// INKqa11910
} else if (strcmp(fname, "proxy.config.body_factory.template_sets_dir") == 0) {
lmgmt->signalFileChange("proxy.config.body_factory.template_sets_dir");
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc?rev=1022377&r1=1022376&r2=1022377&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.cc Thu Oct 14 04:36:16 2010
@@ -301,84 +301,6 @@ Rule::arm_securityParse(char *rule)
/**
- * bypassSubParse
- **/
-Token *
-Rule::bypassSubParse(char *rule, unsigned short minNumToken, unsigned short maxNumToken)
-{
- NOWARN_UNUSED(maxNumToken);
- Tokenizer ruleTok(" \t");
- int numRuleTok = ruleTok.Initialize(rule);
- tok_iter_state ruleTok_state;
- const char *tokenStr = ruleTok.iterFirst(&ruleTok_state);
-
- // Sanity Check -- must have more than 2 tokens, otherwise bail out
- if (numRuleTok < minNumToken) {
- this->setErrorHint("Extra token(s) expected!");
- return NULL;
- }
-
- Token *token = NEW(new Token());
- // First token -- either "src" or "dst"
- token->setName(tokenStr);
-
- // The rest is an IP address or a list of IP address
- while ((tokenStr = ruleTok.iterNext(&ruleTok_state))) {
- token->appendValue(tokenStr);
- }
-
- return (token);
-}
-
-
-/**
- * bypassParse
- * ASSUMPTIONS:
- * + each token is separated by either "\s", "\t" or ","
- * + each rule has at least 2 tokens
- **/
-TokenList *
-Rule::bypassParse(char *rule, unsigned short minNumToken, unsigned short maxNumToken)
-{
- NOWARN_UNUSED(maxNumToken);
- Tokenizer ruleTok(" \t");
- int numRuleTok = ruleTok.Initialize(rule);
- tok_iter_state ruleTok_state;
- const char *tokenStr = ruleTok.iterFirst(&ruleTok_state);
-
- // Sanity Check -- must have more than 3 tokens, otherwise bail out
- if (numRuleTok < minNumToken) {
- this->setErrorHint("Expecting more tokens");
- return NULL;
- }
- TokenList *m_tokenList = NEW(new TokenList());
- Token *token = NEW(new Token());
-
- // First token -- "bypass", no "VALUE"
- token->setName(tokenStr);
- m_tokenList->enqueue(token);
-
- // Skip first token
- rule += strlen(tokenStr);
-
- char *andToken = NULL;
- if (!(andToken = strstr(rule, "AND")) && !(andToken = strstr(rule, "and"))) {
- // Not an AND rule
- m_tokenList->enqueue(bypassSubParse(rule));
- } else {
-
- // Chop rule into two parts: rule & and
- rule[strlen(rule) - strlen(andToken)] = '\0';
-
- m_tokenList->enqueue(bypassSubParse(rule));
- m_tokenList->enqueue(bypassSubParse(andToken + strlen("AND")));
- }
-
- return m_tokenList;
-}
-
-
-/**
* cacheParse
* CAUTION: This function is used for number of similar formatted
* configureation file parsing. Modification to this function
@@ -488,16 +410,6 @@ Rule::congestionParse(char *rule, unsign
}
/**
- * filterParse
- **/
-TokenList *
-Rule::filterParse(char *rule)
-{
- return cacheParse(rule, 2);
-}
-
-
-/**
* hostingParse
**/
TokenList *
@@ -558,38 +470,6 @@ Rule::ip_allowParse(char *rule)
return cacheParse(rule, 2, 2);
}
-TokenList *
-Rule::ipnatParse(char *rule)
-{
- Tokenizer ruleTok(" \t");
- int numRuleTok = ruleTok.Initialize(rule);
- tok_iter_state ruleTok_state;
- const char *tokenStr = ruleTok.iterFirst(&ruleTok_state);
- Token *token;
-
- if (numRuleTok < 10) {
- setErrorHint("Expecting at least 10 tokens!");
- return NULL;
- }
-
- TokenList *m_tokenList = NEW(new TokenList());
-
- while (tokenStr) {
- token = NEW(new Token());
- token->setName(tokenStr);
- tokenStr = ruleTok.iterNext(&ruleTok_state);
- m_tokenList->enqueue(token);
- }
-
- // Just to make sure that there are no left overs
- // coverity[returned_pointer]
- tokenStr = ruleTok.iterNext(&ruleTok_state);
- ink_debug_assert(tokenStr == NULL);
-
- return m_tokenList;
-}
-
-
/**
* logsParse
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h?rev=1022377&r1=1022376&r2=1022377&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/GenericParser.h Thu Oct 14 04:36:16 2010
@@ -192,19 +192,9 @@ private:
char *m_errorHint;
unsigned m_lineNum;
- Token *bypassSubParse(char *rule,
- unsigned short minNumToken = MIN_CONFIG_TOKEN, unsigned short maxNumToken = MAX_CONFIG_TOKEN);
- TokenList *bypassParse(char *rule,
- unsigned short minNumToken = MIN_CONFIG_TOKEN, unsigned short maxNumToken = MAX_CONFIG_TOKEN);
- TokenList *cacheParse(char *rule,
- unsigned short minNumToken = MIN_CONFIG_TOKEN, unsigned short maxNumToken = MAX_CONFIG_TOKEN);
- TokenList *congestionParse(char *rule,
- unsigned short minNumToken = MIN_CONFIG_TOKEN,
- unsigned short maxNumToken = MAX_CONFIG_TOKEN);
- TokenList *filterParse(char *rule);
- TokenList *icpParse(char *rule,
- unsigned short minNumToken = MIN_CONFIG_TOKEN, unsigned short maxNumToken = MAX_CONFIG_TOKEN);
- TokenList *ipnatParse(char *rule);
+ TokenList *cacheParse(char *rule, unsigned short minNumToken = MIN_CONFIG_TOKEN, unsigned short maxNumToken = MAX_CONFIG_TOKEN);
+ TokenList *congestionParse(char *rule, unsigned short minNumToken = MIN_CONFIG_TOKEN, unsigned short maxNumToken = MAX_CONFIG_TOKEN);
+ TokenList *icpParse(char *rule, unsigned short minNumToken = MIN_CONFIG_TOKEN, unsigned short maxNumToken = MAX_CONFIG_TOKEN);
TokenList *parentParse(char *rule);
TokenList *remapParse(char *rule);
TokenList *socksParse(char *rule);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h?rev=1022377&r1=1022376&r2=1022377&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h Thu Oct 14 04:36:16 2010
@@ -593,36 +593,6 @@ typedef enum
INKAccessT access; /* type of access allowed for user */
} INKAdminAccessEle;
-/* arm_security.config */
- typedef struct
- {
- INKCfgEle cfg_ele;
- INKConnectT type_con; /* determines if ports will be opened for TCP or UDP */
- INKIpAddrEle *src_ip_addr; /* arm-deny rule: the ip address or range of ip addresses that
- will be denied access to ports (can be NULL);
- arm-allow rule: the ip address or range of ip addressess
- specifying the source of communication (can be NULL) */
- INKIpAddrEle *dest_ip_addr; /* destination ip address (can be NULL) */
- INKPortEle *open_ports; /* open source ports (can be INVALID) */
- INKPortEle *src_ports; /* source ports (can be INVALID) */
- /* arm-open rule: list of ports/port-ranges to open by default */
- INKPortEle *dest_ports; /* the destination port(s) that TCP traffic will be
- allowed/denied access to (can be INVALID) */
- INKIntList src_port_list; /* alternative for src_ports */
- INKIntList dest_port_list; /* alternative for dest_ports */
- } INKArmSecurityEle; /* + at least of src_ip_addr, dest_ip_addr, dest_ports,
- src_ports is specified for arm allow rules;
- + at least of dest_ports or src_ip_addr is specified for arm
- deny rules */
-
-/* bypass.config */
- typedef struct
- {
- INKCfgEle cfg_ele;
- INKIpAddrList src_ip_addr; /* source ip address (single or range) */
- INKIpAddrList dest_ip_addr; /* destination ip address */
- } INKBypassEle;
-
/* cache.config */
typedef struct
{
@@ -687,20 +657,6 @@ typedef enum
INKIpAllowT action;
} INKIpAllowEle;
-/* ipnat.conf */
- typedef struct
- {
- INKCfgEle cfg_ele;
- char *intr; /* ethernet interface name that user traffic will enter through */
- INKIpAddr src_ip_addr; /* the ip address user traffic is heading for */
- int src_cidr; /* the cidr of the source IP (optional) */
- int src_port; /* the port user traffic is heading to */
- INKIpAddr dest_ip_addr; /* the ip address to redirect traffic to */
- int dest_port; /* the port to redirect traffic to */
- INKConnectT type_con; /* udp or tcp */
- INKProtocolT protocol; /* (optional) user protocol, eg. dns */
- } INKIpFilterEle;
-
/* logs_xml.config */
typedef struct
{
@@ -994,13 +950,8 @@ typedef enum
inkapi void INKSspecDestroy(INKSspec * ele);
inkapi INKPdSsFormat *INKPdSsFormatCreate();
inkapi void INKPdSsFormatDestroy(INKPdSsFormat * ele);
-
inkapi INKAdminAccessEle *INKAdminAccessEleCreate();
inkapi void INKAdminAccessEleDestroy(INKAdminAccessEle * ele);
- inkapi INKArmSecurityEle *INKArmSecurityEleCreate(INKRuleTypeT type);
- inkapi void INKArmSecurityEleDestroy(INKArmSecurityEle * ele);
- inkapi INKBypassEle *INKBypassEleCreate(INKRuleTypeT type);
- inkapi void INKBypassEleDestroy(INKBypassEle * ele);
inkapi INKCacheEle *INKCacheEleCreate(INKRuleTypeT type);
inkapi void INKCacheEleDestroy(INKCacheEle * ele);
inkapi INKCongestionEle *INKCongestionEleCreate();
@@ -1009,8 +960,6 @@ typedef enum
inkapi void INKHostingEleDestroy(INKHostingEle * ele);
inkapi INKIcpEle *INKIcpEleCreate();
inkapi void INKIcpEleDestroy(INKIcpEle * ele);
- inkapi INKIpFilterEle *INKIpFilterEleCreate();
- inkapi void INKIpFilterEleDestroy(INKIpFilterEle * ele);
inkapi INKIpAllowEle *INKIpAllowEleCreate();
inkapi void INKIpAllowEleDestroy(INKIpAllowEle * ele);
inkapi INKLogFilterEle *INKLogFilterEleCreate();
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc?rev=1022377&r1=1022376&r2=1022377&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc Thu Oct 14 04:36:16 2010
@@ -411,54 +411,6 @@ print_admin_access_ele(INKAdminAccessEle
}
void
-print_arm_security_ele(INKArmSecurityEle * ele)
-{
- if (!ele) {
- printf("can't print ele\n");
- }
-
- printf("Connection type: %d\n", ele->type_con);
- print_ip_addr_ele(ele->src_ip_addr);
- print_ip_addr_ele(ele->dest_ip_addr);
- print_ports(ele->open_ports);
- print_ports(ele->src_ports);
- print_ports(ele->dest_ports);
-}
-
-void
-print_bypass_ele(INKBypassEle * ele)
-{
- if (!ele) {
- printf("can't print ele\n");
- }
-
- char buf[MAX_BUF_SIZE];
- bzero(buf, MAX_BUF_SIZE);
- strncat(buf, "bypass ", sizeof(buf) - strlen(buf) - 1);
- char *str_list;
-
- if (ele->src_ip_addr) {
- snprintf(buf, sizeof(buf), "src ");
- str_list = ip_addr_list_to_string((IpAddrList *) ele->src_ip_addr, ",");
- strncat(buf, str_list, sizeof(buf) - strlen(buf) - 1);
- xfree(str_list);
- }
-
- if (ele->dest_ip_addr) {
- if (ele->src_ip_addr) {
- strncat(buf, " AND ", sizeof(buf) - strlen(buf) - 1);
- }
- strncat(buf, "dst ", sizeof(buf) - strlen(buf) - 1);
- str_list = ip_addr_list_to_string((IpAddrList *) ele->dest_ip_addr, ",");
- strncat(buf, str_list, sizeof(buf) - strlen(buf) - 1);
- xfree(str_list);
- }
-
- printf("%s\n", buf);
- return;
-}
-
-void
print_cache_ele(INKCacheEle * ele)
{
if (!ele) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am?rev=1022377&r1=1022376&r2=1022377&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/html2/configure/Makefile.am Thu Oct 14 04:36:16 2010
@@ -37,7 +37,6 @@ dist_webui_DATA = \
c_header.ink \
c_http_cachability.ink \
c_http_dyn_cache.ink \
- c_http_filtering.ink \
c_http_general.ink \
c_http_parent_proxy.ink \
c_http_privacy.ink \
@@ -94,14 +93,11 @@ dist_webui_DATA = \
c_windows_media_general.ink \
c_windows_media_mbridge.ink \
c_windows_media_mcast.ink \
- f_bypass_config.ink \
f_cache_config.ink \
f_configs.ink \
- f_filter_config.ink \
f_hosting_config.ink \
f_icp_config.ink \
f_ip_allow_config.ink \
- f_ipnat_config.ink \
f_mgmt_allow_config.ink \
f_parent_config.ink \
f_partition_config.ink \
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc?rev=1022377&r1=1022376&r2=1022377&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc Thu Oct 14 04:36:16 2010
@@ -2046,212 +2046,6 @@ writeVaddrsRuleList(textBuffer * output)
}
-// -------------------- FORM FUNCTIONS ------------------------------------
-
-//-------------------------------------------------------------------------
-// writeArmSecurityConfigForm
-//-------------------------------------------------------------------------
-// Form contains:
-// Rule Type (open, deny, allow)
-// Connection Type (udp, tcp)
-// Source IP Address (single or range)
-// Destination IP Address
-// Open Ports
-// Destination Ports
-// Source Ports
-int
-writeArmSecurityConfigForm(WebHttpContext * whc)
-{
- textBuffer *output = whc->response_bdy;
-
- // rule type
- 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_RULE_TYPE);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- 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_RULE_TYPE_HELP_3);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // connection type
- 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_CONN_TYPE);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- writeConnTypeSelect(output, "conn_type");
- 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_CONN_TYPE_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // source ip
- 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_SOURCE_IP);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "src_ip", NULL, NULL, NULL);
- 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_SOURCE_IP_HELP_4);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // source port
- 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_SOURCE_PORT);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "s_ports", NULL, NULL, NULL);
- 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_SOURCE_PORT_HELP_2);
- HtmlRndrBr(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PORT_LIST_EG);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // destination ip
- 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_DEST_IP);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "dest_ip", NULL, NULL, NULL);
- 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_DEST_IP_HELP_2);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // destination port
- 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_DEST_PORT);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "d_ports", NULL, NULL, NULL);
- 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_DEST_PORT_HELP_2);
- HtmlRndrBr(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PORT_LIST_EG);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // open port
- 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_OPEN_PORT);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "o_ports", NULL, NULL, NULL);
- 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_OPEN_PORT_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- return WEB_HTTP_ERR_OKAY;
-}
-
-//-------------------------------------------------------------------------
-// writeBypassConfigForm
-//-------------------------------------------------------------------------
-// Form contains:
-// Rule Type rule_type
-// Source IP Address (list of ip addresses) src_ip
-// Destination IP Address (list of ip addresses) dest_ip
-int
-writeBypassConfigForm(WebHttpContext * whc)
-{
- textBuffer *output = whc->response_bdy;
-
- // write the hidden "filename" tag
- HtmlRndrInput(output, HTML_CSS_NONE, HTML_TYPE_HIDDEN, HTML_CONFIG_FILE_TAG, HTML_FILE_BYPASS_CONFIG, NULL, NULL);
-
- // rule type
- 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_RULE_TYPE);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- writeRuleTypeSelect_bypass(output, "rule_type");
- 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_RULE_TYPE_HELP_4);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // source ip
- 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_SOURCE_IP);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "src_ip", NULL, NULL, NULL);
- 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_SOURCE_IP_HELP_5);
- HtmlRndrBr(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_SOURCE_IP_EG_5);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // destination ip
- 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_DEST_IP);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "dest_ip", NULL, NULL, NULL);
- 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_DEST_IP_HELP_3);
- HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_DEST_IP_EG_3);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- return WEB_HTTP_ERR_OKAY;
-}
-
//-------------------------------------------------------------------------
// writeCacheConfigForm
//-------------------------------------------------------------------------
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h?rev=1022377&r1=1022376&r2=1022377&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h Thu Oct 14 04:36:16 2010
@@ -458,9 +458,7 @@
#define HTML_CONFIG_FILE_TAG "filename"
#define HTML_FILE_ALL_CONFIG "/configure/f_configs.ink"
-#define HTML_FILE_BYPASS_CONFIG "/configure/f_bypass_config.ink"
#define HTML_FILE_CACHE_CONFIG "/configure/f_cache_config.ink"
-#define HTML_FILE_FILTER_CONFIG "/configure/f_filter_config.ink"
#define HTML_FILE_HOSTING_CONFIG "/configure/f_hosting_config.ink"
#define HTML_FILE_ICP_CONFIG "/configure/f_icp_config.ink"
#define HTML_FILE_IP_ALLOW_CONFIG "/configure/f_ip_allow_config.ink"
@@ -473,7 +471,6 @@
#define HTML_FILE_UPDATE_CONFIG "/configure/f_update_config.ink"
#define HTML_FILE_VADDRS_CONFIG "/configure/f_vaddrs_config.ink"
-#define HTML_HELP_LINK_BYPASS "/help/ts.ink?help=c_bypass.htm"
#define HTML_HELP_LINK_CACHE "/help/ts.ink?help=ccache.htm"
#define HTML_HELP_LINK_HOSTING "/help/ts.ink?help=c_host.htm"
#define HTML_HELP_LINK_ICP "/help/ts.ink?help=c_icp.htm"