svn commit: r1036740 - /trafficserver/plugins/header_filter/header_filter.cc

[zw...@apache.org]

Author: zwoop
Date: Fri Nov 19 04:48:36 2010
New Revision: 1036740

URL: http://svn.apache.org/viewvc?rev=1036740&view=rev
Log:
Updates for latest trunk changes

Modified:
    trafficserver/plugins/header_filter/header_filter.cc

Modified: trafficserver/plugins/header_filter/header_filter.cc
URL: http://svn.apache.org/viewvc/trafficserver/plugins/header_filter/header_filter.cc?rev=1036740&r1=1036739&r2=1036740&view=diff
==============================================================================
--- trafficserver/plugins/header_filter/header_filter.cc (original)
+++ trafficserver/plugins/header_filter/header_filter.cc Fri Nov 19 04:48:36 2010
@@ -31,6 +31,7 @@ using namespace ::HeaderFilter;
 
 // Global plugin rules
 Rules global;
+int arg_idx;
 
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -63,7 +64,7 @@ cont_header_filter(TSCont contp, TSEvent
       hook = TS_HTTP_SEND_RESPONSE_HDR_HOOK;
     break;
   default:
-    TSError("header_rewrite: unknown event for this plugin");
+    TSError("header_filter: unknown event for this plugin");
     TSDebug(PLUGIN_NAME, "unknown event for this plugin");
     break;
   }
@@ -74,7 +75,7 @@ cont_header_filter(TSCont contp, TSEvent
     global.execute(reqp, hdr_loc, hook);
 
     if (TS_HTTP_READ_REQUEST_HDR_HOOK != hook) { // Don't run the hook handled by remap plugin
-      if (TS_SUCCESS == TSHttpTxnGetArg(txnp, 0, (void**)(&from_remap)) && from_remap)
+      if (TS_SUCCESS == TSHttpTxnArgGet(txnp, arg_idx, (void**)(&from_remap)) && from_remap)
         from_remap->execute(reqp, hdr_loc, hook);
     }
 
@@ -99,7 +100,7 @@ TSPluginInit(int argc, const char *argv[
   info.support_email = const_cast<char*>("users@trafficserver.apache.org");
 
   if (!TSPluginRegister(TS_SDK_VERSION_2_0 , &info)) {
-    TSError("header_rewrite: plugin registration failed.\n"); 
+    TSError("header_filter: plugin registration failed.\n"); 
   }
 
   if (argc != 2) {
@@ -115,8 +116,11 @@ TSPluginInit(int argc, const char *argv[
         TSHttpHookAdd(static_cast<TSHttpHookID>(i), cont);
       }
     }
+    if (TSHttpArgIndexReserve("header_filter", "Filter out headers in various hooks", &arg_idx) != TS_SUCCESS) {
+      TSError("header_filter: failed to reserve private data slot");
+    }
   } else {
-    TSError("header_rewrite: failed to parse configuration file");
+    TSError("header_filter: failed to parse configuration file");
   }
 }
 
@@ -190,7 +194,7 @@ tsremap_remap(ihandle ih, rhandle rh, TS
     TSMBuffer reqp;
     TSMLoc hdr_loc;
 
-    TSHttpTxnSetArg(txnp, 0, static_cast<void*>(ih)); // Save for later hooks
+    TSHttpTxnArgSet(txnp, arg_idx, static_cast<void*>(ih)); // Save for later hooks
     if (TSHttpTxnClientReqGet(txnp, &reqp, &hdr_loc)) {
       confp->execute(reqp, hdr_loc, TS_HTTP_READ_REQUEST_HDR_HOOK);
       TSHandleMLocRelease(reqp, TS_NULL_MLOC, hdr_loc);