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/19 17:12:37 UTC
svn commit: r1036915 - in /trafficserver/traffic/trunk:
example/add-header/readme.txt example/append-transform/readme.txt
example/basic-auth/readme.txt proxy/InkAPI.cc proxy/api/ts/ts.h.in
test/plugin/INKNetConnect/INKqa8418.c
Author: zwoop
Date: Fri Nov 19 16:12:37 2010
New Revision: 1036915
URL: http://svn.apache.org/viewvc?rev=1036915&view=rev
Log:
TS-504 Also fix / cleanup prototypes, so they don't get C++ mangled.
Modified:
trafficserver/traffic/trunk/example/add-header/readme.txt
trafficserver/traffic/trunk/example/append-transform/readme.txt
trafficserver/traffic/trunk/example/basic-auth/readme.txt
trafficserver/traffic/trunk/proxy/InkAPI.cc
trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
trafficserver/traffic/trunk/test/plugin/INKNetConnect/INKqa8418.c
Modified: trafficserver/traffic/trunk/example/add-header/readme.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/add-header/readme.txt?rev=1036915&r1=1036914&r2=1036915&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/add-header/readme.txt (original)
+++ trafficserver/traffic/trunk/example/add-header/readme.txt Fri Nov 19 16:12:37 2010
@@ -16,9 +16,9 @@ The TSPluginInit function does the follo
TSMBufferCreate
TSMimeHdrCreate
TSMimeHdrFieldCreate
- TSMimeFieldInsert
+ TSMimeHdrFieldAppend
TSMimeHdrFieldNameSet
- TSMimeFieldValueInsert
+ TSMimeHdrFieldValueAppend
- sets up the callback for the add-header-plugin function, which
Modified: trafficserver/traffic/trunk/example/append-transform/readme.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/append-transform/readme.txt?rev=1036915&r1=1036914&r2=1036915&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/append-transform/readme.txt (original)
+++ trafficserver/traffic/trunk/example/append-transform/readme.txt Fri Nov 19 16:12:37 2010
@@ -61,7 +61,7 @@ The transform_plugin function does the f
TSHttpTxnServerRespGet
TSHttpHdrStatusGet
TSMimeHdrFieldFind
- TSMimeFieldValueGet
+ TSMimeHdrFieldValueStringGet
- if the response body is deemed transformable, transform_plugin calls
transform_add
Modified: trafficserver/traffic/trunk/example/basic-auth/readme.txt
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/example/basic-auth/readme.txt?rev=1036915&r1=1036914&r2=1036915&view=diff
==============================================================================
--- trafficserver/traffic/trunk/example/basic-auth/readme.txt (original)
+++ trafficserver/traffic/trunk/example/basic-auth/readme.txt Fri Nov 19 16:12:37 2010
@@ -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 TSMimeFieldValueGet to get the value
+ handle_dns uses TSMimeFieldValueStringGet to get the value
of the Proxy-Authorization field.
-- The plugin then obtains the base64-encoded user name and password
Modified: trafficserver/traffic/trunk/proxy/InkAPI.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/InkAPI.cc?rev=1036915&r1=1036914&r2=1036915&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/InkAPI.cc (original)
+++ trafficserver/traffic/trunk/proxy/InkAPI.cc Fri Nov 19 16:12:37 2010
@@ -2745,7 +2745,6 @@ TSMimeHdrFieldsCount(TSMBuffer bufp, TSM
/*************/
/* MimeField */
/*************/
-
const char *
TSMimeFieldValueGet(TSMBuffer bufp, TSMLoc field_obj, int idx, int *value_len_ptr)
{
@@ -5652,7 +5651,7 @@ TSHttpTxnMaxArgCntGet(void)
}
TSReturnCode
-TSHttpArgIndexReserve(int* arg_idx, const char* name, const char* description)
+TSHttpArgIndexReserve(const char* name, const char* description, int* arg_idx)
{
if (sdk_sanity_check_null_ptr(arg_idx) == TS_SUCCESS) {
int volatile ix = ink_atomic_increment(&next_argv_index, 1);
@@ -5686,7 +5685,7 @@ TSHttpArgIndexLookup(int arg_idx, const
// Not particularly efficient, but good enough for now.
TSReturnCode
-TSHttpArgIndexNameLookup(int* arg_idx, const char* name, const char** description)
+TSHttpArgIndexNameLookup(const char* name, int* arg_idx, const char** description)
{
if (sdk_sanity_check_null_ptr(arg_idx) == TS_SUCCESS) {
int len = strlen(name);
@@ -5704,7 +5703,7 @@ TSHttpArgIndexNameLookup(int* arg_idx, c
}
TSReturnCode
-TSHttpTxnArgGet(TSHttpTxn txnp, int arg_idx, void *arg)
+TSHttpTxnArgSet(TSHttpTxn txnp, int arg_idx, void *arg)
{
if (sdk_sanity_check_txn(txnp) == TS_SUCCESS && arg_idx >= 0 && arg_idx < HTTP_SSN_TXN_MAX_USER_ARG) {
HttpSM *sm = (HttpSM *) txnp;
@@ -5715,7 +5714,7 @@ TSHttpTxnArgGet(TSHttpTxn txnp, int arg_
}
TSReturnCode
-TSHttpTxnArgSet(TSHttpTxn txnp, int arg_idx, void **argp)
+TSHttpTxnArgGet(TSHttpTxn txnp, int arg_idx, void **argp)
{
if (sdk_sanity_check_txn(txnp) == TS_SUCCESS && arg_idx >= 0 && arg_idx < HTTP_SSN_TXN_MAX_USER_ARG && argp) {
HttpSM *sm = (HttpSM *) txnp;
@@ -5726,7 +5725,7 @@ TSHttpTxnArgSet(TSHttpTxn txnp, int arg_
}
TSReturnCode
-TSHttpSsnArgGet(TSHttpSsn ssnp, int arg_idx, void *arg)
+TSHttpSsnArgSet(TSHttpSsn ssnp, int arg_idx, void *arg)
{
if (sdk_sanity_check_http_ssn(ssnp) == TS_SUCCESS && arg_idx >= 0 && arg_idx < HTTP_SSN_TXN_MAX_USER_ARG) {
HttpClientSession *cs = (HttpClientSession *)ssnp;
@@ -5738,7 +5737,7 @@ TSHttpSsnArgGet(TSHttpSsn ssnp, int arg_
}
TSReturnCode
-TSHttpSsnArgSet(TSHttpSsn ssnp, int arg_idx, void **argp)
+TSHttpSsnArgGet(TSHttpSsn ssnp, int arg_idx, void **argp)
{
if (sdk_sanity_check_http_ssn(ssnp) == TS_SUCCESS && arg_idx >= 0 && arg_idx < HTTP_SSN_TXN_MAX_USER_ARG && argp) {
HttpClientSession *cs = (HttpClientSession *)ssnp;
@@ -6428,7 +6427,7 @@ TSHttpTxnIntercept(TSCont contp, TSHttpT
/* Net VConnections */
void
-TSVConnInactivityTimeoutSet(TSVConn connp, int timeout)
+TSVConnInactivityTimeoutSet(TSVConn connp, TSHRTime timeout)
{
NetVConnection *vc = (NetVConnection *) connp;
@@ -6444,7 +6443,7 @@ TSVConnInactivityTimeoutCancel(TSVConn c
}
void
-TSVConnActiveTimeoutSet(TSVConn connp, int timeout)
+TSVConnActiveTimeoutSet(TSVConn connp, TSHRTime timeout)
{
NetVConnection *vc = (NetVConnection *) connp;
@@ -7466,7 +7465,8 @@ TSCacheHttpInfoSizeSet(TSCacheHttpInfo i
}
// this function should be called at TS_EVENT_HTTP_READ_RESPONSE_HDR
-TSReturnCode TSRedirectUrlSet(TSHttpTxn txnp, const char* url, const int url_len)
+TSReturnCode
+TSRedirectUrlSet(TSHttpTxn txnp, const char* url, const int url_len)
{
if (url == NULL) {
return TS_ERROR;
@@ -7499,7 +7499,8 @@ TSReturnCode TSRedirectUrlSet(TSHttpTxn
}
}
-const char* TSRedirectUrlGet(TSHttpTxn txnp, int* url_len_ptr)
+const char*
+TSRedirectUrlGet(TSHttpTxn txnp, int* url_len_ptr)
{
if (sdk_sanity_check_txn(txnp)!=TS_SUCCESS) {
return NULL;
@@ -7509,17 +7510,17 @@ const char* TSRedirectUrlGet(TSHttpTxn t
return (const char*)sm->redirect_url;
}
-char* TSFetchRespGet(TSHttpTxn txnp, int *length)
+char*
+TSFetchRespGet(TSHttpTxn txnp, int *length)
{
-
FetchSM *fetch_sm = (FetchSM*)txnp;
return fetch_sm->resp_get(length);
}
int
-TSFetchPageRespGet (TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
+TSFetchPageRespGet(TSHttpTxn txnp, TSMBuffer *bufp, TSMLoc *obj)
{
- if ( sdk_sanity_check_null_ptr((void*)bufp) != TS_SUCCESS || sdk_sanity_check_null_ptr((void*)obj) != TS_SUCCESS)
+ if (sdk_sanity_check_null_ptr((void*)bufp) != TS_SUCCESS || sdk_sanity_check_null_ptr((void*)obj) != TS_SUCCESS)
return 0;
HTTPHdr *hptr = (HTTPHdr*) txnp;
@@ -7527,9 +7528,8 @@ TSFetchPageRespGet (TSHttpTxn txnp, TSMB
if (hptr->valid()) {
*bufp = hptr;
*obj = hptr->m_http;
- sdk_sanity_check_mbuffer(*bufp);
-
- return 1;
+ if (sdk_sanity_check_mbuffer(*bufp) == TS_SUCCESS)
+ return 1;
}
return 0;
}
Modified: trafficserver/traffic/trunk/proxy/api/ts/ts.h.in
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/api/ts/ts.h.in?rev=1036915&r1=1036914&r2=1036915&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/api/ts/ts.h.in (original)
+++ trafficserver/traffic/trunk/proxy/api/ts/ts.h.in Fri Nov 19 16:12:37 2010
@@ -435,17 +435,18 @@ extern "C"
} TSSDKVersion;
typedef enum
- {
- TS_ERROR = -1,
- TS_SUCCESS = 0
- } TSReturnCode;
+ {
+ TS_ERROR = -1,
+ TS_SUCCESS = 0
+ } TSReturnCode;
typedef enum
{
- NO_CALLBACK = 0,
- AFTER_HEADER ,
- AFTER_BODY
+ NO_CALLBACK = 0,
+ AFTER_HEADER ,
+ AFTER_BODY
} TSFetchWakeUpOptions;
+
extern tsapi const void *TS_ERROR_PTR;
typedef int int32;
@@ -492,23 +493,25 @@ extern "C"
typedef void *(*TSThreadFunc) (void *data);
typedef int (*TSEventFunc) (TSCont contp, TSEvent event, void *edata);
typedef void (*TSConfigDestroyFunc) (void *data);
+
typedef struct
{
- int success_event_id;
- int failure_event_id;
- int timeout_event_id;
- }TSFetchEvent;
+ int success_event_id;
+ int failure_event_id;
+ int timeout_event_id;
+ } TSFetchEvent;
+
typedef struct TSFetchUrlParams
{
- const char *request;
- int request_len;
- unsigned int ip;
- int port;
- TSCont contp;
- TSFetchEvent events;
- TSFetchWakeUpOptions options;
- struct TSFetchUrlParams *next;
- }TSFetchUrlParams_t;
+ const char *request;
+ int request_len;
+ unsigned int ip;
+ int port;
+ TSCont contp;
+ TSFetchEvent events;
+ TSFetchWakeUpOptions options;
+ struct TSFetchUrlParams *next;
+ } TSFetchUrlParams_t;
/* --------------------------------------------------------------------------
Init */
@@ -2025,9 +2028,9 @@ extern "C"
tsapi TSReturnCode TSHttpTxnFollowRedirect(TSHttpTxn txnp, int on);
tsapi TSReturnCode TSHttpTxnArgSet(TSHttpTxn txnp, int arg_idx, void *arg);
- tsapi TSReturnCode TSHttpTxnArgGet(TSHttpTxn txnp, int arg_idx, void **arg);
+ tsapi TSReturnCode TSHttpTxnArgGet(TSHttpTxn txnp, int arg_idx, void **argp);
tsapi TSReturnCode TSHttpSsnArgSet(TSHttpSsn ssnp, int arg_idx, void *arg);
- tsapi TSReturnCode TSHttpSsnArgGet(TSHttpSsn ssnp, int arg_idx, void **arg);
+ tsapi TSReturnCode TSHttpSsnArgGet(TSHttpSsn ssnp, int arg_idx, void **argp);
/* The reserve API should only be use in TSAPI plugins, during plugin initialization! */
/* The lookup methods can be used anytime, but are best used during initialization as well,
@@ -2399,27 +2402,27 @@ extern "C"
This is available as of Apache TS v2.2.*/
typedef enum
- {
- TS_STAT_TYPE_INT = 1,
- /* The following are not supported yet. */
- TS_STAT_TYPE_FLOAT,
- TS_STAT_TYPE_STRING,
- TS_STAT_TYPE_COUNTER
- } TSStatDataType;
+ {
+ TS_STAT_TYPE_INT = 1,
+ /* The following are not supported yet. */
+ TS_STAT_TYPE_FLOAT,
+ TS_STAT_TYPE_STRING,
+ TS_STAT_TYPE_COUNTER
+ } TSStatDataType;
typedef enum
- {
- TS_STAT_PERSISTENT = 1,
- TS_STAT_NON_PERSISTENT
- } TSStatPersistence;
+ {
+ TS_STAT_PERSISTENT = 1,
+ TS_STAT_NON_PERSISTENT
+ } TSStatPersistence;
typedef enum
- {
- TS_STAT_SYNC_SUM = 0,
- TS_STAT_SYNC_COUNT,
- TS_STAT_SYNC_AVG,
- TS_STAT_SYNC_TIMEAVG
- } TSStatSync;
+ {
+ TS_STAT_SYNC_SUM = 0,
+ TS_STAT_SYNC_COUNT,
+ TS_STAT_SYNC_AVG,
+ TS_STAT_SYNC_TIMEAVG
+ } TSStatSync;
/* Note that only TS_STAT_TYPE_INT is supported at this point. */
tsapi int TSStatCreate(const char *the_name, TSStatDataType the_type, TSStatPersistence persist, TSStatSync sync);
@@ -2442,10 +2445,10 @@ extern "C"
This is the old stats system, it's deprecated, and should preferably not
be used. It has serious limitations both in scalability and performance. */
typedef enum
- {
- INKSTAT_TYPE_INT64,
- INKSTAT_TYPE_FLOAT
- } INKStatTypes;
+ {
+ INKSTAT_TYPE_INT64,
+ INKSTAT_TYPE_FLOAT
+ } INKStatTypes;
typedef void *INKStat;
typedef void *INKCoupledStat;
@@ -2753,7 +2756,6 @@ extern "C"
*/
tsapi TSVConn TSVConnCreate(TSEventFunc event_funcp, TSMutex mutexp);
-
tsapi TS_DEPRECATED TSReturnCode TSIOBufferAppend(TSIOBuffer bufp, TSIOBufferBlock blockp);
tsapi TS_DEPRECATED TSIOBufferData TSIOBufferDataCreate(void *data, int size, TSIOBufferDataFlags flags);
tsapi TS_DEPRECATED TSIOBufferBlock TSIOBufferBlockCreate(TSIOBufferData datap, int size, int offset);
@@ -2774,13 +2776,18 @@ extern "C"
tsapi void TSVConnActiveTimeoutSet(TSVConn connp, TSHRTime timeout);
tsapi void TSVConnActiveTimeoutCancel(TSVConn connp);
-
/*
ability to skip the remap phase of the State Machine
this only really makes sense in TS_HTTP_READ_REQUEST_HDR_HOOK
*/
tsapi TSReturnCode TSSkipRemappingSet(TSHttpTxn txnp, int flag);
+
+ /*
+ It's unclear if these actually function properly still.
+ */
+ tsapi TSReturnCode TSRedirectUrlSet(TSHttpTxn txnp, const char* url, const int url_len);
+ tsapi const char* TSRedirectUrlGet(TSHttpTxn txnp, int* url_len_ptr);
#ifdef __cplusplus
}
Modified: trafficserver/traffic/trunk/test/plugin/INKNetConnect/INKqa8418.c
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/test/plugin/INKNetConnect/INKqa8418.c?rev=1036915&r1=1036914&r2=1036915&view=diff
==============================================================================
--- trafficserver/traffic/trunk/test/plugin/INKNetConnect/INKqa8418.c (original)
+++ trafficserver/traffic/trunk/test/plugin/INKNetConnect/INKqa8418.c Fri Nov 19 16:12:37 2010
@@ -265,7 +265,7 @@ require_auth(TSHttpTxn txnp)
newfld_loc = TSMimeHdrFieldCreate(bufp, hdr_loc);
TSMimeHdrFieldNameSet(bufp, hdr_loc, newfld_loc, TS_MIME_FIELD_PROXY_AUTHENTICATE, TS_MIME_LEN_PROXY_AUTHENTICATE);
- TSMimeFieldValueInsert(bufp, newfld_loc, "Basic realm=\"Armageddon\"", -1, -1);
+ TSMimeHdrFieldValueAppend(bufp, hdr_loc, newfld_loc, "Basic realm=\"Armageddon\"", -1);
TSMimeHdrFieldAppend(bufp, hdr_loc, newfld_loc);
done: