You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2010/10/13 01:57:12 UTC
svn commit: r1021954 - in /trafficserver/traffic/trunk/proxy: ./ api/ts/
mgmt2/api2/ mgmt2/api2/include/ mgmt2/utils/ mgmt2/web2/
Author: zwoop
Date: Tue Oct 12 23:57:12 2010
New Revision: 1021954
URL: http://svn.apache.org/viewvc?rev=1021954&view=rev
Log:
TS-485 InkAPI cleanup.
Modified:
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/InkAPIInternal.h
trafficserver/traffic/trunk/proxy/Prefetch.h
trafficserver/traffic/trunk/proxy/api/ts/ts_private.h
trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h
trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Tue Oct 12 23:57:12 2010
@@ -26,11 +26,13 @@
// Avoid complaining about the deprecated APIs.
#define INK_DEPRECATED
+#include <stdio.h>
+
#include "inktomi++.h"
#include "I_Layout.h"
+#include "ts.h"
#include "InkAPIInternal.h"
-#include <stdio.h>
#include "Log.h"
#include "URL.h"
#include "MIME.h"
@@ -47,7 +49,6 @@
#include "ProxyConfig.h"
#include "stats/CoupledStats.h"
#include "stats/Stats.h"
-#include "InkAPIInternal.h"
#include "Plugin.h"
#include "LogObject.h"
#include "LogConfig.h"
Modified: trafficserver/traffic/trunk/proxy/InkAPIInternal.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPIInternal.h?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPIInternal.h (original)
+++ trafficserver/traffic/trunk/proxy/InkAPIInternal.h Tue Oct 12 23:57:12 2010
@@ -29,7 +29,7 @@
#include "StatSystem.h"
#include "P_Net.h"
#include "api/ts/ts_private_frozen.h"
-//#include "MixtAPIInternal.h"
+#include "api/ts/InkAPIPrivateIOCore.h"
#include "HTTP.h"
#include "List.h"
#include "ProxyConfig.h"
Modified: trafficserver/traffic/trunk/proxy/Prefetch.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/Prefetch.h?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/Prefetch.h (original)
+++ trafficserver/traffic/trunk/proxy/Prefetch.h Tue Oct 12 23:57:12 2010
@@ -31,6 +31,7 @@
#include "Update.h"
#include "api/ts/ts_private_frozen.h"
+#include "api/ts/InkAPIHughes.h"
#define IPSTRARGS(ip) (unsigned int) ((unsigned char *) &(ip))[0], \
(unsigned int) ((unsigned char *) &(ip))[1], \
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts_private.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts_private.h?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts_private.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts_private.h Tue Oct 12 23:57:12 2010
@@ -34,7 +34,7 @@
#ifndef __INK_API_PRIVATE_H__
#define __INK_API_PRIVATE_H__
-#include "ts_private_frozen.h"
+#include <ts/ts_private_frozen.h>
#ifdef __cplusplus
extern "C"
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts_private_frozen.h Tue Oct 12 23:57:12 2010
@@ -34,8 +34,8 @@
#ifndef __INK_API_PRIVATE_FROZEN_H__
#define __INK_API_PRIVATE_FROZEN_H__
-#include "ts.h"
-#include "InkAPIPrivateIOCore.h"
+#include <ts/ts.h>
+
#ifdef __cplusplus
extern "C"
{
@@ -43,14 +43,12 @@ extern "C"
/****************************************************************************
* Create a new field and assign it a name
- * contact: MIXT
****************************************************************************/
inkapi INKMLoc INKMimeHdrFieldCreateNamed(INKMBuffer bufp, INKMLoc mh_mloc, const char *name, int name_len);
/****************************************************************************
* Test if cache ready to accept request for a specific type of data
- * contact: MIXT
****************************************************************************/
inkapi INKReturnCode INKCacheDataTypeReady(INKCacheDataType type, int *is_ready);
@@ -583,19 +581,6 @@ extern "C"
****************************************************************************/
inkapi INKReturnCode INKUserPolicyFetch(INKU32 ip, char *name);
-/* ----------------------------------------------------------------------
- *
- * Aerocast, MIXT SDK
- * contact: MIXT
- *
- * ---------------------------------------------------------------------- */
-#define INK_EVENT_MIXT_READ_REQUEST_HDR INK_EVENT_INTERNAL_60201
-/* ----------------------------------------------------------------------
- * Prefetch APIs
- * ---------------------------------------------------------------------- */
-
-#include "InkAPIHughes.h"
-
#ifdef __cplusplus
}
#endif /* __cplusplus */
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/CfgContextImpl.cc Tue Oct 12 23:57:12 2010
@@ -1933,8 +1933,6 @@ PartitionObj::PartitionObj(TokenList * t
}
if (!strcmp(token->value, "http")) {
m_ele->scheme = INK_PARTITION_HTTP;
- } else if (!strcmp(token->value, "mixt")) {
- m_ele->scheme = INK_PARTITION_MIXT;
} else {
m_ele->scheme = INK_PARTITION_UNDEFINED;
}
@@ -1980,9 +1978,6 @@ PartitionObj::formatEleToRule()
case INK_PARTITION_HTTP:
strncat(buf, "http", sizeof(buf) - strlen(buf) - 1);
break;
- case INK_PARTITION_MIXT:
- strncat(buf, "mixt", sizeof(buf) - strlen(buf) - 1);
- break;
default:
// Handled here:
// INK_PARTITION_UNDEFINED, INK_SIZE_FMT_ABSOLUTE, INK_SIZE_FMT_UNDEFINED
@@ -2016,7 +2011,6 @@ bool PartitionObj::isValid()
switch (m_ele->scheme) {
case INK_PARTITION_HTTP:
- case INK_PARTITION_MIXT:
break;
default:
m_valid = false;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/api2/include/INKMgmtAPI.h Tue Oct 12 23:57:12 2010
@@ -364,7 +364,6 @@ typedef enum
typedef enum /* possible schemes to divide partition by */
{
INK_PARTITION_HTTP,
- INK_PARTITION_MIXT,
INK_PARTITION_UNDEFINED
} INKPartitionSchemeT;
Modified: trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/utils/MgmtConverter.cc Tue Oct 12 23:57:12 2010
@@ -597,8 +597,6 @@ convertPartitionRule_xml(XMLNode * rule_
if (strcmp(rule_node->getNodeName(), "http") == 0) {
ele->scheme = INK_PARTITION_HTTP;
- } else if (strcmp(rule_node->getNodeName(), "mixt") == 0) {
- ele->scheme = INK_PARTITION_MIXT;
} else {
INKPartitionEleDestroy(ele);
return NULL;
@@ -1605,9 +1603,6 @@ convertPartitionRule_ts(INKCfgEle * cfg_
case INK_PARTITION_HTTP:
writeXmlAttrStartTag(xml_file, "http");
break;
- case INK_PARTITION_MIXT:
- writeXmlAttrStartTag(xml_file, "mixt");
- break;
default:
goto Lerror;
}
@@ -1630,9 +1625,6 @@ convertPartitionRule_ts(INKCfgEle * cfg_
case INK_PARTITION_HTTP:
writeXmlEndTag(xml_file, "http");
break;
- case INK_PARTITION_MIXT:
- writeXmlEndTag(xml_file, "mixt");
- break;
default:
break;
}
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfig.cc Tue Oct 12 23:57:12 2010
@@ -2004,8 +2004,6 @@ updatePartitionConfig(char *rules[], int
// scheme
if (strcmp(tokens[1], "http") == 0) {
ele->scheme = INK_PARTITION_HTTP;
- } else if (strcmp(tokens[1], "mixt") == 0) {
- ele->scheme = INK_PARTITION_MIXT;
} else {
ele->cfg_ele.error = INK_ERR_INVALID_CONFIG_RULE;
Debug("config", "[updatePartitionConfig] invalid scheme - SKIP");
Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc?rev=1021954&r1=1021953&r2=1021954&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebConfigRender.cc Tue Oct 12 23:57:12 2010
@@ -4838,9 +4838,6 @@ convert_partition_ele_to_html_format(INK
case INK_PARTITION_HTTP:
snprintf(scheme, MAX_RULE_PART_SIZE, "http");
break;
- case INK_PARTITION_MIXT:
- snprintf(scheme, MAX_RULE_PART_SIZE, "mixt");
- break;
default:
goto Lerror;
}