You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by mt...@apache.org on 2010/05/13 09:09:56 UTC
svn commit: r943821 [16/18] - in /trafficserver/traffic/trunk:
example/add-header/ example/app-template/ example/append-transform/
example/basic-auth/ example/blacklist-0/ example/blacklist-1/
example/bnull-transform/ example/cache_scan/ example/file-1...
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc Thu May 13 07:09:39 2010
@@ -25,7 +25,7 @@
*
* WebConfigRender.cc - html rendering/assembly for Config File Editor
*
- *
+ *
****************************************************************************/
#include "ink_config.h"
@@ -135,7 +135,7 @@ writeCacheConfigTable(WebHttpContext * w
prefix, suffix, port, method, scheme,
time_period, mixt) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeCacheConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -164,7 +164,7 @@ writeCacheConfigTable(WebHttpContext * w
writeSecondarySpecsTableElem(output, time, src_ip, prefix, suffix, port, method, scheme, mixt);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -391,7 +391,7 @@ writeFilterConfigTable(WebHttpContext *
writeSecondarySpecsTableElem(output, time, src_ip, prefix, suffix, port, method, scheme, mixt);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -453,7 +453,7 @@ writeHostingConfigTable(WebHttpContext *
memset(partitions, 0, MAX_RULE_PART_SIZE);
if (convert_hosting_ele_to_html_format(ele, pdType, partitions) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeHostingConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -475,7 +475,7 @@ writeHostingConfigTable(WebHttpContext *
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -570,7 +570,7 @@ writeIcpConfigTable(WebHttpContext * whc
if (convert_icp_ele_to_html_format(ele, name, host_ip, peer_type, proxy_port, icp_port, mc_state, mc_ip, mc_ttl) !=
WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeIcpConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -618,7 +618,7 @@ writeIcpConfigTable(WebHttpContext * whc
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -679,7 +679,7 @@ writeIpAllowConfigTable(WebHttpContext *
if (convert_ip_allow_ele_to_html_format(ele, src_ip, action) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeIpAllowConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -695,7 +695,7 @@ writeIpAllowConfigTable(WebHttpContext *
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -757,7 +757,7 @@ writeMgmtAllowConfigTable(WebHttpContext
memset(action, 0, MAX_RULE_PART_SIZE);
if (convert_mgmt_allow_ele_to_html_format(ele, src_ip, action) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeMgmtAllowConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -773,7 +773,7 @@ writeMgmtAllowConfigTable(WebHttpContext
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -869,7 +869,7 @@ writeParentConfigTable(WebHttpContext *
(ele, pdType, time, src_ip, prefix, suffix, port, method, scheme, mixt, parents, round_robin,
direct) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeParentConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -903,7 +903,7 @@ writeParentConfigTable(WebHttpContext *
HtmlRndrTdClose(output);
writeSecondarySpecsTableElem(output, time, src_ip, prefix, suffix, port, method, scheme, mixt);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -970,7 +970,7 @@ writePartitionConfigTable(WebHttpContext
memset(size_fmt, 0, MAX_RULE_PART_SIZE);
if (convert_partition_ele_to_html_format(ele, part_num, scheme, size, size_fmt) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writePartitionConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -1003,7 +1003,7 @@ writePartitionConfigTable(WebHttpContext
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -1109,7 +1109,7 @@ writeRemapConfigTable(WebHttpContext * w
if (convert_remap_ele_to_html_format
(ele, rule_type, from_scheme, from_port, from_path, to_scheme, to_port, to_path, mixt) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeRemapConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -1167,7 +1167,7 @@ writeRemapConfigTable(WebHttpContext * w
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -1252,7 +1252,7 @@ writeSocksConfigTable(WebHttpContext * w
memset(rr, 0, MAX_RULE_PART_SIZE);
if (convert_socks_ele_to_html_format(ele, rule_type, dest_ip, user, passwd, servers, rr) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeSocksConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -1293,7 +1293,7 @@ writeSocksConfigTable(WebHttpContext * w
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -1370,7 +1370,7 @@ writeSplitDnsConfigTable(WebHttpContext
memset(search_list, 0, MAX_RULE_PART_SIZE);
if (convert_split_dns_ele_to_html_format(ele, pdType, dns_server, def_domain, search_list) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeSplitDnsConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -1404,7 +1404,7 @@ writeSplitDnsConfigTable(WebHttpContext
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -1481,7 +1481,7 @@ writeUpdateConfigTable(WebHttpContext *
memset(depth, 0, MAX_RULE_PART_SIZE);
if (convert_update_ele_to_html_format(ele, hdrs, offset, interval, depth) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeUpdateConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -1514,7 +1514,7 @@ writeUpdateConfigTable(WebHttpContext *
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -1579,7 +1579,7 @@ writeVaddrsConfigTable(WebHttpContext *
memset(sub_intr, 0, MAX_RULE_PART_SIZE);
if (convert_virt_ip_addr_ele_to_html_format(ele, ip, sub_intr) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeVaddrsConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
// write the rule info into the table row
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_CENTER);
@@ -1600,7 +1600,7 @@ writeVaddrsConfigTable(WebHttpContext *
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- } // end for loop
+ } // end for loop
// no rules
if (count == 0) {
@@ -1674,7 +1674,7 @@ writeCacheRuleList(textBuffer * output)
prefix, suffix, port, method, scheme,
time_period, mixt) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeCacheRuleList] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
memset(rule, 0, MAX_RULE_SIZE);
@@ -1764,7 +1764,7 @@ writeFilterRuleList(textBuffer * output)
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
+ continue; // invalid ele, so skip to next one
}
memset(rule, 0, MAX_RULE_SIZE);
@@ -1822,7 +1822,7 @@ writeHostingRuleList(textBuffer * output
if (convert_hosting_ele_to_html_format(ele, pdType, partitions) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeHostingRuleList] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
memset(rule, 0, MAX_RULE_SIZE);
@@ -1882,7 +1882,7 @@ writeIcpRuleList(textBuffer * output)
if (convert_icp_ele_to_html_format(ele, name, host_ip, peer_type, proxy_port, icp_port, mc_state, mc_ip, mc_ttl) !=
WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeIcpRuleList] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
memset(rule, 0, MAX_RULE_SIZE);
@@ -1931,7 +1931,7 @@ writeIpAllowRuleList(textBuffer * output
if (convert_ip_allow_ele_to_html_format(ele, src_ip, action) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeIpAllowRuleList] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
memset(rule, 0, MAX_RULE_SIZE);
@@ -1978,7 +1978,7 @@ writeMgmtAllowRuleList(textBuffer * outp
if (convert_mgmt_allow_ele_to_html_format(ele, src_ip, action) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeMgmtAllowRuleList] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
memset(rule, 0, MAX_RULE_SIZE);
@@ -2044,7 +2044,7 @@ writeParentRuleList(textBuffer * output)
(ele, pdType, time, src_ip, prefix, suffix, port, method, scheme, mixt, parents, round_robin,
direct) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeParentConfigTable] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
memset(rule, 0, MAX_RULE_SIZE);
@@ -2155,7 +2155,7 @@ writeRemapRuleList(textBuffer * output)
if (convert_remap_ele_to_html_format
(ele, rule_type, from_scheme, from_port, from_path, to_scheme, to_port, to_path, mixt) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeRemapRuleList] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
memset(rule, 0, MAX_RULE_SIZE);
@@ -2211,7 +2211,7 @@ writeSocksRuleList(textBuffer * output)
memset(rr, 0, MAX_RULE_PART_SIZE);
if (convert_socks_ele_to_html_format(ele, rule_type, dest_ip, user, passwd, servers, rr) != WEB_HTTP_ERR_OKAY) {
Debug("config", "[writeSocksRuleList] invalid Ele, can't format - SKIP");
- continue; // invalid ele, so skip to next one
+ continue; // invalid ele, so skip to next one
}
memset(rule, 0, MAX_RULE_SIZE);
@@ -2389,7 +2389,7 @@ writeArmSecurityConfigForm(WebHttpContex
{
textBuffer *output = whc->response_bdy;
- // write the hidden "filename" tag
+ // 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
@@ -2523,7 +2523,7 @@ writeBypassConfigForm(WebHttpContext * w
{
textBuffer *output = whc->response_bdy;
- // write the hidden "filename" tag
+ // 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
@@ -2584,10 +2584,10 @@ writeBypassConfigForm(WebHttpContext * w
//-------------------------------------------------------------------------
// writeCacheConfigForm
//-------------------------------------------------------------------------
-// Form contains:
+// Form contains:
// Rule Type rule_type
// Primary Dest Type pd_type
-// Primary Dest Value pd_value
+// Primary Dest Value pd_value
// Time time
// Source IP src_ip
// Prefix prefix
@@ -2689,7 +2689,7 @@ writeCacheConfigForm(WebHttpContext * wh
// Form contains:
// Rule Type rule_type (allow, deny, keep_hdr, strip_hdr, ldap)
// Primary Dest Type pd_type
-// Primary Dest Value pd_value
+// Primary Dest Value pd_value
// Time time
// Source IP src_ip
// Prefix prefix
@@ -2703,7 +2703,7 @@ writeCacheConfigForm(WebHttpContext * wh
// dn
// realm
// uid_filter
-// attr_name
+// attr_name
// attr_val
// Media-IXT tag mixt
int
@@ -3029,7 +3029,7 @@ writeIcpConfigForm(WebHttpContext * whc)
{
textBuffer *output = whc->response_bdy;
- // write the hidden "filename" tag
+ // 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
@@ -3168,14 +3168,14 @@ writeIcpConfigForm(WebHttpContext * whc)
//-------------------------------------------------------------------------
// Form contains:
// Source IP Address (single or range) src_ip
-// IP action type ip_action
-//
+// IP action type ip_action
+//
int
writeIpAllowConfigForm(WebHttpContext * whc)
{
textBuffer *output = whc->response_bdy;
- // write the hidden "filename" tag
+ // write the hidden "filename" tag
HtmlRndrInput(output, HTML_CSS_NONE, HTML_TYPE_HIDDEN, HTML_CONFIG_FILE_TAG, HTML_FILE_IP_ALLOW_CONFIG, NULL, NULL);
// ip action
@@ -3225,13 +3225,13 @@ writeIpAllowConfigForm(WebHttpContext *
// FTP IP Address to_ip
// FTP Port to_port
// Connection TYpe conn_type
-// Protocol Type protocol
+// Protocol Type protocol
int
writeIpnatConfigForm(WebHttpContext * whc)
{
textBuffer *output = whc->response_bdy;
- // write the hidden "filename" tag
+ // 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
@@ -3372,14 +3372,14 @@ writeIpnatConfigForm(WebHttpContext * wh
//-------------------------------------------------------------------------
// Form contains:
// Source IP Address (single or range) src_ip
-// IP action type ip_action
-//
+// IP action type ip_action
+//
int
writeMgmtAllowConfigForm(WebHttpContext * whc)
{
textBuffer *output = whc->response_bdy;
- // write the hidden "filename" tag
+ // write the hidden "filename" tag
HtmlRndrInput(output, HTML_CSS_NONE, HTML_TYPE_HIDDEN, HTML_CONFIG_FILE_TAG, HTML_FILE_MGMT_ALLOW_CONFIG, NULL, NULL);
HtmlRndrTrOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE);
@@ -3422,7 +3422,7 @@ writeMgmtAllowConfigForm(WebHttpContext
//-------------------------------------------------------------------------
// Form contains:
// Primary Dest Type pd_type
-// Primary Dest Value pd_value
+// Primary Dest Value pd_value
// Time time
// Source IP src_ip
// Prefix prefix
@@ -3635,7 +3635,7 @@ writeRemapConfigForm(WebHttpContext * wh
{
textBuffer *output = whc->response_bdy;
- // write the hidden "filename" tag
+ // write the hidden "filename" tag
HtmlRndrInput(output, HTML_CSS_NONE, HTML_TYPE_HIDDEN, HTML_CONFIG_FILE_TAG, HTML_FILE_REMAP_CONFIG, NULL, NULL);
// rule type
@@ -3806,7 +3806,7 @@ writeRemapConfigForm(WebHttpContext * wh
//-------------------------------------------------------------------------
// Form contains:
// Rule Type rule_type
-// (INK_SOCKS_BYPASS rule type)
+// (INK_SOCKS_BYPASS rule type)
// IP address list dest_ip
// (INK_SOCKS_AUTH rule type)
// Username user
@@ -3819,7 +3819,7 @@ writeSocksConfigForm(WebHttpContext * wh
{
textBuffer *output = whc->response_bdy;
- // write the hidden "filename" tag
+ // write the hidden "filename" tag
HtmlRndrInput(output, HTML_CSS_NONE, HTML_TYPE_HIDDEN, HTML_CONFIG_FILE_TAG, HTML_FILE_SOCKS_CONFIG, NULL, NULL);
// rule type
@@ -3871,7 +3871,7 @@ writeSocksConfigForm(WebHttpContext * wh
HtmlRndrTdClose(output);
HtmlRndrTrClose(output);
- // Destination IP
+ // 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);
@@ -3936,7 +3936,7 @@ writeSocksConfigForm(WebHttpContext * wh
// DNS server names (can have multiple values separated by spaces or ';')
// Domain Name (optional)
// Domain Search List (optional - separated by spaces or ';')
-//
+//
int
writeSplitDnsConfigForm(WebHttpContext * whc)
{
@@ -4142,7 +4142,7 @@ writeUpdateConfigForm(WebHttpContext * w
// writeVaddrsConfigForm
//-------------------------------------------------------------------------
// Form Contains following:
-// virtual IP ip
+// virtual IP ip
// Interface intr
// Sub-Interface sub_intr
int
@@ -4209,9 +4209,9 @@ writeVaddrsConfigForm(WebHttpContext * w
//-------------------------------------------------------------------------
// Helper function - writes the specific editable data fields for secondary
// specifiers. Assumes that the html for a table are already created. This
-// function will only write the a sec spec field per row, and the
+// function will only write the a sec spec field per row, and the
// header for Secondary Specifiers
-// INKFileNameT parameter is needed because there might be some special
+// INKFileNameT parameter is needed because there might be some special
// handling of sec. specs for different files
int
writeSecondarySpecsForm(WebHttpContext * whc, INKFileNameT file)
@@ -4577,7 +4577,7 @@ convert_filter_ele_to_html_format(INKFil
break;
}
- // server
+ // server
if (ele->server)
ink_strncpy(server, ele->server, MAX_RULE_PART_SIZE);
@@ -4676,7 +4676,7 @@ convert_icp_ele_to_html_format(INKIcpEle
if (ele->peer_hostname)
snprintf(name, MAX_RULE_PART_SIZE, "%s", ele->peer_hostname);
- // host_ip
+ // host_ip
if (ele->peer_host_ip_addr) {
tmpStr = ip_addr_to_string(ele->peer_host_ip_addr);
ink_strncpy(host_ip, tmpStr, MAX_RULE_PART_SIZE);
@@ -4748,7 +4748,7 @@ convert_ip_allow_ele_to_html_format(INKI
snprintf(src_ip, MAX_RULE_PART_SIZE, "%s", ip);
xfree(ip);
}
- // action
+ // action
switch (ele->action) {
case INK_IP_ALLOW_ALLOW:
snprintf(action, MAX_RULE_PART_SIZE, "ip_allow");
@@ -4781,7 +4781,7 @@ convert_mgmt_allow_ele_to_html_format(IN
snprintf(src_ip, MAX_RULE_PART_SIZE, "%s", ip);
xfree(ip);
}
- // action
+ // action
switch (ele->action) {
case INK_MGMT_ALLOW_ALLOW:
snprintf(action, MAX_RULE_PART_SIZE, "ip_allow");
@@ -4820,7 +4820,7 @@ convert_parent_ele_to_html_format(INKPar
WEB_HTTP_ERR_OKAY)
goto Lerror;
- // parents
+ // parents
if (ele->proxy_list) {
plist = domain_list_to_string((DomainList *) ele->proxy_list, ";");
snprintf(parents, MAX_RULE_PART_SIZE, "%s", plist);
@@ -4947,7 +4947,7 @@ convert_remap_ele_to_html_format(INKRema
if (!ele->from_host)
goto Lerror;
- // from port
+ // from port
if (ele->from_port > 0) {
snprintf(from_port, MAX_RULE_PART_SIZE, "%d", ele->from_port);
}
@@ -4976,7 +4976,7 @@ convert_remap_ele_to_html_format(INKRema
if (!ele->to_host)
goto Lerror;
- // to port
+ // to port
if (ele->to_port > 0) {
snprintf(to_port, MAX_RULE_PART_SIZE, "%d", ele->to_port);
}
@@ -5228,7 +5228,7 @@ Lerror:
// convert_pdss_to_html_format
//-------------------------------------------------------------------------
// Helper function that can be used by Ele's with embeded INKPdSsFormat
-// structures.
+// structures.
int
convert_pdss_to_html_format(INKPdSsFormat info,
char *pdType,
@@ -5514,7 +5514,7 @@ writePdTypeSelect_hosting(textBuffer * h
//-------------------------------------------------------------------------
// writeMethodSelect
//-------------------------------------------------------------------------
-// some files may/may not include the PUSH option in their list.
+// some files may/may not include the PUSH option in their list.
void
writeMethodSelect_push(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=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h Thu May 13 07:09:39 2010
@@ -26,7 +26,7 @@
* WebConfigRender.h - html rendering and assembly for the Configuration
* File Editor
*
- *
+ *
****************************************************************************/
#ifndef _WEB_CONFIG_RENDER_H_
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebGlobals.h Thu May 13 07:09:39 2010
@@ -39,8 +39,8 @@
*
* WebGlobals.h - Global Variables and types for the Web Interface
*
- *
- *
+ *
+ *
****************************************************************************/
#include "ink_mutex.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Thu May 13 07:09:39 2010
@@ -386,7 +386,7 @@ spawn_cgi(WebHttpContext * whc, const ch
// it won't be inherited by the child process
DuplicateHandle(GetCurrentProcess(), hChildStdinW, GetCurrentProcess(), NULL, 0, FALSE, DUPLICATE_SAME_ACCESS);
- // STDOUT
+ // STDOUT
HANDLE hChildStdoutR = NULL;
HANDLE hChildStdoutW = NULL;
@@ -470,9 +470,9 @@ spawn_cgi(WebHttpContext * whc, const ch
// 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
+// 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.
+// Returns the filename of this file or NULL if the encryption failed.
// Used for bind_pwd_file in filter.config and for radius shared keys.
//-------------------------------------------------------------------------
char *
@@ -1402,7 +1402,7 @@ handle_submit_mgmt_auth(WebHttpContext *
aa_new_access = NULL;
// check if the user is trying to add a new additional-user
if (aa_new_user != NULL) {
- // kwt 12.March.2001 check for username length
+ // kwt 12.March.2001 check for username length
if (strlen(aa_new_user) > WEB_HTTP_AUTH_USER_MAX) {
ink_hash_table_insert(whc->submit_warn_ht, "additional_administrative_accounts", NULL);
ink_hash_table_insert(whc->submit_warn_ht, "add_new_administrative_user", NULL);
@@ -1559,9 +1559,9 @@ handle_submit_snapshot(WebHttpContext *
"[WebHttp::handle_submit_snapshot] Unable to find configuration directory from proxy.config.config_dir\n");
if ((err = stat(config_dir, &s)) < 0) {
- ink_strncpy(config_dir, system_config_directory,sizeof(config_dir));
+ ink_strncpy(config_dir, system_config_directory,sizeof(config_dir));
if ((err = stat(config_dir, &s)) < 0) {
- mgmt_elog("[WebHttp::handle_submit_snapshot] unable to stat() directory '%s': %d %d, %s\n",
+ mgmt_elog("[WebHttp::handle_submit_snapshot] unable to stat() directory '%s': %d %d, %s\n",
config_dir, err, errno, strerror(errno));
mgmt_fatal("[WebHttp::handle_submit_snapshot] please set config path via command line '-path <path>' or 'proxy.config.config_dir' \n");
}
@@ -1644,7 +1644,7 @@ handle_submit_snapshot(WebHttpContext *
// These weren't used, so moved. /leif
//int newLen;
//char* absoluteDir;
- //const char *config_dir = lmgmt->record_data ->readString("proxy.config.config_dir", &found);
+ //const char *config_dir = lmgmt->record_data ->readString("proxy.config.config_dir", &found);
//newLen = strlen(tok) + strlen(config_dir) + 2;
//absoluteDir = new char[newLen];
@@ -1663,17 +1663,17 @@ handle_submit_snapshot(WebHttpContext *
}
} //else {
//if(snap_directory[0] == '/') {
- //lmgmt->record_data ->setString("proxy.config.snapshot_dir", snap_directory);
+ //lmgmt->record_data ->setString("proxy.config.snapshot_dir", snap_directory);
//} else {
//int newLen;
//char* relativeDir;
- //const char *config_dir = lmgmt->record_data ->readString("proxy.config.config_dir", &found);
+ //const char *config_dir = lmgmt->record_data ->readString("proxy.config.config_dir", &found);
//newLen = strlen(snap_directory) + strlen(config_dir) + 2;
//relativeDir = new char[newLen];
//ink_assert(relativeDir != NULL);
//sprintf(relativeDir, "%s%s%s",config_dir, DIR_SEP, snap_directory);
- //lmgmt->record_data ->setString("proxy.config.snapshot_dir", relativeDir);
+ //lmgmt->record_data ->setString("proxy.config.snapshot_dir", relativeDir);
//}
//}
}
@@ -1775,7 +1775,7 @@ handle_submit_snapshot(WebHttpContext *
}
int newLen;
char *newStr;
- //const char *config_dir = lmgmt->record_data ->readString("proxy.config.config_dir", &found);
+ //const char *config_dir = lmgmt->record_data ->readString("proxy.config.config_dir", &found);
newLen = strlen(snap_name) + strlen(ftp_remote_dir) + 2;
newStr = new char[newLen];
@@ -2692,7 +2692,7 @@ handle_submit_inspector(WebHttpContext *
// internationalize. we should put the button names into the
// dictionary.
- // handle URL Regex operation
+ // handle URL Regex operation
if (ink_hash_table_lookup(whc->post_data_ht, "regex_op", (void **) ®ex_action)) {
if (strcmp(regex_action, "Lookup") == 0) {
// handle regex lookup
@@ -2964,7 +2964,7 @@ handle_submit_update(WebHttpContext * wh
lmgmt->rollLogFiles();
goto Ldone;
}
- // check for apply
+ // check for apply
if (ink_hash_table_lookup(whc->post_data_ht, "apply", (void **) &apply)) {
ink_hash_table_delete(whc->post_data_ht, "apply");
xfree(apply);
@@ -3035,7 +3035,7 @@ handle_submit_update(WebHttpContext * wh
// delete the old password file and create a new one
RecGetRecordString_Xmalloc(record, &old_pwd_file);
- if (old_pwd_file) { // remove the old_pwd_file
+ if (old_pwd_file) { // remove the old_pwd_file
if (remove(old_pwd_file) != 0)
Debug("web2", "[handle_submit_update] Failed to remove password file %s", old_pwd_file);
xfree(old_pwd_file);
@@ -3088,19 +3088,19 @@ Ldone:
// handle_submit_update_config
//-------------------------------------------------------------------------
// This handler is called when submit a post form for Configuration File Editor.
-// Uses the hidden tag values to construct and write new config file.
+// Uses the hidden tag values to construct and write new config file.
// If the user presses Cancel, then it should also close
// the current window without committing any changes. If hit "Apply", then
-// commits the changes before closing editor window.
-// Since the Configuration File Editor opens in a separate window,
+// commits the changes before closing editor window.
+// Since the Configuration File Editor opens in a separate window,
// each time a user hits "Apply", we need to also update the table listing all
-// the config rules on the original tab page from which the File Editor window
+// the config rules on the original tab page from which the File Editor window
// was launched - the orignal page is refreshed regularly in order to keep the
-// the values in sync with the Configuration File Editor page (is there a
-// better way to do this??)
-// The file parameter is not used in this handler because a generic
-// c_config_display.ink is used for all files. We determine which file
-// is being revised by using the filename tag that's passed in with the
+// the values in sync with the Configuration File Editor page (is there a
+// better way to do this??)
+// The file parameter is not used in this handler because a generic
+// c_config_display.ink is used for all files. We determine which file
+// is being revised by using the filename tag that's passed in with the
// GET request.
static int
handle_submit_update_config(WebHttpContext * whc, const char *file)
@@ -3122,7 +3122,7 @@ handle_submit_update_config(WebHttpConte
//goto Ldone;
return WEB_HTTP_ERR_OKAY;
}
- // check for apply
+ // check for apply
if (ink_hash_table_lookup(whc->post_data_ht, "apply", (void **) &apply)) {
ink_hash_table_delete(whc->post_data_ht, "apply");
xfree(apply);
@@ -3131,10 +3131,10 @@ handle_submit_update_config(WebHttpConte
// the current ruleList information; commits this information as new config file
// get the filename to create the INKCfgContext; do NOT delete the
- // HTML_CONFIG_FILE_TAG entry because we need to use the filename
+ // HTML_CONFIG_FILE_TAG entry because we need to use the filename
// binding to refresh the page
if (!ink_hash_table_lookup(whc->post_data_ht, HTML_CONFIG_FILE_TAG, (void **) &filename)) {
- // ERROR: no config file specified!!
+ // ERROR: no config file specified!!
whc->response_hdr->setStatus(STATUS_NOT_FOUND);
WebHttpSetErrorResponse(whc, STATUS_NOT_FOUND);
goto Lerror;
@@ -3220,7 +3220,7 @@ handle_submit_update_config(WebHttpConte
}
// do not delete the strings in the array because
- // the binding still exists in the hashtable, so memory will
+ // the binding still exists in the hashtable, so memory will
// be freed when post_data_ht destroyed
if (rules)
delete[]rules;
@@ -3245,8 +3245,8 @@ handle_submit_update_config(WebHttpConte
HtmlRndrBr(whc->submit_warn);
whc->request_state |= WEB_HTTP_STATE_SUBMIT_WARN;
}
- // do not remove and free frecord from post_data_ht because
- // the renderer fn will use it to write the hidden tag
+ // do not remove and free frecord from post_data_ht because
+ // the renderer fn will use it to write the hidden tag
if (ink_hash_table_lookup(whc->post_data_ht, "frecord", (void **) &frecord)) {
if (recordRestartCheck(frecord)) {
ink_hash_table_insert(whc->submit_note_ht, frecord, NULL);
@@ -3270,8 +3270,8 @@ Lerror:
//-------------------------------------------------------------------------
// handle_submit_config_display
//-------------------------------------------------------------------------
-// This handler is called when user wants to open the Configuration Editor
-// window to edit a config file; so it main purpose is simply to
+// This handler is called when user wants to open the Configuration Editor
+// window to edit a config file; so it main purpose is simply to
// render the configurator.ink page
static int
handle_submit_config_display(WebHttpContext * whc, const char *file)
@@ -3556,7 +3556,7 @@ handle_submit_net_config(WebHttpContext
SetWarning(whc, key);
warning = true;
}
- //FIXNOW - Use SysAPI
+ //FIXNOW - Use SysAPI
if (!Config_GetNIC_Netmask(interface, old_value, sizeof(old_value))) {
if (nic[no][4] != NULL && strcmp(nic[no][4], old_value) != 0) {
nic_change[no] = 1;
@@ -3578,7 +3578,7 @@ handle_submit_net_config(WebHttpContext
}
} else if (strcmp(param, "GATEWAY") == 0) {
nic[no][5] = value;
- //FIXNOW - Use SysAPI
+ //FIXNOW - Use SysAPI
if (!Net_IsValid_IP(nic[no][5])) {
SetWarning(whc, key);
warning = true;
@@ -4216,7 +4216,7 @@ WebHttpInit()
ink_hash_table_insert(g_extn_bindings_ht, ".ink", (void *) handle_ink_extn);
// initialize the configurator editing bindings which binds
- // configurator display filename (eg. f_cache_config.ink) to
+ // configurator display filename (eg. f_cache_config.ink) to
// 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);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.h Thu May 13 07:09:39 2010
@@ -25,7 +25,7 @@
*
* WebHttp.h - code to process requests, and create responses
*
- *
+ *
****************************************************************************/
#ifndef _WEB_HTTP_H_
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpAuth.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpAuth.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpAuth.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpAuth.cc Thu May 13 07:09:39 2010
@@ -24,8 +24,8 @@
/****************************************************************************
*
* WebHttpAuth.cc - code to handle administrative access to the web-ui
- *
- *
+ *
+ *
****************************************************************************/
#include "inktomi++.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpAuth.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpAuth.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpAuth.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpAuth.h Thu May 13 07:09:39 2010
@@ -24,8 +24,8 @@
/****************************************************************************
*
* WebHttpAuth.h - code to handle administrative access to the web-ui
- *
- *
+ *
+ *
****************************************************************************/
#ifndef _WEB_HTTP_AUTH_H_
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpContext.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpContext.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpContext.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpContext.h Thu May 13 07:09:39 2010
@@ -53,7 +53,7 @@ struct WebHttpContext
InkHashTable *query_data_ht; // client query name/value hash-table
InkHashTable *post_data_ht; // client POST name/value hash-table
InkHashTable *submit_warn_ht; // ht of warn submission records
- InkHashTable *submit_note_ht; // ht of info submission records
+ InkHashTable *submit_note_ht; // ht of info submission records
sockaddr_in *client_info; // client conection information
SocketInfo si; // socket information
ssl_ctx_st *ssl_ctx; // SSL information
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpLog.cc Thu May 13 07:09:39 2010
@@ -54,22 +54,22 @@ WebHttpLogInit()
char log_file[PATH_NAME_MAX+1];
if ((err = stat(system_log_dir, &s)) < 0) {
- ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &log_dir)
+ ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &log_dir)
== REC_ERR_OKAY);
if ((err = stat(log_dir, &s)) < 0) {
// Try 'system_root_dir/var/log/trafficserver' directory
snprintf(system_log_dir, sizeof(system_log_dir), "%s%s%s%s%s%s%s",
system_root_dir, DIR_SEP,"var",DIR_SEP,"log",DIR_SEP,"trafficserver");
if ((err = stat(system_log_dir, &s)) < 0) {
- mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
+ mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
system_log_dir, err, errno, strerror(errno));
mgmt_elog("please set 'proxy.config.log2.logfile_dir'\n");
//_exit(1);
}
} else {
- ink_strncpy(system_log_dir,log_dir,sizeof(system_log_dir));
+ ink_strncpy(system_log_dir,log_dir,sizeof(system_log_dir));
}
- }
+ }
snprintf(log_file, sizeof(log_file), "%s%s%s", system_log_dir, DIR_SEP, "lm.log");
if (WebHttpLogHandle == WEB_HANDLE_INVALID) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.cc Thu May 13 07:09:39 2010
@@ -408,7 +408,7 @@ httpMessage::~httpMessage()
delete parser;
}
-/* 01/14/99 elam -
+/* 01/14/99 elam -
* Commented out because g++ is not happy with iostream.h
void httpMessage::Print() {
cout << "Method: " << method << endl;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpMessage.h Thu May 13 07:09:39 2010
@@ -34,8 +34,8 @@
* WebHttpMessage.h - classes to store information about incoming requests
* and create hdrs for outgoing requests
*
- *
- *
+ *
+ *
****************************************************************************/
/* define method */
@@ -282,7 +282,7 @@ private:
char *locationURL;
time_t lastMod;
int cachable;
- char *dateResponse; // for logs
+ char *dateResponse; // for logs
};
#endif
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc Thu May 13 07:09:39 2010
@@ -25,7 +25,7 @@
*
* WebHttpRender.cc - html rendering/assembly
*
- *
+ *
****************************************************************************/
#include "ink_config.h"
@@ -150,9 +150,9 @@ handle_alarm_summary_object(WebHttpConte
//-------------------------------------------------------------------------
// Displays rules of config file in table format. The arg specifies
// the "/configure/f_xx_config.ink" of the config file; this arg is used
-// to determine which file table to render. Each of the
-// writeXXConfigTable function writes the html for displaying all the rules
-// by using an INKCfgContext to read all the rules and converting
+// to determine which file table to render. Each of the
+// writeXXConfigTable function writes the html for displaying all the rules
+// by using an INKCfgContext to read all the rules and converting
// each rule into a row of the table.
static int
handle_config_table_object(WebHttpContext * whc, char *tag, char *arg)
@@ -282,13 +282,13 @@ handle_help_config_link(WebHttpContext *
//-------------------------------------------------------------------------
// handle_dynamic_javascript
//-------------------------------------------------------------------------
-// This creates the Javascript Rule object and its properties;
-// Must open the config file and see how many rules; create a javascript Rule
-// object so that it can be inserted into the ruleList object; writes the
+// This creates the Javascript Rule object and its properties;
+// Must open the config file and see how many rules; create a javascript Rule
+// object so that it can be inserted into the ruleList object; writes the
// functions which must interact between the config data form. All
// the config file specific javascript goes here. This javascript is actually
-// stored in the "/configure/f_XXX_config.ink" file.
-//
+// stored in the "/configure/f_XXX_config.ink" file.
+//
static int
handle_dynamic_javascript(WebHttpContext * whc, char *tag, char *arg)
{
@@ -299,10 +299,10 @@ handle_dynamic_javascript(WebHttpContext
char *file_buf = NULL;
int file_size;
- // the configurator page can be invoked from two places so it
+ // the configurator page can be invoked from two places so it
// can retreive the "filename" information from 2 possible places:
- // 1) as a GET request (HTML_SUBMIT_CONFIG_DISPLAY) when click on "Edit file" button
- // 2) refreshing page after clicking "Apply" button (HTML_SUBMIT_UPDATE_CONFIG)
+ // 1) as a GET request (HTML_SUBMIT_CONFIG_DISPLAY) when click on "Edit file" button
+ // 2) refreshing page after clicking "Apply" button (HTML_SUBMIT_UPDATE_CONFIG)
if (ink_hash_table_lookup(whc->query_data_ht, HTML_CONFIG_FILE_TAG, (void **) &ink_file) ||
ink_hash_table_lookup(whc->post_data_ht, HTML_CONFIG_FILE_TAG, (void **) &ink_file)) {
@@ -384,11 +384,11 @@ Ldone:
//-------------------------------------------------------------------------
// handle_config_input_form
//-------------------------------------------------------------------------
-// Writes the html for the section of the Config File Editor that requires
+// Writes the html for the section of the Config File Editor that requires
// user input/modifications (eg. has the INSERT, MODIFY.... buttons).
-// Corresponds to the "writeConfigForm" tag.
-// Each config file has different fields so each form will have different
-// fields on the form (refer to data in corresponding Ele structs).
+// Corresponds to the "writeConfigForm" tag.
+// Each config file has different fields so each form will have different
+// fields on the form (refer to data in corresponding Ele structs).
static int
handle_config_input_form(WebHttpContext * whc, char *tag, char *arg)
{
@@ -471,8 +471,8 @@ handle_config_input_form(WebHttpContext
//-------------------------------------------------------------------------
// HtmlRndrSelectList
//-------------------------------------------------------------------------
-// Creates a select list where the options are the strings passed in
-// the options array. Assuming the value and text of the option are the same.
+// Creates a select list where the options are the strings passed in
+// the options array. Assuming the value and text of the option are the same.
int
HtmlRndrSelectList(textBuffer * html, const char *listName, const char *options[], int numOpts)
{
@@ -1494,7 +1494,7 @@ handle_select_system_logs(WebHttpContext
MgmtInt fsize;;
// define the name of syslog in different OS
-#if (HOST_OS == linux)
+#if (HOST_OS == linux)
syslog = "messages";
#endif
@@ -1553,22 +1553,22 @@ handle_select_access_logs(WebHttpContext
== REC_ERR_OKAY);
if ((err = stat(system_log_dir, &s)) < 0) {
- ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &logdir)
+ ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &logdir)
== REC_ERR_OKAY);
if ((err = stat(logdir, &s)) < 0) {
// Try 'system_root_dir/var/log/trafficserver' directory
snprintf(system_log_dir, sizeof(system_log_dir), "%s%s%s%s%s%s%s",
system_root_dir, DIR_SEP,"var",DIR_SEP,"log",DIR_SEP,"trafficserver");
if ((err = stat(system_log_dir, &s)) < 0) {
- mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
+ mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
system_log_dir, err, errno, strerror(errno));
mgmt_elog("please set 'proxy.config.log2.logfile_dir'\n");
//_exit(1);
}
} else {
- ink_strncpy(system_log_dir,logdir,sizeof(system_log_dir));
+ ink_strncpy(system_log_dir,logdir,sizeof(system_log_dir));
}
- }
+ }
if ((dirp = opendir(system_log_dir))) {
while ((dent = readdir(dirp)) != NULL) {
@@ -1633,22 +1633,22 @@ handle_select_debug_logs(WebHttpContext
== REC_ERR_OKAY);
if ((err = stat(system_log_dir, &s)) < 0) {
- ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &logdir)
+ ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &logdir)
== REC_ERR_OKAY);
if ((err = stat(logdir, &s)) < 0) {
// Try 'system_root_dir/var/log/trafficserver' directory
snprintf(system_log_dir, sizeof(system_log_dir), "%s%s%s%s%s%s%s",
system_root_dir, DIR_SEP,"var",DIR_SEP,"log",DIR_SEP,"trafficserver");
if ((err = stat(system_log_dir, &s)) < 0) {
- mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
+ mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
system_log_dir, err, errno, strerror(errno));
mgmt_elog("please set 'proxy.config.log2.logfile_dir'\n");
//_exit(1);
}
} else {
- ink_strncpy(system_log_dir,logdir,sizeof(system_log_dir));
+ ink_strncpy(system_log_dir,logdir,sizeof(system_log_dir));
}
- }
+ }
// traffic.out*
if ((dirp = opendir(system_log_dir))) {
@@ -2795,7 +2795,7 @@ WebHttpRender(WebHttpContext * whc, cons
char *doc_root_file;
ink_debug_assert(file != NULL);
#if (HOST_OS == linux) || (HOST_OS == solaris)
-//Bug 49922, for those .ink files which may meet the root-only system files,
+//Bug 49922, for those .ink files which may meet the root-only system files,
//upgrade the uid to root.
int old_euid;
bool change_uid = false;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.h Thu May 13 07:09:39 2010
@@ -25,7 +25,7 @@
*
* WebHttpRener.h - html rendering and assembly
*
- *
+ *
****************************************************************************/
#ifndef _WEB_HTTP_RENDER_H_
@@ -255,7 +255,7 @@
#define HTML_ID_CFG_EDIT_SOURCE_CIDR "s_text_731"
#define HTML_ID_CFG_EDIT_SOURCE_CIDR_HELP "s_text_732"
-// arm_security.config
+// arm_security.config
#define HTML_ID_CFG_EDIT_RULE_TYPE_HELP_3 "s_text_735"
#define HTML_ID_CFG_EDIT_CONN_TYPE "s_text_736"
#define HTML_ID_CFG_EDIT_CONN_TYPE_HELP "s_text_737"
@@ -362,7 +362,7 @@
#define HTML_ID_CFG_EDIT_SUB_INTERFACE "s_text_903"
#define HTML_ID_CFG_EDIT_SUB_INTERFACE_HELP "s_text_904"
-// Config File Editor error messages
+// Config File Editor error messages
#define HTML_ID_CFG_COMMIT_ERROR "s_text_905"
#define HTML_ID_CFG_INVALID_RULE "s_text_906"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.cc Thu May 13 07:09:39 2010
@@ -25,7 +25,7 @@
*
* WebHttpSession.cc - Manage session data
*
- *
+ *
****************************************************************************/
#include "ink_config.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpSession.h Thu May 13 07:09:39 2010
@@ -25,7 +25,7 @@
*
* WebHttpSession.h - Manage session data
*
- *
+ *
****************************************************************************/
#ifndef _WEB_HTTP_SESSION_
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.cc Thu May 13 07:09:39 2010
@@ -26,7 +26,7 @@
* WebHttpTree.cc - dynamic, javascript web-ui tree hierarchy and
* web-ui link index
*
- *
+ *
****************************************************************************/
#include "ink_config.h"
@@ -71,7 +71,7 @@ struct tree_node
};
// link_node - The link_node describes a page in the web-ui. The
-// structure contains the following:
+// structure contains the following:
// the disk file for the page; where the page should appear in
// the web-ui (mode, menu, item, tab); and lastly, any additional
// query items required to make this page render correctly.
@@ -128,7 +128,7 @@ static int g_item_id = 0;
static int g_link_id = 0;
//-------------------------------------------------------------------------
-// XML Element Handlers
+// XML Element Handlers
//-------------------------------------------------------------------------
//-------------------------------------------------------------------------
@@ -585,7 +585,7 @@ WebHttpRenderTabs(textBuffer * output, i
if (mode->node.name) {
HtmlRndrTdOpen(output, HTML_CSS_NONE, HTML_ALIGN_NONE, HTML_VALIGN_NONE, NULL, NULL, 0);
if (mode_index == active_mode) {
- // if current mode is active, we need on-off separator
+ // if current mode is active, we need on-off separator
HtmlRndrImg(output, "/images/menu_separator_on_off.gif", NULL, NULL, NULL, NULL);
} else if (mode_index + 1 == active_mode) {
// if next mode is active, we need off-on separator
@@ -788,7 +788,7 @@ WebHttpGetLinkQuery_Xmalloc(char *file_l
}
//------------------------------------------------------------------------
-// WebHttpTreeReturnRefresh
+// WebHttpTreeReturnRefresh
//------------------------------------------------------------------------
bool
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpTree.h Thu May 13 07:09:39 2010
@@ -26,7 +26,7 @@
* WebHttpTree.h - dynamic, javascript web-ui tree hierarchy and
* web-ui link index
*
- *
+ *
****************************************************************************/
#ifndef _WEB_HTTP_TREE_H_
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.cc Thu May 13 07:09:39 2010
@@ -250,22 +250,22 @@ setUpLogging()
char log_file[PATH_NAME_MAX+1];
if ((err = stat(system_log_dir, &s)) < 0) {
- ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &log_dir)
+ ink_assert(RecGetRecordString_Xmalloc("proxy.config.log2.logfile_dir", &log_dir)
== REC_ERR_OKAY);
if ((err = stat(log_dir, &s)) < 0) {
// Try 'system_root_dir/var/log/trafficserver' directory
snprintf(system_log_dir, sizeof(system_log_dir), "%s%s%s%s%s%s%s",
system_root_dir, DIR_SEP,"var",DIR_SEP,"log",DIR_SEP,"trafficserver");
if ((err = stat(system_log_dir, &s)) < 0) {
- mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
+ mgmt_elog("unable to stat() log dir'%s': %d %d, %s\n",
system_log_dir, err, errno, strerror(errno));
mgmt_elog("please set 'proxy.config.log2.logfile_dir'\n");
//_exit(1);
}
} else {
- ink_strncpy(system_log_dir,log_dir,sizeof(system_log_dir));
+ ink_strncpy(system_log_dir,log_dir,sizeof(system_log_dir));
}
- }
+ }
snprintf(log_file, sizeof(log_file), "%s%s%s", system_log_dir, DIR_SEP, "lm.log");
@@ -789,7 +789,7 @@ webIntr_main(void *x)
xfree(autoconfContext.docRoot);
autoconfContext.docRoot = xstrdup(system_config_directory);
if ((err = stat(autoconfContext.docRoot, &s)) < 0) {
- mgmt_elog("[WebIntrMain] unable to stat() directory '%s': %d %d, %s\n",
+ mgmt_elog("[WebIntrMain] unable to stat() directory '%s': %d %d, %s\n",
autoconfContext.docRoot, err, errno, strerror(errno));
mgmt_elog("[WebIntrMain] please set config path via command line '-path <path>' or 'proxy.config.config_dir' \n");
mgmt_fatal(stderr, "[WebIntrMain] No Client AutoConf Root\n");
@@ -843,8 +843,8 @@ webIntr_main(void *x)
// INKqa09866
- // fire up interface for ts configuration through API; use absolute path from root to
- // set up socket paths;
+ // fire up interface for ts configuration through API; use absolute path from root to
+ // set up socket paths;
char api_sock_path[1024];
char event_sock_path[1024];
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebIntrMain.h Thu May 13 07:09:39 2010
@@ -28,8 +28,8 @@
*
* WebIntrMain.h - main loop for the Web Interface
*
- *
- *
+ *
+ *
****************************************************************************/
struct WebContext;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc Thu May 13 07:09:39 2010
@@ -25,7 +25,7 @@
*
* WebOverview.cc - code to overview page
*
- *
+ *
****************************************************************************/
#include "ink_config.h"
@@ -169,7 +169,7 @@ overviewRecord::getStatus(char **hostnam
// void overviewRecord::updateStatus(time_t, ClusterPeerInfo*)
// updates up/down status based on the cluster peer info record
//
-// currentTime is the value of localtime(time()) - sent in as
+// currentTime is the value of localtime(time()) - sent in as
// a parameter so we do not have to make repetitive system calls.
// overviewPage::checkForUpdates can just make one call
//
@@ -260,7 +260,7 @@ overviewRecord::checkAlarms()
// overview::readFloat, overview::readString
//
// Accessor functions for node records. For remote node,
-// we get the value in the node_data array we maintain
+// we get the value in the node_data array we maintain
// in this object. For the node, we do not maintain any data
// and rely on lmgmt->record_data for both the retrieval
// code and the records array
@@ -398,9 +398,9 @@ overviewRecord::readString(const char *n
// Accessor function for node records. Looks up varName for
// this node and if found, turns it value into a string
// and places it in bufVal
-//
+//
// return true if bufVal was succefully set
-// and false otherwise
+// and false otherwise
//
// EVIL ALERT: varStrFromName in WebMgmtUtils.cc is extremely
// similar to this function except in how it gets it's
@@ -620,7 +620,7 @@ overviewPage::checkForUpdates()
}
-// overrviewPage::sortHosts()
+// overrviewPage::sortHosts()
//
// resorts sortRecords, but always leaves the local node
// as the first record
@@ -634,7 +634,7 @@ overviewPage::sortHosts()
qsort(array + 1, numHosts - 1, sizeof(void *), hostSortFunc);
}
-// overviewPage::addRecord(ClusterPerrInfo* cpi)
+// overviewPage::addRecord(ClusterPerrInfo* cpi)
// Adds a new node record
// Assuems that this->accessLock is already held
//
@@ -886,8 +886,8 @@ overviewPage::generateAlarmsTableCLI(tex
// Iterate through the list of alarms
curAlarm = current->nodeAlarms.head;
while (curAlarm != NULL) {
- //
- // The resolve input is <alarmId>:<ip addr>
+ //
+ // The resolve input is <alarmId>:<ip addr>
//
if (curAlarm->ip == NULL)
snprintf(ipBuf, sizeof(ipBuf), "%s", "local");
@@ -925,7 +925,7 @@ overviewPage::generateAlarmsTableCLI(tex
} // end while(.)
} // end for(.)
- // cleanup
+ // cleanup
delete Obuf;
ink_mutex_release(&accessLock);
@@ -995,7 +995,7 @@ overviewPage::generateAlarmsSummary(WebH
}
-// generates the table for the overview page
+// generates the table for the overview page
//
// the entries are hostname, on/off, alarm
//
@@ -1616,7 +1616,7 @@ overviewPage::agCachePercentFree()
ink_assert(varSetFloat("proxy.cluster.cache.percent_free", pFree));
}
-// void overviewPage::agCacheHitRate()
+// void overviewPage::agCacheHitRate()
//
// Updates OLD proxy.cluster.http.cache_hit_ratio
// proxy.cluster.http.cache_total_hits
@@ -1701,7 +1701,7 @@ overviewPage::agCacheHitRate()
MgmtInt num_nodes;
varIntFromName("proxy.process.cluster.nodes", &num_nodes);
if (1 == num_nodes) {
- // Only one node , so grab local value
+ // Only one node , so grab local value
varFloatFromName("proxy.node.cache_hit_ratio_avg_10s", &hitRate);
}
// new stat
@@ -1731,7 +1731,7 @@ overviewPage::agCacheHitRate()
ink_assert(varSetInt("proxy.cluster.cache_total_misses", totalMisses));
}
-// void overviewPage::agHostDBHitRate()
+// void overviewPage::agHostDBHitRate()
//
// Updates proxy.cluster.hostdb.hit_ratio
//
@@ -1812,7 +1812,7 @@ overviewPage::agHostdbHitRate()
MgmtInt num_nodes;
varIntFromName("proxy.process.cluster.nodes", &num_nodes);
if (1 == num_nodes) {
- // Only one node , so grab local value
+ // Only one node , so grab local value
varFloatFromName("proxy.node.hostdb.hit_ratio_avg_10s", &hitRate);
}
// new stat
@@ -1843,7 +1843,7 @@ overviewPage::agHostdbHitRate()
ink_assert(varSetFloat("proxy.cluster.hostdb.hit_ratio", hitRate));
}
-// void overviewPage::agBandwidthHitRate()
+// void overviewPage::agBandwidthHitRate()
//
// Updates proxy.cluster.http.bandwidth_hit_ratio
//
@@ -1873,7 +1873,7 @@ overviewPage::agBandwidthHitRate()
// Get total cluster hits first, only calculate bandwith if > 0
varIntFromName("proxy.cluster.http.cache_total_hits", &totalHits);
- // User Agent
+ // User Agent
// HTTP
varIntFromName("proxy.cluster.http.user_agent_total_request_bytes", &bytes);
@@ -1969,7 +1969,7 @@ overviewPage::agBandwidthHitRate()
MgmtInt num_nodes;
varIntFromName("proxy.process.cluster.nodes", &num_nodes);
if (1 == num_nodes) {
- // Only one node , so grab local value
+ // Only one node , so grab local value
varFloatFromName("proxy.node.bandwidth_hit_ratio_avg_10s", &hitRate);
}
// new stat
@@ -2379,7 +2379,7 @@ overviewPage::resolvePeerHostname_ml(con
// Takes a hash-table returned by processFormSubmission
//
// Note: resolving an alarm is asyncronous with the list of
-// alarms maintained in overviewRecords. That list
+// alarms maintained in overviewRecords. That list
// is only updates when checkAlarms is called
//
void
@@ -2429,7 +2429,7 @@ resolveAlarmCLI(textBuffer * output, con
const char *ipAddr = NULL;
alarm_t alarmType;
- // Get ipAddr of host to resolve alarm for
+ // Get ipAddr of host to resolve alarm for
// request is in form 'alarmType:ipAddr'
if (request && colonTok.Initialize(request) == 2) {
alarmType = atoi(colonTok[0]);
@@ -2476,7 +2476,7 @@ AlarmListable::~AlarmListable()
}
}
-// int hostSortFunc(const void* arg1, const void* arg2)
+// int hostSortFunc(const void* arg1, const void* arg2)
//
// A compare function that we can to qsort that sorts
// overviewRecord*
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.h Thu May 13 07:09:39 2010
@@ -42,16 +42,16 @@
*
* WebOverview.h - code to overview page
*
- *
+ *
****************************************************************************/
-//
+//
// There is one instance of the class overviewPage in the LocalManger
// process. The overviewPage instance stores a record of type
// overviewRecord for each node that has been seen in the cluster.
// The node records contain a list of active alarms on that node.
//
-// overviewPage is responsible for the synchronization issues for both
+// overviewPage is responsible for the synchronization issues for both
// it self and all of its overviewRecords. Whenever updates are made
// to instances of either class, overviewPage's accessLock must be held.
//
@@ -62,9 +62,9 @@
//
// Additional Notes
//
-// These classes have expanded over time. overviewPage and
+// These classes have expanded over time. overviewPage and
// overviewRecord are now clearing houses of cluster information
-// for the UI.
+// for the UI.
// To simplify the locking issues, pointer to overviewRecords should
// NOT be returned by overviewPage. overviewRecords are internal
// to overviewPage and any data needed from an overviewRecord
@@ -124,7 +124,7 @@ public:
overviewPage();
~overviewPage();
/*
- void generateTable(textBuffer* output,
+ void generateTable(textBuffer* output,
const char* submission,
WebContext* pContext);
*/
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.cc Thu May 13 07:09:39 2010
@@ -42,8 +42,8 @@
/****************************************************************************
*
* WebReconfig.cc - code to handle config vars that can change on the fly
- *
- *
+ *
+ *
****************************************************************************/
// Since we don't want to steal the manager's main thread we get
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebReconfig.h Thu May 13 07:09:39 2010
@@ -27,8 +27,8 @@
/****************************************************************************
*
* WebReconfig.h - code to handle config vars that can change on the fly
- *
- *
+ *
+ *
****************************************************************************/
#include "P_RecCore.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.cc Thu May 13 07:09:39 2010
@@ -34,8 +34,8 @@
*
* WebUtils.cc - Misc Utility Functions for the web server internface
*
- *
- *
+ *
+ *
****************************************************************************/
#ifdef HAVE_LIBSSL
@@ -46,7 +46,7 @@
/* Ugly hack - define HEAP_H and STACK_H to prevent stuff
* from the template library from being included which
- * SUNPRO CC does not not like.
+ * SUNPRO CC does not not like.
*/
#define HEAP_H
#define STACK_H
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebUtils.h Thu May 13 07:09:39 2010
@@ -28,8 +28,8 @@
*
* WebUtils.h - Misc Utility Functions for the web server internface
*
- *
- *
+ *
+ *
****************************************************************************/
#include "ink_platform.h"
@@ -39,7 +39,7 @@ struct WebContext;
/* Ugly Hack - declare
* SSLcon as void* instead of SSL since this prevents us from
- * including ssl.h right here which creates a whole bunch of
+ * including ssl.h right here which creates a whole bunch of
* nasty problem to MD5 conflicts with ink_code.h.
*/
struct SocketInfo
Modified: trafficserver/traffic/trunk/proxy/sac.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/sac.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/sac.cc (original)
+++ trafficserver/traffic/trunk/proxy/sac.cc Thu May 13 07:09:39 2010
@@ -26,7 +26,7 @@
Standalone Collator
-
+
***************************************************************************/
#include "ink_unused.h"
@@ -81,7 +81,7 @@ ArgumentDescription argument_description
int n_argument_descriptions = SIZE(argument_descriptions);
-/*-------------------------------------------------------------------------
+/*-------------------------------------------------------------------------
main
-------------------------------------------------------------------------*/
@@ -91,7 +91,7 @@ main(int argc, char *argv[])
char ts_path[PATH_NAME_MAX + 1];
// build the application information structure
//
- appVersionInfo.setup(PACKAGE_NAME,PROGRAM_NAME, PACKAGE_VERSION, __DATE__,
+ appVersionInfo.setup(PACKAGE_NAME,PROGRAM_NAME, PACKAGE_VERSION, __DATE__,
__TIME__, BUILD_MACHINE, BUILD_PERSON, "");
// take care of command-line arguments
@@ -102,7 +102,7 @@ main(int argc, char *argv[])
// Get TS directory
if (0 == get_ts_directory(ts_path,sizeof(ts_path))) {
ink_strncpy(system_root_dir, ts_path, sizeof(system_root_dir));
- }
+ }
management_directory[0] = 0;
strncat(management_directory, system_config_directory, 256 - 1);
Modified: trafficserver/traffic/trunk/proxy/signals.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/signals.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/signals.cc (original)
+++ trafficserver/traffic/trunk/proxy/signals.cc Thu May 13 07:09:39 2010
@@ -318,7 +318,7 @@ signal_handler(int sig, siginfo_t * t, v
#else
snprintf(sig_msg, sizeof(sig_msg), "NOTE: Traffic Server received Sig %d: %s\n", sig, strsignal(sig));
NOWARN_UNUSED_RETURN(write(2, sig_msg, strlen(sig_msg)));
- //syslog(LOG_ERR, sig_msg);
+ //syslog(LOG_ERR, sig_msg);
#endif
#ifdef HAVE_PROFILER
@@ -487,7 +487,7 @@ init_signals(bool do_stackdump)
// set_signal(SIGSEGV,(SigActionFunc_t)signal_handler);
//
// There was an an addtional #if 0 w/ a note about SIGABRT
-// // Do not catch, results in recursive
+// // Do not catch, results in recursive
// // SIGABRT loop on solaris assert() failures
// set_signal(SIGABRT,(SigActionFunc_t)signal_handler);
//
Modified: trafficserver/traffic/trunk/proxy/signals.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/signals.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/signals.h (original)
+++ trafficserver/traffic/trunk/proxy/signals.h Thu May 13 07:09:39 2010
@@ -35,7 +35,7 @@
extern int exited_children;
typedef void (*sig_callback_fptr) (int signo);
-/*
+/*
* plugins use this to attach clean up handlers
* for SIGSEGV and SIGBUS
* Return value: 0 on success, -1 on failure
Modified: trafficserver/traffic/trunk/proxy/stats/CoupledStats.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/stats/CoupledStats.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/stats/CoupledStats.h (original)
+++ trafficserver/traffic/trunk/proxy/stats/CoupledStats.h Thu May 13 07:09:39 2010
@@ -145,7 +145,7 @@ CoupledStats::CreateStat(const char *nam
return NULL;
}
//FIXME: old sdk didnt use category, we _should_ but how to config ...
- //else if (ret = StatDescriptor::CreateDescriptor(m_name, name, init_val))
+ //else if (ret = StatDescriptor::CreateDescriptor(m_name, name, init_val))
else if ((ret = StatDescriptor::CreateDescriptor(name, init_val))) {
ink_mutex_acquire(&m_mux);
grow_check(ret);
@@ -165,7 +165,7 @@ CoupledStats::CreateStat(const char *nam
return NULL;
}
//FIXME: old sdk didnt use category, we _should_ but how to config ...
- //else if (ret = StatDescriptor::CreateDescriptor(m_name, name, init_val))
+ //else if (ret = StatDescriptor::CreateDescriptor(m_name, name, init_val))
else if ((ret = StatDescriptor::CreateDescriptor(name, init_val))) {
ink_mutex_acquire(&m_mux);
grow_check(ret);
Modified: trafficserver/traffic/trunk/proxy/ts_resource.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/ts_resource.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/ts_resource.h (original)
+++ trafficserver/traffic/trunk/proxy/ts_resource.h Thu May 13 07:09:39 2010
@@ -28,7 +28,7 @@
#define IDI_ICON1 101
// Next default values for new objects
-//
+//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 107
Modified: trafficserver/traffic/trunk/test/SDKtest/client/Config.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/SDKtest/client/Config.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/SDKtest/client/Config.cc (original)
+++ trafficserver/traffic/trunk/test/SDKtest/client/Config.cc Thu May 13 07:09:39 2010
@@ -285,7 +285,7 @@ Config::Config(long warmup, char *config
process_line(line_no, line, i, lhs, rhs);
#ifdef _PLUG_IN
- // target_host, target_port, and document_base
+ // target_host, target_port, and document_base
// will be passed to the INKOptionProcess() later, and
// comments are skipped.
if ((strcmp(lhs, "target_host") || strcmp(lhs, "target_port") || strcmp(lhs, "document_base")) && strcmp(lhs, "")) {
@@ -525,5 +525,5 @@ Config::Config(long warmup, char *config
(plug_in->options_process_finish_fcn) ();
}
#endif
- /////////////////////////////
+ /////////////////////////////
}
Modified: trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc (original)
+++ trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc Thu May 13 07:09:39 2010
@@ -80,10 +80,10 @@ DoTest::initialize_stats()
target_byterate_generated[i] = 0;
}
- // number of transactions that had limited target_byterate
+ // number of transactions that had limited target_byterate
num_limited_byterate = 0;
- // Total error among all the limited byterate trans
+ // Total error among all the limited byterate trans
total_limited_byterate_error = 0;
connections_open = 0;
@@ -283,7 +283,7 @@ DoTest::create_new_connection_and_send_r
}
-// User i just finished, update stats
+// User i just finished, update stats
void
DoTest::update_completion_stats(int i)
{
@@ -858,7 +858,7 @@ DoTest::actual_test(int rr_flag)
}
finished_requests += keepalive;
update_completion_stats(i);
- } else { // 200 response
+ } else { // 200 response
fprintf(stderr,
"Error: user %d got 200 response:\n%s but got only %ld bytes when %ld bytes were requested;\nRequest sent [%s]\n%ld msec since connection opened; %ld msec since last read\nPOLLIN count = %d; number of read calls returning data = %d\n\n",
i, user_info[i].status_line_info.buffer, user_info[i].bytes_read, user_info[i].bytes_requested,
@@ -931,7 +931,7 @@ DoTest::actual_test(int rr_flag)
}
- } else { // s > 0
+ } else { // s > 0
/* Transaction is not complete yet. You just read some
bytes so update stats.. */
Modified: trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h (original)
+++ trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h Thu May 13 07:09:39 2010
@@ -155,11 +155,11 @@ struct DoTest
/* It will report how many latencies were above this cutoff (in msec) */
long above_round_trip_time_cutoff; /* Req above latency cutoff */
long first_byte_latency_cutoff;
- /* It will report how many first byte latencies were above
+ /* It will report how many first byte latencies were above
this cutoff (in msec) */
long above_first_byte_latency_cutoff; /* Req above first-byte cutoff */
long connect_time_cutoff;
- /* It will report how many connect times were above
+ /* It will report how many connect times were above
this cutoff (in msec) */
long above_connect_time_cutoff; /* Req above connect cutoff */
@@ -170,7 +170,7 @@ struct DoTest
histogram connect_histogram;
long generated_thinktime; /* Total number of reqs generated */
- long thinktime_generated[MAX_THINKTIMES]; /* Number of reqs with
+ long thinktime_generated[MAX_THINKTIMES]; /* Number of reqs with
each thinktime */
double total_actual_thinktime;
@@ -178,9 +178,9 @@ struct DoTest
long target_byterate_generated[MAX_TARGET_BYTERATES];
/* Number of reqs with each target_byterate */
long num_limited_byterate;
- // number of transactions that had limited target_byterate
+ // number of transactions that had limited target_byterate
double total_limited_byterate_error;
- // Total error among all the limited byterate trans
+ // Total error among all the limited byterate trans
int reporting_interval;
int connections_open;
@@ -198,9 +198,9 @@ struct DoTest
int num_target_byterates; /* Number of thinktimes in the distribution */
long *target_byterates; /* actual thinktimes */
double *cumulative_target_byterate_prob;
- /* Cumulative probability of selecting different
- target_byterates
- cumulative_target_byterate_prob[num_thinktimes-1]
+ /* Cumulative probability of selecting different
+ target_byterates
+ cumulative_target_byterate_prob[num_thinktimes-1]
must be 1.0 */
UserInfo *user_info;
@@ -213,7 +213,7 @@ struct DoTest
INKPlugin *plug_in;
long warmup;
// =0: real test, > 0 : warmup; create only warmup number of
- // requests
+ // requests
int users;
int poll_timeout;
int keepalive;
@@ -245,7 +245,7 @@ struct DoTest
long generate_target_byterate();
long compute_bytes_to_read(int user, struct timeval current_time);
- // User i just finished, update stats
+ // User i just finished, update stats
void update_completion_stats(int i);
int create_new_connection_and_send_request(int user, struct timeval current_time);
void initialize_stats();
Modified: trafficserver/traffic/trunk/test/SDKtest/client/LoadGenerator.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/SDKtest/client/LoadGenerator.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/SDKtest/client/LoadGenerator.cc (original)
+++ trafficserver/traffic/trunk/test/SDKtest/client/LoadGenerator.cc Thu May 13 07:09:39 2010
@@ -99,7 +99,7 @@ LoadGenerator::initialize_targets()
// generates strings "size0" to "sizeN" where total number of sizes
// is N+1. Used only for synthetic documents. Also returns the
-// corresponding expected size
+// corresponding expected size
void
LoadGenerator::generate_size_str(char *size_str, long *size_requested_p)
@@ -157,7 +157,7 @@ LoadGenerator::generate_serial_number_st
}
/* Generate a server str of the form: "server0"..
-"serverN-1", where N is the number of origin servers.
+"serverN-1", where N is the number of origin servers.
Only applicable for synthetic load */
void
@@ -233,11 +233,11 @@ LoadGenerator::create_synthetic_request(
}
if (!more_request) {
strcpy(req_string, "");
- // ready to finish inkbench and print stats
+ // ready to finish inkbench and print stats
return;
} else if (strcmp(dynamic_origin_server_name, "") != 0 &&
strcmp(dynamic_origin_server_port, "") != 0 && strcmp(req_string, "") != 0) {
- // generate new sockaddr and origin_server_str based on the
+ // generate new sockaddr and origin_server_str based on the
// dynamic_origin_server_name and dynamic_origin_server_port
if (direct) {
generate_dynamic_origin_server_target(dynamic_origin_server_name, dynamic_origin_server_port, target);
@@ -318,7 +318,7 @@ LoadGenerator::create_synthetic_request(
return;
} else if (strcmp(dynamic_origin_server_name, "") != 0 &&
strcmp(dynamic_origin_server_port, "") != 0 && strcmp(req_string, "") != 0) {
- // generate new sockaddr and origin_server_str based on the
+ // generate new sockaddr and origin_server_str based on the
// dynamic_origin_server_name and dynamic_origin_server_port
if (direct) {
generate_dynamic_origin_server_target(dynamic_origin_server_name, dynamic_origin_server_port, target);
Modified: trafficserver/traffic/trunk/test/SDKtest/client/LoadGenerator.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/SDKtest/client/LoadGenerator.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/SDKtest/client/LoadGenerator.h (original)
+++ trafficserver/traffic/trunk/test/SDKtest/client/LoadGenerator.h Thu May 13 07:09:39 2010
@@ -51,7 +51,7 @@ struct LoadGenerator
long max_hotset_serial_num;
long max_docset_serial_num;
- // Config variables
+ // Config variables
int debug;
int ssl;
int keepalive; /* how many requests per connection */
@@ -77,7 +77,7 @@ struct LoadGenerator
int direct;
INKPlugin *plug_in;
double *cumulative_size_prob;
- /* Cumulative probability of selecting different sizes
+ /* Cumulative probability of selecting different sizes
cumulative_size_prob[num_sizes-1] must be 1.0 */
// Stats
@@ -127,7 +127,7 @@ struct LoadGenerator
int anum_sizes, /* Number of sizes in the docsize distribution */
long *asizes, /* actual sizes */
double *acumulative_size_prob,
- /* Cumulative probability of selecting different sizes
+ /* Cumulative probability of selecting different sizes
cumulative_size_prob[num_sizes-1] must be 1.0 */
int adirect, INKPlugin * aplug_in)
{