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 [15/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/tools/ShmemClean.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/ShmemClean.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/ShmemClean.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/ShmemClean.cc Thu May 13 07:09:39 2010
@@ -28,7 +28,7 @@
*
* $Date: 2003-06-01 18:38:21 $
*
- *
+ *
*/
#include "ink_config.h"
@@ -56,7 +56,7 @@ union semun
/*
* main(...)
- * Function takes an int id to start and walks through (as the Local
+ * Function takes an int id to start and walks through (as the Local
* manager does) ids until it fails to delete an id. To delete a seg id
* you need the uid of the creator or root, be careful not to nuke any
* that may be running.
Modified: trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/tools/VIPConfig.cc Thu May 13 07:09:39 2010
@@ -25,12 +25,12 @@
/*
*
* VIPConfig.cc
- * Tool to configure up/down/create virtual ip interfaces. To be exec'ed
+ * Tool to configure up/down/create virtual ip interfaces. To be exec'ed
* by management processes so they need not be running set uid root.
*
* $Date: 2008-05-20 17:26:18 $
*
- *
+ *
*/
@@ -71,7 +71,7 @@ char *get_broadcast_for_intr(char *intrN
* main(...)
* Main for the vip config tool. Return values are status to caller.
*
- * Return Value:
+ * Return Value:
*
*/
int
@@ -341,7 +341,7 @@ get_netmask_for_intr(char *intrName)
static char static_buffer[17]; // static return buffer
char *return_ptr = NULL; // what we are planning to return to the callee
- // Prevent UMRs
+ // Prevent UMRs
memset(ifbuf, 0, sizeof(ifbuf));
if (intrName == NULL) {
@@ -399,7 +399,7 @@ get_broadcast_for_intr(char *intrName)
static char static_buffer[17]; // static return buffer
char *return_ptr = NULL; // what we are planning to return to the callee
- // Prevent UMRs
+ // Prevent UMRs
memset(ifbuf, 0, sizeof(ifbuf));
if (intrName == NULL) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/EnvBlock.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/EnvBlock.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/EnvBlock.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/EnvBlock.h Thu May 13 07:09:39 2010
@@ -28,8 +28,8 @@
*
* EnvBlock.h - class to store/retrieve a set of environment variables
*
- *
- *
+ *
+ *
****************************************************************************/
#include "ink_hash_table.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/ExpandingArray.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/ExpandingArray.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/ExpandingArray.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/ExpandingArray.h Thu May 13 07:09:39 2010
@@ -27,10 +27,10 @@
/****************************************************************************
*
* ExpandingArray.h - interface for a simple expanding array class
- *
+ *
* Thread-Safe: no
- *
- *
+ *
+ *
****************************************************************************/
#define EA_MIN_SIZE 4
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.cc Thu May 13 07:09:39 2010
@@ -311,7 +311,7 @@ IpLookup::MatchNext(IpLookupState * s, v
if (cur == NULL) {
return false;
}
- // We must adjust the cur_mask and cur_shift_bits based
+ // We must adjust the cur_mask and cur_shift_bits based
// on the current table level otherwise we get garbage r
// results for subsequent calls to nextMatch (INKqa04167)
for (int q = 0; q < s->table_level; q++) {
@@ -378,7 +378,7 @@ IpLookup::MatchNext(IpLookupState * s, v
return false;
}
-// void IpLookup::PrintArray(void* array_in, IpLookupPrintFunc f)
+// void IpLookup::PrintArray(void* array_in, IpLookupPrintFunc f)
//
// Note void* is used for array_in hide all typing from the header file
// the type must be DynArray<ip_match_el>*
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/IpLookup.h Thu May 13 07:09:39 2010
@@ -78,7 +78,7 @@ protected:
ip_match_el *match_els; // array of match elements in the table
//int array_len; // size of the arrays - its not being used
int num_el; // number of elements in the table
- int table_depth; // number of levels in the table
+ int table_depth; // number of levels in the table
const char *table_name; // a string identifing the table
};
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc Thu May 13 07:09:39 2010
@@ -36,7 +36,7 @@
#define SCHEMA_FILE "/home/lant/cnp/TrafficServer.xsd"
-// each file entry in the table stores the info needed for that file in
+// each file entry in the table stores the info needed for that file in
// order to convert it to XML format
FileInfo file_info_entries[] = {
{"proxy.config.cache.control.filename", INK_FNAME_CACHE_OBJ, &convertCacheRule_ts, &convertCacheRule_xml},
@@ -62,7 +62,7 @@ int num_file_entries = SIZE(file_info_en
static InkHashTable *file_info_ht = 0;
-// This is for TESTING ONLY!! (used in testConvertFile_ts)
+// This is for TESTING ONLY!! (used in testConvertFile_ts)
const char *config_files[] = {
"admin_access.config",
"bypass.config",
@@ -86,7 +86,7 @@ const char *config_files[] = {
// ---------------------------------------------------------------------
-// converterInit
+// converterInit
// ---------------------------------------------------------------------
// Need to create hashtable that maps the record name used in the
// XML instance file with the file_info_entries.
@@ -96,7 +96,7 @@ converterInit()
int i, j;
InkHashTableValue hash_value;
// This isn't used.
- //FileInfo *file_info;
+ //FileInfo *file_info;
XMLDom schema;
XMLNode *ts_node, *seq_node, *file_node;
char *schema_name, *record_name;
@@ -105,19 +105,19 @@ converterInit()
// Step 1:
// Create a temporary hashtable from file_info_entries list where:
// key = record_name (eg. proxy.config.cache.filename)
- // value = corresponding FileInfo struct
+ // value = corresponding FileInfo struct
InkHashTable *temp_info_ht = ink_hash_table_create(InkHashTableKeyType_String);
for (i = 0; i < num_file_entries; i++) {
ink_hash_table_insert(temp_info_ht, file_info_entries[i].record_name, &(file_info_entries[i]));
}
- // Step 2: THIS IS DEPENDENT ON STRUCTURE OF XML SCHEMA
- // Parse the trafficServer schema tag which should specify the
+ // Step 2: THIS IS DEPENDENT ON STRUCTURE OF XML SCHEMA
+ // Parse the trafficServer schema tag which should specify the
// file element name (eg. arm_security_file) and a record_name
// attribute (eg. proxy.config.arm.security_filename)
// - create a new hashtable where:
// key = schema file element name
- // value = corresponding FileInfo struct (which is located by
+ // value = corresponding FileInfo struct (which is located by
// looking up the hashtable in 1) using the record_name attribute
file_info_ht = ink_hash_table_create(InkHashTableKeyType_String);
schema.LoadFile(SCHEMA_FILE);
@@ -153,15 +153,15 @@ converterInit()
// ---------------------------------------------------------------------
-// convertFile_xml
+// convertFile_xml
// ---------------------------------------------------------------------
-// Purpose: Converts the entire XML tree into the TS file format;
-// does not directly write result to disk; stores the
-// converted text in "file" parameter.
+// Purpose: Converts the entire XML tree into the TS file format;
+// does not directly write result to disk; stores the
+// converted text in "file" parameter.
// Input: file_node - xml root node for all the rules
-// file - buffer that converted text is stored
+// file - buffer that converted text is stored
// Output: returns INK_ERR_OKAY if all the rules converted correctly
-// If there is a problem converting a rule, the rule is simply
+// If there is a problem converting a rule, the rule is simply
// skipped, and INK_ERR_FAIL is returned
char *
convertFile_xml(XMLNode * file_node)
@@ -180,7 +180,7 @@ convertFile_xml(XMLNode * file_node)
RuleConverter_xml converter;
FileInfo *info = NULL;
InkHashTableValue lookup;
- // iterate through each of the "rule" nodes
+ // iterate through each of the "rule" nodes
filename = file_node->getNodeName();
for (i = 0; i < file_node->getChildCount(); i++) {
child = file_node->getChildNode(i);
@@ -201,7 +201,7 @@ convertFile_xml(XMLNode * file_node)
ts_file.copyFrom("\n", 1);
}
xfree(rule);
- } else { // ERROR: converting
+ } else { // ERROR: converting
Debug("convert", "[convertFile_xml] Error converting XML rule %d", i);
return 0;
}
@@ -907,8 +907,8 @@ convertVaddrsRule_xml(XMLNode * rule_nod
// ---------------------------------------------------------------------
// convertPdssFormat_xml
// ---------------------------------------------------------------------
-// Convert the XML pdssFormatType complexType into INKPdSsFormat struct;
-// this can be used by any file which has INKPdSsFormat
+// Convert the XML pdssFormatType complexType into INKPdSsFormat struct;
+// this can be used by any file which has INKPdSsFormat
int
convertPdssFormat_xml(XMLNode * pdss_node, INKPdSsFormat * pdss)
{
@@ -949,7 +949,7 @@ convertPdssFormat_xml(XMLNode * pdss_nod
// convertTimePeriod_xml
// ---------------------------------------------------------------------
// Convert XML timePeriodType into INKHmsTime struct;
-// <time_period> tag only has attribute values
+// <time_period> tag only has attribute values
int
convertTimePeriod_xml(XMLNode * time_node, INKHmsTime * time)
{
@@ -1050,7 +1050,7 @@ convertPortList_xml(XMLNode * port_node)
// ---------------------------------------------------------------------
// convertIpAddrEle_xml
// ---------------------------------------------------------------------
-// Converts ip_range type into INKIpAddrEle
+// Converts ip_range type into INKIpAddrEle
int
convertIpAddrEle_xml(XMLNode * ip_node, INKIpAddrEle * ip)
{
@@ -1060,7 +1060,7 @@ convertIpAddrEle_xml(XMLNode * ip_node,
ip1 = ip_node->getChildNode(0);
ip2 = ip_node->getChildNode(1);
- if (!ip1) // required
+ if (!ip1) // required
return INK_ERR_FAIL;
ip_val = ip1->getAttributeValueByName("ip");
@@ -1172,12 +1172,12 @@ convertDomain_xml(XMLNode * dom_node, IN
//######################################################################
// ---------------------------------------------------------------------
-// convertFile_ts
+// convertFile_ts
// ---------------------------------------------------------------------
-// Purpose: converts TS text file into XML file
-// Input: ts_file - the TS config file we need to convert
-// xml_file - results of the conversion (allocated buffer)
-// Output:
+// Purpose: converts TS text file into XML file
+// Input: ts_file - the TS config file we need to convert
+// xml_file - results of the conversion (allocated buffer)
+// Output:
int
convertFile_ts(const char *filename, char **xml_file)
{
@@ -1185,7 +1185,7 @@ convertFile_ts(const char *filename, cha
INKCfgEle *ele;
// This isn't used.
//INKActionNeedT action_need;
- //INKError response;
+ //INKError response;
int i, ret = INK_ERR_OKAY, numRules;
textBuffer xml(1024);
textBuffer ruleBuf(512);
@@ -1209,12 +1209,12 @@ convertFile_ts(const char *filename, cha
return INK_ERR_FAIL; /* lv: file info does not exist, */
}
- // read the file and convert each rule
+ // read the file and convert each rule
ctx = INKCfgContextCreate(type);
if (!ctx) {
return INK_ERR_FAIL;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY) {
return INK_ERR_FAIL;
@@ -1224,8 +1224,8 @@ convertFile_ts(const char *filename, cha
// Convert each Ele into XML format and write it into the buffer
// In general, there should be no problems converting the rule since
- // only valid rules will be in the CfgContext, but if there is a
- // problem converting the rule, the rule should not be put in the
+ // only valid rules will be in the CfgContext, but if there is a
+ // problem converting the rule, the rule should not be put in the
// final buffer
numRules = INKCfgContextGetCount(ctx);
for (i = 0; i < numRules; i++) {
@@ -1249,7 +1249,7 @@ convertFile_ts(const char *filename, cha
}
/***********************************************************************
- Make sure that each "convert...Rule_ts" functions only returns
+ Make sure that each "convert...Rule_ts" functions only returns
INK_ERR_OKAY if the Ele wass successfuly converted into XML.
***********************************************************************/
@@ -1592,7 +1592,7 @@ convertParentRule_ts(INKCfgEle * cfg_ele
convertPdssFormat_ts(&(ele->parent_info), xml_file);
tempStr = domain_list_to_string(ele->proxy_list, " ");
- if (tempStr) { // optional field
+ if (tempStr) { // optional field
writeXmlElement(xml_file, "proxies", tempStr);
xfree(tempStr);
}
@@ -1686,7 +1686,7 @@ convertRemapRule_ts(INKCfgEle * cfg_ele,
}
xml_file->copyFrom(">", 1);
- // write Url's
+ // write Url's
writeXmlAttrStartTag(xml_file, "src_url");
strPtr = scheme_type_to_string(ele->from_scheme);
if (!strPtr)
@@ -1812,7 +1812,7 @@ convertSplitDnsRule_ts(INKCfgEle * cfg_e
writeXmlElement(xml_file, "dns_servers", strPtr);
xfree(strPtr);
- // INKDomainList search_list optional
+ // INKDomainList search_list optional
strPtr = domain_list_to_string(ele->search_list, " ");
if (strPtr) {
writeXmlElement(xml_file, "search_list", strPtr);
@@ -1895,7 +1895,7 @@ convertVaddrsRule_ts(INKCfgEle * cfg_ele
//######################################################################
// ---------------------------------------------------------------------
-// convertPortEle_ts
+// convertPortEle_ts
// ---------------------------------------------------------------------
// corresponds to complex type "port_range"
int
@@ -1914,7 +1914,7 @@ convertPortEle_ts(INKPortEle * ele, text
}
// ---------------------------------------------------------------------
-// convertIpAddrEle_ts
+// convertIpAddrEle_ts
// ---------------------------------------------------------------------
int
convertIpAddrEle_ts(INKIpAddrEle * ele, textBuffer * xml_file, const char *tag_name)
@@ -1951,7 +1951,7 @@ convertIpAddrEle_ts(INKIpAddrEle * ele,
// convertPdssFormat_ts
// ---------------------------------------------------------------------
// converts the INKPdssFormat struct into XML format and writes
-// the XML directly into xml_file
+// the XML directly into xml_file
int
convertPdssFormat_ts(INKPdSsFormat * pdss, textBuffer * xml_file)
{
@@ -1987,7 +1987,7 @@ convertPdssFormat_ts(INKPdSsFormat * pds
writeXmlAttrStartTag(xml_file, "sec_specs");
- // write sec specs attributes
+ // write sec specs attributes
if (sspec.src_ip) {
writeXmlAttribute(xml_file, "src_ip", sspec.src_ip);
}
@@ -2023,7 +2023,7 @@ convertPdssFormat_ts(INKPdSsFormat * pds
if (sspec.time.hour_a != 0 || sspec.time.hour_b != 0 ||
sspec.time.min_a != 0 || sspec.time.min_b != 0 || sspec.port) {
- xml_file->copyFrom(">", 1); //close sec_specs tag first
+ xml_file->copyFrom(">", 1); //close sec_specs tag first
if (sspec.time.hour_a != 0 || sspec.time.hour_b != 0 || sspec.time.min_a != 0 || sspec.time.min_b != 0) {
writeXmlAttrStartTag(xml_file, "time_range");
@@ -2066,10 +2066,10 @@ convertPdssFormat_ts(INKPdSsFormat * pds
}
// ---------------------------------------------------------------------
-// convertTimePeriod_ts
+// convertTimePeriod_ts
// ---------------------------------------------------------------------
-// Before converting, first checks that there are valid values for
-// time period
+// Before converting, first checks that there are valid values for
+// time period
int
convertTimePeriod_ts(INKHmsTime * time, textBuffer * xml_file)
{
@@ -2096,7 +2096,7 @@ convertTimePeriod_ts(INKHmsTime * time,
// ---------------------------------------------------------------------
// convertIpAddrList_ts
// ---------------------------------------------------------------------
-// converts into ipPortListType with the given "tag_name"
+// converts into ipPortListType with the given "tag_name"
int
convertIpAddrList_ts(INKIpAddrList list, textBuffer * xml_file, const char *tag_name)
{
@@ -2208,7 +2208,7 @@ writeXmlEndTag(textBuffer * xml, const c
// writeXmlElement
// ---------------------------------------------------------------------
// writes into the file "xml": "<elemName>value</elemName>"
-// the nsp is optional
+// the nsp is optional
void
writeXmlElement(textBuffer * xml, const char *elemName, const char *value, const char *nsp)
{
@@ -2221,7 +2221,7 @@ writeXmlElement(textBuffer * xml, const
// writeXmlElement_int
// ---------------------------------------------------------------------
// writes into the file "xml": "<elemName>value</elemName>"
-// the nsp is optional
+// the nsp is optional
void
writeXmlElement_int(textBuffer * xml, const char *elemName, int value, const char *nsp)
{
@@ -2279,7 +2279,7 @@ writeXmlClose(textBuffer * xml)
// ---------------------------------------------------------------------
// strcmptag
// ---------------------------------------------------------------------
-// namespace is optional argument, by default it is null; if null, then
+// namespace is optional argument, by default it is null; if null, then
// function is just like a strcmp
// returns: 0 if "fulltag" == "namespace:name"
// <0 if "fulltag" < "namespace:name"
@@ -2304,10 +2304,10 @@ strcmptag(char *fulltag, char *name, cha
// ---------------------------------------------------------------------
// convertRecordsFile_ts
// ---------------------------------------------------------------------
-// Unlike the other config files, each "rule" is actually an
+// Unlike the other config files, each "rule" is actually an
// attribute name-value pair. Instead of using the *.config file
-// to retrieve the values (no INKCfgContext) the XML
-// values are retrieved from TM's internal record arrays
+// to retrieve the values (no INKCfgContext) the XML
+// values are retrieved from TM's internal record arrays
void
convertRecordsFile_ts(char **xml_file)
{
@@ -2321,7 +2321,7 @@ convertRecordsFile_ts(char **xml_file)
}
// write as list of attributes; will fit under trafficserver root tag probably?
for (int r = 0; RecordsConfig[r].value_type != INVALID; r++) {
- if (RecordsConfig[r].required == RR_REQUIRED) { // need to write to xml
+ if (RecordsConfig[r].required == RR_REQUIRED) { // need to write to xml
// get the value of the record
memset(record, 0, 1024);
memset(value, 0, 256);
@@ -2341,7 +2341,7 @@ convertRecordsFile_ts(char **xml_file)
// convertRecordsFile_xml
// ---------------------------------------------------------------------
// Unlike other *.config files, this does not directly write a new
-// records.config. Instead, it updates TM's internal records arrays.
+// records.config. Instead, it updates TM's internal records arrays.
// (a new records.config file is created by TM when records are changed)
void
convertRecordsFile_xml(XMLNode * file_node)
@@ -2369,10 +2369,10 @@ convertRecordsFile_xml(XMLNode * file_no
// ---------------------------------------------------------------------
// createXmlSchemaRecords
// ---------------------------------------------------------------------
-// all the records are subdivided into various arrays; use these
+// all the records are subdivided into various arrays; use these
// arrays to look up the RecordElement data in RecordsElement table
// and create the Record XML schema obj;
-// A record will be an attribute of the root trafficserver tag!
+// A record will be an attribute of the root trafficserver tag!
void
createXmlSchemaRecords(char **output)
{
@@ -2398,7 +2398,7 @@ createXmlSchemaRecords(char **output)
// ---------------------------------------------------------------------
// getXmlRecType
// ---------------------------------------------------------------------
-// helper function that helps determine what the XML simple type
+// helper function that helps determine what the XML simple type
// should be used for the given RecordElement
void
getXmlRecType(struct RecordElement rec, char *buf, int buf_size)
@@ -2433,7 +2433,7 @@ getXmlRecType(struct RecordElement rec,
if (rec.regex) {
if (strcmp(rec.regex, "[0-1]") == 0) { // for [0-1] range, make into boolean type
sprintf(buf, "<xs:attribute name=\"%s\" type=\"xs:boolean\" default=\"%s\"/>", rec.name, rec.value);
- } else { // break up [x-y] into ts:range_x_y type
+ } else { // break up [x-y] into ts:range_x_y type
Tokenizer range("[]-");
if (range.Initialize(rec.regex) == 2) {
sprintf(buf, "<xs:attribute name=\"%s\" type=\"ts:range_%s_%s\" default=\"%s\"/>",
@@ -2473,11 +2473,11 @@ getXmlRecType(struct RecordElement rec,
// ---------------------------------------------------------------------
// TrafficServer_xml
// ---------------------------------------------------------------------
-// The trafficserver xml tag should be stored in a location which is
+// The trafficserver xml tag should be stored in a location which is
// passed to this function. This function will read in the trafficserver
-// xml, parse it, and convert each subsection of the xml configuration into
-// TS config files and write them to disk. Must invoke a rereadConfig
-// to indicate that a reread of the configuration files is needed.
+// xml, parse it, and convert each subsection of the xml configuration into
+// TS config files and write them to disk. Must invoke a rereadConfig
+// to indicate that a reread of the configuration files is needed.
void
TrafficServer_xml(char *filepath)
{
@@ -2501,10 +2501,10 @@ TrafficServer_xml(char *filepath)
xtree.LoadFile(filepath);
Debug("convert", "[TrafficServer_xml] convert %s to *.config files", filepath);
- // process attributes for records.config (internally updated, not to disk)
+ // process attributes for records.config (internally updated, not to disk)
convertRecordsFile_xml((XMLNode *) & xtree);
- // process the other *.config files
+ // process the other *.config files
for (int i = 0; i < xtree.getChildCount(); i++) {
file_node = xtree.getChildNode(i);
file_node->getNodeName();
@@ -2530,20 +2530,20 @@ TrafficServer_xml(char *filepath)
}
- // notify Traffic Server that config files changed
+ // notify Traffic Server that config files changed
configFiles->rereadConfig();
}
// ---------------------------------------------------------------------
// TrafficServer_ts
// ---------------------------------------------------------------------
-// Need to iterate through all the TS config files and convert them
+// Need to iterate through all the TS config files and convert them
// into XML format in order to assemble the entire TrafficServer xml tag
void
TrafficServer_ts(char **xml_file)
{
const char xml_hdr[] = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
- const char start_ts_tag[] = "<trafficserver xmlns=\"http://www.inktomi.com/CNP/trafficserver\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.inktomi.com/CNP/trafficserver cfg_sample.xsd\" \n"; // do not close the tag
+ const char start_ts_tag[] = "<trafficserver xmlns=\"http://www.inktomi.com/CNP/trafficserver\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"http://www.inktomi.com/CNP/trafficserver cfg_sample.xsd\" \n"; // do not close the tag
const char end_ts_tag[] = "</trafficserver>";
char *filename;
char *cfile = NULL;
@@ -2575,10 +2575,10 @@ TrafficServer_ts(char **xml_file)
cfile = NULL;
}
- xml.copyFrom(">\n", 2); // close trafficserver start tag
+ xml.copyFrom(">\n", 2); // close trafficserver start tag
- // order of how the config files organized in trafficserver tag is
+ // order of how the config files organized in trafficserver tag is
// determined by order listed in hashtable (build from the schema)
InkHashTableEntry *entry;
InkHashTableIteratorState iterator_state;
@@ -2603,8 +2603,8 @@ TrafficServer_ts(char **xml_file)
// FOR TESTING ONLY
//#######################################################################
-// If it hits a certain config file,it will convert the file and
-// print the results to output file xml-ts.log
+// If it hits a certain config file,it will convert the file and
+// print the results to output file xml-ts.log
int
testConvertFile_xml(XMLNode * file_node, char *file)
{
@@ -2643,14 +2643,14 @@ testConvertFile_xml(XMLNode * file_node,
// Converts the specified TS config file specified by "file" and outputs
// the xml result in file.xml. If file = "all", then all the config files
-// are converted to xml.
+// are converted to xml.
int
testConvertFile_ts(char *file)
{
char *xml_file = NULL;
const char *filename;
// Not used here.
- //INKError err;
+ //INKError err;
FILE *fp; // output file for conversion results
if (!file_info_ht)
@@ -2674,7 +2674,7 @@ testConvertFile_ts(char *file)
xml_file = NULL;
}
// convert files in alphabetical order so easy to compare
- // to template "correct" file
+ // to template "correct" file
int i = 0;
while (config_files[i]) {
filename = config_files[i];
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.h Thu May 13 07:09:39 2010
@@ -44,9 +44,9 @@ struct FileInfo
RuleConverter_xml converter_xml;
};
-/*
+/*
.._xml means the function will convert the file from xml to text format
- .._ts means the function will convert from TS's text file format to XML
+ .._ts means the function will convert from TS's text file format to XML
*/
void converterInit();
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtHashTable.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtHashTable.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtHashTable.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtHashTable.h Thu May 13 07:09:39 2010
@@ -27,7 +27,7 @@
*
* $Date: 2003-06-01 18:38:21 $
*
- *
+ *
*/
#ifndef _MGMT_HASH_TABLE_H
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.cc Thu May 13 07:09:39 2010
@@ -26,7 +26,7 @@
* MgmtPing.cc
* icmp ping class
*
- *
+ *
*/
#include "ink_config.h"
@@ -183,7 +183,7 @@ MgmtPing::pingAddress(char *addr)
// we see our own reply to another ping query. However, I'm
// already chaning alot of code in this EBF so I'm leaving this
// issue alone for now. I would have thought the icmp_id field
- // would solve this problem but if you are externally pinging an
+ // would solve this problem but if you are externally pinging an
// up address on the machine you will never find the down
// address at least on Solaris
if ((n < iphdrlen + ICMP_MINLEN) || (icp->icmp_type != ICMP_ECHOREPLY) || (icp->icmp_id != pid)) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtPing.h Thu May 13 07:09:39 2010
@@ -28,7 +28,7 @@
*
* $Date: 2007-10-05 16:56:46 $
*
- *
+ *
*/
#ifndef _MGMT_PING_H
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtSchema.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtSchema.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtSchema.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtSchema.h Thu May 13 07:09:39 2010
@@ -30,8 +30,8 @@
*
* MgmtSchema.h - Functions for interfacing to manage Traffic Server Schema
*
- *
- *
+ *
+ *
****************************************************************************/
#include "ink_hash_table.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.cc Thu May 13 07:09:39 2010
@@ -23,12 +23,12 @@
/****************************************************************************
*
- * MgmtServerRPC.cc
- *
+ * MgmtServerRPC.cc
+ *
* Deals with Traffic Manager communicating with Traffic Server's
* RAF port
*
- *
+ *
*
****************************************************************************/
@@ -47,16 +47,16 @@
#define SIZE_RESPONSE 1024
-// NOTE:
-// Usually identifiers in messages are used to identify RAF requests;
-// however, there is only one type of request being sent and per connection,
+// NOTE:
+// Usually identifiers in messages are used to identify RAF requests;
+// however, there is only one type of request being sent and per connection,
// so to keep it simple for now use the same id for all requests
// --------------------------------------------------------------------------
// raf_writen
// --------------------------------------------------------------------------
// Simple, inefficient, write line function. Takes a fd to write to, an
-// unsigned char * containing the data, and the number of bytes to write.
+// unsigned char * containing the data, and the number of bytes to write.
// Returns: num bytes not written
// -1 error
ssize_t
@@ -117,11 +117,11 @@ raf_readn(int fd, char *ptr, size_t n)
// --------------------------------------------------------------------------
// send_exit_request
// --------------------------------------------------------------------------
-// Input: the file descriptor to send the "0 exit" request to;
+// Input: the file descriptor to send the "0 exit" request to;
// will close the fd !!!!
-// Output: returns 0 if exit successful
-// returns -1 if error code is non-zero
-//
+// Output: returns 0 if exit successful
+// returns -1 if error code is non-zero
+//
int
send_exit_request(int fd)
{
@@ -167,10 +167,10 @@ Lerror:
// --------------------------------------------------------------------------
// send_cli_congest_request
// --------------------------------------------------------------------------
-// Sends the arguments in a RAF request to the Traffic Server RAF port.
+// Sends the arguments in a RAF request to the Traffic Server RAF port.
// Input: arguments - follows the "id congest ...." of RAF request
// Output: returns the socket file descriptor to read the RAF response from
-//
+//
int
send_cli_congest_request(const char *arguments)
{
@@ -200,7 +200,7 @@ send_cli_congest_request(const char *arg
Debug("raf", "[send_cli_congest_request] connect failed (%d)", connect_result);
return -1;
}
- // send RAF query request
+ // send RAF query request
memset(request, 0, 257);
snprintf(request, 256, "0 congest %s\n", arguments);
raf_writen(s, request, strlen(request));
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtServerRPC.h Thu May 13 07:09:39 2010
@@ -24,11 +24,11 @@
/****************************************************************************
*
* MgmtServerRPC.h
- *
+ *
* Deals with Traffic Manager communicating with Traffic Server's
* RAF port
*
- *
+ *
*
****************************************************************************/
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.cc Thu May 13 07:09:39 2010
@@ -26,7 +26,7 @@
* MgmtUtils.h
* Some utility and support functions for the management module.
*
- *
+ *
*/
#include "ink_unused.h" /* MAGIC_EDITING_TAG */
@@ -103,11 +103,11 @@ mgmt_readline(int soc, char *buf, int ma
} /* End mgmt_readline */
-/*
+/*
* mgmt_writeline(...)
* Simple, inefficient, write line function. Takes a soc to write to,
- * a char * containing the data, and the number of bytes to write.
- * It sends nbytes + 1 bytes worth of data, the + 1 being the newline
+ * a char * containing the data, and the number of bytes to write.
+ * It sends nbytes + 1 bytes worth of data, the + 1 being the newline
* character.
*
* Returns: num bytes not written
@@ -142,7 +142,7 @@ mgmt_writeline(int soc, const char *data
#if !defined(_WIN32)
-/*
+/*
* mgmt_read_pipe()
* - Reads from a pipe
*
@@ -184,7 +184,7 @@ mgmt_read_pipe(int fd, char *buf, int by
return bytes_read;
}
-/*
+/*
* mgmt_write_pipe()
* - Writes to a pipe
*
@@ -228,7 +228,7 @@ mgmt_write_pipe(int fd, char *buf, int b
#else
-/*
+/*
* mgmt_read_pipe()
* - Reads from a message type named pipe.
* - Blocking.
@@ -264,7 +264,7 @@ mgmt_read_pipe(HANDLE hpipe, char *buf,
return bytesRead;
}
-/*
+/*
* mgmt_write_pipe()
* - Writes to a message type named pipe.
* - Blocking.
@@ -384,7 +384,7 @@ mgmt_log(const char *message_format, ...
/*
* mgmt_log(...)
- * Same as above, but intended for errors.
+ * Same as above, but intended for errors.
*/
void
mgmt_elog(FILE * log, const char *message_format, ...)
@@ -606,7 +606,7 @@ mgmt_getAddrForIntr(char *intrName, stru
int lastlen;
int len;
- // Prevent UMRs
+ // Prevent UMRs
memset(addr, 0, sizeof(struct in_addr));
if ((fakeSocket = socket(AF_INET, SOCK_DGRAM, 0)) < 0) {
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtUtils.h Thu May 13 07:09:39 2010
@@ -28,7 +28,7 @@
*
* $Date: 2007-10-05 16:56:46 $
*
- *
+ *
*/
#ifndef _MGMT_UTILS_H
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.cc Thu May 13 07:09:39 2010
@@ -31,12 +31,12 @@
/****************************************************************************
*
* SimpleQueue.cc - a thread safe queue
- *
- *
+ *
+ *
****************************************************************************/
//
-// class SimpleQueue
+// class SimpleQueue
//
// The queue is a doublely linked list. The two operations
// permitted are add a new item to the end of the queue
@@ -65,7 +65,7 @@ SimpleQueue::SimpleQueue()
tail = NULL;
}
-//
+//
// destory the queue
//
// Does not attempt to deallocate the entries
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/SimpleQueue.h Thu May 13 07:09:39 2010
@@ -27,8 +27,8 @@
/****************************************************************************
*
* SimpleQueue.h - a thread safe queue
- *
- *
+ *
+ *
****************************************************************************/
#include <stdio.h>
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.cc Thu May 13 07:09:39 2010
@@ -38,8 +38,8 @@
*
* WebMgmtUtils.cc - Functions for interfacing to management records
*
- *
- *
+ *
+ *
****************************************************************************/
@@ -50,8 +50,8 @@
// value string to get it to the type of the local manager
// variable
//
-// returns true if the variable was successfully set
-// and false otherwise
+// returns true if the variable was successfully set
+// and false otherwise
//
bool
varSetFromStr(const char *varName, const char *value)
@@ -120,7 +120,7 @@ varSetFromStr(const char *varName, const
return found;
}
-// bool varSetFloat(const char* varName, RecFloat value)
+// bool varSetFloat(const char* varName, RecFloat value)
//
// Sets the variable specifed by varName to value. varName
// must be a RecFloat variable. No conversion is done for
@@ -172,7 +172,7 @@ varSetFloat(const char *varName, RecFloa
return found;
}
-// bool varSetCounter(const char* varName, RecCounter value)
+// bool varSetCounter(const char* varName, RecCounter value)
//
// Sets the variable specifed by varName to value. varName
// must be an RecCounter variable. No conversion is done for
@@ -222,7 +222,7 @@ varSetCounter(const char *varName, RecCo
return found;
}
-// bool varSetInt(const char* varName, RecInt value)
+// bool varSetInt(const char* varName, RecInt value)
//
// Sets the variable specifed by varName to value. varName
// must be an RecInt variable. No conversion is done for
@@ -272,7 +272,7 @@ varSetInt(const char *varName, RecInt va
return found;
}
-// bool varSetLLong(const char* varName, RecLLong value)
+// bool varSetLLong(const char* varName, RecLLong value)
//
// Sets the variable specifed by varName to value. varName
// must be an RecLLong variable. No conversion is done for
@@ -327,9 +327,9 @@ varSetLLong(const char *varName, RecLLon
// bool varCounterFromName (const char*, RecFloat* )
//
// Sets the *value to value of the varName.
-//
+//
// return true if bufVal was succefully set
-// and false otherwise
+// and false otherwise
//
bool
varCounterFromName(const char *varName, RecCounter * value)
@@ -382,9 +382,9 @@ varCounterFromName(const char *varName,
// bool varFloatFromName (const char*, RecFloat* )
//
// Sets the *value to value of the varName.
-//
+//
// return true if bufVal was succefully set
-// and false otherwise
+// and false otherwise
//
bool
varFloatFromName(const char *varName, RecFloat * value)
@@ -433,9 +433,9 @@ varFloatFromName(const char *varName, Re
// bool varIntFromName (const char*, RecInt* )
//
// Sets the *value to value of the varName.
-//
+//
// return true if bufVal was succefully set
-// and false otherwise
+// and false otherwise
//
bool
varIntFromName(const char *varName, RecInt * value)
@@ -488,9 +488,9 @@ varIntFromName(const char *varName, RecI
// bool varLLongFromName (const char*, RecLLong* )
//
// Sets the *value to value of the varName.
-//
+//
// return true if bufVal was succefully set
-// and false otherwise
+// and false otherwise
//
bool
varLLongFromName(const char *varName, RecLLong * value)
@@ -631,7 +631,7 @@ commaStrFromLLong(RecLLong bytes, char *
ink_assert(curPtr + 1 == bufVal);
}
-// void MbytesFromInt(RecInt bytes, char* bufVal)
+// void MbytesFromInt(RecInt bytes, char* bufVal)
// Converts into a string in units of megabytes
// No unit specification is added
//
@@ -645,7 +645,7 @@ MbytesFromInt(RecInt bytes, char *bufVal
sprintf(bufVal, "%lld", mBytes);
}
-// void MbytesFromLLong(RecLLong bytes, char* bufVal)
+// void MbytesFromLLong(RecLLong bytes, char* bufVal)
// Converts into a string in units of megabytes
// No unit specification is added
//
@@ -659,7 +659,7 @@ MbytesFromLLong(RecLLong bytes, char *bu
sprintf(bufVal, "%lld", mBytes);
}
-// void bytesFromInt(RecInt bytes, char* bufVal)
+// void bytesFromInt(RecInt bytes, char* bufVal)
//
// Converts mgmt into a string with one of
// GB, MB, KB, B units
@@ -696,7 +696,7 @@ bytesFromInt(RecInt bytes, char *bufVal)
}
}
-// void bytesFromLLong(RecLLong bytes, char* bufVal)
+// void bytesFromLLong(RecLLong bytes, char* bufVal)
//
// Converts mgmt into a string with one of
// GB, MB, KB, B units
@@ -730,9 +730,9 @@ bytesFromLLong(RecLLong bytes, char *buf
//
// Sets the bufVal string to the value of the local manager
// named by varName. bufLen is size of bufVal
-//
+//
// return true if bufVal was succefully set
-// and false otherwise
+// and false otherwise
//
// EVIL ALERT: overviewRecord::varStrFromName is extremely
// similar to this function except in how it gets it's
@@ -947,9 +947,9 @@ MgmtData::compareFromString(const char *
break;
case RECD_FLOAT:
compData.rec_float = atof(str);
- // HACK - There are some rounding problems with
+ // HACK - There are some rounding problems with
// floating point numbers so say we have a match if there difference
- // is small
+ // is small
floatDiff = data.rec_float - compData.rec_float;
if (floatDiff > -0.001 && floatDiff < 0.001) {
compare = true;
@@ -1038,7 +1038,7 @@ computeXactMax()
}
-// InkHashTable* processFormSubmission(char* submission)
+// InkHashTable* processFormSubmission(char* submission)
//
// A generic way to handle a HTML form submission.
// Creates a hash table with name value pairs
@@ -1099,7 +1099,7 @@ processFormSubmission(char *submission)
return nameVal;
}
-// InkHashTable* processFormSubmission_noSubstitute(char* submission)
+// InkHashTable* processFormSubmission_noSubstitute(char* submission)
//
// A generic way to handle a HTML form submission.
// Creates a hash table with name value pairs
@@ -1158,7 +1158,7 @@ processFormSubmission_noSubstitute(char
return nameVal;
}
-//
+//
// Removes any cr/lf line breaks from the text data
//
int
@@ -1271,7 +1271,7 @@ substituteForHTMLChars(const char *buffe
}
-// bool ProxyShutdown()
+// bool ProxyShutdown()
//
// Attempts to turn the proxy off. Returns
// true if the proxy is off when the call returns
@@ -1638,7 +1638,7 @@ processSpawn(const char *args[],
//-------------------------------------------------------------------------
// getFilesInDirectory
-//
+//
// copied from MultiFiles::WalkFiles - but slightly modified
// returns -1 if directory does not exit
// returns 1 if everything is ok
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/WebMgmtUtils.h Thu May 13 07:09:39 2010
@@ -31,8 +31,8 @@
*
* WebMgmtUtils.h - Functions for interfacing to management records
*
- *
- *
+ *
+ *
****************************************************************************/
#include "ink_hash_table.h"
@@ -101,7 +101,7 @@ int substituteUnsafeChars(char *buffer);
char *substituteForHTMLChars(const char *buffer);
// Produce a hash table based on a HTML form submission
-//
+//
// CALLEE deallocates hashtable
InkHashTable *processFormSubmission(char *submission);
InkHashTable *processFormSubmission_noSubstitute(char *submission);
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/XmlUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/XmlUtils.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/XmlUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/XmlUtils.cc Thu May 13 07:09:39 2010
@@ -33,8 +33,8 @@
*
* XmlUtils.cc - Functions for interfacing to XML parser (expat)
*
- *
- *
+ *
+ *
*
* This code was taken from the xmlparse library developed
* by Xing Xiong for SynText.
@@ -232,7 +232,7 @@ XMLNode::AppendChild(XMLNode * p)
m_nChildCount++;
}
-/* <pName pAttr>pValue</pName>
+/* <pName pAttr>pValue</pName>
pValue may be NULL.
pAttr may be NULL, otherwise, there is already a " " at its beginning.
*/
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/XmlUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/XmlUtils.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/XmlUtils.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/XmlUtils.h Thu May 13 07:09:39 2010
@@ -29,8 +29,8 @@
*
* XmlUtils.h - Functions for interfacing to XML parser (expat)
*
- *
- *
+ *
+ *
*
* This code was taken from the xmlparse library developed
* by Xing Xiong for SynText.
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.cc Thu May 13 07:09:39 2010
@@ -25,7 +25,7 @@
*
* IPAllow.cc - Implementation to IP Access Control systtem
*
- *
+ *
****************************************************************************/
#include "ink_config.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtAllow.h Thu May 13 07:09:39 2010
@@ -25,7 +25,7 @@
*
* MgmtAllow.h - Interface to Manager IP Access Control systtem
*
- *
+ *
****************************************************************************/
#ifndef _MGMT_ALLOW_H_
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.cc Thu May 13 07:09:39 2010
@@ -27,7 +27,7 @@
Description:
-
+
****************************************************************************/
#include "rafencode.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/MgmtRaf.h Thu May 13 07:09:39 2010
@@ -27,7 +27,7 @@
Description:
-
+
****************************************************************************/
#ifndef _MGMT_RAF_H_
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.cc Thu May 13 07:09:39 2010
@@ -24,8 +24,8 @@
/****************************************************************************
*
* WebCompatibility.cc - cross platform issues dealt with here
- *
- *
+ *
+ *
****************************************************************************/
#include "ink_config.h"
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebCompatibility.h Thu May 13 07:09:39 2010
@@ -24,8 +24,8 @@
/****************************************************************************
*
* WebCompatibility.h - cross platform issues dealt with here
- *
- *
+ *
+ *
****************************************************************************/
#ifndef _WEB_COMPATIBILITY_H_
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc Thu May 13 07:09:39 2010
@@ -49,13 +49,13 @@
//-------------------------------------------------------------------------
// convertRules
-//-------------------------------------------------------------------------
+//-------------------------------------------------------------------------
// "list" contains the indices of the invalid rules in the "rules" array
// Need to convert all the rules into displayable format and put it
-// into a buffer.
+// into a buffer.
// Return an allocated buffer containing the HTML of the invalid rules
-// that will appear in "Rule" format. Returns NULL if error.
-// Note, that it will dequeue the elements from errRules list, but will
+// that will appear in "Rule" format. Returns NULL if error.
+// Note, that it will dequeue the elements from errRules list, but will
// not free it (it is up to the caller to free the INKIntList)
//
char *
@@ -108,7 +108,7 @@ convertRules(INKFileNameT file, INKIntLi
case INK_FNAME_VADDRS:
rule = formatVaddrsRule(rules[*index]);
break;
- default: // UH-OH!!!
+ default: // UH-OH!!!
goto Lerror;
}
if (rule) {
@@ -819,14 +819,14 @@ updateCacheConfig(char *rules[], int num
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateCacheConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -880,7 +880,7 @@ updateCacheConfig(char *rules[], int num
// FIXME: lots of parsing and conversion to do - similar to CfgContextUtils.cc
// secondary specifiers
- // time
+ // time
if (strlen(tokens[3]) > 0) {
if (string_to_time_struct(tokens[3], &(pdss->sec_spec)) != INK_ERR_OKAY) {
ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
@@ -975,14 +975,14 @@ updateFilterConfig(char *rules[], int nu
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateFilterConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -1033,7 +1033,7 @@ updateFilterConfig(char *rules[], int nu
// FIXME: lots of parsing and conversion to do - similar to CfgContextUtils.cc
// secondary specifiers
- // time
+ // time
if (strlen(tokens[3]) > 0) {
if (string_to_time_struct(tokens[3], &(pdss->sec_spec)) != INK_ERR_OKAY) {
ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
@@ -1136,9 +1136,9 @@ Lerror:
//-------------------------------------------------------------------------
// updateFilterConfigPassword
//-------------------------------------------------------------------------
-// Create new rule by reading the values from the form which are specified in
+// Create new rule by reading the values from the form which are specified in
// WebConfigRender::writeFilterConfigForm(). Be sure to encrypt the password
-// and create a bind_pwd_file.
+// and create a bind_pwd_file.
int
updateFilterConfigPassword(WebHttpContext * whc, char **errBuff)
{
@@ -1157,24 +1157,24 @@ updateFilterConfigPassword(WebHttpContex
memset(ruleStr, 0, MAX_RULE_LENGTH);
- // make sure all required fields are specified
+ // make sure all required fields are specified
table_lookup_value = ink_hash_table_lookup(whc->post_data_ht, "rule_type", (void **) &rule_type);
if (!rule_type) {
- valid = false; // ERROR: this must be specified!
+ valid = false; // ERROR: this must be specified!
} else {
snprintf(ruleStr + strlen(ruleStr), MAX_RULE_LENGTH - strlen(ruleStr), "Rule Type=%s%s", rule_type, HTML_DELIM);
}
table_lookup_value = ink_hash_table_lookup(whc->post_data_ht, "pd_type", (void **) &pd_type);
if (table_lookup_value && !pd_type) {
- valid = false; // ERROR: this must be specified!
+ valid = false; // ERROR: this must be specified!
} else {
snprintf(ruleStr + strlen(ruleStr), MAX_RULE_LENGTH - strlen(ruleStr), "%s=", pd_type);
}
table_lookup_value = ink_hash_table_lookup(whc->post_data_ht, "pd_val", (void **) &pd_val);
if (table_lookup_value && !pd_val) {
- valid = false; // ERROR: this must be specified!
+ valid = false; // ERROR: this must be specified!
} else {
snprintf(ruleStr + strlen(ruleStr), MAX_RULE_LENGTH - strlen(ruleStr), "%s%s", pd_val, HTML_DELIM);
}
@@ -1222,7 +1222,7 @@ updateFilterConfigPassword(WebHttpContex
table_lookup_value = ink_hash_table_lookup(whc->post_data_ht, "hdr_type", (void **) &hdr_type);
// coverity[DEADCODE]
if (table_lookup_value && hdr_type) {
- valid = false; // ERROR: this should not be specified!
+ valid = false; // ERROR: this should not be specified!
snprintf(ruleStr + strlen(ruleStr), MAX_RULE_LENGTH - strlen(ruleStr), "Header Type=%s%s", hdr_type,
HTML_DELIM);
}
@@ -1268,14 +1268,14 @@ updateFilterConfigPassword(WebHttpContex
table_lookup_value = ink_hash_table_lookup(whc->post_data_ht, "bind_dn", (void **) &bind_dn);
if (table_lookup_value && !bind_dn) {
- valid = false; // ERROR: should have
+ valid = false; // ERROR: should have
} else {
snprintf(ruleStr + strlen(ruleStr), MAX_RULE_LENGTH - strlen(ruleStr), "Bind DN=%s%s", bind_dn, HTML_DELIM);
}
table_lookup_value = ink_hash_table_lookup(whc->post_data_ht, "bind_pwd", (void **) &bind_pwd);
if (table_lookup_value && !bind_pwd) {
- valid = false; // ERROR: should have
+ valid = false; // ERROR: should have
} else {
snprintf(ruleStr + strlen(ruleStr), MAX_RULE_LENGTH - strlen(ruleStr), "Bind Password=%s%s", bind_pwd,
HTML_DELIM);
@@ -1284,7 +1284,7 @@ updateFilterConfigPassword(WebHttpContex
if (!valid)
goto Lerror_commit;
- // add the rule to end of the file
+ // add the rule to end of the file
ctx = INKCfgContextCreate(INK_FNAME_FILTER);
if (!ctx) {
Debug("config", "[updateFilterConfigPassword] can't allocate ctx memory");
@@ -1343,7 +1343,7 @@ updateFilterConfigPassword(WebHttpContex
Debug("config", "[updateFilterConfigPassword] invalid rule - SKIP");
}
- // time
+ // time
if (time) {
if (string_to_time_struct(time, &(pdss->sec_spec)) != INK_ERR_OKAY) {
ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
@@ -1415,7 +1415,7 @@ updateFilterConfigPassword(WebHttpContex
if (bind_dn) {
ele->bind_dn = xstrdup(bind_dn);
}
- if (bind_pwd) { // encrypt the password
+ if (bind_pwd) { // encrypt the password
char *pwd_file = encryptToFileAuth_malloc(bind_pwd);
if (pwd_file) {
ele->bind_pwd_file = pwd_file;
@@ -1476,14 +1476,14 @@ updateHostingConfig(char *rules[], int n
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateHostingConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -1515,7 +1515,7 @@ updateHostingConfig(char *rules[], int n
Debug("config", "[updateHostingConfig] invalid rule - SKIP");
}
- INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
+ INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
// commit the CfgContext to write a new version of the file
@@ -1557,14 +1557,14 @@ updateIcpConfig(char *rules[], int numRu
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateIcpConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -1644,7 +1644,7 @@ updateIcpConfig(char *rules[], int numRu
}
}
- INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
+ INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
// commit the CfgContext to write a new version of the file
@@ -1687,14 +1687,14 @@ updateIpAllowConfig(char *rules[], int n
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateIpAllowConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -1704,7 +1704,7 @@ updateIpAllowConfig(char *rules[], int n
if (strlen(tokens[0]) > 0) {
ele->src_ip_addr = string_to_ip_addr_ele(tokens[0]);
}
- // ip action
+ // ip action
if (strlen(tokens[1]) > 0) {
if (strcmp(tokens[1], "ip_allow") == 0) {
ele->action = INK_IP_ALLOW_ALLOW;
@@ -1716,7 +1716,7 @@ updateIpAllowConfig(char *rules[], int n
}
}
- INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
+ INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
// commit the CfgContext to write a new version of the file
@@ -1759,14 +1759,14 @@ updateMgmtAllowConfig(char *rules[], int
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateMgmtAllowConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -1776,7 +1776,7 @@ updateMgmtAllowConfig(char *rules[], int
if (strlen(tokens[0]) > 0) {
ele->src_ip_addr = string_to_ip_addr_ele(tokens[0]);
}
- // ip action
+ // ip action
if (strlen(tokens[1]) > 0) {
if (strcmp(tokens[1], "ip_allow") == 0) {
ele->action = INK_MGMT_ALLOW_ALLOW;
@@ -1788,7 +1788,7 @@ updateMgmtAllowConfig(char *rules[], int
}
}
- INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
+ INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
// commit the CfgContext to write a new version of the file
@@ -1831,14 +1831,14 @@ updateParentConfig(char *rules[], int nu
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateParentConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -1872,7 +1872,7 @@ updateParentConfig(char *rules[], int nu
// FIXME: lots of parsing and conversion to do - similar to CfgContextUtils.cc
// secondary specifiers
- // time
+ // time
if (strlen(tokens[2]) > 0) {
if (string_to_time_struct(tokens[2], &(pdss->sec_spec)) != INK_ERR_OKAY) {
ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
@@ -1997,14 +1997,14 @@ updatePartitionConfig(char *rules[], int
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updatePartitionConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -2046,7 +2046,7 @@ updatePartitionConfig(char *rules[], int
Debug("config", "[updatePartitionConfig] invalid size format - SKIP");
}
- INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
+ INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
// commit the CfgContext to write a new version of the file
@@ -2088,14 +2088,14 @@ updateRemapConfig(char *rules[], int num
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateRemapConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -2127,7 +2127,7 @@ updateRemapConfig(char *rules[], int num
Debug("config", "[updateRemapConfig] invalid scheme - SKIP");
}
- // from host
+ // from host
if (strlen(tokens[2]) > 0) {
ele->from_host = xstrdup(tokens[2]);
} else {
@@ -2160,7 +2160,7 @@ updateRemapConfig(char *rules[], int num
Debug("config", "[updateRemapConfig] invalid scheme - SKIP");
}
- // to host
+ // to host
if (strlen(tokens[6]) > 0) {
ele->to_host = xstrdup(tokens[6]);
} else {
@@ -2228,14 +2228,14 @@ updateSocksConfig(char *rules[], int num
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateSocksConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -2337,14 +2337,14 @@ updateSplitDnsConfig(char *rules[], int
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateSplitDnsConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -2393,7 +2393,7 @@ updateSplitDnsConfig(char *rules[], int
}
}
- INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
+ INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
// commit the CfgContext to write a new version of the file
@@ -2435,14 +2435,14 @@ updateUpdateConfig(char *rules[], int nu
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateUpdateConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -2486,7 +2486,7 @@ updateUpdateConfig(char *rules[], int nu
}
}
- INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
+ INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
// commit the CfgContext to write a new version of the file
@@ -2529,14 +2529,14 @@ updateVaddrsConfig(char *rules[], int nu
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // since we want to preserve comments, we need to read in the
+ // since we want to preserve comments, we need to read in the
// file using INKCfgContextGet and remove all the rules; starting from scratch
if (INKCfgContextGet(ctx) != INK_ERR_OKAY || INKCfgContextRemoveAll(ctx) != INK_ERR_OKAY) {
Debug("config", "[updateVaddrsConfig] Failed to Get and Clear CfgContext");
err = WEB_HTTP_ERR_FAIL;
goto Lerror;
}
- // create Ele's by parsing the rules in the rules array
+ // create Ele's by parsing the rules in the rules array
// insert the Ele's into a Cfg Context; if get invalid formatted rule, just skip it
for (i = 0; i < numRules; i++) {
tokens.Initialize(rules[i], ALLOW_EMPTY_TOKS);
@@ -2566,7 +2566,7 @@ updateVaddrsConfig(char *rules[], int nu
Debug("config", "[updateVaddrsConfig] invalid sub-interface - SKIP");
}
- INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
+ INKCfgContextAppendEle(ctx, (INKCfgEle *) ele); // add new ele to end of list
}
// commit the CfgContext to write a new version of the file
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h?rev=943821&r1=943820&r2=943821&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.h Thu May 13 07:09:39 2010
@@ -22,10 +22,10 @@
*/
/****************************************************************************
- * WebConfig.h - code to process config file editor requests, and
+ * WebConfig.h - code to process config file editor requests, and
* create responses
*
- *
+ *
****************************************************************************/
#ifndef _WEB_CONFIG_H_