You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/09/17 18:58:42 UTC
svn commit: r998201 [1/4] - in /trafficserver/traffic/trunk:
contrib/perl/AdminClient/lib/Apache/TS/ doc/man/ librecords/ proxy/
proxy/api/ts/ proxy/config/ proxy/logging/ proxy/mgmt2/ proxy/mgmt2/api2/
proxy/mgmt2/api2/include/ proxy/mgmt2/api2/remote...
Author: zwoop
Date: Fri Sep 17 16:58:40 2010
New Revision: 998201
URL: http://svn.apache.org/viewvc?rev=998201&view=rev
Log:
TS-443 Cleanup remnants of MIXT and LDAP/NTLM.
Removed:
trafficserver/traffic/trunk/doc/man/config_ldap.1
trafficserver/traffic/trunk/doc/man/config_ntlm.1
trafficserver/traffic/trunk/doc/man/config_qt.1
trafficserver/traffic/trunk/doc/man/config_radius.1
trafficserver/traffic/trunk/doc/man/config_rni.1
trafficserver/traffic/trunk/doc/man/config_wmt.1
trafficserver/traffic/trunk/doc/man/show_ldap-stats.1
trafficserver/traffic/trunk/doc/man/show_ldap.1
trafficserver/traffic/trunk/doc/man/show_ntlm-stats.1
trafficserver/traffic/trunk/doc/man/show_ntlm.1
trafficserver/traffic/trunk/doc/man/show_qt-stats.1
trafficserver/traffic/trunk/doc/man/show_qt.1
trafficserver/traffic/trunk/doc/man/show_radius.1
trafficserver/traffic/trunk/doc/man/show_rni-stats.1
trafficserver/traffic/trunk/doc/man/show_rni.1
trafficserver/traffic/trunk/doc/man/show_wmt-stats.1
trafficserver/traffic/trunk/doc/man/show_wmt.1
trafficserver/traffic/trunk/proxy/api/ts/InkAPIaaa.h
trafficserver/traffic/trunk/proxy/config/ldapsrvr.config
trafficserver/traffic/trunk/proxy/config/policy_config.xml
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/RemoteTestOem.cc
Modified:
trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
trafficserver/traffic/trunk/doc/man/Makefile.am
trafficserver/traffic/trunk/librecords/test_RecTree.cc
trafficserver/traffic/trunk/proxy/CoreUtils.cc
trafficserver/traffic/trunk/proxy/CoreUtils.h
trafficserver/traffic/trunk/proxy/DynamicStats.h
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/InkAPITest.cc
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/Makefile.am
trafficserver/traffic/trunk/proxy/api/ts/ts.h
trafficserver/traffic/trunk/proxy/config/stats.config.xml
trafficserver/traffic/trunk/proxy/logging/LogConfig.cc
trafficserver/traffic/trunk/proxy/logging/LogConfig.h
trafficserver/traffic/trunk/proxy/mgmt2/Alarms.cc
trafficserver/traffic/trunk/proxy/mgmt2/Alarms.h
trafficserver/traffic/trunk/proxy/mgmt2/LocalManager.cc
trafficserver/traffic/trunk/proxy/mgmt2/Main.cc
trafficserver/traffic/trunk/proxy/mgmt2/RecordsConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/StatAggregation.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextUtils.h
trafficserver/traffic/trunk/proxy/mgmt2/api2/INKMgmtAPI.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
trafficserver/traffic/trunk/proxy/mgmt2/api2/remote/APITestCliRemote.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli/CLImonitor.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/CliCreateCommands.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.h
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.cc
trafficserver/traffic/trunk/proxy/mgmt2/cli2/ShowCmd.h
trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_detailed_command_list.txt
trafficserver/traffic/trunk/proxy/mgmt2/cli2/cli_feature_spec.txt
trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml
trafficserver/traffic/trunk/proxy/mgmt2/html2/navigation_tree.xml.win
trafficserver/traffic/trunk/proxy/mgmt2/html2/tune/navigation_tree.xmlcpp
trafficserver/traffic/trunk/proxy/mgmt2/uistats
trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.h
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebOverview.cc
trafficserver/traffic/trunk/proxy/sac.cc
trafficserver/traffic/trunk/proxy/ts-instantiate.pl
trafficserver/traffic/trunk/rc/update_records.cc
trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c
Modified: trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm (original)
+++ trafficserver/traffic/trunk/contrib/perl/AdminClient/lib/Apache/TS/AdminClient.pm Fri Sep 17 16:58:40 2010
@@ -183,22 +183,6 @@ get to this information, traffic_line is
The Apache Traffic Server Administration Manual will explain what these strings represent. (http://trafficserver.apache.org/docs/)
- proxy.config.aaa.billing.event_file_location
- proxy.config.aaa.billing.install_directory
- proxy.config.aaa.billing.machine_name
- proxy.config.aaa.billing.reporting_interval
- proxy.config.aaa.hashtable.size
- proxy.config.aaa.radius.acct_port
- proxy.config.aaa.radius.auth_port
- proxy.config.aaa.radius.database_path
- proxy.config.aaa.radius.is_proxy
- proxy.config.aaa.radius.log_path
- proxy.config.aaa.radius.max_retries
- proxy.config.aaa.radius.min_timeout
- proxy.config.aaa.radius.radius_server_acct_port
- proxy.config.aaa.radius.radius_server_auth_port
- proxy.config.aaa.radius.radius_server_ip
- proxy.config.aaa.radius.radius_server_key
proxy.config.accept_threads
proxy.config.admin.access_control_file
proxy.config.admin.admin_password
@@ -267,7 +251,6 @@ The Apache Traffic Server Administration
proxy.config.cache.partition_filename
proxy.config.cache.permit.pinning
proxy.config.cache.ram_cache_cutoff
- proxy.config.cache.ram_cache_mixt_cutoff
proxy.config.cache.ram_cache.size
proxy.config.cache.select_alternate
proxy.config.cache.storage_filename
@@ -526,30 +509,6 @@ The Apache Traffic Server Administration
proxy.config.icp.reply_to_unknown_peer
proxy.config.icp.stale_icp_enabled
proxy.config.io.max_buffer_size
- proxy.config.ldap.auth.bound_attr_search
- proxy.config.ldap.auth.bypass.enabled
- proxy.config.ldap.auth.enabled
- proxy.config.ldap.auth.multiple.ldap_servers.config.file
- proxy.config.ldap.auth.multiple.ldap_servers.enabled
- proxy.config.ldap.auth.periodic.timeout.interval
- proxy.config.ldap.auth.purge_cache_on_auth_fail
- proxy.config.ldap.auth.query.timeout
- proxy.config.ldap.auth.redirect_url
- proxy.config.ldap.auth.ttl_value
- proxy.config.ldap.cache.filename
- proxy.config.ldap.cache.size
- proxy.config.ldap.cache.storage_path
- proxy.config.ldap.cache.storage_size
- proxy.config.ldap.proc.ldap.attribute.name
- proxy.config.ldap.proc.ldap.attribute.value
- proxy.config.ldap.proc.ldap.base.dn
- proxy.config.ldap.proc.ldap.server.bind_dn
- proxy.config.ldap.proc.ldap.server.bind_pwd
- proxy.config.ldap.proc.ldap.server.name
- proxy.config.ldap.proc.ldap.server.port
- proxy.config.ldap.proc.ldap.uid_filter
- proxy.config.ldap.secure.bind.enabled
- proxy.config.ldap.secure.cert.db.path
proxy.config.lm.pserver_timeout_msecs
proxy.config.lm.pserver_timeout_secs
proxy.config.lm.sem_id
@@ -604,7 +563,6 @@ The Apache Traffic Server Administration
proxy.config.log2.search_url_filter
proxy.config.log2.separate_host_logs
proxy.config.log2.separate_icp_logs
- proxy.config.log2.separate_mixt_logs
proxy.config.log2.space_used_frequency
proxy.config.log2.squid_log_enabled
proxy.config.log2.squid_log_header
@@ -614,14 +572,6 @@ The Apache Traffic Server Administration
proxy.config.log2.xml_logs_config
proxy.config.manager_binary
proxy.config.manager_name
- proxy.config.mixt.mp3.enabled
- proxy.config.mixt.mp3.port
- proxy.config.mixt.push.enabled
- proxy.config.mixt.push.password
- proxy.config.mixt.push.port
- proxy.config.mixt.push.verbosity
- proxy.config.mixt.rtsp_proxy_port
- proxy.config.mixt.wmtmcast.enabled
proxy.config.net.accept_throttle
proxy.config.net.connections_throttle
proxy.config.net.enable_ink_disk_io
@@ -647,25 +597,6 @@ The Apache Traffic Server Administration
proxy.config.net.sock_send_buffer_size_out
proxy.config.net.tcp_accept_defer_timeout
proxy.config.net.throttle_enabled
- proxy.config.ntlm.allow_guest_login
- proxy.config.ntlm.auth.enabled
- proxy.config.ntlm.cache.enabled
- proxy.config.ntlm.cache.filename
- proxy.config.ntlm.cache.size
- proxy.config.ntlm.cache.storage_path
- proxy.config.ntlm.cache.storage_size
- proxy.config.ntlm.cache.ttl_value
- proxy.config.ntlm.dc.fail_threshold
- proxy.config.ntlm.dc.list
- proxy.config.ntlm.dc.load_balance
- proxy.config.ntlm.dc.max_connections
- proxy.config.ntlm.dc.max_conn_time
- proxy.config.ntlm.dc.retry_time
- proxy.config.ntlm.fail_open
- proxy.config.ntlm.nt_domain
- proxy.config.ntlm.nt_host
- proxy.config.ntlm.queue_len
- proxy.config.ntlm.req_timeout
proxy.config.output.logfile
proxy.config.ping.npacks_to_trans
proxy.config.ping.timeout_sec
@@ -695,32 +626,6 @@ The Apache Traffic Server Administration
proxy.config.proxy_binary
proxy.config.proxy_binary_opts
proxy.config.proxy_name
- proxy.config.qt.digest_masquerade.enabled
- proxy.config.qt.enabled
- proxy.config.qt.live_splitter.enabled
- proxy.config.qt.media_bridge.monitor.name
- proxy.config.qt.media_bridge.monitor.port
- proxy.config.qt.media_bridge.mount_point
- proxy.config.qt.media_bridge.name
- proxy.config.qt.media_bridge.port
- proxy.config.qt.tunnel_rni_req
- proxy.config.radius.auth.enabled
- proxy.config.radius.auth.max_retries
- proxy.config.radius.auth.min_timeout
- proxy.config.radius.auth.purge_cache_on_auth_fail
- proxy.config.radius.auth.ttl_value
- proxy.config.radius.cache.size
- proxy.config.radius.cache.storage_size
- proxy.config.radius.proc.radius.primary_server.acct_port
- proxy.config.radius.proc.radius.primary_server.auth_port
- proxy.config.radius.proc.radius.primary_server.name
- proxy.config.radius.proc.radius.primary_server.shared_key
- proxy.config.radius.proc.radius.primary_server.shared_key_file
- proxy.config.radius.proc.radius.secondary_server.acct_port
- proxy.config.radius.proc.radius.secondary_server.auth_port
- proxy.config.radius.proc.radius.secondary_server.name
- proxy.config.radius.proc.radius.secondary_server.shared_key
- proxy.config.radius.proc.radius.secondary_server.shared_key_file
proxy.config.raf.enabled
proxy.config.raf.manager.enabled
proxy.config.raf.manager.port
@@ -736,21 +641,6 @@ The Apache Traffic Server Administration
proxy.config.res_track_memory
proxy.config.reverse_proxy.enabled
proxy.config.reverse_proxy.oldasxbehavior
- proxy.config.rni.auth_port
- proxy.config.rni.cache_port
- proxy.config.rni.control_port
- proxy.config.rni.enabled
- proxy.config.rni.proxy_cache_dir
- proxy.config.rni.proxy_pid_path
- proxy.config.rni.proxy_port
- proxy.config.rni.proxy_restart_cmd
- proxy.config.rni.proxy_restart_interval
- proxy.config.rni.proxy_service_name
- proxy.config.rni.rpass_restart_cmd
- proxy.config.rni.rpass_watcher_enabled
- proxy.config.rni.upstream_cache_port
- proxy.config.rni.verbosity
- proxy.config.rni.watcher_enabled
proxy.config.server_name
proxy.config.snapshot_dir
proxy.config.snmp.master_agent_enabled
@@ -845,45 +735,6 @@ The Apache Traffic Server Administration
proxy.config.vmap.down_up_timeout
proxy.config.vmap.enabled
proxy.config.watch_script
- proxy.config.wmt.admin_only_mcast_start
- proxy.config.wmt.asx_cache.enabled
- proxy.config.wmt.asx_rewrite.enabled
- proxy.config.wmt.chunksize_sec
- proxy.config.wmt.debug_level
- proxy.config.wmt.debug.maxgap
- proxy.config.wmt.debug_tags.enabled
- proxy.config.wmt.enabled
- proxy.config.wmt.file_attribute_mask
- proxy.config.wmt.http.enabled
- proxy.config.wmt.http.proxyonly
- proxy.config.wmt.inactivity_timeout
- proxy.config.wmt.loadhost
- proxy.config.wmt.loadpath
- proxy.config.wmt.log_http_intercept
- proxy.config.wmt.log_per_client
- proxy.config.wmt.loopback.enabled
- proxy.config.wmt.max_rexmit_memory
- proxy.config.wmt.media_bridge.livehosts
- proxy.config.wmt.media_bridge.monitor.livehosts
- proxy.config.wmt.media_bridge.monitor.name
- proxy.config.wmt.media_bridge.monitor.port
- proxy.config.wmt.media_bridge.monitor.version
- proxy.config.wmt.media_bridge.mount_point
- proxy.config.wmt.media_bridge.name
- proxy.config.wmt.media_bridge.port
- proxy.config.wmt.media_bridge.version
- proxy.config.wmt.mem_startdrop_mb
- proxy.config.wmt.ntlm.domain
- proxy.config.wmt.ntlm.host
- proxy.config.wmt.old_splitter_logging
- proxy.config.wmt.port
- proxy.config.wmt.post_wait_time
- proxy.config.wmt.prebuffering_ms
- proxy.config.wmt.prebuffering_ms_tcp
- proxy.config.wmt.proxyonly
- proxy.config.wmt.redirect.enabled
- proxy.config.wmt.tcp_backlog_behavior
- proxy.config.wmt.tcp_max_backlog_sec
=head1 LICENSE
Modified: trafficserver/traffic/trunk/doc/man/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/doc/man/Makefile.am?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/doc/man/Makefile.am (original)
+++ trafficserver/traffic/trunk/doc/man/Makefile.am Fri Sep 17 16:58:40 2010
@@ -28,19 +28,14 @@ man_MANS = \
config_hostdb.1 \
config_http.1 \
config_icp.1 \
- config_ldap.1 \
config_logging.1 \
config_name.1 \
config_network.1 \
- config_ntlm.1 \
config_parent.1 \
config_port-tunnels.1 \
- config_qt.1 \
- config_radius.1 \
config_remap.1 \
config_reset-stats.1 \
config_restart.1 \
- config_rni.1 \
config_root.1 \
config_scheduled-update.1 \
config_security.1 \
@@ -52,7 +47,6 @@ man_MANS = \
config_stop.1 \
config_upgrade.1 \
config_virtual-ip.1 \
- config_wmt.1 \
disable.1 \
enable.1 \
exit.1 \
@@ -70,23 +64,14 @@ man_MANS = \
show_http-trans-stats.1 \
show_icp.1 \
show_icp-stats.1 \
- show_ldap.1 \
- show_ldap-stats.1 \
show_logging.1 \
show_logging-stats.1 \
show_network.1 \
- show_ntlm.1 \
- show_ntlm-stats.1 \
show_parent.1 \
show_port-tunnels.1 \
show_proxy.1 \
show_proxy-stats.1 \
- show_qt.1 \
- show_qt-stats.1 \
- show_radius.1 \
show_remap.1 \
- show_rni.1 \
- show_rni-stats.1 \
show_scheduled-update.1 \
show_security.1 \
show_snmp.1 \
@@ -95,6 +80,4 @@ man_MANS = \
show_status.1 \
show_version.1 \
show_virtual-ip.1 \
- show_wmt.1 \
- show_wmt-stats.1 \
traffic_shell.1
Modified: trafficserver/traffic/trunk/librecords/test_RecTree.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/librecords/test_RecTree.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/librecords/test_RecTree.cc (original)
+++ trafficserver/traffic/trunk/librecords/test_RecTree.cc Fri Sep 17 16:58:40 2010
@@ -54,10 +54,6 @@ main(int argc, char **argv)
printf("\n");
new_rec_tree->rec_tree_insert("proxy.node.http.hitrate");
printf("\n");
- new_rec_tree->rec_tree_insert("proxy.node.rni.client.connections");
- printf("\n");
- new_rec_tree->rec_tree_insert("proxy.node.rni.server.connections");
- printf("\n");
new_rec_tree->print();
/* Test getting subtree */
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.cc (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.cc Fri Sep 17 16:58:40 2010
@@ -144,15 +144,6 @@ int program_counter = 0;
#include "EventName.h"
-#ifdef READ_CORE_WMT
-#include "WMT-Debug.h"
-#include "WMT-ServerFileSM.h"
-#include "WMT-SM.h"
-#include "TunnelSM.h"
-#include "WMT-ClientServer.h"
-#include "WMT-Datapump.h"
-#endif
-
#include "http2/HttpSM.h"
bool inTable;
@@ -164,14 +155,6 @@ const int HDR_HEAP_HDR_SIZE = ROUND(size
HTTPHdrImpl *global_http;
HttpSM *last_seen_http_sm = NULL;
-#ifdef READ_CORE_WMT
-WMT_ServerFileSM *last_seen_wmt_sfsm = NULL;
-WMT_Top *last_seen_wmt_top = NULL;
-TunnelSM *last_seen_wmt_tunnel = NULL;
-WMT_ClientServer *last_seen_wmt_cssm = NULL;
-WMT_Datapump *last_seen_wmt_pump = NULL;
-#endif
-
char ethread_ptr_str[256] = "";
char netvc_ptr_str[256] = "";
@@ -633,88 +616,6 @@ CoreUtils::test_HttpSM(void *arg)
}
}
-
-#ifdef READ_CORE_WMT
-void
-CoreUtils::test_wmtTop(void *arg)
-{
- WMT_Top *top_test = (WMT_Top *) arg;
-
- int *magic_ptr = (int *) (&top_test->m_magic);
- int magic = 0;
-
- if (read_from_core((intptr_t) magic_ptr, sizeof(int), (char *) &magic) != 0) {
- if (magic == WMT_TOP_MAGIC_ALIVE || magic == WMT_TOP_MAGIC_PENDING || magic == WMT_TOP_MAGIC_DEAD) {
- process_WmtTop(top_test);
- }
- }
-}
-
-void
-CoreUtils::test_wmtTunnel(void *arg)
-{
- TunnelSM *tunnel_test = (TunnelSM *) arg;
-
- int *magic_ptr = (int *) (&tunnel_test->m_magic);
- int magic = 0;
-
- if (read_from_core((intptr_t) magic_ptr, sizeof(int), (char *) &magic) != 0) {
- if (magic == WMT_TUNNEL_MAGIC_ALIVE || magic == WMT_TUNNEL_MAGIC_PENDING || magic == WMT_TUNNEL_MAGIC_DEAD) {
- process_WmtTunnel(tunnel_test);
- }
- }
-}
-
-
-
-void
-CoreUtils::test_wmtServerFile(void *arg)
-{
- WMT_ServerFileSM *wsfsm_test = (WMT_ServerFileSM *) arg;
-
- int *magic_ptr = (int *) (&wsfsm_test->m_magic);
- int magic = 0;
-
- if (read_from_core((intptr_t) magic_ptr, sizeof(int), (char *) &magic) != 0) {
- if (magic == WMT_SERVERF_MAGIC_ALIVE || magic == WMT_SERVERF_MAGIC_PENDING || magic == WMT_SERVERF_MAGIC_DEAD) {
- process_WmtServerFileSM(wsfsm_test);
- }
- }
-}
-
-void
-CoreUtils::test_wmtClientServer(void *arg)
-{
- WMT_ClientServer *wcs_test = (WMT_ClientServer *) arg;
-
- int *magic_ptr = (int *) (&wcs_test->m_magic);
- int magic = 0;
-
- if (read_from_core((intptr_t) magic_ptr, sizeof(int), (char *) &magic) != 0) {
- if (magic == WMT_CLISERV_MAGIC_ALIVE || magic == WMT_CLISERV_MAGIC_PENDING || magic == WMT_CLISERV_MAGIC_DEAD) {
- process_WmtClientServer(wcs_test);
- }
- }
-}
-
-
-void
-CoreUtils::test_wmtDatapump(void *arg)
-{
- WMT_Datapump *wdp_test = (WMT_Datapump *) arg;
-
- int *magic_ptr = (int *) (&wdp_test->m_magic);
- int magic = 0;
-
- if (read_from_core((intptr_t) magic_ptr, sizeof(int), (char *) &magic) != 0) {
- if (magic == WMT_DATAPUMP_MAGIC_ALIVE || magic == WMT_DATAPUMP_MAGIC_PENDING || magic == WMT_DATAPUMP_MAGIC_DEAD) {
- process_WmtDatapump(wdp_test);
- }
- }
-}
-#endif /* READ_CORE_WMT */
-
-
void
CoreUtils::process_HttpSM(HttpSM * core_ptr)
{
@@ -1125,317 +1026,6 @@ CoreUtils::process_NetVC(UnixNetVConnect
}
-#ifdef READ_CORE_WMT
-void
-CoreUtils::process_WmtServerFileSM(WMT_ServerFileSM * wsfm_test)
-{
-
- if (last_seen_wmt_sfsm != wsfm_test) {
- last_seen_wmt_sfsm = wsfm_test;
- char *buf = (char *) malloc(sizeof(char) * sizeof(WMT_ServerFileSM));
-
- if (read_from_core((int) wsfm_test, sizeof(WMT_ServerFileSM), buf) != -1) {
- WMT_ServerFileSM *loaded_sf = (WMT_ServerFileSM *) buf;
-
- printf("---- Found WMT-ServerFileSM @ 0x%X -----\n\n", wsfm_test);
-
- printf(" Magic Number 0x%X ---- \n", loaded_sf->m_magic);
-
- char *host = load_string(loaded_sf->m_server_host);
- int port = loaded_sf->m_server_port;
- char *filename = load_string(loaded_sf->m_filename);
- int ip = loaded_sf->m_ip;
-
- printf(" Host: %s Ip: %u.%u.%u.%u, Port %d, File %s\n",
- host,
- ((unsigned char *) &ip)[0],
- ((unsigned char *) &ip)[1], ((unsigned char *) &ip)[2], ((unsigned char *) &ip)[3], port, filename);
-
- xfree(host);
- xfree(filename);
-
- printf(" m_sm: 0X%X m_op: 0X%X\n", loaded_sf->m_sm.m_MixtPtr, loaded_sf->m_op);
- printf(" m_fileid: %d, m_playIncarnation: %d\n", (int) loaded_sf->m_fileid, (int) loaded_sf->m_playIncarnation);
- printf(" m_previous_op %d, m_connectReadblockPhaseDone: %d\n\n",
- (int) loaded_sf->m_previous_op, (int) loaded_sf->m_connectReadblockPhaseDone);
-
-
- if (loaded_sf->m_magic == WMT_SERVERF_MAGIC_ALIVE || loaded_sf->m_magic == WMT_SERVERF_MAGIC_PENDING) {
- wmt_dump_history(&loaded_sf->m_history);
-
- printf(" MasterSM @ 0x%X\n\n", loaded_sf->m_mastersm.m_MixtPtr);
- test_wmtTop(loaded_sf->m_mastersm.m_MixtPtr);
- test_wmtTunnel(loaded_sf->m_mastersm.m_MixtPtr);
- test_wmtClientServer(loaded_sf->m_sm.m_MixtPtr);
- }
- }
-
- free(buf);
- }
-}
-
-static void
-process_afheader(char *af)
-{
-
- // Try to load the AF header from the pdu
- char *hptr = af;
- if (hptr) {
- AF_HEADER_TYPE0 *loaded_af = (AF_HEADER_TYPE0 *) malloc(sizeof(AF_HEADER_TYPE0));
- if (CoreUtils::read_from_core((int) hptr, sizeof(AF_HEADER_TYPE0), (char *) loaded_af) != -1) {
- printf(" AF_HEADER_TYPE0\n");
- printf(" PacketId: %d BlockId: %d\n",
- (int) (LE_TO_SHORT(loaded_af->id.PacketId)), (int) (LE_TO_SHORT(loaded_af->id.BlockId)));
- printf(" Incarnation: %d AFFlags: %d\n", (int) loaded_af->Incarnation, (int) loaded_af->AFFlags);
- printf(" PacketSize: %d\n", (int) (LE_TO_SHORT(loaded_af->PacketSize)));
- }
- free(loaded_af);
- }
-}
-
-static INCONTROLMSG_ENC *
-get_control_msg_in(char *cmsg)
-{
-
- // Try to load the control msg from the pdu
- char *msg_ptr = cmsg;
- if (msg_ptr) {
- INCONTROLMSG_ENC *loaded_msg = (INCONTROLMSG_ENC *) malloc(sizeof(INCONTROLMSG_ENC));
- if (CoreUtils::read_from_core((int) msg_ptr, sizeof(INCONTROLMSG_ENC), (char *) loaded_msg) != -1) {
- return loaded_msg;
- }
- free(loaded_msg);
- }
-
- return NULL;
-}
-
-static OUTCONTROLMSG *
-get_control_msg_out(char *cmsg)
-{
-
- // Try to load the control msg from the pdu
- char *msg_ptr = cmsg;
- if (msg_ptr) {
- OUTCONTROLMSG *loaded_msg = (OUTCONTROLMSG *) malloc(sizeof(OUTCONTROLMSG));
- if (CoreUtils::read_from_core((int) msg_ptr, sizeof(OUTCONTROLMSG), (char *) loaded_msg) != -1) {
- return loaded_msg;
- }
- free(loaded_msg);
- }
-
- return NULL;
-}
-
-static void
-print_read_block(OUTCONTROLMSG * o_msg)
-{
-
- LinkViewerToMacReadBlockMessage *r_msg = &o_msg->u.ReadBlock;
-
- printf(" openFileId: %d, fileBlockId: %d \n", LE_TO_LONG(r_msg->openFileId), LE_TO_LONG(r_msg->fileBlockId));
- printf(" offset: %d, length: %d \n", LE_TO_LONG(r_msg->offset), LE_TO_LONG(r_msg->length));
- printf(" flags: %d, dummy: %d \n", LE_TO_LONG(r_msg->flags), LE_TO_LONG(r_msg->dummy));
- printf(" Earliest: %e, Deadline: %e \n",
- LE_TO_INT64((int64) r_msg->tEarliest), LE_TO_INT64((int64) r_msg->tDeadline));
- printf(" UserIncarnation: %d, playSequence: %d \n",
- LE_TO_LONG(r_msg->playIncarnation), LE_TO_LONG(r_msg->playSequence));
-}
-
-void
-CoreUtils::process_WmtClientServer(WMT_ClientServer * wcs_test)
-{
-
- if (last_seen_wmt_cssm != wcs_test) {
- last_seen_wmt_cssm = wcs_test;
- char *buf = (char *) malloc(sizeof(char) * sizeof(WMT_ClientServer));
-
- if (read_from_core((int) wcs_test, sizeof(WMT_ClientServer), buf) != -1) {
- WMT_ClientServer *loaded_cs = (WMT_ClientServer *) buf;
-
- printf("---- Found WMT-ClientServer @ 0x%X -----\n\n", wcs_test);
-
- printf(" Magic Number 0x%X ---- \n", loaded_cs->m_magic);
-
- printf(" master_sm: 0x%X ---- \n", loaded_cs->m_mastersm.m_MixtPtr);
- printf(" m_isclient: %d, m_connected: %d, m_TSFileId: %d\n\n",
- (int) loaded_cs->m_isclient, (int) loaded_cs->m_connected, (int) loaded_cs->m_TSFileId);
-
-
- printf(" PDU Info: \n");
- printf(" m_mid: 0x%X\n", (int) loaded_cs->m_pdu.m_mid);
-
- if (loaded_cs->m_pdu.m_mid == LinkMacToViewerReportOpenFileMID) {
- printf(" m_mid is LinkMacToViewerReportOpenFileMID\n");
- INCONTROLMSG_ENC *loaded_msg = get_control_msg_in(loaded_cs->m_pdu.u.buf);
- if (loaded_msg) {
- LinkMacToViewerReportOpenFileMessage *m = &loaded_msg->u.ReportOpenFile;
- printf(" hrResult: 0x%X\n", (int) (LE_TO_LONG(m->hr)));
- printf(" filedId: %d\n", (int) (LE_TO_LONG(m->openFileId)));
- free(loaded_msg);
- }
- } else if (loaded_cs->m_pdu.m_mid == LinkViewerToMacReadBlockMID) {
- printf(" m_mid is LinkViewerToMacReadBlockMID\n");
- OUTCONTROLMSG *loaded_msg = get_control_msg_out(loaded_cs->m_pdu.u.buf);
- if (loaded_msg) {
- print_read_block(loaded_msg);
- }
- free(loaded_msg);
- } else {
- process_afheader(loaded_cs->m_pdu.u.buf);
- }
-
- printf("\n\n");
- }
-
- free(buf);
- }
-}
-
-
-void
-CoreUtils::process_WmtTop(WMT_Top * top_test)
-{
-
- if (last_seen_wmt_top != top_test) {
- last_seen_wmt_top = top_test;
-
- char *buf = (char *) malloc(sizeof(char) * sizeof(WMT_Top));
-
- if (read_from_core((int) top_test, sizeof(WMT_Top), buf) != -1) {
- WMT_Top *loaded_top = (WMT_Top *) buf;
-
- printf("---- Found WMT-Top @ 0x%X -----\n\n", top_test);
-
- printf(" Magic Number 0x%X ---- \n", loaded_top->m_magic);
-
-
- char *urlstr = load_string(loaded_top->m_urlstr);;
- printf(" murl_str: %s \n", urlstr);
- xfree(urlstr);
- printf(" m_host: %s m_redirhost: %s\n", loaded_top->m_host, loaded_top->m_redirhost);
-
- char *subname = load_string(loaded_top->m_state_name);
- printf(" sub_state: %d (%s)\n", (int) loaded_top->m_state, subname);
- xfree(subname);
-
- printf(" m_loginfo: \n");
- printf(" m_url: %s \n", loaded_top->m_loginfo.m_url);
- printf(" m_xuid: %s \n", loaded_top->m_loginfo.m_xuid);
- printf(" m_server_host: %s \n", loaded_top->m_loginfo.m_server_host);
- printf(" m_proxy_host: %s \n", loaded_top->m_loginfo.m_proxy_host);
- printf(" m_client_host_ip_str: %s \n", loaded_top->m_loginfo.m_client_host_ip_str);
- printf(" m_clientURL: %s \n", loaded_top->m_loginfo.m_clientURL);
- printf(" m_streamtype: %d \n", loaded_top->m_loginfo.m_streamtype);
- printf(" m_cachehitbytes: %d \n", loaded_top->m_loginfo.m_cachehitbytes);
- printf(" m_origin_bytes_read: %d \n", loaded_top->m_loginfo.m_origin_bytes_read);
- printf(" m_client_bytes_written: %d \n", loaded_top->m_loginfo.m_client_bytes_written);
- printf(" m_filesize: %d \n\n", loaded_top->m_loginfo.m_filesize);
-
-
-
- if (loaded_top->m_magic == WMT_TOP_MAGIC_ALIVE || loaded_top->m_magic == WMT_TOP_MAGIC_PENDING) {
- wmt_dump_history(&loaded_top->m_history);
- }
-
- test_wmtServerFile(loaded_top->m_cacheloader.m_MixtPtr);
- test_wmtClientServer(loaded_top->m_client.m_MixtPtr);
- }
-
- free(buf);
- }
-}
-
-void
-CoreUtils::process_WmtTunnel(TunnelSM * tunnel_test)
-{
-
- if (last_seen_wmt_tunnel != tunnel_test) {
- last_seen_wmt_tunnel = tunnel_test;
-
- char *buf = (char *) malloc(sizeof(char) * sizeof(TunnelSM));
-
- if (read_from_core((int) tunnel_test, sizeof(TunnelSM), buf) != -1) {
- TunnelSM *loaded_tunnel = (TunnelSM *) buf;
-
- printf("---- Found WMT-Tunnel @ 0x%X -----\n\n", tunnel_test);
-
- printf(" Magic Number 0x%X ---- \n", loaded_tunnel->m_magic);
-
-
- if (loaded_tunnel->m_magic == WMT_TUNNEL_MAGIC_ALIVE || loaded_tunnel->m_magic == WMT_TUNNEL_MAGIC_PENDING) {
- wmt_dump_history(&loaded_tunnel->m_history);
- }
- }
-
- free(buf);
- }
-}
-
-void
-CoreUtils::process_WmtDatapump(WMT_Datapump * wdp_test)
-{
- if (last_seen_wmt_pump != wdp_test) {
- last_seen_wmt_pump = wdp_test;
-
- char *buf = (char *) malloc(sizeof(char) * sizeof(WMT_Datapump));
-
- if (read_from_core((int) wdp_test, sizeof(WMT_Datapump), buf) != -1) {
- WMT_Datapump *loaded_pump = (WMT_Datapump *) buf;
-
- printf("---- Found WMT-Datapump @ 0x%X -----\n\n", wdp_test);
-
- printf(" Magic Number 0x%X ---- \n", loaded_pump->m_magic);
- printf(" m_deliveryStarted: %lld, m_Twan: %lld\n", loaded_pump->m_deliveryStarted, loaded_pump->m_Twan);
- printf(" m_nextoffset: %lld, m_baseoffset: %lld\n", loaded_pump->m_nextoffset, loaded_pump->m_baseoffset);
- printf(" m_startingDeliveryOffset: %lld, m_last_location %d\n\n",
- loaded_pump->m_startingDeliveryOffset, loaded_pump->m_last_location);
-
- if (loaded_pump->m_magic == WMT_DATAPUMP_MAGIC_ALIVE || loaded_pump->m_magic == WMT_DATAPUMP_MAGIC_PENDING) {
- wmt_dump_history(&loaded_pump->m_history);
- }
-
- test_wmtTop(loaded_pump->m_mastersm.m_MixtPtr);
- test_wmtTunnel(loaded_pump->m_mastersm.m_MixtPtr);
- }
-
- free(buf);
- }
-}
-
-void
-CoreUtils::wmt_dump_history(evHistory * ehist)
-{
-
- printf(" -------- Begin History -------------\n");
-
- int num_hist = ehist->m_history_pos;
-
- if (num_hist >= WMT_HISTORY_SLOTS) {
- printf(" History Wrap Around: %d entries made\n", num_hist);
- num_hist = WMT_HISTORY_SLOTS;
- }
- // Loop through the history and dump it
- for (int i = 0; i < num_hist; i++) {
- int e = (int) ehist->h[i].event;
-
- char *fileline = load_string(ehist->h[i].fileline);
- fileline = (fileline != NULL) ? fileline : xstrdup("UNKNOWN");
-
- char *desc = load_string(ehist->h[i].desc);
- fileline = (fileline != NULL) ? fileline : xstrdup("UNKNOWN");
-
- printf(" %d %s %s\n", e, desc, fileline);
-
- xfree(fileline);
- xfree(desc);
- }
-
- printf(" -------- End History -----------\n\n");
-}
-#endif /* READ_CORE_WMT */
-
-
char *
CoreUtils::load_string(const char *addr)
{
@@ -1618,14 +1208,6 @@ process_core(char *fname)
CoreUtils::find_stuff(&CoreUtils::test_HdrHeap);
CoreUtils::find_stuff(&CoreUtils::test_HttpSM);
-#ifdef READ_CORE_WMT
- CoreUtils::find_stuff(&CoreUtils::test_wmtServerFile);
- CoreUtils::find_stuff(&CoreUtils::test_wmtTop);
- CoreUtils::find_stuff(&CoreUtils::test_wmtDatapump);
- CoreUtils::find_stuff(&CoreUtils::test_wmtClientServer);
- CoreUtils::find_stuff(&CoreUtils::test_HttpSM);
-#endif
-
fclose(fp);
}
#endif
@@ -1800,14 +1382,6 @@ process_core(char *fname)
CoreUtils::find_stuff(&CoreUtils::test_HdrHeap);
CoreUtils::find_stuff(&CoreUtils::test_HttpSM);
-#ifdef READ_CORE_WMT
- CoreUtils::find_stuff(&CoreUtils::test_wmtServerFile);
- CoreUtils::find_stuff(&CoreUtils::test_wmtTop);
- CoreUtils::find_stuff(&CoreUtils::test_wmtDatapump);
- CoreUtils::find_stuff(&CoreUtils::test_wmtClientServer);
- CoreUtils::find_stuff(&CoreUtils::test_HttpSM);
-#endif
-
fclose(fp);
}
#endif /* sparc */
Modified: trafficserver/traffic/trunk/proxy/CoreUtils.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/CoreUtils.h?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/CoreUtils.h (original)
+++ trafficserver/traffic/trunk/proxy/CoreUtils.h Fri Sep 17 16:58:40 2010
@@ -119,15 +119,6 @@ class HdrHeap;
class EThread;
class UnixNetVConnection;
-#ifdef READ_CORE_WMT
-class WMT_ServerFileSM;
-class WMT_ClientServer;
-class WMT_Top;
-class TunnelSM;
-class WMT_Datapump;
-class evHistory;
-#endif
-
class CoreUtils
{
public:
@@ -228,14 +219,6 @@ public:
static void test_HttpSM(void *);
static void test_HttpSM_from_tunnel(void *);
-#ifdef READ_CORE_WMT
- static void test_wmtServerFile(void *);
- static void test_wmtTunnel(void *);
- static void test_wmtTop(void *);
- static void test_wmtClientServer(void *arg);
- static void test_wmtDatapump(void *arg);
-#endif
-
/**********************************************************************
* purpose: prints out info about a give HttpSM
* inputs: HttpSM* core_ptr (ptr to http_sm in core)
@@ -245,14 +228,6 @@ public:
static void process_EThread(EThread * eth_test);
static void process_NetVC(UnixNetVConnection * eth_test);
-#ifdef READ_CORE_WMT
- static void process_WmtServerFileSM(WMT_ServerFileSM * wsfm_test);
- static void process_WmtTunnel(TunnelSM * tunnel_test);
- static void process_WmtTop(WMT_Top * top_test);
- static void process_WmtClientServer(WMT_ClientServer * wcs_test);
- static void process_WmtDatapump(WMT_Datapump * wdp_test);
-#endif
-
/**********************************************************************
* purpose: dumps the given state machine's history
* inputs: HttpSM* hsm
@@ -260,10 +235,6 @@ public:
**********************************************************************/
static void dump_history(HttpSM * hsm);
-#ifdef READ_CORE_WMT
- static void wmt_dump_history(evHistory * hist);
-#endif
-
/**********************************************************************
* purpose: fills in the given HTTPHdr * live_hdr with live information
* take from core_hdr the core file
Modified: trafficserver/traffic/trunk/proxy/DynamicStats.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/DynamicStats.h?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/DynamicStats.h (original)
+++ trafficserver/traffic/trunk/proxy/DynamicStats.h Fri Sep 17 16:58:40 2010
@@ -117,25 +117,6 @@ _D(cpu_metric_fds_ready_per_loop_stat)
// Dynamic QT stats
//
#define QT_STATS_1
- //
- // Dynamic LDAP stats
- //
-//_D(ldap_cache_hits_stat)
-//_D(ldap_cache_misses_stat)
-//_D(ldap_server_errors_count_stat)
-//_D(ldap_denied_authorizations_count_stat)
-//_D(ldap_cancelled_auth_count_stat)
-//_D(ldap_auth_timed_out_count_stat)
-//_D(ldap_server_connections_count_stat)
- //
- // Dynamic NTLM stats
- //
-//_D(ntlm_cache_hits_stat)
-//_D(ntlm_cache_misses_stat)
-//_D(ntlm_server_errors_count_stat)
-//_D(ntlm_denied_authorizations_count_stat)
-//_D(ntlm_cancelled_auth_count_stat)
-//_D(ntlm_server_connections_count_stat)
#ifdef TS_MICRO
//
// Prefetch Stuffer Stats
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Fri Sep 17 16:58:40 2010
@@ -58,8 +58,6 @@
#include "ICP.h"
#include "HttpAccept.h"
#include "PluginVC.h"
-//#include "MixtAPIInternal.h"
-#include "api/ts/InkAPIaaa.h"
#include "FetchSM.h"
#include "StatSystemV2.h"
#include "HttpDebugNames.h"
@@ -4704,11 +4702,6 @@ INKCacheKeyDataTypeSet(INKCacheKey key,
case INK_CACHE_DATA_TYPE_HTTP:
((CacheInfo *) key)->frag_type = CACHE_FRAG_TYPE_HTTP;
break;
- case INK_CACHE_DATA_TYPE_MIXT_RTSP: /* rtsp, wmt, qtime map to rtsp */
- case INK_CACHE_DATA_TYPE_MIXT_WMT:
- case INK_CACHE_DATA_TYPE_MIXT_QTIME:
- ((CacheInfo *) key)->frag_type = CACHE_FRAG_TYPE_RTSP;
- break;
default:
return INK_ERROR;
}
@@ -7039,11 +7032,6 @@ INKCacheDataTypeReady(INKCacheDataType t
case INK_CACHE_DATA_TYPE_HTTP:
frag_type = CACHE_FRAG_TYPE_HTTP;
break;
- case INK_CACHE_DATA_TYPE_MIXT_RTSP: /* rtsp, wmt, qtime map to rtsp */
- case INK_CACHE_DATA_TYPE_MIXT_WMT:
- case INK_CACHE_DATA_TYPE_MIXT_QTIME:
- frag_type = CACHE_FRAG_TYPE_RTSP;
- break;
default:
*is_ready = 0;
return INK_ERROR;
@@ -7839,1118 +7827,6 @@ INKMgmtConfigIntSet(const char *var_name
}
-
-/**
- * AAA API
- */
-
-/**
- * IMPORTANT: Change this description.
- * Function will return the User Policy in Flist Format. Flist format is used
- * by Portal's billing software to report any information. The user's policy
- * information can then be queried from this flist using Portal's PIN Macro
- *
- * Input Parameters:
- * txnp :INKHttpTxn :The transaction under consideration.
- * user_info :pin_flist_t :Null Pointer. Will contain return
- * value
- *
- * Output Parameters:
- * user_info :void :Pointer to user's account
- * information and services that user
- * has subscribed to.
- *
- *
- * Return Value:
- * INK_SUCCESS : Success
- * INK_ERROR : Failure
- */
-
-
-INKReturnCode
-INKUserPolicyLookup(INKHttpTxn txnp, void **user_info)
-{
-
- unsigned int ip;
- struct USER_INFO *user_struct = NULL;
-
- ip = INKHttpTxnClientIPGet(txnp);
- user_struct = UserCacheLookup(ip, NULL);
-
- if (user_struct == NULL) {
- return INK_ERROR;
- }
-
- switch (user_struct->status) {
- case POLICY_FETCHED:
- if (*user_info == NULL) {
- (*user_info) = INKstrndup((char *) (user_struct->policy), user_struct->len);
- } else {
- strncpy((char *) (*user_info), (char *) (user_struct->policy), strlen((char *) (*user_info)));
- }
- break;
- case POLICY_FETCHING:
- case LOGGED_OFF:
- case REASSIGNED:
- INKfree(user_struct);
- return INK_ERROR;
- break;
- default:
- INKfree(user_struct);
- return INK_ERROR;
- break;
- }
-
- INKfree(user_struct);
- return INK_SUCCESS;
-}
-
-
-
-/**
- * Function will change the value of header '\@Bill' in Client Request Header
- * depending on value of bill. variable bill is 0 if the transaction is not
- * supposed to be billed and 1 otherwise. For any other value, no action is
- * taken. If the transaction is billable, eventName has to be specified under
- * which the transaction is to billed.
- *
- * Input Parameters:
- * txnp :INKHttpTxn: The transaction under consideration.
- * bill :int : 0 if transaction is not billed.
- * 1 otherwise.
- * Any other value, input ignored.
- * eventName :string : Name of the event if transaction is
- * billable. Else NULL.
- *
- *
- * Output Parameters:
- * NONE
- *
- *
- * Return Value:
- * INK_SUCCESS : Success
- * INK_ERROR : Failure
- */
-INKReturnCode
-INKHttpTxnBillable(INKHttpTxn txnp, int bill, const char *eventName)
-{
-
- INKMBuffer clientReqHdr;
- INKMLoc clientReqHdrLoc;
- INKMLoc hdr_loc;
-
- if ((INKHttpTxnClientReqGet(txnp, &clientReqHdr, &clientReqHdrLoc)) == 0) {
- printf("Cannot retrieve Client's Request\n");
- return INK_ERROR;
- }
-
- switch (bill) {
- case 0:
- if ((INKMimeHdrFieldFind(clientReqHdr, clientReqHdrLoc, "@Bill", -1)) == 0) {
- hdr_loc = INKMimeHdrFieldCreate(clientReqHdr, clientReqHdrLoc);
- INKMimeHdrFieldNameSet(clientReqHdr, clientReqHdrLoc, hdr_loc, "@Bill", -1);
- INKMimeHdrFieldValueInsertInt(clientReqHdr, clientReqHdrLoc, hdr_loc, 0, -1);
- INKMimeHdrFieldInsert(clientReqHdr, clientReqHdrLoc, hdr_loc, -1);
- }
-
- if ((INKMimeHdrFieldFind(clientReqHdr, clientReqHdrLoc, "@Event", -1)) == 0) {
- hdr_loc = INKMimeHdrFieldCreate(clientReqHdr, clientReqHdrLoc);
- INKMimeHdrFieldNameSet(clientReqHdr, clientReqHdrLoc, hdr_loc, "@Event", -1);
- INKMimeHdrFieldInsert(clientReqHdr, clientReqHdrLoc, hdr_loc, -1);
- }
- break;
-
- case 1:
- if (eventName == NULL) {
- return INK_ERROR;
- }
-
- INKDebug("aaa_api", "[Billable]: Billing the transaction with %s event", eventName);
-
- if ((hdr_loc = INKMimeHdrFieldFind(clientReqHdr, clientReqHdrLoc, "@Bill", -1)) == 0) {
- INKDebug("aaa_api", "[Billable]: Not Found the header @Bill");
- hdr_loc = INKMimeHdrFieldCreate(clientReqHdr, clientReqHdrLoc);
- INKMimeHdrFieldNameSet(clientReqHdr, clientReqHdrLoc, hdr_loc, "@Bill", -1);
- INKMimeHdrFieldValueInsertInt(clientReqHdr, clientReqHdrLoc, hdr_loc, 1, -1);
- INKMimeHdrFieldInsert(clientReqHdr, clientReqHdrLoc, hdr_loc, -1);
- } else {
- int tempValue;
- tempValue = INKMimeHdrFieldValueGetInt(clientReqHdr, clientReqHdrLoc, hdr_loc, 0);
- INKMimeHdrFieldValuesClear(clientReqHdr, clientReqHdrLoc, hdr_loc);
- INKMimeHdrFieldValueInsertInt(clientReqHdr, clientReqHdrLoc, hdr_loc, ++tempValue, -1);
- }
-
-
- if ((hdr_loc = INKMimeHdrFieldFind(clientReqHdr, clientReqHdrLoc, "@Event", -1)) == 0) {
- hdr_loc = INKMimeHdrFieldCreate(clientReqHdr, clientReqHdrLoc);
- INKMimeHdrFieldNameSet(clientReqHdr, clientReqHdrLoc, hdr_loc, "@Event", -1);
- INKMimeHdrFieldValueInsert(clientReqHdr, clientReqHdrLoc, hdr_loc, eventName, -1, -1);
- INKMimeHdrFieldInsert(clientReqHdr, clientReqHdrLoc, hdr_loc, -1);
- } else {
- INKMimeHdrFieldValueInsert(clientReqHdr, clientReqHdrLoc, hdr_loc, eventName, -1, -1);
- }
- break;
-
- default:
- break;
- }
-
- return INK_SUCCESS;
-}
-
-/**
- * END AAA API
- */
-
-/**
- * AAA policy contiunation set API
- */
-static INKCont policy_contp = NULL;
-
-void
-INKPolicyContSet(INKCont p)
-{
- policy_contp = p;
-}
-
-INKReturnCode
-INKUserPolicyFetch(INKU32 ip, char *name)
-{
- if (policy_contp != NULL) {
- int has_lock = 0;
- INKMutex mtx;
- struct USER_INFO *node;
-
- node = (struct USER_INFO *) INKmalloc(sizeof(struct USER_INFO));
- node->ipaddr = ip;
- node->name = INKstrdup(name);
- node->policy = NULL;
- node->len = 0;
- node->status = POLICY_FETCHING;
-
- mtx = INKContMutexGet(policy_contp);
- if (mtx)
- has_lock = 1;
- if (has_lock)
- INKMutexLock(mtx);
- INKContCall(policy_contp, INK_EVENT_POLICY_LOOKUP, (void *) node);
- if (has_lock)
- INKMutexUnlock(mtx);
- INKfree(node->name);
- INKfree(node);
-
- return INK_SUCCESS;
- } else {
- INKDebug("aaa_api", "[INKUserPolicyFetch]: policy continuation is not set");
- return INK_ERROR;
- }
-}
-
-/**
- * End AAA policy contiunation set API
- */
-
-/**
- * AAA USER CACHE API
- */
-
-void freeNode(struct USER_INFO *a);
-void utoa(unsigned int input_int_value, char *output_str);
-void *marshal(int *marshal_length, INKU32 ip, char *name, status_t s, void *p, int l);
-void unmarshal(void *tem, INKU32 * ip, char **name, status_t * s, void **p, int *l);
-
-
-int disk_remove(INKU32 ip);
-int disk_read(INKU32 ip, INKCont caller_cont);
-int disk_write(INKU32 ip, void *data, int len);
-
-void HashTableInit();
-void HashTableDelete(INKU32 ip);
-int HashTableInsert(INKU32 ip, char *name, status_t status, void *policy, int len);
-struct USER_INFO *HashTableLookup(INKU32 ip);
-int HashTableModify(INKU32 ip, char *name, status_t status, void *policy, int len);
-INKAction INKCacheOverwrite(INKCont contp, INKCacheKey key);
-
-/* *************************************************************************
- * Wrapper functions: interface for memory and disk operation *
- ***************************************************************************/
-INKAction
-INKCacheOverwrite(INKCont contp, INKCacheKey key)
-{
- FORCE_PLUGIN_MUTEX(contp);
- CacheInfo *info = (CacheInfo *) key;
- Continuation *i = (INKContInternal *) contp;
- return (INKAction)
- cacheProcessor.open_write(i, &info->cache_key,
- info->frag_type, 0, true, info->pin_in_cache, info->hostname, info->len);
-}
-
-void
-UserCacheInit()
-{
- HashTableInit();
-}
-
-void
-UserCacheDelete(INKU32 ip)
-{
- HashTableDelete(ip);
-
- disk_remove(ip);
-}
-
-int
-UserCacheInsert(INKU32 ip, char *name, status_t s, void *p, int len)
-{
- void *user;
- int marshal_length;
- int returnValue;
-
- returnValue = HashTableInsert(ip, name, s, p, len);
-
- user = marshal(&marshal_length, ip, name, s, p, len);
-
- disk_write(ip, user, marshal_length);
- INKfree(user);
-
- if (p == NULL) {
- INKUserPolicyFetch(ip, name);
- }
-
- return returnValue;
-}
-
-struct USER_INFO *
-UserCacheLookup(INKU32 ip, INKCont caller_cont)
-{
- if (caller_cont) {
- disk_read(ip, caller_cont);
- return NULL;
- }
-
- return HashTableLookup(ip);
-}
-
-int
-UserCacheModify(INKU32 ip, char *name, status_t s, void *p, int l)
-{
- void *user;
- int marshal_length;
- int returnValue;
-
- returnValue = HashTableModify(ip, name, s, p, l);
-
- user = marshal(&marshal_length, ip, name, s, p, l);
- disk_write(ip, user, marshal_length);
- INKfree(user);
-
- return returnValue;
-}
-
-
-void
-UserCacheCloneFree(struct USER_INFO *a)
-{
- freeNode(a);
-}
-
-
-/* *************************************************************************
- * hash table for memory operation *
- ***************************************************************************/
-INKMgmtInt hashtablesize;
-static struct USER_INFO **hashtable;
-static INKMutex *hashlock;
-
-void
-HashTableInit()
-{
- int i;
-
- if (INKMgmtIntGet("proxy.config.aaa.hashtable.size", &hashtablesize) != 0) {
- INKError("[HashTableInit] unable to read configuration option: proxy.config.aaa.hashtableinit.size");
- }
- INKDebug("aaa_cache", "[HashTableInit]: hashtablesize = %d", (int) hashtablesize);
-
- /* alloc memory for hash table pointers */
- hashtable = (struct USER_INFO **) INKmalloc(hashtablesize * (sizeof(struct USER_INFO *)));
- /* initialize the hash table with NULL */
- memset(hashtable, 0, (hashtablesize * (sizeof(struct USER_INFO *))));
-
- /* alloc memory for hash table bucket mutexes */
- hashlock = (INKMutex *) INKmalloc(hashtablesize * (sizeof(INKMutex)));
-
- /* allocate a lock for each cache entry. */
- for (i = 0; i < hashtablesize; i++) {
- hashlock[i] = INKMutexCreate();
- }
-}
-
-/* the simplest hash function */
-int
-HashTableEntryGet(INKU32 key)
-{
- return (key % hashtablesize);
-}
-
-/* Insert an user's info into the entry of hashtable corresponding to
- * its IP addess. Warning: pass in a structure with no pointer within it.
- * Return 1 if success; 0 if failure.
- */
-int
-HashTableInsert(INKU32 ip, char *name, status_t s, void *p, int len)
-{
- int index;
- struct USER_INFO *newnode;
-
- newnode = (struct USER_INFO *) INKmalloc(sizeof(struct USER_INFO));
-
- newnode->ipaddr = ip;
- newnode->name = INKstrdup(name); /* INKmalloc memory and return a dup of name */
- newnode->status = s;
- newnode->len = len;
- newnode->policy = INKstrndup((char *) p, len);
-
- /* delete the old node whose ip is the same as the new node if any */
- USER_INFO *tmpUserInfo = HashTableLookup(ip);
- if (tmpUserInfo != NULL) {
- INKfree(tmpUserInfo);
- HashTableDelete(ip);
- } else {
- INKfree(tmpUserInfo);
- }
-
- index = HashTableEntryGet(ip);
-
- INKMutexLock(hashlock[index]);
-
- /* insert the new node at the beginnning of the cache entry */
- newnode->next = hashtable[index];
- hashtable[index] = newnode;
-
- INKDebug("aaa_cache", "hashtable: user \"%s\" inserted in bucket %d", hashtable[index]->name, index);
-
- INKMutexUnlock(hashlock[index]);
- return 1;
-}
-
-
-/* If failed, returns 0, else returns pointer to the structure for the user. */
-struct USER_INFO *
-HashTablePtrGet(INKU32 ip)
-{
- struct USER_INFO *cur;
- int index;
-
- index = HashTableEntryGet(ip);
-
- INKMutexLock(hashlock[index]);
-
- cur = hashtable[index];
-
- while ((cur != NULL) && (cur->ipaddr != ip)) {
- cur = cur->next;
- }
-
- INKMutexUnlock(hashlock[index]);
-
- if (cur) {
- INKDebug("aaa_cache", "hashtable: user \"%s\" found in bucket %d", cur->name, index);
- return cur;
- }
- return (struct USER_INFO *) 0;
-}
-
-/* If failed, returns 0, else returns pointer to the CLONE of the structure for the user.
- * It's your responsiblity to free the memory
- */
-struct USER_INFO *
-HashTableLookup(INKU32 ip)
-{
- struct USER_INFO *clone;
- struct USER_INFO *cur;
- int index;
-
- index = HashTableEntryGet(ip);
- /* Fixed race condition between HashTableLookup(),
- * HashTableDelete(), HashTableModify() if we call INKMutexLock()
- * after HashTablePtrGet()
- */
- INKMutexLock(hashlock[index]);
-
- cur = HashTablePtrGet(ip);
-
- if (cur) {
- /* clone a node */
- clone = (struct USER_INFO *) INKmalloc(sizeof(struct USER_INFO));
-
- clone->ipaddr = cur->ipaddr;
- clone->name = INKstrdup(cur->name);
- clone->status = cur->status;
- clone->len = cur->len;
- clone->policy = INKstrndup((char *) cur->policy, cur->len);
-
- INKMutexUnlock(hashlock[index]);
-
- return clone;
- }
-
- INKMutexUnlock(hashlock[index]);
-
- return (struct USER_INFO *) 0;
-}
-
-/* delete all the nodes whose ipaddr is the key ip, free the memory */
-void
-HashTableDelete(INKU32 ip)
-{
- struct USER_INFO *a, *last, *next;
- int index;
- /* keep track of how many nodes are deleted */
- int found = 0;
-
- index = HashTableEntryGet(ip);
- last = NULL;
-
- INKMutexLock(hashlock[index]);
-
- /* delete all the nodes in this entry with the IP address as ip */
- for (a = hashtable[index]; a; a = next) {
- next = a->next;
- if (a->ipaddr == ip) {
-
- found++;
-
- if (last) {
- last->next = a->next;
- } else {
- hashtable[index] = a->next;
- }
-
- INKDebug("aaa_cache", "hashtable: user \"%s\" deleted from bucket %d; %dth time", a->name, index, found);
-
- freeNode(a);
- continue;
- }
- last = a;
- }
-
- INKMutexUnlock(hashlock[index]);
- if (!found)
- INKDebug("aaa_cache", "hashtable: no entry for user with ip = %d", ip);
-}
-
-/* Update the user info with the same IP if possible
- * Return -1 if the stale info is not found;
- * 0 if the stale info is found and being replaced by new one
- */
-int
-HashTableModify(INKU32 ip, char *name, status_t s, void *policy, int len)
-{
- struct USER_INFO *old;
- int index;
-
- index = HashTableEntryGet(ip);
-
- /* Fixed race condition between HashTableLookup(),
- * HashTableDelete(), HashTableModify() if we call INKMutexLock()
- * after HashTablePtrGet()
- */
- INKMutexLock(hashlock[index]);
-
- old = HashTablePtrGet(ip);
-
- if (!old) {
- INKMutexUnlock(hashlock[index]);
- return -1;
- }
-
- /* update the user info */
- if (old->name) {
- INKfree(old->name);
- }
- old->name = INKstrdup(name);
- old->status = s;
- old->len = len;
- if (old->policy) {
- INKfree(old->policy);
- }
- old->policy = INKstrndup((char *) policy, len);
-
- INKMutexUnlock(hashlock[index]);
-
- return 0;
-}
-
-
-/*******************************************************************************
- * Disk Remove *
- *******************************************************************************/
-
-static int
-remove_cache_handler(INKCont cache_contp, INKEvent event, void *edata)
-{
- NOWARN_UNUSED(edata);
- INKCacheKey key;
-
- key = (INKCacheKey) INKContDataGet(cache_contp);
-
- switch (event) {
- case INK_EVENT_CACHE_REMOVE:
- INKDebug("aaa_cache", "[remove_cache_handler]: removed !");
- break;
- case INK_EVENT_CACHE_REMOVE_FAILED:
- INKDebug("aaa_cache", "[remove_cache_handler]: remove failed !");
- break;
- default:
- INKDebug("aaa_cache", "[remove_cache_handler]: unexpected event, %d", event);
- break;
- }
-
- INKCacheKeyDestroy(key);
- INKContDestroy(cache_contp);
- return 0;
-}
-
-int
-disk_remove(INKU32 ip)
-{
- INKMutex cache_mtx;
- INKCont cache_contp;
- INKCacheKey key;
-
- char input[50];
- int ilen;
-
- utoa(ip, input);
- ilen = strlen(input);
-
- cache_mtx = INKMutexCreate();
-
- cache_contp = INKContCreate(remove_cache_handler, cache_mtx);
-
- INKCacheKeyCreate(&key);
- INKCacheKeyDigestSet(key, (unsigned char *) input, ilen);
-
- INKContDataSet(cache_contp, key);
-
- INKCacheRemove(cache_contp, key);
-
- return 0;
-}
-
-typedef struct
-{
- INKAction actionp;
- INKCacheKey key;
- INKVConn cache_vc;
- INKVIO cache_read_vio;
- INKVIO cache_write_vio;
- INKIOBuffer read_buf;
- INKIOBuffer write_buf;
- INKIOBufferReader read_bufreader;
- INKIOBufferReader write_bufreader;
- INKCont caller_cont;
- char *data;
- int data_len;
- INKU32 ip;
-
-} CacheStruct;
-
-static void
-destroy_cache_s(INKCont cache_contp)
-{
-
- CacheStruct *cache_s;
-
- cache_s = (CacheStruct *) INKContDataGet(cache_contp);
-
- cache_s->caller_cont = NULL;
-
- if (cache_s->actionp) {
- INKActionCancel(cache_s->actionp);
- }
- if (cache_s->key) {
- INKCacheKeyDestroy(cache_s->key);
- }
- if (cache_s->cache_vc) {
- INKVConnAbort(cache_s->cache_vc, 1);
- }
- if (cache_s->read_buf) {
- INKIOBufferDestroy(cache_s->read_buf);
- }
- if (cache_s->write_buf) {
- INKIOBufferDestroy(cache_s->write_buf);
- }
- if (cache_s->data) {
- INKfree(cache_s->data);
- }
-
- INKfree(cache_s);
- INKContDestroy(cache_contp);
- return;
-}
-
-
-/*******************************************************************************
- * Disk Write *
- *******************************************************************************/
-
-typedef struct
-{
- char *data;
- int data_len;
- INKU32 ip;
-} passdata_s;
-
-static int
-handle_write_fail(INKCont cont, INKEvent event, void *edata)
-{
- NOWARN_UNUSED(event);
- NOWARN_UNUSED(edata);
- passdata_s *pd;
-
- pd = (passdata_s *) INKContDataGet(cont);
-
- INKDebug("aaa_cache", "[handle_write_fail]: called !");
-
- disk_write(pd->ip, pd->data, pd->data_len);
-
- if (pd->data)
- INKfree(pd->data);
- INKfree(pd);
- INKContDestroy(cont);
- return 0;
-}
-
-static int
-write_cache_handler(INKCont cache_contp, INKEvent event, void *edata)
-{
-
- CacheStruct *cache_s;
- INKCont cont;
- passdata_s *pd;
-
- cache_s = (CacheStruct *) INKContDataGet(cache_contp);
-
- switch (event) {
- case INK_EVENT_CACHE_OPEN_WRITE:
- INKDebug("aaa_cache", "[write_cache_handler]: INK_EVENT_CACHE_OPEN_WRITE");
- cache_s->cache_vc = (INKVConn) edata;
- cache_s->cache_write_vio = INKVConnWrite(cache_s->cache_vc, cache_contp,
- cache_s->write_bufreader,
- INKIOBufferReaderAvail(cache_s->write_bufreader));
- break;
- case INK_EVENT_CACHE_OPEN_WRITE_FAILED:
- INKDebug("aaa_cache", "[write_cache_handler]: INK_EVENT_CACHE_OPEN_WRITE_FAILED");
- pd = (passdata_s *) INKmalloc(sizeof(passdata_s));
- pd->ip = cache_s->ip;
- pd->data = (char *) INKmalloc(cache_s->data_len);
- memset(pd->data, 0, cache_s->data_len);
- memcpy(pd->data, cache_s->data, cache_s->data_len);
- pd->data_len = cache_s->data_len;
-
- cont = INKContCreate(handle_write_fail, INKMutexCreate());
- INKContDataSet(cont, pd);
- INKContSchedule(cont, 100);
- destroy_cache_s(cache_contp);
- break;
- case INK_EVENT_VCONN_WRITE_READY:
- INKVIOReenable(cache_s->cache_write_vio);
- break;
- case INK_EVENT_VCONN_WRITE_COMPLETE:
- INKDebug("aaa_cache", "[write_cache_handler]: data written to cache");
- INKVConnClose(cache_s->cache_vc);
- cache_s->cache_vc = NULL;
- cache_s->cache_write_vio = NULL;
- destroy_cache_s(cache_contp);
- return 0;
- default:
- INKDebug("aaa_cache", "[write_cache_handler]: unexpected event, %d", event);
- destroy_cache_s(cache_contp);
- return 0;
- }
-
- return 0;
-}
-
-int
-disk_write(INKU32 ip, void *data, int len)
-{
- CacheStruct *cache_s;
- INKMutex cache_mtx;
- INKCont cache_contp;
- INKAction action;
- char input[50];
- int ilen;
-
- utoa(ip, input);
- ilen = strlen(input);
-
- cache_mtx = INKMutexCreate();
- cache_contp = INKContCreate(write_cache_handler, cache_mtx);
-
- cache_s = (CacheStruct *) INKmalloc(sizeof(CacheStruct));
-
- cache_s->actionp = NULL;
- cache_s->caller_cont = NULL;
-
- INKCacheKeyCreate(&(cache_s->key));
- INKCacheKeyDigestSet(cache_s->key, (unsigned char *) input, ilen);
-
- cache_s->cache_vc = NULL;
- cache_s->cache_read_vio = NULL;
- cache_s->cache_write_vio = NULL;
- cache_s->read_buf = NULL;
- cache_s->read_bufreader = NULL;
-
- cache_s->write_buf = INKIOBufferCreate();
- cache_s->write_bufreader = INKIOBufferReaderAlloc(cache_s->write_buf);
- INKIOBufferWrite(cache_s->write_buf, (char *) data, len); /* new API, no doc */
- /* save the data in case write fails in this round */
- cache_s->data = (char *) INKmalloc(len * sizeof(char));
- memset(cache_s->data, 0, len);
- memcpy(cache_s->data, data, len);
- cache_s->data_len = len;
- cache_s->ip = ip;
-
-
- INKContDataSet(cache_contp, cache_s);
-
- action = INKCacheOverwrite(cache_contp, cache_s->key);
- if (!INKActionDone(action)) {
- cache_s->actionp = action;
- }
- return 0;
-}
-
-
-/***********************************************************************
- * Disk Read *
- * 1 disk read if it is not in memory *
- * 2 memory insert and call the event INK_EVENT_POLICY_LOOKUP *
- * if disk cache read succeeds *
- ***********************************************************************/
-
-static int
-read_cache_handler(INKCont cache_contp, INKEvent event, void *edata)
-{
- CacheStruct *cache_s;
- struct USER_INFO *node;
- INKMutex caller_mtx;
- int has_lock = 0;
-
- int total_avail;
- int block_avail;
- int output_len;
- char *output_string;
- INKIOBufferBlock block;
- const char *block_start;
-
- INKU32 ip;
- char *name;
- status_t s;
- void *p;
- int len = 0, object_size = 0;
-
- cache_s = (CacheStruct *) INKContDataGet(cache_contp);
-
- switch (event) {
-
- case INK_EVENT_CACHE_OPEN_READ:
- INKDebug("aaa_cache", "[read_cache_handler]: HIT, begin reading data from disk");
- cache_s->cache_vc = (INKVConn) edata;
- cache_s->read_buf = INKIOBufferCreate();
- cache_s->read_bufreader = INKIOBufferReaderAlloc(cache_s->read_buf);
- INKVConnCacheObjectSizeGet(cache_s->cache_vc, &object_size);
- cache_s->cache_read_vio = INKVConnRead(cache_s->cache_vc, cache_contp, cache_s->read_buf, object_size);
- break;
- case INK_EVENT_CACHE_OPEN_READ_FAILED:
- INKDebug("aaa_cache", "[read_cache_handler]: INK_EVENT_CACHE_OPEN_READ_FAILED");
- caller_mtx = INKContMutexGet(cache_s->caller_cont);
- if (caller_mtx)
- has_lock = 1;
- if (has_lock)
- INKMutexLock(caller_mtx);
- /* send NULL to caller to signal error */
- INKContCall(cache_s->caller_cont, INK_EVENT_POLICY_LOOKUP, NULL);
- if (has_lock)
- INKMutexUnlock(caller_mtx);
- destroy_cache_s(cache_contp);
- break;
- case INK_EVENT_VCONN_READ_READY:
- INKVIOReenable(cache_s->cache_read_vio);
- break;
- case INK_EVENT_VCONN_READ_COMPLETE:
- INKDebug("aaa_cache", "[read_cache_handler]: complete reading from disk");
-
- /* print read content to stderr in following block, adopted from output_hdr.c */
-
- total_avail = INKIOBufferReaderAvail(cache_s->read_bufreader);
- output_string = (char *) INKmalloc(total_avail + 1);
- output_len = 0;
-
- block = INKIOBufferReaderStart(cache_s->read_bufreader);
- while (block) {
- block_start = INKIOBufferBlockReadStart(block, cache_s->read_bufreader, &block_avail);
- if (block_avail == 0) {
- break;
- }
- memcpy(output_string + output_len, block_start, block_avail);
- output_len += block_avail;
- INKIOBufferReaderConsume(cache_s->read_bufreader, block_avail);
- block = INKIOBufferReaderStart(cache_s->read_bufreader);
- }
-
- unmarshal(output_string, &ip, &name, &s, &p, &len);
-
- INKDebug("aaa_cache", "[read_cache_handler]: name/IP/policy read from disk");
- INKDebug("aaa_cache", "Read data from disk: name = \"%s\"", name);
- INKDebug("aaa_cache", "Read data from disk: IP = \"%ld\"", ip);
- INKDebug("aaa_cache", "Read data from disk: status = \"%ld\"", s);
- INKDebug("aaa_cache", "Read data from disk: policy = \"%s\"", p);
-
- HashTableInsert(ip, name, s, p, len);
-
- node = (struct USER_INFO *) INKmalloc(sizeof(struct USER_INFO));
- node->ipaddr = ip;
- node->name = INKstrdup(name);
- node->status = s;
- node->len = len;
- node->policy = INKstrndup((char *) p, len);
-
- /* call the caller's handle to tell that the data is available */
- caller_mtx = INKContMutexGet(cache_s->caller_cont);
- if (caller_mtx)
- has_lock = 1;
- if (has_lock)
- INKMutexLock(caller_mtx);
- INKContCall(cache_s->caller_cont, INK_EVENT_POLICY_LOOKUP, (void *) node);
- if (has_lock)
- INKMutexUnlock(caller_mtx);
-
- if (name)
- INKfree(name);
- if (p)
- INKfree(p);
- INKfree(output_string);
-
- /* close the vconnection and destroy the cache structre obj cache_s */
- INKVConnClose(cache_s->cache_vc);
- cache_s->cache_vc = NULL;
- cache_s->cache_read_vio = NULL;
- destroy_cache_s(cache_contp);
- return 0;
-
- default:
- INKDebug("aaa_cache", "[read_cache_handler]: unexpected event, %d", event);
- destroy_cache_s(cache_contp);
- return 0;
- }
-
- return 0;
-}
-
-
-int
-disk_read(INKU32 ip, INKCont caller_cont)
-{
- CacheStruct *cache_s;
- INKMutex cache_mtx;
- INKCont cache_contp;
- struct USER_INFO *node;
- INKAction action;
- char input[50];
- int ilen;
-
- /* check if the data in memory, if yes, simple
- * schedule the event to caller_cont handle
- */
- node = HashTableLookup(ip);
- if (node) {
- INKMutex caller_mtx;
-
- INKDebug("aaa_cache", "[disk_read]: name/IP/policy is read from memory");
- caller_mtx = INKContMutexGet(caller_cont);
- INKMutexLock(caller_mtx);
- INKContCall(caller_cont, INK_EVENT_POLICY_LOOKUP, (void *) node);
- INKMutexUnlock(caller_mtx);
- return 0;
- }
-
- utoa(ip, input);
- ilen = strlen(input);
-
- cache_mtx = INKMutexCreate();
- cache_contp = INKContCreate(read_cache_handler, cache_mtx);
-
- cache_s = (CacheStruct *) INKmalloc(sizeof(CacheStruct));
-
- cache_s->actionp = NULL;
-
- INKCacheKeyCreate(&(cache_s->key));
- INKCacheKeyDigestSet(cache_s->key, (unsigned char *) input, ilen);
-
- cache_s->caller_cont = caller_cont;
- INKAssert(cache_s->caller_cont);
-
- cache_s->cache_vc = NULL;
- cache_s->cache_read_vio = NULL;
- cache_s->cache_write_vio = NULL;
- cache_s->read_buf = NULL;
- cache_s->write_buf = NULL;
- cache_s->read_bufreader = NULL;
- cache_s->write_bufreader = NULL;
- cache_s->data = NULL;
-
- INKContDataSet(cache_contp, cache_s);
-
- action = INKCacheRead(cache_contp, cache_s->key);
- if (!INKActionDone(action)) {
- cache_s->actionp = action;
- }
-
- return 0;
-}
-
-/*******************************************************************************
- * functions to convert unsigned int into a string *
- *******************************************************************************/
-
-/* reverse the string s with null terminator */
-void
-reverse(char *s)
-{
- char *head;
- char *tail;
- char c;
-
- head = s;
- tail = s + strlen(s) - 1;
-
- while (head < tail) {
- c = *head;
- *head = *tail;
- *tail = c;
- head++;
- tail--;
- }
-}
-
-/* Unsigned int ---> a string with the same form,
- * e.g. change the integer 123456789 into "123456789".
- * Note: allocate memory for sv before call utoa */
-void
-utoa(unsigned int iv, char *sv)
-{
- int i = 0;
-
- if (iv == 0) {
- sv[0] = '0', sv[1] = '\0';
- } else {
- while (iv % 10 || iv / 10) {
- sv[i++] = '0' + iv % 10;
- iv /= 10;
- }
- sv[i] = '\0';
-
- reverse(sv);
- }
-}
-
-/* *************************************************************************
- * functions to marsh and unmarsh a structure for disk access *
- ***************************************************************************/
-
-/* Convert a structrue into a piesce of memory which is returned as void *.
- * The memory is allocated in this function and should be INKfreed by you.
- */
-void *
-marshal(int *marshal_length, INKU32 ip, char *name, status_t s, void *p, int len)
-{
- char *temp;
- int size;
- int name_len;
- int cur_pos = 0;
-
- name_len = strlen(name);
-
- // INKAssert(len == strlen((char *)p));
- size = 8 + sizeof(int) + name_len + sizeof(status_t) + sizeof(int) + len + 1;
- temp = (char *) INKmalloc(size);
- memset(temp, 0, size);
-
- memcpy(temp, &ip, 8);
-
- cur_pos += 8;
- memcpy(temp + cur_pos, &name_len, sizeof(int));
-
- cur_pos += sizeof(int);
- memcpy(temp + cur_pos, name, name_len);
-
- cur_pos += name_len;
- memcpy(temp + cur_pos, &s, sizeof(status_t));
-
- cur_pos += sizeof(status_t);
- memcpy(temp + cur_pos, &len, sizeof(int));
-
- cur_pos += sizeof(int);
- memcpy(temp + cur_pos, p, len);
- cur_pos += len;
- // INKAssert(size == cur_pos + 1);
- *marshal_length = cur_pos;
-
- return (void *) temp;
-}
-
-/* Unmarshal a piesce of memory. Allocate memory for name, policy.
- * The memory is allocated in this function and should be INKfreed by you.
- */
-void
-unmarshal(void *tem, INKU32 * ip, char **name, status_t * s, void **p, int *l)
-{
- int cur_pos = 0;
- int len;
- char *temp;
-
- temp = (char *) tem;
-
- memcpy(ip, temp, 8);
- cur_pos += 8;
- memcpy(&len, temp + cur_pos, sizeof(int));
-
- cur_pos += sizeof(int);
- *name = (char *) INKmalloc((len + 1) * sizeof(char));
- memset(*name, 0, len + 1);
- memcpy(*name, temp + cur_pos, len);
-
- cur_pos += len;
- memcpy(s, temp + cur_pos, sizeof(status_t));
-
- cur_pos += sizeof(status_t);
- memcpy(l, temp + cur_pos, sizeof(int));
- cur_pos += sizeof(int);
- *p = (char *) INKmalloc((*l + 1) * sizeof(char));
- memset(*p, 0, *l + 1);
- memcpy(*p, temp + cur_pos, *l);
- cur_pos += *l;
-}
-
-/* free a node */
-void
-freeNode(struct USER_INFO *a)
-{
- if (a->name)
- INKfree(a->name);
- if (a->policy)
- INKfree(a->policy);
- INKfree(a);
-}
-
-/**
- * END AAA USER CACHE API
- */
-
/* Alarm */
/* return type is "int" currently, it should be INKReturnCode */
int
Modified: trafficserver/traffic/trunk/proxy/InkAPITest.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPITest.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPITest.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPITest.cc Fri Sep 17 16:58:40 2010
@@ -6633,9 +6633,6 @@ typedef enum
{
ORIG_INK_CACHE_DATA_TYPE_NONE,
ORIG_INK_CACHE_DATA_TYPE_HTTP,
- ORIG_INK_CACHE_DATA_TYPE_MIXT_RTSP,
- ORIG_INK_CACHE_DATA_TYPE_MIXT_WMT,
- ORIG_INK_CACHE_DATA_TYPE_MIXT_QTIME,
ORIG_INK_CACHE_DATA_TYPE_OTHER
} ORIG_INKCacheDataType;
@@ -6803,9 +6800,6 @@ REGRESSION_TEST(SDK_API_INKConstant) (Re
PRINT_DIFF(INK_CACHE_DATA_TYPE_NONE);
PRINT_DIFF(INK_CACHE_DATA_TYPE_HTTP);
- PRINT_DIFF(INK_CACHE_DATA_TYPE_MIXT_RTSP);
- PRINT_DIFF(INK_CACHE_DATA_TYPE_MIXT_WMT);
- PRINT_DIFF(INK_CACHE_DATA_TYPE_MIXT_QTIME);
PRINT_DIFF(INK_CACHE_DATA_TYPE_OTHER);
PRINT_DIFF(INK_CACHE_ERROR_NO_DOC);
Modified: trafficserver/traffic/trunk/proxy/Main.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Main.cc?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Main.cc (original)
+++ trafficserver/traffic/trunk/proxy/Main.cc Fri Sep 17 16:58:40 2010
@@ -77,7 +77,6 @@ extern "C" int plock(int);
#include "IPAllow.h"
#include "CacheInspectorAllow.h"
#include "ParentSelection.h"
-//#include "rni/Rni.h"
#ifdef RNI_STATIC_LINK
#include "RniProcessor.h"
#endif
@@ -154,7 +153,6 @@ int run_test_hook = 0;
int http_accept_port_number = DEFAULT_HTTP_ACCEPT_PORT_NUMBER;
int http_accept_file_descriptor = NO_FD;
int ssl_accept_file_descriptor = NO_FD;
-int qt_accept_file_descriptor = NO_FD;
char accept_fd_list[1024] = "";
char core_file[255] = "";
int command_flag = DEFAULT_COMMAND_FLAG;
@@ -186,9 +184,6 @@ char action_tags[1024] = "";
int show_statistics = 0;
int gsplitDNS_enabled = 0;
int history_info_enabled = 1;
-//int gldap_auth_enable = 0;
-//int gsplit_ldap_enabled = 0;
-//int gauth_bypass_enabled = 0;
inkcoreapi Diags *diags = NULL;
inkcoreapi DiagsConfig *diagsConfig = NULL;
HttpBodyFactory *body_factory = NULL;
@@ -601,42 +596,6 @@ skip(char *cmd, int null_ok = 0)
return cmd;
}
-/* Clears the Real Network cache. If the proxy.config.rni.proxy_cache_dir
- variable is set to a valid directory, removes all the files in that dir.
- returns CMD_OK on success, CMD_FAILURE on failure
- */
-static int
-clear_rn_cache()
-{
- char *rn_cache_path = NULL;;
- int result = 0;
- TS_ReadConfigStringAlloc(rn_cache_path, "proxy.config.rni.proxy_cache_dir");
- if (rn_cache_path) {
- if (*rn_cache_path != '\0') {
- // first check if the directory exists.
- if (access(rn_cache_path, F_OK) == -1) {
- result = errno;
- Warning("unable to access() '%s': %d, %s", rn_cache_path, errno, strerror(errno));
- Note("unable to clear RN Cache, CLEAR failed [%d]", result);
- return CMD_FAILED;
- }
- char remove_cmd[PATH_NAME_MAX + 6];
- snprintf(remove_cmd, sizeof(remove_cmd), "%s %s/*", "rm -f", rn_cache_path);
- do {
- result = system(remove_cmd);
- }
- while (result == -1 && errno == EINTR);
- Note("clear rn cache");
- }
- xfree(rn_cache_path);
- }
- if (result != 0) {
- Note("unable to clear RN Cache, CLEAR failed [%d]", result);
- return CMD_FAILED;
- }
- return CMD_OK;
-}
-
struct CmdCacheCont: public Continuation
{
@@ -808,8 +767,6 @@ cmd_clear(char *cmd)
if (c_all || c_cache) {
Note("Clearing Cache");
- /* clear the real network cache also */
- clear_rn_cache();
if (cacheProcessor.start_internal(PROCESSOR_RECONFIGURE) < 0) {
Note("unable to open Cache, CLEAR failed");
return CMD_FAILED;
@@ -1054,11 +1011,6 @@ parse_accept_fd_list()
ink_assert(ssl_accept_file_descriptor == NO_FD);
ssl_accept_file_descriptor = fd;
continue;
- case 'Q':
- // Q is the special case of QT port
- ink_assert(qt_accept_file_descriptor == NO_FD);
- qt_accept_file_descriptor = fd;
- continue;
case 'C':
attr = SERVER_PORT_COMPRESSED;
break;
@@ -2013,9 +1965,6 @@ main(int argc, char **argv)
#ifndef INK_NO_CLUSTER
clusterProcessor.init();
#endif
- if (cacheProcessor.auto_clear_flag)
- /* clear the real network cache also */
- clear_rn_cache();
cacheProcessor.start();
Modified: trafficserver/traffic/trunk/proxy/Makefile.am
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Makefile.am?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Makefile.am (original)
+++ trafficserver/traffic/trunk/proxy/Makefile.am Fri Sep 17 16:58:40 2010
@@ -58,7 +58,6 @@ include_HEADERS = \
noinst_HEADERS = \
api/ts/InkAPIHughes.h \
- api/ts/InkAPIaaa.h \
api/ts/InkAPIPrivateIOCore.h \
ConfigParse.h \
NTDefs.h \
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h?rev=998201&r1=998200&r2=998201&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h Fri Sep 17 16:58:40 2010
@@ -323,29 +323,6 @@ extern "C"
INK_EVENT_INTERNAL_60200 = 60200,
INK_EVENT_INTERNAL_60201 = 60201,
INK_EVENT_INTERNAL_60202 = 60202,
-
- INK_EVENT_MIXT_CONTINUE = 70000,
- INK_EVENT_MIXT_READ_INCOMPLETE = 70001,
- INK_EVENT_MIXT_DENY = 70002,
- INK_EVENT_MIXT_ERROR = 70003,
-
- INK_EVENT_MIXT_NEW_CONNECTION = 70004,
- INK_EVENT_MIXT_CLIENT_READ_CMD = 70005,
- INK_EVENT_MIXT_CLIENT_READ_REQUEST_HDR = 70006,
- INK_EVENT_MIXT_CLIENT_SEND_RESP = 70007,
- INK_EVENT_MIXT_CLIENT_READ_RESP_HDR = 70008,
- INK_EVENT_MIXT_SERVER_CONNECT = 70009,
- INK_EVENT_MIXT_SERVER_CONNECT_DONE = 70010,
- INK_EVENT_MIXT_SERVER_READ_CMD_HDR = 70011,
- INK_EVENT_MIXT_SERVER_SEND_CMD = 70012,
- INK_EVENT_MIXT_SERVER_READ_RESP = 70013,
- INK_EVENT_MIXT_SERVER_READ_RESP_HDR = 70014,
- INK_EVENT_MIXT_TXN_TERMINATE = 70015,
- INK_EVENT_MIXT_CLIENT_DATA_PKT_SEND = 70016,
- INK_EVENT_MIXT_SERVER_DATA_PKT_READ = 70017,
- INK_EVENT_MIXT_CACHE_DATA_PKT_WRITE = 70018,
- INK_EVENT_MIXT_CACHE_DATA_PKT_READ = 70019,
- INK_EVENT_MIXT_CLIENT_CTRL_PKT_READ = 70020
} INKEvent;
typedef enum
@@ -385,9 +362,6 @@ extern "C"
{
INK_CACHE_DATA_TYPE_NONE,
INK_CACHE_DATA_TYPE_HTTP,
- INK_CACHE_DATA_TYPE_MIXT_RTSP,
- INK_CACHE_DATA_TYPE_MIXT_WMT,
- INK_CACHE_DATA_TYPE_MIXT_QTIME,
INK_CACHE_DATA_TYPE_OTHER
} INKCacheDataType;