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:11 UTC
svn commit: r1022376 [2/2] - in /trafficserver/traffic/trunk:
contrib/perl/AdminClient/lib/Apache/TS/ doc/man/ proxy/config/ proxy/mgmt2/
proxy/mgmt2/api2/ proxy/mgmt2/api2/include/ proxy/mgmt2/api2/remote/
proxy/mgmt2/cli2/ proxy/mgmt2/cluster/ proxy/...
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h?rev=1022376&r1=1022375&r2=1022376&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h Thu Oct 14 04:36:09 2010
@@ -37,7 +37,6 @@
char *convertRules(INKFileNameT file, INKIntList errRules, char *rules[]);
char *formatCacheRule(char *rule);
-char *formatFilterRule(char *rule);
char *formatHostingRule(char *rule);
char *formatIcpRule(char *rule);
char *formatIpAllowRule(char *rule);
@@ -51,8 +50,6 @@ char *formatUpdateRule(char *rule);
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 updateHostingConfig(char *rules[], int numRules, char **errBuff);
int updateIcpConfig(char *rules[], int numRules, char **errBuff);
int updateIpAllowConfig(char *rules[], int numRules, char **errBuff);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc?rev=1022376&r1=1022375&r2=1022376&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc Thu Oct 14 04:36:09 2010
@@ -180,232 +180,6 @@ writeCacheConfigTable(WebHttpContext * w
return WEB_HTTP_ERR_OKAY;
}
-//-------------------------------------------------------------------------
-// writeFilterConfigTable
-//-------------------------------------------------------------------------
-int
-writeFilterConfigTable(WebHttpContext * whc)
-{
- INKFilterEle *ele;
- char ruleType[MAX_RULE_PART_SIZE];
- char pdType[MAX_RULE_PART_SIZE];
- char time[MAX_RULE_PART_SIZE];
- char src_ip[MAX_RULE_PART_SIZE];
- char prefix[MAX_RULE_PART_SIZE];
- char suffix[MAX_RULE_PART_SIZE];
- char port[MAX_RULE_PART_SIZE];
- char method[MAX_RULE_PART_SIZE];
- char scheme[MAX_RULE_PART_SIZE];
- char hdr_type[MAX_RULE_PART_SIZE];
- char server[MAX_RULE_PART_SIZE];
- char dn[MAX_RULE_PART_SIZE];
- char realm[MAX_RULE_PART_SIZE];
- char uid_filter[MAX_RULE_PART_SIZE];
- char attr_name[MAX_RULE_PART_SIZE];
- char attr_val[MAX_RULE_PART_SIZE];
- char redirect_url[MAX_RULE_PART_SIZE];
- char bind_dn[MAX_RULE_PART_SIZE];
- char bind_pwd_file[MAX_RULE_PART_SIZE];
- char mixt[MAX_RULE_PART_SIZE];
- int count;
- char line[30];
- bool hasSspecs;
-
-
- textBuffer *output = whc->response_bdy;
- INKCfgContext ctx = INKCfgContextCreate(INK_FNAME_FILTER);
- INKError err = INKCfgContextGet(ctx);
- if (err != INK_ERR_OKAY) {
- mgmt_log(stderr, "[writeFilterConfigTable] Error: INKCfgContextGet failed");
- INKCfgContextDestroy(ctx);
- return WEB_HTTP_ERR_FAIL;
- }
-
- HtmlRndrTableOpen(output, "100%", 1, 0, 0, BORDER_COLOR);
-
- // write the table headings
- HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE);
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_LABEL_SMALL, HTML_ALIGN_CENTER, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_RULE_TYPE);
- HtmlRndrTdClose(output);
-
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_LABEL_SMALL, HTML_ALIGN_CENTER, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_TYPE);
- HtmlRndrTdClose(output);
-
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_LABEL_SMALL, HTML_ALIGN_CENTER, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_VALUE);
- HtmlRndrTdClose(output);
-
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_LABEL_SMALL, HTML_ALIGN_CENTER, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_HEADER_TYPE);
- HtmlRndrTdClose(output);
-
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_LABEL_SMALL, HTML_ALIGN_CENTER, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_ADDITIONAL_SPEC);
- HtmlRndrTdClose(output);
- HtmlRndrTdClose(output);
-
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_LABEL_SMALL, HTML_ALIGN_CENTER, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_SECONDARY_SPEC);
- HtmlRndrTdClose(output);
- HtmlRndrTdClose(output);
-
- HtmlRndrTrClose(output);
-
- count = INKCfgContextGetCount(ctx);
- for (int i = 0; i < count; i++) {
- ele = (INKFilterEle *) INKCfgContextGetEleAt(ctx, i);
-
- memset(ruleType, 0, MAX_RULE_PART_SIZE);
- memset(pdType, 0, MAX_RULE_PART_SIZE);
- memset(time, 0, MAX_RULE_PART_SIZE);
- memset(src_ip, 0, MAX_RULE_PART_SIZE);
- memset(prefix, 0, MAX_RULE_PART_SIZE);
- memset(suffix, 0, MAX_RULE_PART_SIZE);
- memset(port, 0, MAX_RULE_PART_SIZE);
- memset(method, 0, MAX_RULE_PART_SIZE);
- memset(scheme, 0, MAX_RULE_PART_SIZE);
- memset(hdr_type, 0, MAX_RULE_PART_SIZE);
- memset(server, 0, MAX_RULE_PART_SIZE);
- memset(dn, 0, MAX_RULE_PART_SIZE);
- memset(realm, 0, MAX_RULE_PART_SIZE);
- memset(uid_filter, 0, MAX_RULE_PART_SIZE);
- memset(attr_name, 0, MAX_RULE_PART_SIZE);
- memset(attr_val, 0, MAX_RULE_PART_SIZE);
- memset(redirect_url, 0, MAX_RULE_PART_SIZE);
- memset(bind_dn, 0, MAX_RULE_PART_SIZE);
- memset(bind_pwd_file, 0, MAX_RULE_PART_SIZE);
- memset(mixt, 0, MAX_RULE_PART_SIZE);
- if (convert_filter_ele_to_html_format(ele, ruleType, pdType, time, src_ip,
- prefix, suffix, port, method, scheme,
- hdr_type, server, dn, realm, uid_filter,
- attr_name, attr_val, redirect_url, bind_dn, bind_pwd_file, mixt)
- != WEB_HTTP_ERR_OKAY) {
- Debug("config", "[writeFilterConfigTable] invalid Ele, can't format - SKIP");
- continue; /* invalid ele, so skip to next one */
- }
- // write the rule info into the table row
- HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
-
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- HtmlRndrSpace(output, 2);
- output->copyFrom(ruleType, strlen(ruleType));
- HtmlRndrTdClose(output);
-
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- HtmlRndrSpace(output, 2);
- output->copyFrom(pdType, strlen(pdType));
- HtmlRndrTdClose(output);
-
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- HtmlRndrSpace(output, 2);
- output->copyFrom(ele->filter_info.pd_val, strlen(ele->filter_info.pd_val));
- HtmlRndrTdClose(output);
-
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- HtmlRndrSpace(output, 2);
- if (strlen(hdr_type) > 0)
- output->copyFrom(hdr_type, strlen(hdr_type));
- HtmlRndrTdClose(output);
-
- // LDAP options
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- hasSspecs = false;
- if (strlen(server) > 0) {
- HtmlRndrSpace(output, 2);
- memset(line, 0, 30);
- snprintf(line, 30, "server=%s", server);
- output->copyFrom(line, strlen(line));
- HtmlRndrBr(output);
- hasSspecs = true;
- }
- if (strlen(dn) > 0) {
- HtmlRndrSpace(output, 2);
- memset(line, 0, 30);
- snprintf(line, 30, "dn=%s", dn);
- output->copyFrom(line, strlen(line));
- HtmlRndrBr(output);
- hasSspecs = true;
- }
- if (strlen(uid_filter) > 0) {
- HtmlRndrSpace(output, 2);
- memset(line, 0, 30);
- snprintf(line, 30, "uid_filter=%s", uid_filter);
- output->copyFrom(line, strlen(line));
- HtmlRndrBr(output);
- hasSspecs = true;
- }
- if (strlen(attr_name) > 0) {
- HtmlRndrSpace(output, 2);
- memset(line, 0, 30);
- snprintf(line, 30, "attr=%s", attr_name);
- output->copyFrom(line, strlen(line));
- HtmlRndrBr(output);
- hasSspecs = true;
- }
- if (strlen(attr_val) > 0) {
- HtmlRndrSpace(output, 2);
- memset(line, 0, 30);
- snprintf(line, 30, "attr_val=%s", attr_val);
- output->copyFrom(line, strlen(line));
- HtmlRndrBr(output);
- hasSspecs = true;
- }
- if (strlen(realm) > 0) {
- HtmlRndrSpace(output, 2);
- memset(line, 0, 30);
- snprintf(line, 30, "realm=%s", realm);
- output->copyFrom(line, strlen(line));
- HtmlRndrBr(output);
- hasSspecs = true;
- }
- if (strlen(redirect_url) > 0) {
- HtmlRndrSpace(output, 2);
- memset(line, 0, 30);
- snprintf(line, 30, "redirect_url=%s", redirect_url);
- output->copyFrom(line, strlen(line));
- HtmlRndrBr(output);
- hasSspecs = true;
- }
- if (strlen(bind_dn) > 0) {
- HtmlRndrSpace(output, 2);
- memset(line, 0, 30);
- snprintf(line, 30, "bind_dn=%s", bind_dn);
- output->copyFrom(line, strlen(line));
- HtmlRndrBr(output);
- hasSspecs = true;
- }
- if (strlen(bind_pwd_file) > 0) {
- HtmlRndrSpace(output, 2);
- output->copyFrom("bind_pwd=*****", strlen("bind_pwd=*****"));
- HtmlRndrBr(output);
- hasSspecs = true;
- }
- if (!hasSspecs) {
- HtmlRndrSpace(output, 2);
- }
- HtmlRndrTdClose(output);
-
- writeSecondarySpecsTableElem(output, time, src_ip, prefix, suffix, port, method, scheme, mixt);
-
- HtmlRndrTrClose(output);
- } // end for loop
-
- // no rules
- if (count == 0) {
- HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_NONE, HTML_VALIGN_NONE, NULL, NULL, 6);
- HtmlRndrSpace(output, 2);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_NO_RULES);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
- }
-
- HtmlRndrTableClose(output);
- INKCfgContextDestroy(ctx);
- return WEB_HTTP_ERR_OKAY;
-}
//-------------------------------------------------------------------------
// writeHostingConfigTable
@@ -1691,104 +1465,6 @@ writeCacheRuleList(textBuffer * output)
//-------------------------------------------------------------------------
-// writeFilterRuleList
-//-------------------------------------------------------------------------
-int
-writeFilterRuleList(textBuffer * output)
-{
- INKFilterEle *ele;
- int count, i;
- const char ruleList[] = "var ruleList = new Object();\n";
-
- INKCfgContext ctx = INKCfgContextCreate(INK_FNAME_FILTER);
- INKError err = INKCfgContextGet(ctx);
- if (err != INK_ERR_OKAY) {
- mgmt_log(stderr, "[writeFilterRuleList] Error INKCfgContextGet");
- return WEB_HTTP_ERR_FAIL;
- }
-
- output->copyFrom(ruleList, strlen(ruleList));
-
- char rule[MAX_RULE_SIZE];
- char ruleType[MAX_RULE_PART_SIZE];
-
- char pdType[MAX_RULE_PART_SIZE];
- char time[MAX_RULE_PART_SIZE];
- char src_ip[MAX_RULE_PART_SIZE];
- char prefix[MAX_RULE_PART_SIZE];
- char suffix[MAX_RULE_PART_SIZE];
- char port[MAX_RULE_PART_SIZE];
- char method[MAX_RULE_PART_SIZE];
- char scheme[MAX_RULE_PART_SIZE];
-
- char hdr_type[MAX_RULE_PART_SIZE];
- char server[MAX_RULE_PART_SIZE];
- char dn[MAX_RULE_PART_SIZE];
- char realm[MAX_RULE_PART_SIZE];
- char uid_filter[MAX_RULE_PART_SIZE];
- char attr_name[MAX_RULE_PART_SIZE];
- char attr_val[MAX_RULE_PART_SIZE];
- char redirect_url[MAX_RULE_PART_SIZE];
- char bind_dn[MAX_RULE_PART_SIZE];
- char bind_pwd_file[MAX_RULE_PART_SIZE];
- char mixt[MAX_RULE_PART_SIZE];
-
- count = INKCfgContextGetCount(ctx);
- for (i = 0; i < count; i++) {
- ele = (INKFilterEle *) INKCfgContextGetEleAt(ctx, i);
-
- memset(ruleType, 0, MAX_RULE_PART_SIZE);
- memset(pdType, 0, MAX_RULE_PART_SIZE);
- memset(time, 0, MAX_RULE_PART_SIZE);
- memset(src_ip, 0, MAX_RULE_PART_SIZE);
- memset(prefix, 0, MAX_RULE_PART_SIZE);
- memset(suffix, 0, MAX_RULE_PART_SIZE);
- memset(port, 0, MAX_RULE_PART_SIZE);
- memset(method, 0, MAX_RULE_PART_SIZE);
- memset(scheme, 0, MAX_RULE_PART_SIZE);
- memset(hdr_type, 0, MAX_RULE_PART_SIZE);
- memset(server, 0, MAX_RULE_PART_SIZE);
- memset(dn, 0, MAX_RULE_PART_SIZE);
- memset(realm, 0, MAX_RULE_PART_SIZE);
- memset(uid_filter, 0, MAX_RULE_PART_SIZE);
- memset(attr_name, 0, MAX_RULE_PART_SIZE);
- memset(attr_val, 0, MAX_RULE_PART_SIZE);
- memset(redirect_url, 0, MAX_RULE_PART_SIZE);
- memset(bind_dn, 0, MAX_RULE_PART_SIZE);
- memset(bind_pwd_file, 0, MAX_RULE_PART_SIZE);
- memset(mixt, 0, MAX_RULE_PART_SIZE);
- if (convert_filter_ele_to_html_format(ele, ruleType, pdType, time, src_ip,
- prefix, suffix, port, method, scheme,
- hdr_type, server, dn, realm, uid_filter, attr_name, attr_val, redirect_url,
- bind_dn, bind_pwd_file, mixt)
- != WEB_HTTP_ERR_OKAY) {
- Debug("config", "[writeFilterRuleList] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
- }
-
- memset(rule, 0, MAX_RULE_SIZE);
- if (strlen(bind_pwd_file) > 0) {
- snprintf(rule, MAX_RULE_SIZE,
- "ruleList[%d] = new Rule(\"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"*****\", \"%s\", \"%s\");\n",
- i, ruleType, pdType, ele->filter_info.pd_val, time, src_ip, prefix, suffix, port, method, scheme,
- hdr_type, server, dn, realm, uid_filter, attr_name, attr_val, redirect_url, bind_dn, bind_pwd_file,
- mixt);
- } else {
- snprintf(rule, MAX_RULE_SIZE,
- "ruleList[%d] = new Rule(\"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"%s\", \"\", \"%s\", \"%s\");\n",
- i, ruleType, pdType, ele->filter_info.pd_val, time, src_ip, prefix, suffix, port, method, scheme,
- hdr_type, server, dn, realm, uid_filter, attr_name, attr_val, redirect_url, bind_dn, bind_pwd_file,
- mixt);
- }
- output->copyFrom(rule, strlen(rule));
- }
-
- INKCfgContextDestroy(ctx);
- return WEB_HTTP_ERR_OKAY;
-}
-
-
-//-------------------------------------------------------------------------
// writeHostingRuleList
//-------------------------------------------------------------------------
int
@@ -2388,16 +2064,12 @@ writeArmSecurityConfigForm(WebHttpContex
{
textBuffer *output = whc->response_bdy;
- // write the hidden "filename" tag
- HtmlRndrInput(output, HTML_CSS_NONE, HTML_TYPE_HIDDEN, HTML_CONFIG_FILE_TAG, HTML_FILE_ARM_SECURITY_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_arm(output, "rule_type");
HtmlRndrTdClose(output);
HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
HtmlRndrUlOpen(output);
@@ -2683,371 +2355,108 @@ writeCacheConfigForm(WebHttpContext * wh
}
//-------------------------------------------------------------------------
-// writeFilterConfigForm
+// writeHostingConfigForm
//-------------------------------------------------------------------------
-// Form contains:
-// Rule Type rule_type (allow, deny, keep_hdr, strip_hdr, ldap)
-// Primary Dest Type pd_type
-// Primary Dest Value pd_value
-// Time time
-// Source IP src_ip
-// Prefix prefix
-// Suffix suffix
-// Port port
-// Method method
-// Scheme scheme
-// Header Type hdr_type (only for keep_hdr rule type)
-// (The following apply only to ldap rule type)
-// server
-// dn
-// realm
-// uid_filter
-// attr_name
-// attr_val
-// Media-IXT tag mixt
+// Form Contains following:
+// Primary Dest Type (only domain or hostname) pd_type
+// Primary Dest Value pd_val
+// partitions (comma separated list of #'s) partitions
int
-writeFilterConfigForm(WebHttpContext * whc)
+writeHostingConfigForm(WebHttpContext * whc)
{
textBuffer *output = whc->response_bdy;
// write "filename" hidden tag
- HtmlRndrInput(output, HTML_CSS_NONE, HTML_TYPE_HIDDEN, HTML_CONFIG_FILE_TAG, HTML_FILE_FILTER_CONFIG, NULL, NULL);
+ HtmlRndrInput(output, HTML_CSS_NONE, HTML_TYPE_HIDDEN, HTML_CONFIG_FILE_TAG, HTML_FILE_HOSTING_CONFIG, NULL, NULL);
- // rule type
+ // Primary Dest 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);
+ HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_TYPE);
HtmlRndrTdClose(output);
HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- writeRuleTypeSelect_filter(output, "rule_type");
+ writePdTypeSelect_hosting(output, "pd_type");
HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
+ HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, 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_5);
+ HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_TYPE_HELP_2);
HtmlRndrUlClose(output);
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- // primary destination type
+ // Primary Dest Value (name = "pd_val")
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_PDEST_TYPE);
+ HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_VALUE);
HtmlRndrTdClose(output);
HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- writePdTypeSelect(output, "pd_type");
+ HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "pd_val", NULL, NULL, NULL);
HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
+ HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
HtmlRndrUlOpen(output);
HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_TYPE_HELP_4);
+ HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_VALUE_HELP_2);
HtmlRndrUlClose(output);
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- // primary destination value
+ // Partitions
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_PDEST_VALUE);
+ HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PARTITIONS);
HtmlRndrTdClose(output);
HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "pd_val", NULL, NULL, NULL);
+ HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "partitions", NULL, NULL, NULL);
HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
+ HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
HtmlRndrUlOpen(output);
HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_VALUE_HELP_4);
+ HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PARTITIONS_HELP);
HtmlRndrUlClose(output);
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- // header type
+ return WEB_HTTP_ERR_OKAY;
+}
+
+//-------------------------------------------------------------------------
+// writeIcpConfigForm
+//-------------------------------------------------------------------------
+// Form contains:
+// ICP Peer Hostname hostname
+// ICP Peer IP host_ip
+// Peer Type (select) peer_type
+// TCP Proxy Port proxy_port
+// UDP ICP Port icp_port
+// Multicast on/off mc_state
+// Multicast IP mc_ip
+// Multicast TTL mc_ttl
+int
+writeIcpConfigForm(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_ICP_CONFIG, NULL, NULL);
+
+ // peer hostname
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_HEADER_TYPE);
+ HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PEER_HOST);
HtmlRndrTdClose(output);
HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- writeHeaderTypeSelect(output, "hdr_type");
+ HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "hostname", NULL, NULL, NULL);
HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
+ HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
HtmlRndrUlOpen(output);
HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_HEADER_TYPE_HELP);
+ HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PEER_HOST_HELP);
HtmlRndrUlClose(output);
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- // secondary specifiers
- writeSecondarySpecsForm(whc, INK_FNAME_FILTER);
-
- // additional specifiers
- HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE);
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_LABEL_SMALL, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 3);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_AUTH_SPEC);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // LDAP server name
- 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_LDAP_SERVER);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "server", 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_LDAP_SERVER_HELP);
- HtmlRndrBr(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_LDAP_SERVER_EG);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // LDAP base dn
- 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_LDAP_BASE_DN);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "dn", 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_LDAP_BASE_DN_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // LDAP uid filter
- 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_LDAP_UID);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "uid_filter", 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_LDAP_UID_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
-
- // LDAP attribute name
- 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_LDAP_ATTR_NAME);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "attr_name", 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_LDAP_ATTR_NAME_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // LDAP attribute value
- 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_LDAP_ATTR_VALUE);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "attr_val", 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_LDAP_ATTR_VALUE_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_RIGHT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_LDAP_BIND_DN);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "bind_dn", 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_LDAP_BIND_DN_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_RIGHT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_LDAP_BIND_PWD);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "password", "bind_pwd", NULL, NULL, NULL);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- // add Apply Password button here
- HtmlRndrSpace(output, 6);
- HtmlRndrInput(output, HTML_CSS_CONFIGURE_BUTTON, "submit", "apply_pwd", "Apply Password", NULL, NULL);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 2);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrUlOpen(output);
- HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_LDAP_BIND_PWD_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // LDAP/NTLM/radius realm value
- 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_LDAP_REALM);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "realm", 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_LDAP_REALM_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // LDAP/NTLM/radius redirect_url
- 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_LDAP_RDR_URL);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "redirect_url", 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_LDAP_RDR_URL_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- return WEB_HTTP_ERR_OKAY;
-}
-
-//-------------------------------------------------------------------------
-// writeHostingConfigForm
-//-------------------------------------------------------------------------
-// Form Contains following:
-// Primary Dest Type (only domain or hostname) pd_type
-// Primary Dest Value pd_val
-// partitions (comma separated list of #'s) partitions
-int
-writeHostingConfigForm(WebHttpContext * whc)
-{
- textBuffer *output = whc->response_bdy;
-
- // write "filename" hidden tag
- HtmlRndrInput(output, HTML_CSS_NONE, HTML_TYPE_HIDDEN, HTML_CONFIG_FILE_TAG, HTML_FILE_HOSTING_CONFIG, NULL, NULL);
-
- // Primary Dest 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_PDEST_TYPE);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- writePdTypeSelect_hosting(output, "pd_type");
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- HtmlRndrUlOpen(output);
- HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_TYPE_HELP_2);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // Primary Dest Value (name = "pd_val")
- 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_PDEST_VALUE);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "pd_val", NULL, NULL, NULL);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- HtmlRndrUlOpen(output);
- HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PDEST_VALUE_HELP_2);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // Partitions
- 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_PARTITIONS);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "partitions", NULL, NULL, NULL);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- HtmlRndrUlOpen(output);
- HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PARTITIONS_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- return WEB_HTTP_ERR_OKAY;
-}
-
-//-------------------------------------------------------------------------
-// writeIcpConfigForm
-//-------------------------------------------------------------------------
-// Form contains:
-// ICP Peer Hostname hostname
-// ICP Peer IP host_ip
-// Peer Type (select) peer_type
-// TCP Proxy Port proxy_port
-// UDP ICP Port icp_port
-// Multicast on/off mc_state
-// Multicast IP mc_ip
-// Multicast TTL mc_ttl
-int
-writeIcpConfigForm(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_ICP_CONFIG, NULL, NULL);
-
- // peer hostname
- 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_PEER_HOST);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "hostname", NULL, NULL, NULL);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, HTML_ALIGN_LEFT, HTML_VALIGN_TOP, NULL, NULL, 0);
- HtmlRndrUlOpen(output);
- HtmlRndrLi(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_PEER_HOST_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // peer IP
+ // peer 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_PEER_IP);
@@ -3214,157 +2623,6 @@ writeIpAllowConfigForm(WebHttpContext *
return WEB_HTTP_ERR_OKAY;
}
-//-------------------------------------------------------------------------
-// writeIpnatConfigForm
-//-------------------------------------------------------------------------
-// Form contains:
-// Ethernet Interface interface
-// Traffic Server IP Address from_ip
-// Traffic Server Port from_port
-// FTP IP Address to_ip
-// FTP Port to_port
-// Connection TYpe conn_type
-// Protocol Type protocol
-int
-writeIpnatConfigForm(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_IPNAT_CONFIG, NULL, NULL);
-
- // ethernet Interface
- 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_ETH_INTERFACE);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "intr", 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_ETH_INTERFACE_HELP);
- 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_2);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // from 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", "from_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_3);
- HtmlRndrBr(output);
- HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_SOURCE_IP_EG_3);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // source cidr (optional)
- 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_CIDR);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- HtmlRndrInput(output, HTML_CSS_BODY_TEXT, "text", "from_cidr", 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_CIDR_HELP);
- 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", "from_port", 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);
- 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", "to_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);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // to 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", "to_port", 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);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- // Protocol
- 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_USER_PROTOCOL);
- HtmlRndrTdClose(output);
- HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- writeProtocolSelect(output, "protocol");
- 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_USER_PROTOCOL_HELP);
- HtmlRndrUlClose(output);
- HtmlRndrTdClose(output);
- HtmlRndrTrClose(output);
-
- return WEB_HTTP_ERR_OKAY;
-}
//-------------------------------------------------------------------------
// writeMgmtAllowConfigForm
@@ -3523,9 +2781,6 @@ writeParentConfigForm(WebHttpContext * w
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- // secondary specifiers
- writeSecondarySpecsForm(whc, INK_FNAME_FILTER);
-
return WEB_HTTP_ERR_OKAY;
}
@@ -4295,10 +3550,7 @@ writeSecondarySpecsForm(WebHttpContext *
HtmlRndrText(output, whc->lang_dict_ht, HTML_ID_CFG_EDIT_METHOD);
HtmlRndrTdClose(output);
HtmlRndrTdOpen(output, HTML_CSS_BODY_TEXT, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
- if (file == INK_FNAME_FILTER)
- writeMethodSelect_push(output, "method");
- else
- writeMethodSelect(output, "method");
+ writeMethodSelect(output, "method");
HtmlRndrTdClose(output);
HtmlRndrTdOpen(output, HTML_CSS_CONFIGURE_HELP, HTML_ALIGN_LEFT, HTML_VALIGN_NONE, NULL, NULL, 0);
HtmlRndrUlOpen(output);
@@ -4477,113 +3729,6 @@ Lerror:
return WEB_HTTP_ERR_FAIL;
}
-//-------------------------------------------------------------------------
-// convert_filter_ele_to_html_format
-//-------------------------------------------------------------------------
-int
-convert_filter_ele_to_html_format(INKFilterEle * ele,
- char *ruleType,
- char *pdType,
- char *time,
- char *src_ip,
- char *prefix,
- char *suffix,
- char *port,
- char *method,
- char *scheme,
- char *hdr_type, char *server, char *dn, char *realm, char *uid_filter,
- char *attr_name, char *attr_val, char *redirect_url, char *bind_dn,
- char *bind_pwd_file, char *mixt)
-{
-
- // rule type
- switch (ele->cfg_ele.type) {
- case INK_FILTER_ALLOW:
- snprintf(ruleType, MAX_RULE_PART_SIZE, "allow");
- break;
- case INK_FILTER_DENY:
- snprintf(ruleType, MAX_RULE_PART_SIZE, "deny");
- break;
- case INK_FILTER_LDAP:
- snprintf(ruleType, MAX_RULE_PART_SIZE, "ldap");
- break;
- case INK_FILTER_NTLM:
- snprintf(ruleType, MAX_RULE_PART_SIZE, "ntlm");
- break;
- case INK_FILTER_RADIUS:
- snprintf(ruleType, MAX_RULE_PART_SIZE, "radius");
- break;
- case INK_FILTER_KEEP_HDR:
- snprintf(ruleType, MAX_RULE_PART_SIZE, "keep_hdr");
- break;
- case INK_FILTER_STRIP_HDR:
- snprintf(ruleType, MAX_RULE_PART_SIZE, "strip_hdr");
- break;
- default:
- goto Lerror;
- }
-
- if (convert_pdss_to_html_format(ele->filter_info, pdType, time, src_ip, prefix, suffix, port, method, scheme, mixt) !=
- WEB_HTTP_ERR_OKAY)
- goto Lerror;
-
- // header type
- switch (ele->hdr) {
- case INK_HDR_DATE:
- snprintf(hdr_type, MAX_RULE_PART_SIZE, "date");
- break;
- case INK_HDR_HOST:
- snprintf(hdr_type, MAX_RULE_PART_SIZE, "host");
- break;
- case INK_HDR_COOKIE:
- snprintf(hdr_type, MAX_RULE_PART_SIZE, "cookie");
- break;
- case INK_HDR_CLIENT_IP:
- snprintf(hdr_type, MAX_RULE_PART_SIZE, "client_ip");
- break;
- default:
- break;
- }
-
- // server
- if (ele->server)
- ink_strncpy(server, ele->server, MAX_RULE_PART_SIZE);
-
- // dn
- if (ele->dn)
- ink_strncpy(dn, ele->dn, MAX_RULE_PART_SIZE);
-
- // realm
- if (ele->realm)
- ink_strncpy(realm, ele->realm, MAX_RULE_PART_SIZE);
-
- // uid filter
- if (ele->uid_filter)
- ink_strncpy(uid_filter, ele->uid_filter, MAX_RULE_PART_SIZE);
-
- // attr name
- if (ele->attr)
- ink_strncpy(attr_name, ele->attr, MAX_RULE_PART_SIZE);
-
- // attr value
- if (ele->attr_val)
- ink_strncpy(attr_val, ele->attr_val, MAX_RULE_PART_SIZE);
-
- if (ele->redirect_url)
- ink_strncpy(redirect_url, ele->redirect_url, MAX_RULE_PART_SIZE);
-
- if (ele->bind_dn)
- ink_strncpy(bind_dn, ele->bind_dn, MAX_RULE_PART_SIZE);
-
- if (ele->bind_pwd_file)
- ink_strncpy(bind_pwd_file, ele->bind_pwd_file, MAX_RULE_PART_SIZE);
-
- return WEB_HTTP_ERR_OKAY;
-
-Lerror:
- Debug("config", "[convert_filter_ele_to_html_format] ERROR - invalid Ele");
- return WEB_HTTP_ERR_FAIL;
-}
//-------------------------------------------------------------------------
// convert_hosting_ele_to_html_format
@@ -5326,18 +4471,6 @@ writeRuleTypeSelect_cache(textBuffer * h
HtmlRndrSelectList(html, listName, options, 7);
}
-
-void
-writeRuleTypeSelect_arm(textBuffer * html, const char *listName)
-{
- const char *options[3];
- options[0] = "open";
- options[1] = "deny";
- options[2] = "allow";
-
- HtmlRndrSelectList(html, listName, options, 3);
-}
-
void
writeRuleTypeSelect_filter(textBuffer * html, const char *listName)
{
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h?rev=1022376&r1=1022375&r2=1022376&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h Thu Oct 14 04:36:09 2010
@@ -41,10 +41,6 @@ int writeCacheConfigTable(WebHttpContext
int writeCacheRuleList(textBuffer * output);
int writeCacheConfigForm(WebHttpContext * whc);
-int writeFilterConfigTable(WebHttpContext * whc);
-int writeFilterRuleList(textBuffer * output);
-int writeFilterConfigForm(WebHttpContext * whc);
-
int writeHostingConfigTable(WebHttpContext * whc);
int writeHostingRuleList(textBuffer * output);
int writeHostingConfigForm(WebHttpContext * whc);
@@ -105,20 +101,6 @@ int convert_cache_ele_to_html_format(INK
char *suffix,
char *port, char *method, char *scheme, char *time_period, char *mixt);
-int convert_filter_ele_to_html_format(INKFilterEle * ele,
- char *ruleType,
- char *pdType,
- char *time,
- char *src_ip,
- char *prefix,
- char *suffix,
- char *port,
- char *method,
- char *scheme,
- char *hdr_type, char *server, char *dn, char *realm, char *uid_filter,
- char *attr_name, char *attr_val, char *redirect_url, char *bind_dn,
- char *bind_pwd_file, char *mixt);
-
int convert_hosting_ele_to_html_format(INKHostingEle * ele, char *pdType, char *partitions);
int convert_icp_ele_to_html_format(INKIcpEle * ele,
@@ -167,9 +149,7 @@ int convert_pdss_to_html_format(INKPdSsF
//------------------------- SELECT FUNCTIONS ------------------------------
-void writeRuleTypeSelect_arm(textBuffer * html, const char *listName);
void writeRuleTypeSelect_cache(textBuffer * html, const char *listName);
-void writeRuleTypeSelect_filter(textBuffer * html, const char *listName);
void writeRuleTypeSelect_remap(textBuffer * html, const char *listName);
void writeRuleTypeSelect_socks(textBuffer * html, const char *listName);
void writeRuleTypeSelect_bypass(textBuffer * html, const char *listName);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=1022376&r1=1022375&r2=1022376&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Thu Oct 14 04:36:09 2010
@@ -462,44 +462,6 @@ spawn_cgi(WebHttpContext * whc, const ch
return WEB_HTTP_ERR_OKAY;
}
-
-//-------------------------------------------------------------------------
-// encryptToFileAuth_malloc
-//
-// Given the clear-case password, this function will encrypt the password
-// and print the key to a unique file (name assembled from timestamp and
-// stored in the path specified by an auth record)
-// Returns the filename of this file or NULL if the encryption failed.
-//-------------------------------------------------------------------------
-char *
-encryptToFileAuth_malloc(const char *password)
-{
- NOWARN_UNUSED(password);
- RecString dir_path;
- RecGetRecordString_Xmalloc("proxy.config.auth.password_file_path", &dir_path);
-
- if (!dir_path)
- return NULL;
-
- char file_path[MAX_TMP_BUF_LEN + 1];
- time_t my_time_t;
- time(&my_time_t);
- memset(file_path, 0, MAX_TMP_BUF_LEN);
- snprintf(file_path, MAX_TMP_BUF_LEN, "%s%spwd_%lld.enc", dir_path, DIR_SEP, (int64)my_time_t);
- if (dir_path)
- xfree(dir_path);
-
-// AuthString fileAuthStr(file_path);
-// AuthString passwdAuthStr(password);
-/* if (!AccCrypto::encryptToFile(fileAuthStr, passwdAuthStr)) {
- Debug("config", "[encryptToFileAuth_malloc] Failed to encrypt password");
-
- }*/
-
- return xstrdup(file_path);
-}
-
-
//-------------------------------------------------------------------------
// handle_cgi_extn
//-------------------------------------------------------------------------
@@ -3070,7 +3032,6 @@ handle_submit_update_config(WebHttpConte
char name[10]; // "rule#"
char *close;
char *apply;
- char *apply_pwd;
char *filename;
char *frecord;
INKFileNameT type;
@@ -3132,16 +3093,6 @@ handle_submit_update_config(WebHttpConte
case INK_FNAME_CACHE_OBJ:
err = updateCacheConfig(rules, numRules, &errBuff);
break;
- case INK_FNAME_FILTER:
- // check if regular Apply or special Apply Password
- if (ink_hash_table_lookup(whc->post_data_ht, "apply_pwd", (void **) &apply_pwd)) {
- ink_hash_table_delete(whc->post_data_ht, "apply_pwd");
- xfree(apply_pwd);
- err = updateFilterConfigPassword(whc, &errBuff);
- } else {
- err = updateFilterConfig(rules, numRules, &errBuff);
- }
- break;
case INK_FNAME_HOSTING:
err = updateHostingConfig(rules, numRules, &errBuff);
break;
@@ -4178,7 +4129,6 @@ WebHttpInit()
// its mgmt API config file type (INKFileNameT)
g_display_config_ht = ink_hash_table_create(InkHashTableKeyType_String);
ink_hash_table_insert(g_display_config_ht, HTML_FILE_CACHE_CONFIG, (void *) INK_FNAME_CACHE_OBJ);
- ink_hash_table_insert(g_display_config_ht, HTML_FILE_FILTER_CONFIG, (void *) INK_FNAME_FILTER);
ink_hash_table_insert(g_display_config_ht, HTML_FILE_HOSTING_CONFIG, (void *) INK_FNAME_HOSTING);
ink_hash_table_insert(g_display_config_ht, HTML_FILE_ICP_CONFIG, (void *) INK_FNAME_ICP_PEER);
ink_hash_table_insert(g_display_config_ht, HTML_FILE_IP_ALLOW_CONFIG, (void *) INK_FNAME_IP_ALLOW);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.h?rev=1022376&r1=1022375&r2=1022376&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.h Thu Oct 14 04:36:09 2010
@@ -44,6 +44,5 @@ void WebHttpSetErrorResponse(WebHttpCont
char *WebHttpAddDocRoot_Xmalloc(WebHttpContext * whc, const char *file);
int spawn_cgi(WebHttpContext * whc, const char *cgi_path, char **args, bool nowait, bool run_as_root);
-char *encryptToFileAuth_malloc(const char *password);
#endif // _WEB_HTTP_H_
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc?rev=1022376&r1=1022375&r2=1022376&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc Thu Oct 14 04:36:09 2010
@@ -171,9 +171,6 @@ handle_config_table_object(WebHttpContex
case INK_FNAME_CACHE_OBJ:
err = writeCacheConfigTable(whc);
break;
- case INK_FNAME_FILTER:
- err = writeFilterConfigTable(whc);
- break;
case INK_FNAME_HOSTING:
err = writeHostingConfigTable(whc);
break;
@@ -238,9 +235,6 @@ handle_help_config_link(WebHttpContext *
case INK_FNAME_CACHE_OBJ:
whc->response_bdy->copyFrom(HTML_HELP_LINK_CACHE, strlen(HTML_HELP_LINK_CACHE));
break;
- case INK_FNAME_FILTER:
- whc->response_bdy->copyFrom(HTML_HELP_LINK_FILTER, strlen(HTML_HELP_LINK_FILTER));
- break;
case INK_FNAME_HOSTING:
whc->response_bdy->copyFrom(HTML_HELP_LINK_HOSTING, strlen(HTML_HELP_LINK_HOSTING));
break;
@@ -329,9 +323,6 @@ handle_dynamic_javascript(WebHttpContext
case INK_FNAME_CACHE_OBJ:
err = writeCacheRuleList(whc->response_bdy);
break;
- case INK_FNAME_FILTER:
- err = writeFilterRuleList(whc->response_bdy);
- break;
case INK_FNAME_HOSTING:
err = writeHostingRuleList(whc->response_bdy);
break;
@@ -429,9 +420,6 @@ handle_config_input_form(WebHttpContext
case INK_FNAME_CACHE_OBJ:
err = writeCacheConfigForm(whc);
break;
- case INK_FNAME_FILTER:
- err = writeFilterConfigForm(whc);
- break;
case INK_FNAME_HOSTING:
err = writeHostingConfigForm(whc);
break;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h?rev=1022376&r1=1022375&r2=1022376&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h Thu Oct 14 04:36:09 2010
@@ -458,14 +458,12 @@
#define HTML_CONFIG_FILE_TAG "filename"
#define HTML_FILE_ALL_CONFIG "/configure/f_configs.ink"
-#define HTML_FILE_ARM_SECURITY_CONFIG "/configure/f_arm_security_config.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"
-#define HTML_FILE_IPNAT_CONFIG "/configure/f_ipnat_config.ink"
#define HTML_FILE_MGMT_ALLOW_CONFIG "/configure/f_mgmt_allow_config.ink"
#define HTML_FILE_PARENT_CONFIG "/configure/f_parent_config.ink"
#define HTML_FILE_PARTITION_CONFIG "/configure/f_partition_config.ink"
@@ -475,14 +473,11 @@
#define HTML_FILE_UPDATE_CONFIG "/configure/f_update_config.ink"
#define HTML_FILE_VADDRS_CONFIG "/configure/f_vaddrs_config.ink"
-#define HTML_HELP_LINK_ARM "/help/ts.ink?help=c_arm.htm"
#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_FILTER "/help/ts.ink?help=c_filter.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"
#define HTML_HELP_LINK_IP_ALLOW "/help/ts.ink?help=ipallow.htm"
-#define HTML_HELP_LINK_IPNAT "/help/ts.ink?help=ipnat.htm"
#define HTML_HELP_LINK_MGMT_ALLOW "/help/ts.ink?help=C_mgm.htm"
#define HTML_HELP_LINK_PARENT "/help/ts.ink?help=c_parent.htm"
#define HTML_HELP_LINK_PARTITION "/help/ts.ink?help=c_part.htm"