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/11/16 21:22:08 UTC
svn commit: r1035782 [1/29] - in /trafficserver/traffic/trunk:
example/add-header/ example/append-transform/ example/basic-auth/
example/blacklist-0/ example/blacklist-1/ example/bnull-transform/
example/cache_plugin/ example/cache_scan/ example/file-1...
Author: zwoop
Date: Tue Nov 16 20:22:02 2010
New Revision: 1035782
URL: http://svn.apache.org/viewvc?rev=1035782&view=rev
Log:
TS-521 Rename all public APIs from INK* to TS*.
Removed:
trafficserver/traffic/trunk/test/plugin/add-header-deprecated/Makefile.am
trafficserver/traffic/trunk/test/plugin/add-header-deprecated/add-header.deprecated.c
trafficserver/traffic/trunk/test/plugin/add-header-deprecated/readme.txt
trafficserver/traffic/trunk/test/plugin/append-transform-deprecated/Makefile.am
trafficserver/traffic/trunk/test/plugin/append-transform-deprecated/append-transform.deprecated.c
trafficserver/traffic/trunk/test/plugin/append-transform-deprecated/readme.txt
trafficserver/traffic/trunk/test/plugin/basic-auth-deprecated/Makefile.am
trafficserver/traffic/trunk/test/plugin/basic-auth-deprecated/basic-auth.deprecated.c
trafficserver/traffic/trunk/test/plugin/basic-auth-deprecated/readme.txt
trafficserver/traffic/trunk/test/plugin/redirect-1-deprecated/Makefile.am
trafficserver/traffic/trunk/test/plugin/redirect-1-deprecated/readme.txt
trafficserver/traffic/trunk/test/plugin/redirect-1-deprecated/redirect-1.deprecated.c
Modified:
trafficserver/traffic/trunk/example/add-header/add-header.c
trafficserver/traffic/trunk/example/add-header/readme.txt
trafficserver/traffic/trunk/example/append-transform/append-transform.c
trafficserver/traffic/trunk/example/append-transform/readme.txt
trafficserver/traffic/trunk/example/basic-auth/basic-auth.c
trafficserver/traffic/trunk/example/basic-auth/readme.txt
trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c
trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c
trafficserver/traffic/trunk/example/bnull-transform/bnull-transform.c
trafficserver/traffic/trunk/example/cache_plugin/cache_plugin.cc
trafficserver/traffic/trunk/example/cache_scan/cache_scan.cc
trafficserver/traffic/trunk/example/file-1/file-1.c
trafficserver/traffic/trunk/example/file-1/readme.txt
trafficserver/traffic/trunk/example/file_system_cache/DiskCache.cc
trafficserver/traffic/trunk/example/file_system_cache/DiskCache.h
trafficserver/traffic/trunk/example/file_system_cache/diskcache_plugin.cc
trafficserver/traffic/trunk/example/file_system_cache/test_diskcache.cc
trafficserver/traffic/trunk/example/gzip-transform/gunzip.c
trafficserver/traffic/trunk/example/gzip-transform/gzip.c
trafficserver/traffic/trunk/example/hello/hello.c
trafficserver/traffic/trunk/example/include_other/macro.h
trafficserver/traffic/trunk/example/null-transform/null-transform.c
trafficserver/traffic/trunk/example/null-transform/readme.txt
trafficserver/traffic/trunk/example/output-header/output-header.c
trafficserver/traffic/trunk/example/output-header/readme
trafficserver/traffic/trunk/example/prefetch/prefetch-plugin-eg1.c
trafficserver/traffic/trunk/example/prefetch/test-hns-plugin.c
trafficserver/traffic/trunk/example/protocol/Protocol.c
trafficserver/traffic/trunk/example/protocol/TxnSM.c
trafficserver/traffic/trunk/example/protocol/TxnSM.h
trafficserver/traffic/trunk/example/query_remap/query_remap.c
trafficserver/traffic/trunk/example/redirect-1/redirect-1.c
trafficserver/traffic/trunk/example/remap/remap.cc
trafficserver/traffic/trunk/example/replace-header/replace-header.c
trafficserver/traffic/trunk/example/response-header-1/response-header-1.c
trafficserver/traffic/trunk/example/server-transform/server-transform.c
trafficserver/traffic/trunk/example/session-1/session-1.c
trafficserver/traffic/trunk/example/thread-1/readme.txt
trafficserver/traffic/trunk/example/thread-1/thread-1.c
trafficserver/traffic/trunk/example/thread-pool/psi.c
trafficserver/traffic/trunk/example/thread-pool/test/SDKTest/psi_server.c
trafficserver/traffic/trunk/example/thread-pool/thread.c
trafficserver/traffic/trunk/example/thread-pool/thread.h
trafficserver/traffic/trunk/iocore/cache/Cache.cc
trafficserver/traffic/trunk/iocore/cache/CachePages.cc
trafficserver/traffic/trunk/iocore/cache/NewCacheVC.cc
trafficserver/traffic/trunk/iocore/cluster/ClusterAPI.cc
trafficserver/traffic/trunk/libinktomi++/ink_config.h.in
trafficserver/traffic/trunk/proxy/FetchSM.cc
trafficserver/traffic/trunk/proxy/FetchSM.h
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/InkAPIInternal.h
trafficserver/traffic/trunk/proxy/InkAPITest.cc
trafficserver/traffic/trunk/proxy/InkAPITestTool.cc
trafficserver/traffic/trunk/proxy/InkIOCoreAPI.cc
trafficserver/traffic/trunk/proxy/Main.cc
trafficserver/traffic/trunk/proxy/Plugin.cc
trafficserver/traffic/trunk/proxy/Prefetch.cc
trafficserver/traffic/trunk/proxy/Prefetch.h
trafficserver/traffic/trunk/proxy/StatSystemV2.cc
trafficserver/traffic/trunk/proxy/Transform.cc
trafficserver/traffic/trunk/proxy/UDPAPIClientTest.cc
trafficserver/traffic/trunk/proxy/UDPAPITest.cc
trafficserver/traffic/trunk/proxy/UserNameCacheTest.cc
trafficserver/traffic/trunk/proxy/api/ts/InkAPIHughes.h
trafficserver/traffic/trunk/proxy/api/ts/InkAPIPrivateIOCore.h
trafficserver/traffic/trunk/proxy/api/ts/experimental.h
trafficserver/traffic/trunk/proxy/api/ts/remap.h
trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
trafficserver/traffic/trunk/proxy/hdrs/MIME.cc
trafficserver/traffic/trunk/proxy/http2/HttpClientSession.cc
trafficserver/traffic/trunk/proxy/http2/HttpClientSession.h
trafficserver/traffic/trunk/proxy/http2/HttpDebugNames.cc
trafficserver/traffic/trunk/proxy/http2/HttpDebugNames.h
trafficserver/traffic/trunk/proxy/http2/HttpProxyServerMain.cc
trafficserver/traffic/trunk/proxy/http2/HttpSM.cc
trafficserver/traffic/trunk/proxy/http2/HttpSM.h
trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
trafficserver/traffic/trunk/proxy/http2/HttpTransact.h
trafficserver/traffic/trunk/proxy/http2/HttpTransactCache.cc
trafficserver/traffic/trunk/proxy/http2/HttpUpdateSM.cc
trafficserver/traffic/trunk/proxy/mgmt2/api2/MgmtPlugin.cc
trafficserver/traffic/trunk/test/SDKtest/client/ClientAPI.h
trafficserver/traffic/trunk/test/SDKtest/client/Config.cc
trafficserver/traffic/trunk/test/SDKtest/client/Config.h
trafficserver/traffic/trunk/test/SDKtest/client/Defines.h
trafficserver/traffic/trunk/test/SDKtest/client/DoTest.cc
trafficserver/traffic/trunk/test/SDKtest/client/DoTest.h
trafficserver/traffic/trunk/test/SDKtest/client/LoadGenerator.h
trafficserver/traffic/trunk/test/SDKtest/client/Main.cc
trafficserver/traffic/trunk/test/SDKtest/client/Plugin.cc
trafficserver/traffic/trunk/test/SDKtest/client/Plugin.h
trafficserver/traffic/trunk/test/SDKtest/client/api/BlackList.c
trafficserver/traffic/trunk/test/SDKtest/client/api/CheckAppend-1.c
trafficserver/traffic/trunk/test/SDKtest/client/api/CheckAppend.c
trafficserver/traffic/trunk/test/SDKtest/client/api/CheckContentClient.c
trafficserver/traffic/trunk/test/SDKtest/client/api/CheckReplaceHeader.c
trafficserver/traffic/trunk/test/SDKtest/client/api/ClientAPI.h
trafficserver/traffic/trunk/test/SDKtest/client/api/RequestList.c
trafficserver/traffic/trunk/test/SDKtest/client/api/SimBasicAuth-0.c
trafficserver/traffic/trunk/test/SDKtest/client/api/SimBasicAuth-1.c
trafficserver/traffic/trunk/test/SDKtest/client/api/SimInkBench.c
trafficserver/traffic/trunk/test/SDKtest/client/api/SimInkBenchCache.c
trafficserver/traffic/trunk/test/SDKtest/client/api/SimSDKtest.c
trafficserver/traffic/trunk/test/SDKtest/client/api/SimSDKtestCache.c
trafficserver/traffic/trunk/test/SDKtest/client/api/SingleHostFilter.c
trafficserver/traffic/trunk/test/SDKtest/client/api/connection_finish.c
trafficserver/traffic/trunk/test/SDKtest/client/api/header_process.c
trafficserver/traffic/trunk/test/SDKtest/client/api/hello_world.c
trafficserver/traffic/trunk/test/SDKtest/client/api/internal/CheckAppend.c
trafficserver/traffic/trunk/test/SDKtest/client/api/internal/CheckReplaceHeader.c
trafficserver/traffic/trunk/test/SDKtest/client/api/internal/ClientAPI.h
trafficserver/traffic/trunk/test/SDKtest/client/api/internal/TestCacheAPI.c
trafficserver/traffic/trunk/test/SDKtest/client/api/options_process.c
trafficserver/traffic/trunk/test/SDKtest/client/api/options_process_finish.c
trafficserver/traffic/trunk/test/SDKtest/client/api/partial_body_process.c
trafficserver/traffic/trunk/test/SDKtest/client/api/plugin_finish.c
trafficserver/traffic/trunk/test/SDKtest/client/api/readme
trafficserver/traffic/trunk/test/SDKtest/client/api/report.c
trafficserver/traffic/trunk/test/SDKtest/client/api/request_create.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/ServerAPI.h
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/CheckContentServer.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/LogRequest.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/ServerAPI.h
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/SimSynthServer.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/SimSynthServerCache.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/hello_world.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/options_process.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/options_process_finish.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/plugin_finish.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/readme
trafficserver/traffic/trunk/test/SDKtest/synth_server/api/response_prepare.c
trafficserver/traffic/trunk/test/SDKtest/synth_server/synth_server.c
trafficserver/traffic/trunk/test/deft/proc_manager.cc
trafficserver/traffic/trunk/test/plugin/CacheAPITester/CacheAPITester.c
trafficserver/traffic/trunk/test/plugin/CacheAPITester/CacheAPITester.h
trafficserver/traffic/trunk/test/plugin/INKAction/INKAction.cc
trafficserver/traffic/trunk/test/plugin/INKAction/README.txt
trafficserver/traffic/trunk/test/plugin/INKContLeak/wapnet.c
trafficserver/traffic/trunk/test/plugin/INKContinuations/INKContSchedule.c
trafficserver/traffic/trunk/test/plugin/INKContinuations/ServerSM.cc
trafficserver/traffic/trunk/test/plugin/INKContinuations/mod.Sched
trafficserver/traffic/trunk/test/plugin/INKFopen/INKFopen.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpHook.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpReenableStop.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpSelAlt.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpSsnHookAdd.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpTransaction.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpTxnErrBodySet.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpTxnHookAdd.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpTxnIPAddress.cc
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKHttpTxnServer.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/INKProto.c
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/README.txt
trafficserver/traffic/trunk/test/plugin/INKHttpHooksTrans/altSelect.notes
trafficserver/traffic/trunk/test/plugin/INKNetConnect/INKNetConnectTest.c
trafficserver/traffic/trunk/test/plugin/INKNetConnect/INKqa8418.c
trafficserver/traffic/trunk/test/plugin/alt-info/alt-info.c
trafficserver/traffic/trunk/test/plugin/alt-info/alt_info_spec.htm
trafficserver/traffic/trunk/test/plugin/assembly/assembly.c
trafficserver/traffic/trunk/test/plugin/assembly/common.h
trafficserver/traffic/trunk/test/plugin/assembly/headers.c
trafficserver/traffic/trunk/test/plugin/assembly/headers.h
trafficserver/traffic/trunk/test/plugin/assembly/list.c
trafficserver/traffic/trunk/test/plugin/blacklist-1-neg/blacklist-1-neg.c
trafficserver/traffic/trunk/test/plugin/check-constants/check-constants.c
trafficserver/traffic/trunk/test/plugin/check-http/check-http-0.c
trafficserver/traffic/trunk/test/plugin/check-mime-1/check-mime-1.c
trafficserver/traffic/trunk/test/plugin/check-mime-1/check_mime_1_spec.htm
trafficserver/traffic/trunk/test/plugin/check-mime/check-mime-0.c
trafficserver/traffic/trunk/test/plugin/check-mime/check-mime.c
trafficserver/traffic/trunk/test/plugin/check-url/check-url-0.c
trafficserver/traffic/trunk/test/plugin/climate/climate.c
trafficserver/traffic/trunk/test/plugin/climate/events.h
trafficserver/traffic/trunk/test/plugin/cluster-RPC/clusterRPC.c
trafficserver/traffic/trunk/test/plugin/include_other/macro.h
trafficserver/traffic/trunk/test/plugin/lookup/lookup.c
trafficserver/traffic/trunk/test/plugin/order/README.txt
trafficserver/traffic/trunk/test/plugin/order/orderplugin1.c
trafficserver/traffic/trunk/test/plugin/order/orderplugin2.c
trafficserver/traffic/trunk/test/plugin/order/orderplugin3.c
trafficserver/traffic/trunk/test/plugin/order/orderplugin4.c
trafficserver/traffic/trunk/test/plugin/order/orderstartplugin.c
trafficserver/traffic/trunk/test/plugin/plugin_as_origin/http_connect_bridge.c
trafficserver/traffic/trunk/test/plugin/plugin_as_origin/net_bridge.c
trafficserver/traffic/trunk/test/plugin/plugin_as_origin/serve_file.c
trafficserver/traffic/trunk/test/plugin/plugin_as_origin/test_dealloc.c
trafficserver/traffic/trunk/test/plugin/redirect-1-neg/redirect-1-neg.c
trafficserver/traffic/trunk/test/plugin/session-2/session-2.c
trafficserver/traffic/trunk/test/plugin/session-2/session_2_spec.htm
trafficserver/traffic/trunk/test/plugin/test-mgmt/test-mgmt.c
trafficserver/traffic/trunk/test/plugin/test-protocol/test-protocol.c
trafficserver/traffic/trunk/test/plugin/test-protocol/test-protocol.cc
trafficserver/traffic/trunk/test/plugin/test-protocol/test-protocol.h
trafficserver/traffic/trunk/test/plugin/test-protocol/test_protocol_spec.htm
trafficserver/traffic/trunk/test/plugin/test-transform/test-transform.c
trafficserver/traffic/trunk/test/plugin/test-transform/test_transform_spec.htm
trafficserver/traffic/trunk/test/plugin/write-server-ip/write-server-ip.c
trafficserver/traffic/trunk/test/plugin/write-server-ip/write_server_ip_spec.htm
Modified: trafficserver/traffic/trunk/example/add-header/add-header.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/add-header/add-header.c?rev=1035782&r1=1035781&r2=1035782&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/add-header/add-header.c (original)
+++ trafficserver/traffic/trunk/example/add-header/add-header.c Tue Nov 16 20:22:02 2010
@@ -38,27 +38,27 @@
#include <string.h>
#include <ts/ts.h>
-static INKMBuffer hdr_bufp;
-static INKMLoc hdr_loc;
+static TSMBuffer hdr_bufp;
+static TSMLoc hdr_loc;
static void
-add_header(INKHttpTxn txnp, INKCont contp)
+add_header(TSHttpTxn txnp, TSCont contp)
{
- INKMBuffer req_bufp;
- INKMLoc req_loc;
- INKMLoc field_loc;
- INKMLoc next_field_loc;
- INKMLoc new_field_loc;
+ TSMBuffer req_bufp;
+ TSMLoc req_loc;
+ TSMLoc field_loc;
+ TSMLoc next_field_loc;
+ TSMLoc new_field_loc;
int retval;
- if (!INKHttpTxnClientReqGet(txnp, &req_bufp, &req_loc)) {
- INKError("[add_header] Error while retrieving client request header\n");
+ if (!TSHttpTxnClientReqGet(txnp, &req_bufp, &req_loc)) {
+ TSError("[add_header] Error while retrieving client request header\n");
goto done;
}
- field_loc = INKMimeHdrFieldGet(hdr_bufp, hdr_loc, 0);
- if (field_loc == INK_ERROR_PTR) {
- INKError("[add_header] Error while getting field");
+ field_loc = TSMimeHdrFieldGet(hdr_bufp, hdr_loc, 0);
+ if (field_loc == TS_ERROR_PTR) {
+ TSError("[add_header] Error while getting field");
goto error;
}
@@ -66,58 +66,58 @@ add_header(INKHttpTxn txnp, INKCont cont
while (field_loc) {
/* First create a new field in the client request header */
- new_field_loc = INKMimeHdrFieldCreate(req_bufp, req_loc);
- if (new_field_loc == INK_ERROR_PTR) {
- INKError("[add_header] Error while creating new field");
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ new_field_loc = TSMimeHdrFieldCreate(req_bufp, req_loc);
+ if (new_field_loc == TS_ERROR_PTR) {
+ TSError("[add_header] Error while creating new field");
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
break;
}
/* Then copy our new field at this new location */
- retval = INKMimeHdrFieldCopy(req_bufp, req_loc, new_field_loc, hdr_bufp, hdr_loc, field_loc);
- if (retval == INK_ERROR) {
- INKError("[add_header] Error while copying new field");
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ retval = TSMimeHdrFieldCopy(req_bufp, req_loc, new_field_loc, hdr_bufp, hdr_loc, field_loc);
+ if (retval == TS_ERROR) {
+ TSError("[add_header] Error while copying new field");
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
break;
}
/* Add this field to the Http client request header */
- retval = INKMimeHdrFieldAppend(req_bufp, req_loc, new_field_loc);
- if (retval == INK_ERROR) {
- INKError("[add_header] Error while appending new field");
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ retval = TSMimeHdrFieldAppend(req_bufp, req_loc, new_field_loc);
+ if (retval == TS_ERROR) {
+ TSError("[add_header] Error while appending new field");
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
break;
}
/* We can now release this handle */
- INKHandleMLocRelease(req_bufp, req_loc, new_field_loc);
+ TSHandleMLocRelease(req_bufp, req_loc, new_field_loc);
- next_field_loc = INKMimeHdrFieldNext(hdr_bufp, hdr_loc, field_loc);
- if (next_field_loc == INK_ERROR_PTR) {
- INKError("[add_header] Error while getting next field to add");
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ next_field_loc = TSMimeHdrFieldNext(hdr_bufp, hdr_loc, field_loc);
+ if (next_field_loc == TS_ERROR_PTR) {
+ TSError("[add_header] Error while getting next field to add");
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
goto error;
}
- INKHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
+ TSHandleMLocRelease(hdr_bufp, hdr_loc, field_loc);
field_loc = next_field_loc;
}
error:
- INKHandleMLocRelease(req_bufp, INK_NULL_MLOC, req_loc);
+ TSHandleMLocRelease(req_bufp, TS_NULL_MLOC, req_loc);
done:
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
static int
-add_header_plugin(INKCont contp, INKEvent event, void *edata)
+add_header_plugin(TSCont contp, TSEvent event, void *edata)
{
- INKHttpTxn txnp = (INKHttpTxn) edata;
+ TSHttpTxn txnp = (TSHttpTxn) edata;
switch (event) {
- case INK_EVENT_HTTP_READ_REQUEST_HDR:
+ case TS_EVENT_HTTP_READ_REQUEST_HDR:
add_header(txnp, contp);
return 0;
default:
@@ -130,7 +130,7 @@ int
check_ts_version()
{
- const char *ts_version = INKTrafficServerVersionGet();
+ const char *ts_version = TSTrafficServerVersionGet();
int result = 0;
if (ts_version) {
@@ -152,62 +152,62 @@ check_ts_version()
}
void
-INKPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
- INKMLoc field_loc;
+ TSMLoc field_loc;
const char *p;
int i, retval;
- INKPluginRegistrationInfo info;
+ TSPluginRegistrationInfo info;
info.plugin_name = "add-header";
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
- INKError("[PluginInit] Plugin registration failed.\n");
+ if (!TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+ TSError("[PluginInit] Plugin registration failed.\n");
goto error;
}
if (!check_ts_version()) {
- INKError("[PluginInit] Plugin requires Traffic Server 2.0 or later\n");
+ TSError("[PluginInit] Plugin requires Traffic Server 2.0 or later\n");
goto error;
}
if (argc < 2) {
- INKError("[PluginInit] Usage: %s \"name1: value1\" \"name2: value2\" ...>\n", argv[0]);
+ TSError("[PluginInit] Usage: %s \"name1: value1\" \"name2: value2\" ...>\n", argv[0]);
goto error;
}
- hdr_bufp = INKMBufferCreate();
- if (hdr_bufp == INK_ERROR_PTR) {
- INKError("[PluginInit] Can not create mbuffer");
+ hdr_bufp = TSMBufferCreate();
+ if (hdr_bufp == TS_ERROR_PTR) {
+ TSError("[PluginInit] Can not create mbuffer");
goto error;
}
- hdr_loc = INKMimeHdrCreate(hdr_bufp);
- if (hdr_loc == INK_ERROR_PTR) {
- INKError("[PluginInit] Can not create mime header");
+ hdr_loc = TSMimeHdrCreate(hdr_bufp);
+ if (hdr_loc == TS_ERROR_PTR) {
+ TSError("[PluginInit] Can not create mime header");
goto error;
}
for (i = 1; i < argc; i++) {
- field_loc = INKMimeHdrFieldCreate(hdr_bufp, hdr_loc);
- if (field_loc == INK_ERROR_PTR) {
- INKError("[PluginInit] Error while creating field");
+ field_loc = TSMimeHdrFieldCreate(hdr_bufp, hdr_loc);
+ if (field_loc == TS_ERROR_PTR) {
+ TSError("[PluginInit] Error while creating field");
goto error;
}
- retval = INKMimeHdrFieldAppend(hdr_bufp, hdr_loc, field_loc);
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while adding field");
+ retval = TSMimeHdrFieldAppend(hdr_bufp, hdr_loc, field_loc);
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while adding field");
goto error;
}
p = strchr(argv[i], ':');
if (p) {
- retval = INKMimeHdrFieldNameSet(hdr_bufp, hdr_loc, field_loc, argv[i], p - argv[i]);
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while naming field");
+ retval = TSMimeHdrFieldNameSet(hdr_bufp, hdr_loc, field_loc, argv[i], p - argv[i]);
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while naming field");
goto error;
}
@@ -215,15 +215,15 @@ INKPluginInit(int argc, const char *argv
while (isspace(*p)) {
p += 1;
}
- retval = INKMimeHdrFieldValueStringInsert(hdr_bufp, hdr_loc, field_loc, -1, p, strlen(p));
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while inserting field value");
+ retval = TSMimeHdrFieldValueStringInsert(hdr_bufp, hdr_loc, field_loc, -1, p, strlen(p));
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while inserting field value");
goto error;
}
} else {
- retval = INKMimeHdrFieldNameSet(hdr_bufp, hdr_loc, field_loc, argv[i], strlen(argv[i]));
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while inserting field value");
+ retval = TSMimeHdrFieldNameSet(hdr_bufp, hdr_loc, field_loc, argv[i], strlen(argv[i]));
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while inserting field value");
goto error;
}
}
@@ -231,16 +231,16 @@ INKPluginInit(int argc, const char *argv
/* Create a continuation with a mutex as there is a shared global structure
containing the headers to add */
- retval = INKHttpHookAdd(INK_HTTP_READ_REQUEST_HDR_HOOK, INKContCreate(add_header_plugin, INKMutexCreate()));
- if (retval == INK_ERROR) {
- INKError("[PluginInit] Error while registering to hook");
+ retval = TSHttpHookAdd(TS_HTTP_READ_REQUEST_HDR_HOOK, TSContCreate(add_header_plugin, TSMutexCreate()));
+ if (retval == TS_ERROR) {
+ TSError("[PluginInit] Error while registering to hook");
goto error;
}
goto done;
error:
- INKError("[PluginInit] Plugin not initialized");
+ TSError("[PluginInit] Plugin not initialized");
done:
return;
Modified: trafficserver/traffic/trunk/example/add-header/readme.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/add-header/readme.txt?rev=1035782&r1=1035781&r2=1035782&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/add-header/readme.txt (original)
+++ trafficserver/traffic/trunk/example/add-header/readme.txt Tue Nov 16 20:22:02 2010
@@ -9,42 +9,42 @@ enter the following line in plugin.confi
On NT: AddHeader.dll "name1: value1" "name2: value2"
On Solaris: add-header.so "name1: value1" "name2: value2"
-The INKPluginInit function does the following:
+The TSPluginInit function does the following:
- creates a MIME field buffer that contains the header to be added,
using the following functions:
- INKMBufferCreate
- INKMimeHdrCreate
- INKMimeHdrFieldCreate
- INKMimeFieldInsert
- INKMimeHdrFieldNameSet
- INKMimeFieldValueInsert
+ TSMBufferCreate
+ TSMimeHdrCreate
+ TSMimeHdrFieldCreate
+ TSMimeFieldInsert
+ TSMimeHdrFieldNameSet
+ TSMimeFieldValueInsert
- sets up the callback for the add-header-plugin function, which
is the main callback function, using
- INKHttpHookAdd(INK_HTTP_READ_REQUEST_HDR_HOOK,
- INKContCreate(add_header_plugin, NULL);
+ TSHttpHookAdd(TS_HTTP_READ_REQUEST_HDR_HOOK,
+ TSContCreate(add_header_plugin, NULL);
add_header_plugin is the main function in the plugin. In the
-event of INK_EVENT_HTTP_READ_REQUEST_HDR (when the HTTP
+event of TS_EVENT_HTTP_READ_REQUEST_HDR (when the HTTP
state machine reads a request header), it calls the function
add_header.
add_header first makes sure that it can retrieve the client request
header from the current transaction, using
- INKHttpTxnClientReqGet
+ TSHttpTxnClientReqGet
copies the header into the MIME headers of the
HTTP request, using the following functions:
- INKMimeHdrFieldGet
- INKMimeHdrFieldCreate
- INKMimeHdrFieldCopy
- INKMimeHdrFieldAPpend
- INKMimeHdrFieldNext
+ TSMimeHdrFieldGet
+ TSMimeHdrFieldCreate
+ TSMimeHdrFieldCopy
+ TSMimeHdrFieldAPpend
+ TSMimeHdrFieldNext
When add_header is done, it uses
- INKHttpTxnReenable
+ TSHttpTxnReenable
to continue.
Modified: trafficserver/traffic/trunk/example/append-transform/append-transform.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/append-transform/append-transform.c?rev=1035782&r1=1035781&r2=1035782&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/append-transform/append-transform.c (original)
+++ trafficserver/traffic/trunk/example/append-transform/append-transform.c Tue Nov 16 20:22:02 2010
@@ -42,18 +42,18 @@
#include <string.h>
#include <ts/ts.h>
-#define ASSERT_SUCCESS(_x) INKAssert ((_x) == INK_SUCCESS)
+#define ASSERT_SUCCESS(_x) TSAssert ((_x) == TS_SUCCESS)
typedef struct
{
- INKVIO output_vio;
- INKIOBuffer output_buffer;
- INKIOBufferReader output_reader;
+ TSVIO output_vio;
+ TSIOBuffer output_buffer;
+ TSIOBufferReader output_reader;
int append_needed;
} MyData;
-static INKIOBuffer append_buffer;
-static INKIOBufferReader append_buffer_reader;
+static TSIOBuffer append_buffer;
+static TSIOBufferReader append_buffer_reader;
static int append_buffer_length;
static MyData *
@@ -61,8 +61,8 @@ my_data_alloc()
{
MyData *data;
- data = (MyData *) INKmalloc(sizeof(MyData));
- INKReleaseAssert(data && data != INK_ERROR_PTR);
+ data = (MyData *) TSmalloc(sizeof(MyData));
+ TSReleaseAssert(data && data != TS_ERROR_PTR);
data->output_vio = NULL;
data->output_buffer = NULL;
@@ -77,45 +77,45 @@ my_data_destroy(MyData * data)
{
if (data) {
if (data->output_buffer) {
- ASSERT_SUCCESS(INKIOBufferDestroy(data->output_buffer));
+ ASSERT_SUCCESS(TSIOBufferDestroy(data->output_buffer));
}
- INKfree(data);
+ TSfree(data);
}
}
static void
-handle_transform(INKCont contp)
+handle_transform(TSCont contp)
{
- INKVConn output_conn;
- INKVIO write_vio;
+ TSVConn output_conn;
+ TSVIO write_vio;
MyData *data;
int towrite;
int avail;
/* Get the output connection where we'll write data to. */
- output_conn = INKTransformOutputVConnGet(contp);
+ output_conn = TSTransformOutputVConnGet(contp);
/* Get the write VIO for the write operation that was performed on
ourself. This VIO contains the buffer that we are to read from
as well as the continuation we are to call when the buffer is
empty. */
- write_vio = INKVConnWriteVIOGet(contp);
+ write_vio = TSVConnWriteVIOGet(contp);
/* Get our data structure for this operation. The private data
structure contains the output VIO and output buffer. If the
private data structure pointer is NULL, then we'll create it
and initialize its internals. */
- data = INKContDataGet(contp);
+ data = TSContDataGet(contp);
if (!data) {
- towrite = INKVIONBytesGet(write_vio);
+ towrite = TSVIONBytesGet(write_vio);
if (towrite != INT_MAX) {
towrite += append_buffer_length;
}
data = my_data_alloc();
- data->output_buffer = INKIOBufferCreate();
- data->output_reader = INKIOBufferReaderAlloc(data->output_buffer);
- data->output_vio = INKVConnWrite(output_conn, contp, data->output_reader, towrite);
- ASSERT_SUCCESS(INKContDataSet(contp, data));
+ data->output_buffer = TSIOBufferCreate();
+ data->output_reader = TSIOBufferReaderAlloc(data->output_buffer);
+ data->output_vio = TSVConnWrite(output_conn, contp, data->output_reader, towrite);
+ ASSERT_SUCCESS(TSContDataSet(contp, data));
}
/* We also check to see if the write VIO's buffer is non-NULL. A
@@ -125,62 +125,62 @@ handle_transform(INKCont contp)
transformation that means we're done. In a more complex
transformation we might have to finish writing the transformed
data to our output connection. */
- if (!INKVIOBufferGet(write_vio)) {
+ if (!TSVIOBufferGet(write_vio)) {
if (data->append_needed) {
data->append_needed = 0;
- INKIOBufferCopy(INKVIOBufferGet(data->output_vio), append_buffer_reader, append_buffer_length, 0);
+ TSIOBufferCopy(TSVIOBufferGet(data->output_vio), append_buffer_reader, append_buffer_length, 0);
}
- ASSERT_SUCCESS(INKVIONBytesSet(data->output_vio, INKVIONDoneGet(write_vio) + append_buffer_length));
+ ASSERT_SUCCESS(TSVIONBytesSet(data->output_vio, TSVIONDoneGet(write_vio) + append_buffer_length));
- ASSERT_SUCCESS(INKVIOReenable(data->output_vio));
+ ASSERT_SUCCESS(TSVIOReenable(data->output_vio));
return;
}
/* Determine how much data we have left to read. For this append
transform plugin this is also the amount of data we have left
to write to the output connection. */
- towrite = INKVIONTodoGet(write_vio);
+ towrite = TSVIONTodoGet(write_vio);
if (towrite > 0) {
/* The amount of data left to read needs to be truncated by
the amount of data actually in the read buffer. */
- avail = INKIOBufferReaderAvail(INKVIOReaderGet(write_vio));
+ avail = TSIOBufferReaderAvail(TSVIOReaderGet(write_vio));
if (towrite > avail) {
towrite = avail;
}
if (towrite > 0) {
/* Copy the data from the read buffer to the output buffer. */
- INKIOBufferCopy(INKVIOBufferGet(data->output_vio), INKVIOReaderGet(write_vio), towrite, 0);
+ TSIOBufferCopy(TSVIOBufferGet(data->output_vio), TSVIOReaderGet(write_vio), towrite, 0);
/* Tell the read buffer that we have read the data and are no
longer interested in it. */
- ASSERT_SUCCESS(INKIOBufferReaderConsume(INKVIOReaderGet(write_vio), towrite));
+ ASSERT_SUCCESS(TSIOBufferReaderConsume(TSVIOReaderGet(write_vio), towrite));
/* Modify the write VIO to reflect how much data we've
completed. */
- ASSERT_SUCCESS(INKVIONDoneSet(write_vio, INKVIONDoneGet(write_vio) + towrite));
+ ASSERT_SUCCESS(TSVIONDoneSet(write_vio, TSVIONDoneGet(write_vio) + towrite));
}
}
/* Now we check the write VIO to see if there is data left to
read. */
- if (INKVIONTodoGet(write_vio) > 0) {
+ if (TSVIONTodoGet(write_vio) > 0) {
if (towrite > 0) {
/* If there is data left to read, then we reenable the output
connection by reenabling the output VIO. This will wakeup
the output connection and allow it to consume data from the
output buffer. */
- ASSERT_SUCCESS(INKVIOReenable(data->output_vio));
+ ASSERT_SUCCESS(TSVIOReenable(data->output_vio));
/* Call back the write VIO continuation to let it know that we
are ready for more data. */
- INKContCall(INKVIOContGet(write_vio), INK_EVENT_VCONN_WRITE_READY, write_vio);
+ TSContCall(TSVIOContGet(write_vio), TS_EVENT_VCONN_WRITE_READY, write_vio);
}
} else {
if (data->append_needed) {
data->append_needed = 0;
- INKIOBufferCopy(INKVIOBufferGet(data->output_vio), append_buffer_reader, append_buffer_length, 0);
+ TSIOBufferCopy(TSVIOBufferGet(data->output_vio), append_buffer_reader, append_buffer_length, 0);
}
/* If there is no data left to read, then we modify the output
@@ -188,49 +188,49 @@ handle_transform(INKCont contp)
expect. This allows the output connection to know when it
is done reading. We then reenable the output connection so
that it can consume the data we just gave it. */
- ASSERT_SUCCESS(INKVIONBytesSet(data->output_vio, INKVIONDoneGet(write_vio) + append_buffer_length));
+ ASSERT_SUCCESS(TSVIONBytesSet(data->output_vio, TSVIONDoneGet(write_vio) + append_buffer_length));
- ASSERT_SUCCESS(INKVIOReenable(data->output_vio));
+ ASSERT_SUCCESS(TSVIOReenable(data->output_vio));
/* Call back the write VIO continuation to let it know that we
have completed the write operation. */
- INKContCall(INKVIOContGet(write_vio), INK_EVENT_VCONN_WRITE_COMPLETE, write_vio);
+ TSContCall(TSVIOContGet(write_vio), TS_EVENT_VCONN_WRITE_COMPLETE, write_vio);
}
}
static int
-append_transform(INKCont contp, INKEvent event, void *edata)
+append_transform(TSCont contp, TSEvent event, void *edata)
{
/* Check to see if the transformation has been closed by a call to
- INKVConnClose. */
- if (INKVConnClosedGet(contp)) {
- my_data_destroy(INKContDataGet(contp));
- ASSERT_SUCCESS(INKContDestroy(contp));
+ TSVConnClose. */
+ if (TSVConnClosedGet(contp)) {
+ my_data_destroy(TSContDataGet(contp));
+ ASSERT_SUCCESS(TSContDestroy(contp));
return 0;
} else {
switch (event) {
- case INK_EVENT_ERROR:
+ case TS_EVENT_ERROR:
{
- INKVIO write_vio;
+ TSVIO write_vio;
/* Get the write VIO for the write operation that was
performed on ourself. This VIO contains the continuation of
our parent transformation. */
- write_vio = INKVConnWriteVIOGet(contp);
+ write_vio = TSVConnWriteVIOGet(contp);
/* Call back the write VIO continuation to let it know that we
have completed the write operation. */
- INKContCall(INKVIOContGet(write_vio), INK_EVENT_ERROR, write_vio);
+ TSContCall(TSVIOContGet(write_vio), TS_EVENT_ERROR, write_vio);
}
break;
- case INK_EVENT_VCONN_WRITE_COMPLETE:
+ case TS_EVENT_VCONN_WRITE_COMPLETE:
/* When our output connection says that it has finished
reading all the data we've written to it then we should
shutdown the write portion of its connection to
indicate that we don't want to hear about it anymore. */
- ASSERT_SUCCESS(INKVConnShutdown(INKTransformOutputVConnGet(contp), 0, 1));
+ ASSERT_SUCCESS(TSVConnShutdown(TSTransformOutputVConnGet(contp), 0, 1));
break;
- case INK_EVENT_VCONN_WRITE_READY:
+ case TS_EVENT_VCONN_WRITE_READY:
default:
/* If we get a WRITE_READY event or any other type of
event (sent, perhaps, because we were reenabled) then
@@ -244,46 +244,46 @@ append_transform(INKCont contp, INKEvent
}
static int
-transformable(INKHttpTxn txnp)
+transformable(TSHttpTxn txnp)
{
- INKMBuffer bufp;
- INKMLoc hdr_loc;
- INKMLoc field_loc;
- INKHttpStatus resp_status;
+ TSMBuffer bufp;
+ TSMLoc hdr_loc;
+ TSMLoc field_loc;
+ TSHttpStatus resp_status;
const char *value;
int val_length;
- INKHttpTxnServerRespGet(txnp, &bufp, &hdr_loc);
+ TSHttpTxnServerRespGet(txnp, &bufp, &hdr_loc);
/*
* We are only interested in "200 OK" responses.
*/
- if (INK_HTTP_STATUS_OK == (resp_status = INKHttpHdrStatusGet(bufp, hdr_loc))) {
+ if (TS_HTTP_STATUS_OK == (resp_status = TSHttpHdrStatusGet(bufp, hdr_loc))) {
/* We only want to do the transformation on documents that have a
content type of "text/html". */
- field_loc = INKMimeHdrFieldFind(bufp, hdr_loc, "Content-Type", 12);
+ field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, "Content-Type", 12);
if (!field_loc) {
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc));
return 0;
}
- if (INKMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, 0, &value, &val_length) == INK_SUCCESS) {
+ if (TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, 0, &value, &val_length) == TS_SUCCESS) {
#ifndef _WIN32
if (value && (strncasecmp(value, "text/html", sizeof("text/html") - 1) == 0)) {
#else
if (value && (strnicmp(value, "text/html", sizeof("text/html") - 1) == 0)) {
#endif
- ASSERT_SUCCESS(INKHandleStringRelease(bufp, field_loc, value));
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, hdr_loc, field_loc));
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc));
+ ASSERT_SUCCESS(TSHandleStringRelease(bufp, field_loc, value));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, hdr_loc, field_loc));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc));
return 1;
} else {
- ASSERT_SUCCESS(INKHandleStringRelease(bufp, field_loc, value));
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, hdr_loc, field_loc));
- ASSERT_SUCCESS(INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc));
+ ASSERT_SUCCESS(TSHandleStringRelease(bufp, field_loc, value));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, hdr_loc, field_loc));
+ ASSERT_SUCCESS(TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc));
return 0;
}
@@ -294,28 +294,28 @@ transformable(INKHttpTxn txnp)
}
static void
-transform_add(INKHttpTxn txnp)
+transform_add(TSHttpTxn txnp)
{
- INKVConn connp;
+ TSVConn connp;
- connp = INKTransformCreate(append_transform, txnp);
+ connp = TSTransformCreate(append_transform, txnp);
- if (INKHttpTxnHookAdd(txnp, INK_HTTP_RESPONSE_TRANSFORM_HOOK, connp) == INK_ERROR) {
- INKError("[append-transform] Unable to attach plugin to http transaction\n");
+ if (TSHttpTxnHookAdd(txnp, TS_HTTP_RESPONSE_TRANSFORM_HOOK, connp) == TS_ERROR) {
+ TSError("[append-transform] Unable to attach plugin to http transaction\n");
}
}
static int
-transform_plugin(INKCont contp, INKEvent event, void *edata)
+transform_plugin(TSCont contp, TSEvent event, void *edata)
{
- INKHttpTxn txnp = (INKHttpTxn) edata;
+ TSHttpTxn txnp = (TSHttpTxn) edata;
switch (event) {
- case INK_EVENT_HTTP_READ_RESPONSE_HDR:
+ case TS_EVENT_HTTP_READ_RESPONSE_HDR:
if (transformable(txnp)) {
transform_add(txnp);
}
- ASSERT_SUCCESS(INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE));
+ ASSERT_SUCCESS(TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE));
return 0;
default:
break;
@@ -327,36 +327,36 @@ transform_plugin(INKCont contp, INKEvent
static int
load(const char *filename)
{
- INKFile fp;
- INKIOBufferBlock blk;
+ TSFile fp;
+ TSIOBufferBlock blk;
char *p;
int64 avail;
int err;
- fp = INKfopen(filename, "r");
+ fp = TSfopen(filename, "r");
if (!fp) {
return 0;
}
- append_buffer = INKIOBufferCreate();
- append_buffer_reader = INKIOBufferReaderAlloc(append_buffer);
- INKAssert(append_buffer_reader != INK_ERROR_PTR);
+ append_buffer = TSIOBufferCreate();
+ append_buffer_reader = TSIOBufferReaderAlloc(append_buffer);
+ TSAssert(append_buffer_reader != TS_ERROR_PTR);
for (;;) {
- blk = INKIOBufferStart(append_buffer);
- p = INKIOBufferBlockWriteStart(blk, &avail);
+ blk = TSIOBufferStart(append_buffer);
+ p = TSIOBufferBlockWriteStart(blk, &avail);
- err = INKfread(fp, p, avail);
+ err = TSfread(fp, p, avail);
if (err > 0) {
- ASSERT_SUCCESS(INKIOBufferProduce(append_buffer, err));
+ ASSERT_SUCCESS(TSIOBufferProduce(append_buffer, err));
} else {
break;
}
}
- append_buffer_length = INKIOBufferReaderAvail(append_buffer_reader);
+ append_buffer_length = TSIOBufferReaderAvail(append_buffer_reader);
- INKfclose(fp);
+ TSfclose(fp);
return 1;
}
@@ -364,7 +364,7 @@ int
check_ts_version()
{
- const char *ts_version = INKTrafficServerVersionGet();
+ const char *ts_version = TSTrafficServerVersionGet();
int result = 0;
if (ts_version) {
@@ -387,36 +387,36 @@ check_ts_version()
}
void
-INKPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
- INKPluginRegistrationInfo info;
+ TSPluginRegistrationInfo info;
info.plugin_name = "append-transform";
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
- INKError("Plugin registration failed.\n");
+ if (!TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+ TSError("Plugin registration failed.\n");
goto Lerror;
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 2.0 or later\n");
+ TSError("Plugin requires Traffic Server 2.0 or later\n");
goto Lerror;
}
if (argc != 2) {
- INKError("usage: %s <filename>\n", argv[0]);
+ TSError("usage: %s <filename>\n", argv[0]);
goto Lerror;
}
if (!load(argv[1])) {
- INKError("[append-transform] Could not load %s\n", argv[1]);
+ TSError("[append-transform] Could not load %s\n", argv[1]);
goto Lerror;
}
- if (INKHttpHookAdd(INK_HTTP_READ_RESPONSE_HDR_HOOK, INKContCreate(transform_plugin, NULL)) == INK_ERROR) {
- INKError("[append-transform] Unable to set read response header\n");
+ if (TSHttpHookAdd(TS_HTTP_READ_RESPONSE_HDR_HOOK, TSContCreate(transform_plugin, NULL)) == TS_ERROR) {
+ TSError("[append-transform] Unable to set read response header\n");
goto Lerror;
}
@@ -424,5 +424,5 @@ INKPluginInit(int argc, const char *argv
Lerror:
- INKError("[append-transform] Unable to initialize plugin\n");
+ TSError("[append-transform] Unable to initialize plugin\n");
}
Modified: trafficserver/traffic/trunk/example/append-transform/readme.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/append-transform/readme.txt?rev=1035782&r1=1035781&r2=1035782&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/append-transform/readme.txt (original)
+++ trafficserver/traffic/trunk/example/append-transform/readme.txt Tue Nov 16 20:22:02 2010
@@ -20,7 +20,7 @@ On Solaris: append-transform.so path/to/
Specify an absolute path to the text file, or a relative path as
described in the file-plugin README.
-INKPluginInit does the following:
+TSPluginInit does the following:
- makes sure that there is a text file specified in plugin.config
(if not, it returns an error message)
@@ -29,57 +29,57 @@ INKPluginInit does the following:
a buffer to be appended to HTML response bodies
- sets up the global hook to call back the plugin:
- INKHttpHookAdd(INK_HTTP_READ_RESPONSE_HDR_HOOK,
-INKContCreate (transform_plugin, NULL));
+ TSHttpHookAdd(TS_HTTP_READ_RESPONSE_HDR_HOOK,
+TSContCreate (transform_plugin, NULL));
The load function does the following (similar to file-1.c):
- opens the file specified in plugin.config using
- INKfopen
+ TSfopen
- creates a buffer for the text to be appended using
- INKIOBufferCreate
+ TSIOBufferCreate
- creates a buffer reader for the text to be appended using
- INKIOBufferReaderAlloc
+ TSIOBufferReaderAlloc
- reads the contents of the file in to the buffer using:
- INKIOBufferStart
- INKIOBufferBlockWriteStart
- INKfread
- INKIOBufferProduce
- INKIOBufferReaderAvail
+ TSIOBufferStart
+ TSIOBufferBlockWriteStart
+ TSfread
+ TSIOBufferProduce
+ TSIOBufferReaderAvail
- closes the file using
- INKfclose
+ TSfclose
The transform_plugin function does the following:
- tests the response body to make sure it is text/html, using
the function "transformable". The transformable function
uses the following API calls:
- INKHttpTxnServerRespGet
- INKHttpHdrStatusGet
- INKMimeHdrFieldFind
- INKMimeFieldValueGet
+ TSHttpTxnServerRespGet
+ TSHttpHdrStatusGet
+ TSMimeHdrFieldFind
+ TSMimeFieldValueGet
- if the response body is deemed transformable, transform_plugin calls
transform_add
- continues the HTTP transaction using
- INKHttpTxnReenable
+ TSHttpTxnReenable
The transform_add function does the following:
- creates a continuation for the append transform, using
- INKTransformCreate (append_transform, txnp);
+ TSTransformCreate (append_transform, txnp);
The handler function for this continuation is
append_transform.
- adds a transaction hook for the append transform, using
- INKHttpTxnHookAdd(txnp, INK_HTTP_RESPONSE_TRANSFORM_HOOK, connp);
+ TSHttpTxnHookAdd(txnp, TS_HTTP_RESPONSE_TRANSFORM_HOOK, connp);
This transaction hook sets up a callback during transactions.
- When the event INK_HTTP_RESPONSE_TRANSFORM_HOOK happens,
+ When the event TS_HTTP_RESPONSE_TRANSFORM_HOOK happens,
the append_transform function is called back.
The remaining functions in the plugin, append_transform and
Modified: trafficserver/traffic/trunk/example/basic-auth/basic-auth.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/basic-auth/basic-auth.c?rev=1035782&r1=1035781&r2=1035782&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/basic-auth/basic-auth.c (original)
+++ trafficserver/traffic/trunk/example/basic-auth/basic-auth.c Tue Nov 16 20:22:02 2010
@@ -58,7 +58,7 @@ base64_decode(const char *input)
for (len = 0; (input[len] != '\0') && (input[len] != '='); len++);
- output = obuf = (char *) INKmalloc((len * 6) / 8 + 3);
+ output = obuf = (char *) TSmalloc((len * 6) / 8 + 3);
while (len > 0) {
*output++ = decode(0) << 2 | decode(1) >> 4;
@@ -118,42 +118,42 @@ authorized(char *user, char *password)
}
static void
-handle_dns(INKHttpTxn txnp, INKCont contp)
+handle_dns(TSHttpTxn txnp, TSCont contp)
{
- INKMBuffer bufp;
- INKMLoc hdr_loc;
- INKMLoc field_loc;
+ TSMBuffer bufp;
+ TSMLoc hdr_loc;
+ TSMLoc field_loc;
const char *val;
const char *ptr;
char *user, *password;
int authval_length;
- if (!INKHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
- INKError("couldn't retrieve client request header\n");
+ if (!TSHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
+ TSError("couldn't retrieve client request header\n");
goto done;
}
- field_loc = INKMimeHdrFieldFind(bufp, hdr_loc, INK_MIME_FIELD_PROXY_AUTHORIZATION, INK_MIME_LEN_PROXY_AUTHORIZATION);
+ field_loc = TSMimeHdrFieldFind(bufp, hdr_loc, TS_MIME_FIELD_PROXY_AUTHORIZATION, TS_MIME_LEN_PROXY_AUTHORIZATION);
if (!field_loc) {
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
- INKError("no Proxy-Authorization field\n");
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
+ TSError("no Proxy-Authorization field\n");
goto done;
}
- if (INKMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, 0, &val, &authval_length) != INK_SUCCESS) {
- INKError("no value in Proxy-Authorization field\n");
- INKHandleMLocRelease(bufp, hdr_loc, field_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ if (TSMimeHdrFieldValueStringGet(bufp, hdr_loc, field_loc, 0, &val, &authval_length) != TS_SUCCESS) {
+ TSError("no value in Proxy-Authorization field\n");
+ TSHandleMLocRelease(bufp, hdr_loc, field_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
ptr = val;
if (strncmp(ptr, "Basic", 5) != 0) {
- INKError("no Basic auth type in Proxy-Authorization\n");
- INKHandleStringRelease(bufp, field_loc, val);
- INKHandleMLocRelease(bufp, hdr_loc, field_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSError("no Basic auth type in Proxy-Authorization\n");
+ TSHandleStringRelease(bufp, field_loc, val);
+ TSHandleMLocRelease(bufp, hdr_loc, field_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
@@ -165,78 +165,78 @@ handle_dns(INKHttpTxn txnp, INKCont cont
user = base64_decode(ptr);
password = strchr(user, ':');
if (!password) {
- INKError("no password in authorization information\n");
- INKfree(user);
- INKHandleStringRelease(bufp, field_loc, val);
- INKHandleMLocRelease(bufp, hdr_loc, field_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSError("no password in authorization information\n");
+ TSfree(user);
+ TSHandleStringRelease(bufp, field_loc, val);
+ TSHandleMLocRelease(bufp, hdr_loc, field_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
*password = '\0';
password += 1;
if (!authorized(user, password)) {
- INKError("%s:%s not authorized\n", user, password);
- INKfree(user);
- INKHandleStringRelease(bufp, field_loc, val);
- INKHandleMLocRelease(bufp, hdr_loc, field_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSError("%s:%s not authorized\n", user, password);
+ TSfree(user);
+ TSHandleStringRelease(bufp, field_loc, val);
+ TSHandleMLocRelease(bufp, hdr_loc, field_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
- INKfree(user);
- INKHandleStringRelease(bufp, field_loc, val);
- INKHandleMLocRelease(bufp, hdr_loc, field_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSfree(user);
+ TSHandleStringRelease(bufp, field_loc, val);
+ TSHandleMLocRelease(bufp, hdr_loc, field_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
return;
done:
- INKHttpTxnHookAdd(txnp, INK_HTTP_SEND_RESPONSE_HDR_HOOK, contp);
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_ERROR);
+ TSHttpTxnHookAdd(txnp, TS_HTTP_SEND_RESPONSE_HDR_HOOK, contp);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_ERROR);
}
static void
-handle_response(INKHttpTxn txnp)
+handle_response(TSHttpTxn txnp)
{
- INKMBuffer bufp;
- INKMLoc hdr_loc;
- INKMLoc field_loc;
+ TSMBuffer bufp;
+ TSMLoc hdr_loc;
+ TSMLoc field_loc;
const char *insert = "Basic realm=\"proxy\"";
int len = strlen(insert);
- if (!INKHttpTxnClientRespGet(txnp, &bufp, &hdr_loc)) {
- INKError("couldn't retrieve client response header\n");
+ if (!TSHttpTxnClientRespGet(txnp, &bufp, &hdr_loc)) {
+ TSError("couldn't retrieve client response header\n");
goto done;
}
- INKHttpHdrStatusSet(bufp, hdr_loc, INK_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED);
- INKHttpHdrReasonSet(bufp, hdr_loc,
- INKHttpHdrReasonLookup(INK_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED),
- strlen(INKHttpHdrReasonLookup(INK_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED)));
-
- field_loc = INKMimeHdrFieldCreate(bufp, hdr_loc);
- INKMimeHdrFieldNameSet(bufp, hdr_loc, field_loc, INK_MIME_FIELD_PROXY_AUTHENTICATE, INK_MIME_LEN_PROXY_AUTHENTICATE);
- INKMimeHdrFieldValueStringInsert(bufp, hdr_loc, field_loc, -1, insert, len);
- INKMimeHdrFieldAppend(bufp, hdr_loc, field_loc);
+ TSHttpHdrStatusSet(bufp, hdr_loc, TS_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED);
+ TSHttpHdrReasonSet(bufp, hdr_loc,
+ TSHttpHdrReasonLookup(TS_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED),
+ strlen(TSHttpHdrReasonLookup(TS_HTTP_STATUS_PROXY_AUTHENTICATION_REQUIRED)));
+
+ field_loc = TSMimeHdrFieldCreate(bufp, hdr_loc);
+ TSMimeHdrFieldNameSet(bufp, hdr_loc, field_loc, TS_MIME_FIELD_PROXY_AUTHENTICATE, TS_MIME_LEN_PROXY_AUTHENTICATE);
+ TSMimeHdrFieldValueStringInsert(bufp, hdr_loc, field_loc, -1, insert, len);
+ TSMimeHdrFieldAppend(bufp, hdr_loc, field_loc);
- INKHandleMLocRelease(bufp, hdr_loc, field_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSHandleMLocRelease(bufp, hdr_loc, field_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
done:
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
static int
-auth_plugin(INKCont contp, INKEvent event, void *edata)
+auth_plugin(TSCont contp, TSEvent event, void *edata)
{
- INKHttpTxn txnp = (INKHttpTxn) edata;
+ TSHttpTxn txnp = (TSHttpTxn) edata;
switch (event) {
- case INK_EVENT_HTTP_OS_DNS:
+ case TS_EVENT_HTTP_OS_DNS:
handle_dns(txnp, contp);
return 0;
- case INK_EVENT_HTTP_SEND_RESPONSE_HDR:
+ case TS_EVENT_HTTP_SEND_RESPONSE_HDR:
handle_response(txnp);
return 0;
default:
@@ -250,7 +250,7 @@ int
check_ts_version()
{
- const char *ts_version = INKTrafficServerVersionGet();
+ const char *ts_version = TSTrafficServerVersionGet();
int result = 0;
if (ts_version) {
@@ -273,21 +273,21 @@ check_ts_version()
}
void
-INKPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
int i, cc;
- INKPluginRegistrationInfo info;
+ TSPluginRegistrationInfo info;
info.plugin_name = "basic-authorization";
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
- INKError("Plugin registration failed.\n");
+ if (!TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+ TSError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 2.0 or later\n");
+ TSError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
@@ -307,7 +307,7 @@ INKPluginInit(int argc, const char *argv
base64_codes['+'] = cc++;
base64_codes['/'] = cc++;
- INKHttpHookAdd(INK_HTTP_OS_DNS_HOOK, INKContCreate(auth_plugin, NULL));
+ TSHttpHookAdd(TS_HTTP_OS_DNS_HOOK, TSContCreate(auth_plugin, NULL));
}
Modified: trafficserver/traffic/trunk/example/basic-auth/readme.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/basic-auth/readme.txt?rev=1035782&r1=1035781&r2=1035782&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/basic-auth/readme.txt (original)
+++ trafficserver/traffic/trunk/example/basic-auth/readme.txt Tue Nov 16 20:22:02 2010
@@ -3,12 +3,12 @@ The basic-auth.c plugin performs basic H
-- The plugin checks all client request headers for the Proxy-Authorization
MIME field, which should contain the user name and password.
- INKPluginInit sets up a global HTTP hook that calls the plugin
+ TSPluginInit sets up a global HTTP hook that calls the plugin
whenever there is a host DNS lookup. The plugin's continuation
handler, auth-plugin, calls handle_dns to check the
Proxy-Authorization field.
- handle_dns uses INKHttpTxnClientReqGet and INKMimeHdrFieldFind
+ handle_dns uses TSHttpTxnClientReqGet and TSMimeHdrFieldFind
to obtain the Proxy-Authorization field.
-- If the request does not have the Proxy-Authorization field,
@@ -23,7 +23,7 @@ The basic-auth.c plugin performs basic H
plugin back when sending the client response.
handle_dns also reenables the transaction with
- INK_EVENT_HTTP_ERROR, which means that the plugin wants
+ TS_EVENT_HTTP_ERROR, which means that the plugin wants
Traffic Server to terminate the transaction.
When Traffic Server terminates the transaction, it
@@ -38,7 +38,7 @@ The basic-auth.c plugin performs basic H
-- If the Proxy-Authorization MIME field is present, the plugin
checks that the authentication scheme is "Basic".
- handle_dns uses INKMimeFieldValueGet to get the value
+ handle_dns uses TSMimeFieldValueGet to get the value
of the Proxy-Authorization field.
-- The plugin then obtains the base64-encoded user name and password
Modified: trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c?rev=1035782&r1=1035781&r2=1035782&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c (original)
+++ trafficserver/traffic/trunk/example/blacklist-0/blacklist-0.c Tue Nov 16 20:22:02 2010
@@ -38,110 +38,110 @@ static char **sites;
static int nsites;
static void
-handle_dns(INKHttpTxn txnp, INKCont contp)
+handle_dns(TSHttpTxn txnp, TSCont contp)
{
- INKMBuffer bufp;
- INKMLoc hdr_loc;
- INKMLoc url_loc;
+ TSMBuffer bufp;
+ TSMLoc hdr_loc;
+ TSMLoc url_loc;
const char *host;
int i;
int host_length;
- if (!INKHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
- INKError("couldn't retrieve client request header\n");
+ if (!TSHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
+ TSError("couldn't retrieve client request header\n");
goto done;
}
- url_loc = INKHttpHdrUrlGet(bufp, hdr_loc);
+ url_loc = TSHttpHdrUrlGet(bufp, hdr_loc);
if (!url_loc) {
- INKError("couldn't retrieve request url\n");
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSError("couldn't retrieve request url\n");
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
- host = INKUrlHostGet(bufp, url_loc, &host_length);
+ host = TSUrlHostGet(bufp, url_loc, &host_length);
if (!host) {
- INKError("couldn't retrieve request hostname\n");
- INKHandleMLocRelease(bufp, hdr_loc, url_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSError("couldn't retrieve request hostname\n");
+ TSHandleMLocRelease(bufp, hdr_loc, url_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
for (i = 0; i < nsites; i++) {
if (strncmp(host, sites[i], host_length) == 0) {
printf("blacklisting site: %s\n", sites[i]);
- INKHttpTxnHookAdd(txnp, INK_HTTP_SEND_RESPONSE_HDR_HOOK, contp);
- INKHandleStringRelease(bufp, url_loc, host);
- INKHandleMLocRelease(bufp, hdr_loc, url_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, url_loc);
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_ERROR);
+ TSHttpTxnHookAdd(txnp, TS_HTTP_SEND_RESPONSE_HDR_HOOK, contp);
+ TSHandleStringRelease(bufp, url_loc, host);
+ TSHandleMLocRelease(bufp, hdr_loc, url_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, url_loc);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_ERROR);
return;
}
}
- INKHandleStringRelease(bufp, url_loc, host);
- INKHandleMLocRelease(bufp, hdr_loc, url_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSHandleStringRelease(bufp, url_loc, host);
+ TSHandleMLocRelease(bufp, hdr_loc, url_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
done:
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
static void
-handle_response(INKHttpTxn txnp)
+handle_response(TSHttpTxn txnp)
{
- INKMBuffer bufp;
- INKMLoc hdr_loc;
- INKMLoc url_loc;
+ TSMBuffer bufp;
+ TSMLoc hdr_loc;
+ TSMLoc url_loc;
char *url_str;
char *buf;
int url_length;
- if (!INKHttpTxnClientRespGet(txnp, &bufp, &hdr_loc)) {
- INKError("couldn't retrieve client response header\n");
+ if (!TSHttpTxnClientRespGet(txnp, &bufp, &hdr_loc)) {
+ TSError("couldn't retrieve client response header\n");
goto done;
}
- INKHttpHdrStatusSet(bufp, hdr_loc, INK_HTTP_STATUS_FORBIDDEN);
- INKHttpHdrReasonSet(bufp, hdr_loc,
- INKHttpHdrReasonLookup(INK_HTTP_STATUS_FORBIDDEN),
- strlen(INKHttpHdrReasonLookup(INK_HTTP_STATUS_FORBIDDEN)));
+ TSHttpHdrStatusSet(bufp, hdr_loc, TS_HTTP_STATUS_FORBIDDEN);
+ TSHttpHdrReasonSet(bufp, hdr_loc,
+ TSHttpHdrReasonLookup(TS_HTTP_STATUS_FORBIDDEN),
+ strlen(TSHttpHdrReasonLookup(TS_HTTP_STATUS_FORBIDDEN)));
- if (!INKHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
- INKError("couldn't retrieve client request header\n");
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ if (!TSHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
+ TSError("couldn't retrieve client request header\n");
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
- url_loc = INKHttpHdrUrlGet(bufp, hdr_loc);
+ url_loc = TSHttpHdrUrlGet(bufp, hdr_loc);
if (!url_loc) {
- INKError("couldn't retrieve request url\n");
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSError("couldn't retrieve request url\n");
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
- buf = INKmalloc(4096);
+ buf = TSmalloc(4096);
- url_str = INKUrlStringGet(bufp, url_loc, &url_length);
+ url_str = TSUrlStringGet(bufp, url_loc, &url_length);
sprintf(buf, "You are forbidden from accessing \"%s\"\n", url_str);
- INKfree(url_str);
- INKHandleMLocRelease(bufp, hdr_loc, url_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSfree(url_str);
+ TSHandleMLocRelease(bufp, hdr_loc, url_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
- INKHttpTxnErrorBodySet(txnp, buf, strlen(buf), NULL);
+ TSHttpTxnErrorBodySet(txnp, buf, strlen(buf), NULL);
done:
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
static int
-blacklist_plugin(INKCont contp, INKEvent event, void *edata)
+blacklist_plugin(TSCont contp, TSEvent event, void *edata)
{
- INKHttpTxn txnp = (INKHttpTxn) edata;
+ TSHttpTxn txnp = (TSHttpTxn) edata;
switch (event) {
- case INK_EVENT_HTTP_OS_DNS:
+ case TS_EVENT_HTTP_OS_DNS:
handle_dns(txnp, contp);
return 0;
- case INK_EVENT_HTTP_SEND_RESPONSE_HDR:
+ case TS_EVENT_HTTP_SEND_RESPONSE_HDR:
handle_response(txnp);
return 0;
default:
@@ -154,7 +154,7 @@ int
check_ts_version()
{
- const char *ts_version = INKTrafficServerVersionGet();
+ const char *ts_version = TSTrafficServerVersionGet();
int result = 0;
if (ts_version) {
@@ -177,34 +177,34 @@ check_ts_version()
}
void
-INKPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
int i;
- INKPluginRegistrationInfo info;
+ TSPluginRegistrationInfo info;
info.plugin_name = "blacklist-0";
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
- INKError("Plugin registration failed.\n");
+ if (!TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+ TSError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 2.0 or later\n");
+ TSError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
nsites = argc - 1;
if (nsites > 0) {
- sites = (char **) INKmalloc(sizeof(char *) * nsites);
+ sites = (char **) TSmalloc(sizeof(char *) * nsites);
for (i = 0; i < nsites; i++) {
- sites[i] = INKstrdup(argv[i + 1]);
+ sites[i] = TSstrdup(argv[i + 1]);
}
- INKHttpHookAdd(INK_HTTP_OS_DNS_HOOK, INKContCreate(blacklist_plugin, NULL));
+ TSHttpHookAdd(TS_HTTP_OS_DNS_HOOK, TSContCreate(blacklist_plugin, NULL));
}
}
Modified: trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c?rev=1035782&r1=1035781&r2=1035782&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c (original)
+++ trafficserver/traffic/trunk/example/blacklist-1/blacklist-1.c Tue Nov 16 20:22:02 2010
@@ -44,11 +44,11 @@
static char *sites[MAX_NSITES];
static int nsites;
-static INKMutex sites_mutex;
-static INKTextLogObject log;
-static INKCont global_contp;
+static TSMutex sites_mutex;
+static TSTextLogObject log;
+static TSCont global_contp;
-static void handle_txn_start(INKCont contp, INKHttpTxn txnp);
+static void handle_txn_start(TSCont contp, TSHttpTxn txnp);
typedef struct contp_data
{
@@ -60,179 +60,179 @@ typedef struct contp_data
READ_BLACKLIST
} cf;
- INKHttpTxn txnp;
+ TSHttpTxn txnp;
} cdata;
static void
-destroy_continuation(INKHttpTxn txnp, INKCont contp)
+destroy_continuation(TSHttpTxn txnp, TSCont contp)
{
cdata *cd = NULL;
- cd = (cdata *) INKContDataGet(contp);
+ cd = (cdata *) TSContDataGet(contp);
if (cd != NULL) {
- INKfree(cd);
+ TSfree(cd);
}
- INKContDestroy(contp);
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSContDestroy(contp);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
return;
}
static void
-handle_dns(INKHttpTxn txnp, INKCont contp)
+handle_dns(TSHttpTxn txnp, TSCont contp)
{
- INKMBuffer bufp;
- INKMLoc hdr_loc;
- INKMLoc url_loc;
+ TSMBuffer bufp;
+ TSMLoc hdr_loc;
+ TSMLoc url_loc;
const char *host;
int i;
int host_length;
int lock;
- INKReturnCode ret_code;
+ TSReturnCode ret_code;
- if (!INKHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
- INKError("couldn't retrieve client request header\n");
+ if (!TSHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
+ TSError("couldn't retrieve client request header\n");
goto done;
}
- url_loc = INKHttpHdrUrlGet(bufp, hdr_loc);
+ url_loc = TSHttpHdrUrlGet(bufp, hdr_loc);
if (!url_loc) {
- INKError("couldn't retrieve request url\n");
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSError("couldn't retrieve request url\n");
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
- host = INKUrlHostGet(bufp, url_loc, &host_length);
+ host = TSUrlHostGet(bufp, url_loc, &host_length);
if (!host) {
- INKError("couldn't retrieve request hostname\n");
- INKHandleMLocRelease(bufp, hdr_loc, url_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSError("couldn't retrieve request hostname\n");
+ TSHandleMLocRelease(bufp, hdr_loc, url_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
/* We need to lock the sites_mutex as that is the mutex that is
protecting the global list of all blacklisted sites. */
- ret_code = INKMutexLockTry(sites_mutex, &lock);
+ ret_code = TSMutexLockTry(sites_mutex, &lock);
- if (ret_code == INK_ERROR) {
- INKError("Error while locking mutex. Cannot check URL against list. Allowing Site....");
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ if (ret_code == TS_ERROR) {
+ TSError("Error while locking mutex. Cannot check URL against list. Allowing Site....");
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
return;
}
if (!lock) {
- INKDebug("blacklist-1", "Unable to get lock. Will retry after some time");
- INKHandleStringRelease(bufp, url_loc, host);
- INKHandleMLocRelease(bufp, hdr_loc, url_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
- INKContSchedule(contp, RETRY_TIME);
+ TSDebug("blacklist-1", "Unable to get lock. Will retry after some time");
+ TSHandleStringRelease(bufp, url_loc, host);
+ TSHandleMLocRelease(bufp, hdr_loc, url_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
+ TSContSchedule(contp, RETRY_TIME);
return;
}
for (i = 0; i < nsites; i++) {
if (strncmp(host, sites[i], host_length) == 0) {
if (log) {
- INKTextLogObjectWrite(log, "blacklisting site: %s", sites[i]);
+ TSTextLogObjectWrite(log, "blacklisting site: %s", sites[i]);
} else {
- INKDebug("blacklist-1", "blacklisting site: %s\n", sites[i]);
+ TSDebug("blacklist-1", "blacklisting site: %s\n", sites[i]);
}
- INKHttpTxnHookAdd(txnp, INK_HTTP_SEND_RESPONSE_HDR_HOOK, contp);
- INKHandleStringRelease(bufp, url_loc, host);
- INKHandleMLocRelease(bufp, hdr_loc, url_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_ERROR);
- INKMutexUnlock(sites_mutex);
+ TSHttpTxnHookAdd(txnp, TS_HTTP_SEND_RESPONSE_HDR_HOOK, contp);
+ TSHandleStringRelease(bufp, url_loc, host);
+ TSHandleMLocRelease(bufp, hdr_loc, url_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_ERROR);
+ TSMutexUnlock(sites_mutex);
return;
}
}
- INKMutexUnlock(sites_mutex);
- INKHandleStringRelease(bufp, url_loc, host);
- INKHandleMLocRelease(bufp, hdr_loc, url_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSMutexUnlock(sites_mutex);
+ TSHandleStringRelease(bufp, url_loc, host);
+ TSHandleMLocRelease(bufp, hdr_loc, url_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
done:
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
static void
-handle_response(INKHttpTxn txnp, INKCont contp)
+handle_response(TSHttpTxn txnp, TSCont contp)
{
- INKMBuffer bufp;
- INKMLoc hdr_loc;
- INKMLoc url_loc;
+ TSMBuffer bufp;
+ TSMLoc hdr_loc;
+ TSMLoc url_loc;
char *url_str;
char *buf;
int url_length;
- if (!INKHttpTxnClientRespGet(txnp, &bufp, &hdr_loc)) {
- INKError("couldn't retrieve client response header\n");
+ if (!TSHttpTxnClientRespGet(txnp, &bufp, &hdr_loc)) {
+ TSError("couldn't retrieve client response header\n");
goto done;
}
- INKHttpHdrStatusSet(bufp, hdr_loc, INK_HTTP_STATUS_FORBIDDEN);
- INKHttpHdrReasonSet(bufp, hdr_loc,
- INKHttpHdrReasonLookup(INK_HTTP_STATUS_FORBIDDEN),
- strlen(INKHttpHdrReasonLookup(INK_HTTP_STATUS_FORBIDDEN)));
-
- if (!INKHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
- INKError("couldn't retrieve client request header\n");
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSHttpHdrStatusSet(bufp, hdr_loc, TS_HTTP_STATUS_FORBIDDEN);
+ TSHttpHdrReasonSet(bufp, hdr_loc,
+ TSHttpHdrReasonLookup(TS_HTTP_STATUS_FORBIDDEN),
+ strlen(TSHttpHdrReasonLookup(TS_HTTP_STATUS_FORBIDDEN)));
+
+ if (!TSHttpTxnClientReqGet(txnp, &bufp, &hdr_loc)) {
+ TSError("couldn't retrieve client request header\n");
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
- url_loc = INKHttpHdrUrlGet(bufp, hdr_loc);
+ url_loc = TSHttpHdrUrlGet(bufp, hdr_loc);
if (!url_loc) {
- INKError("couldn't retrieve request url\n");
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSError("couldn't retrieve request url\n");
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
goto done;
}
- buf = (char *) INKmalloc(4096);
+ buf = (char *) TSmalloc(4096);
- url_str = INKUrlStringGet(bufp, url_loc, &url_length);
+ url_str = TSUrlStringGet(bufp, url_loc, &url_length);
sprintf(buf, "You are forbidden from accessing \"%s\"\n", url_str);
- INKfree(url_str);
- INKHandleMLocRelease(bufp, hdr_loc, url_loc);
- INKHandleMLocRelease(bufp, INK_NULL_MLOC, hdr_loc);
+ TSfree(url_str);
+ TSHandleMLocRelease(bufp, hdr_loc, url_loc);
+ TSHandleMLocRelease(bufp, TS_NULL_MLOC, hdr_loc);
- INKHttpTxnErrorBodySet(txnp, buf, strlen(buf), NULL);
+ TSHttpTxnErrorBodySet(txnp, buf, strlen(buf), NULL);
done:
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
static void
-read_blacklist(INKCont contp)
+read_blacklist(TSCont contp)
{
char blacklist_file[1024];
- INKFile file;
+ TSFile file;
int lock;
- INKReturnCode ret_code;
+ TSReturnCode ret_code;
- sprintf(blacklist_file, "%s/blacklist.txt", INKPluginDirGet());
- file = INKfopen(blacklist_file, "r");
+ sprintf(blacklist_file, "%s/blacklist.txt", TSPluginDirGet());
+ file = TSfopen(blacklist_file, "r");
- ret_code = INKMutexLockTry(sites_mutex, &lock);
+ ret_code = TSMutexLockTry(sites_mutex, &lock);
- if (ret_code == INK_ERROR) {
- INKError("Failed to lock mutex. Cannot read new blacklist file. Exiting ...\n");
+ if (ret_code == TS_ERROR) {
+ TSError("Failed to lock mutex. Cannot read new blacklist file. Exiting ...\n");
return;
}
nsites = 0;
/* If the Mutext lock is not successful try again in RETRY_TIME */
if (!lock) {
- INKContSchedule(contp, RETRY_TIME);
+ TSContSchedule(contp, RETRY_TIME);
return;
}
if (file != NULL) {
char buffer[1024];
- while (INKfgets(file, buffer, sizeof(buffer) - 1) != NULL && nsites < MAX_NSITES) {
+ while (TSfgets(file, buffer, sizeof(buffer) - 1) != NULL && nsites < MAX_NSITES) {
char *eol;
if ((eol = strstr(buffer, "\r\n")) != NULL) {
/* To handle newlines on Windows */
@@ -244,71 +244,71 @@ read_blacklist(INKCont contp)
continue;
}
if (sites[nsites] != NULL) {
- INKfree(sites[nsites]);
+ TSfree(sites[nsites]);
}
- sites[nsites] = INKstrdup(buffer);
+ sites[nsites] = TSstrdup(buffer);
nsites++;
}
- INKfclose(file);
+ TSfclose(file);
} else {
- INKError("unable to open %s\n", blacklist_file);
- INKError("all sites will be allowed\n", blacklist_file);
+ TSError("unable to open %s\n", blacklist_file);
+ TSError("all sites will be allowed\n", blacklist_file);
}
- INKMutexUnlock(sites_mutex);
+ TSMutexUnlock(sites_mutex);
}
static int
-blacklist_plugin(INKCont contp, INKEvent event, void *edata)
+blacklist_plugin(TSCont contp, TSEvent event, void *edata)
{
- INKHttpTxn txnp;
+ TSHttpTxn txnp;
cdata *cd;
switch (event) {
- case INK_EVENT_HTTP_TXN_START:
- txnp = (INKHttpTxn) edata;
+ case TS_EVENT_HTTP_TXN_START:
+ txnp = (TSHttpTxn) edata;
handle_txn_start(contp, txnp);
return 0;
- case INK_EVENT_HTTP_OS_DNS:
+ case TS_EVENT_HTTP_OS_DNS:
if (contp != global_contp) {
- cd = (cdata *) INKContDataGet(contp);
+ cd = (cdata *) TSContDataGet(contp);
cd->cf = HANDLE_DNS;
handle_dns(cd->txnp, contp);
return 0;
} else {
break;
}
- case INK_EVENT_HTTP_TXN_CLOSE:
- txnp = (INKHttpTxn) edata;
+ case TS_EVENT_HTTP_TXN_CLOSE:
+ txnp = (TSHttpTxn) edata;
if (contp != global_contp) {
destroy_continuation(txnp, contp);
}
break;
- case INK_EVENT_HTTP_SEND_RESPONSE_HDR:
+ case TS_EVENT_HTTP_SEND_RESPONSE_HDR:
if (contp != global_contp) {
- cd = (cdata *) INKContDataGet(contp);
+ cd = (cdata *) TSContDataGet(contp);
cd->cf = HANDLE_RESPONSE;
handle_response(cd->txnp, contp);
return 0;
} else {
break;
}
- case INK_EVENT_MGMT_UPDATE:
+ case TS_EVENT_MGMT_UPDATE:
if (contp == global_contp) {
read_blacklist(contp);
return 0;
} else {
break;
}
- case INK_EVENT_TIMEOUT:
+ case TS_EVENT_TIMEOUT:
/* when mutex lock is not acquired and continuation is rescheduled,
- the plugin is called back with INK_EVENT_TIMEOUT with a NULL
+ the plugin is called back with TS_EVENT_TIMEOUT with a NULL
edata. We need to decide, in which function did the MutexLock
failed and call that function again */
if (contp != global_contp) {
- cd = (cdata *) INKContDataGet(contp);
+ cd = (cdata *) TSContDataGet(contp);
switch (cd->cf) {
case HANDLE_DNS:
handle_dns(cd->txnp, contp);
@@ -330,22 +330,22 @@ blacklist_plugin(INKCont contp, INKEvent
}
static void
-handle_txn_start(INKCont contp, INKHttpTxn txnp)
+handle_txn_start(TSCont contp, TSHttpTxn txnp)
{
- INKCont txn_contp;
+ TSCont txn_contp;
cdata *cd;
- txn_contp = INKContCreate((INKEventFunc) blacklist_plugin, INKMutexCreate());
+ txn_contp = TSContCreate((TSEventFunc) blacklist_plugin, TSMutexCreate());
/* create the data that'll be associated with the continuation */
- cd = (cdata *) INKmalloc(sizeof(cdata));
- INKContDataSet(txn_contp, cd);
+ cd = (cdata *) TSmalloc(sizeof(cdata));
+ TSContDataSet(txn_contp, cd);
cd->txnp = txnp;
- INKHttpTxnHookAdd(txnp, INK_HTTP_OS_DNS_HOOK, txn_contp);
- INKHttpTxnHookAdd(txnp, INK_HTTP_TXN_CLOSE_HOOK, txn_contp);
+ TSHttpTxnHookAdd(txnp, TS_HTTP_OS_DNS_HOOK, txn_contp);
+ TSHttpTxnHookAdd(txnp, TS_HTTP_TXN_CLOSE_HOOK, txn_contp);
- INKHttpTxnReenable(txnp, INK_EVENT_HTTP_CONTINUE);
+ TSHttpTxnReenable(txnp, TS_EVENT_HTTP_CONTINUE);
}
@@ -353,7 +353,7 @@ int
check_ts_version()
{
- const char *ts_version = INKTrafficServerVersionGet();
+ const char *ts_version = TSTrafficServerVersionGet();
int result = 0;
if (ts_version) {
@@ -376,43 +376,43 @@ check_ts_version()
}
void
-INKPluginInit(int argc, const char *argv[])
+TSPluginInit(int argc, const char *argv[])
{
int i;
- INKPluginRegistrationInfo info;
- INKReturnCode error;
+ TSPluginRegistrationInfo info;
+ TSReturnCode error;
info.plugin_name = "blacklist-1";
info.vendor_name = "MyCompany";
info.support_email = "ts-api-support@MyCompany.com";
- if (!INKPluginRegister(INK_SDK_VERSION_2_0, &info)) {
- INKError("Plugin registration failed.\n");
+ if (!TSPluginRegister(TS_SDK_VERSION_2_0, &info)) {
+ TSError("Plugin registration failed.\n");
}
if (!check_ts_version()) {
- INKError("Plugin requires Traffic Server 2.0 or later\n");
+ TSError("Plugin requires Traffic Server 2.0 or later\n");
return;
}
- /* create an INKTextLogObject to log blacklisted requests to */
- error = INKTextLogObjectCreate("blacklist", INK_LOG_MODE_ADD_TIMESTAMP, &log);
- if (!log || error == INK_ERROR) {
- INKDebug("blacklist-1", "error while creating log");
+ /* create an TSTextLogObject to log blacklisted requests to */
+ error = TSTextLogObjectCreate("blacklist", TS_LOG_MODE_ADD_TIMESTAMP, &log);
+ if (!log || error == TS_ERROR) {
+ TSDebug("blacklist-1", "error while creating log");
}
- sites_mutex = INKMutexCreate();
+ sites_mutex = TSMutexCreate();
nsites = 0;
for (i = 0; i < MAX_NSITES; i++) {
sites[i] = NULL;
}
- global_contp = INKContCreate(blacklist_plugin, sites_mutex);
+ global_contp = TSContCreate(blacklist_plugin, sites_mutex);
read_blacklist(global_contp);
- /*INKHttpHookAdd (INK_HTTP_OS_DNS_HOOK, contp); */
- INKHttpHookAdd(INK_HTTP_TXN_START_HOOK, global_contp);
+ /*TSHttpHookAdd (TS_HTTP_OS_DNS_HOOK, contp); */
+ TSHttpHookAdd(TS_HTTP_TXN_START_HOOK, global_contp);
- INKMgmtUpdateRegister(global_contp, "Inktomi Blacklist Plugin", "blacklist.cgi");
+ TSMgmtUpdateRegister(global_contp, "Inktomi Blacklist Plugin", "blacklist.cgi");
}