trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1059430 [3/5] - in /trafficserver/traffic/trunk/proxy/mgmt: cli/ html2/ html2/images/ web2/
Date Sun, 16 Jan 2011 01:16:40 GMT
Modified: trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfigRender.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfigRender.h?rev=1059430&r1=1059429&r2=1059430&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfigRender.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/web2/WebConfigRender.h Sun Jan 16 01:16:39 2011
@@ -33,120 +33,37 @@
 #define _WEB_CONFIG_RENDER_H_
 
 #include "TextBuffer.h"
-#include "WebHttpContext.h"
 
 #include "P_RecCore.h"
 
-int writeCacheConfigTable(WebHttpContext * whc);
 int writeCacheRuleList(textBuffer * output);
-int writeCacheConfigForm(WebHttpContext * whc);
 
-int writeHostingConfigTable(WebHttpContext * whc);
 int writeHostingRuleList(textBuffer * output);
-int writeHostingConfigForm(WebHttpContext * whc);
 
-int writeIcpConfigTable(WebHttpContext * whc);
 int writeIcpRuleList(textBuffer * output);
-int writeIcpConfigForm(WebHttpContext * whc);
 
-int writeIpAllowConfigTable(WebHttpContext * whc);
 int writeIpAllowRuleList(textBuffer * output);
-int writeIpAllowConfigForm(WebHttpContext * whc);
 
-int writeMgmtAllowConfigTable(WebHttpContext * whc);
-int writeMgmtAllowRuleList(textBuffer * output);
-int writeMgmtAllowConfigForm(WebHttpContext * whc);
-
-int writeParentConfigTable(WebHttpContext * whc);
 int writeParentRuleList(textBuffer * output);
-int writeParentConfigForm(WebHttpContext * whc);
 
-int writePartitionConfigTable(WebHttpContext * whc);
 int writePartitionRuleList(textBuffer * output);
-int writePartitionConfigForm(WebHttpContext * whc);
 
-int writeRemapConfigTable(WebHttpContext * whc);
 int writeRemapRuleList(textBuffer * output);
-int writeRemapConfigForm(WebHttpContext * whc);
 
-int writeSocksConfigTable(WebHttpContext * whc);
 int writeSocksRuleList(textBuffer * output);
-int writeSocksConfigForm(WebHttpContext * whc);
 
-int writeSplitDnsConfigTable(WebHttpContext * whc);
 int writeSplitDnsRuleList(textBuffer * output);
-int writeSplitDnsConfigForm(WebHttpContext * whc);
 
-int writeUpdateConfigTable(WebHttpContext * whc);
 int writeUpdateRuleList(textBuffer * output);
-int writeUpdateConfigForm(WebHttpContext * whc);
 
-int writeVaddrsConfigTable(WebHttpContext * whc);
 int writeVaddrsRuleList(textBuffer * output);
-int writeVaddrsConfigForm(WebHttpContext * whc);
 
-int writeSecondarySpecsForm(WebHttpContext * whc, INKFileNameT file);
 int writeSecondarySpecsTableElem(textBuffer * output, char *time, char *src_ip, char *prefix,
char *suffix, char *port,
                                  char *method, char *scheme, char *mixt);
 
 
 // -------------------- CONVERSION FUNCTIONS ------------------------------
 
-int convert_cache_ele_to_html_format(INKCacheEle * ele,
-                                     char *ruleType,
-                                     char *pdType,
-                                     char *time,
-                                     char *src_ip,
-                                     char *prefix,
-                                     char *suffix,
-                                     char *port, char *method, char *scheme, char *time_period,
char *mixt);
-
-int convert_hosting_ele_to_html_format(INKHostingEle * ele, char *pdType, char *partitions);
-
-int convert_icp_ele_to_html_format(INKIcpEle * ele,
-                                   char *name,
-                                   char *host_ip,
-                                   char *peer_type,
-                                   char *proxy_port, char *icp_port, char *mc_state, char
*mc_ip, char *mc_ttl);
-
-int convert_ip_allow_ele_to_html_format(INKIpAllowEle * ele, char *src_ip, char *action);
-
-int convert_mgmt_allow_ele_to_html_format(INKMgmtAllowEle * ele, char *src_ip, char *action);
-
-int convert_parent_ele_to_html_format(INKParentProxyEle * ele,
-                                      char *pdType,
-                                      char *time,
-                                      char *src_ip,
-                                      char *prefix,
-                                      char *suffix,
-                                      char *port,
-                                      char *method,
-                                      char *scheme, char *mixt, char *parents, char *round_robin,
char *direct);
-
-int convert_partition_ele_to_html_format(INKPartitionEle * ele,
-                                         char *part_num, char *scheme, char *size, char *size_fmt);
-
-int convert_remap_ele_to_html_format(INKRemapEle * ele,
-                                     char *rule_type,
-                                     char *from_scheme, char *from_port, char *from_path,
-                                     char *to_scheme, char *to_port, char *to_path, char
*mixt);
-
-int convert_socks_ele_to_html_format(INKSocksEle * ele,
-                                     char *rule_type, char *dest_ip, char *user, char *passwd,
char *servers, char *rr);
-
-int convert_split_dns_ele_to_html_format(INKSplitDnsEle * ele,
-                                         char *pdType, char *dns_server, char *def_domain,
char *search_list);
-
-int convert_update_ele_to_html_format(INKUpdateEle * ele, char *hdrs, char *offset, char
*interval, char *depth);
-
-int convert_virt_ip_addr_ele_to_html_format(INKVirtIpAddrEle * ele, char *ip, char *sub_intr);
-
-int convert_pdss_to_html_format(INKPdSsFormat info,
-                                char *pdType,
-                                char *time,
-                                char *src_ip,
-                                char *prefix, char *suffix, char *port, char *method, char
*scheme, char *mixt);
-
 //------------------------- SELECT FUNCTIONS ------------------------------
 
 void writeRuleTypeSelect_cache(textBuffer * html, const char *listName);

Modified: trafficserver/traffic/trunk/proxy/mgmt/web2/WebGlobals.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt/web2/WebGlobals.h?rev=1059430&r1=1059429&r2=1059430&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt/web2/WebGlobals.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt/web2/WebGlobals.h Sun Jan 16 01:16:39 2011
@@ -45,7 +45,6 @@
 
 #include "ink_mutex.h"
 #include "MgmtHashTable.h"
-#include "WebHttpAuth.h"
 
 extern "C"
 {
@@ -92,22 +91,6 @@ struct serviceThr_t
 //  since prior transactions in the system will STILL
 //  BE USING the memory pointed to.
 //
-struct WebContext
-{
-  const char *defaultFile;
-  char *docRoot;
-  int docRootLen;
-  char *pluginDocRoot;
-  int pluginDocRootLen;
-  int adminAuthEnabled;
-  WebHttpAuthUser admin_user;   // admin user (always available)
-  MgmtHashTable *other_users_ht;        // other users (can change dynamically)
-  MgmtHashTable *lang_dict_ht;  // language dictionary (tag to string)
-  int SSLenabled;
-  int AdvUIEnabled;             /* 0=Simple UI, 1=Full UI, 2=RNI UI */
-  int FeatureSet;               /* bit field of features */
-  ssl_ctx_st *SSL_Context;
-};
 
 struct WebInterFaceGlobals
 {
@@ -128,8 +111,6 @@ struct WebInterFaceGlobals
 };
 
 extern WebInterFaceGlobals wGlobals;
-extern WebContext adminContext;
-extern WebContext autoconfContext;
 
 #define MAX_SERVICE_THREADS 100
 #define MAX_VAR_LENGTH      256
@@ -165,11 +146,5 @@ extern WebContext autoconfContext;
 #define WEB_MAX_PAGE_QUERY_LEN             (32+1)
 #define WEB_MAX_EDIT_FILE_SIZE             (32*1024)    // Some browsers limit you to this
 
-struct WebHttpConInfo
-{
-  int fd;
-  WebContext *context;
-  sockaddr_in *clientInfo;
-};
 
 #endif



Mime
View raw message