Updated Branches: refs/heads/master 6bc19b4e0 -> 2cee56fc7
TS-1210: remove 3.0.x deprecated APIs Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/2cee56fc Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/2cee56fc Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/2cee56fc Branch: refs/heads/master Commit: 2cee56fc75f537a52d2695d7d2322feec4acdf27 Parents: 6bc19b4 Author: James Peach <[email protected]> Authored: Wed Apr 18 20:47:10 2012 -0700 Committer: James Peach <[email protected]> Committed: Wed Apr 25 20:41:11 2012 -0700 ---------------------------------------------------------------------- CHANGES | 2 + proxy/InkAPI.cc | 122 -------------------------------------------- proxy/InkIOCoreAPI.cc | 49 ------------------ proxy/api/ts/ts.h.in | 41 --------------- tools/apichecker.pl | 4 -- 5 files changed, 2 insertions(+), 216 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2cee56fc/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 4e3315c..fefdce2 100644 --- a/CHANGES +++ b/CHANGES @@ -1,5 +1,7 @@ -*- coding: utf-8 -*- Changes with Apache Traffic Server 3.1.4 + *) [TS-1210] remove 3.0.x deprecated APIs + *) [TS-1226] Make header_filter support e.g. '=' characters in header values. http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2cee56fc/proxy/InkAPI.cc ---------------------------------------------------------------------- diff --git a/proxy/InkAPI.cc b/proxy/InkAPI.cc index 6145a2f..2453550 100644 --- a/proxy/InkAPI.cc +++ b/proxy/InkAPI.cc @@ -5273,15 +5273,6 @@ TSHttpTxnClientAddrGet(TSHttpTxn txnp) return TSHttpSsnClientAddrGet(ssnp); } -unsigned int -TSHttpTxnClientIPGet(TSHttpTxn txnp) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - - HttpSM *sm = (HttpSM *) txnp; - return ats_ip4_addr_cast(&sm->t_state.client_info.addr); -} - sockaddr const* TSHttpSsnIncomingAddrGet(TSHttpSsn ssnp) { HttpClientSession *cs = reinterpret_cast<HttpClientSession *>(ssnp); @@ -5301,15 +5292,6 @@ TSHttpTxnIncomingAddrGet(TSHttpTxn txnp) { return TSHttpSsnIncomingAddrGet(ssnp); } -int -TSHttpTxnClientIncomingPortGet(TSHttpTxn txnp) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - - HttpSM *sm = (HttpSM *) txnp; - return sm->t_state.client_info.port; -} - sockaddr const* TSHttpTxnServerAddrGet(TSHttpTxn txnp) { @@ -5319,15 +5301,6 @@ TSHttpTxnServerAddrGet(TSHttpTxn txnp) return &sm->t_state.server_info.addr.sa; } -unsigned int -TSHttpTxnServerIPGet(TSHttpTxn txnp) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - - HttpSM *sm = (HttpSM *) txnp; - return ats_ip4_addr_cast(&sm->t_state.server_info.addr.sa); -} - // [amc] This might use the port. The code path should do that but it // hasn't been tested. TSReturnCode @@ -5365,33 +5338,6 @@ TSHttpTxnNextHopAddrGet(TSHttpTxn txnp) return &sm->t_state.current.server->addr.sa; } -in_addr_t -TSHttpTxnNextHopIPGet(TSHttpTxn txnp) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - - HttpSM *sm = (HttpSM *) txnp; - /** - * Return zero if the server structure is not yet constructed. - */ - if (sm->t_state.current.server == NULL) - return 0; - return ats_ip4_addr_cast(&sm->t_state.current.server->addr.sa); -} - -int -TSHttpTxnNextHopPortGet(TSHttpTxn txnp) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - - HttpSM *sm = (HttpSM *) txnp; - int port = 0; - - if (sm && sm->t_state.current.server) - port = ats_ip_port_host_order(&sm->t_state.current.server->addr); - return port; -} - TSReturnCode TSHttpTxnOutgoingTransparencySet(TSHttpTxn txnp, int flag) { @@ -5541,13 +5487,6 @@ TSHttpTxnReenable(TSHttpTxn txnp, TSEvent event) } } -// This is deprecated, and shouldn't be used, use the register function instead. -int -TSHttpTxnMaxArgCntGet(void) -{ - return HTTP_SSN_TXN_MAX_USER_ARG; -} - TSReturnCode TSHttpArgIndexReserve(const char* name, const char* description, int *arg_idx) { @@ -6387,26 +6326,6 @@ TSNetVConnRemoteAddrGet(TSVConn connp) { return vc->get_remote_addr(); } - -// TODO: IPv6 ... -unsigned int -TSNetVConnRemoteIPGet(TSVConn connp) -{ - sdk_assert(sdk_sanity_check_iocore_structure(connp) == TS_SUCCESS); - - NetVConnection* vc = reinterpret_cast<NetVConnection*>(connp); - return vc->get_remote_ip(); -} - -int -TSNetVConnRemotePortGet(TSVConn connp) -{ - sdk_assert(sdk_sanity_check_iocore_structure(connp) == TS_SUCCESS); - - NetVConnection* vc = reinterpret_cast<NetVConnection*>(connp); - return vc->get_remote_port(); -} - TSAction TSNetConnect(TSCont contp, sockaddr const* addr) { @@ -6494,24 +6413,6 @@ TSHostLookupResultAddrGet(TSHostLookupResult lookup_result) return di->ip(); } -in_addr_t -TSHostLookupResultIpGet(TSHostLookupResult lookup_result) -{ - sdk_assert(sdk_sanity_check_hostlookup_structure(lookup_result) == TS_SUCCESS); - return ats_ip4_addr_cast(((HostDBInfo *)lookup_result)->ip()); -} - -void -TSOSIpSet(TSHttpTxn txnp, unsigned int ip) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - HttpSM *sm = (HttpSM *) txnp; - HttpTransact::State *s = &(sm->t_state); - - s->dns_info.lookup_success = true; - ats_ip4_set(s->host_db_info.ip(), ip); -} - /* * checks if the cache is ready */ @@ -7047,29 +6948,6 @@ TSHttpTxnClientFdGet(TSHttpTxn txnp, int *fdp) return TSHttpSsnClientFdGet(ssnp, fdp); } -TSReturnCode -TSHttpTxnClientRemotePortGet(TSHttpTxn txnp, int *portp) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - sdk_assert(sdk_sanity_check_null_ptr((void*)portp) == TS_SUCCESS); - - TSHttpSsn ssnp = TSHttpTxnSsnGet(txnp); - HttpClientSession *cs = (HttpClientSession *) ssnp; - - if (cs == NULL) - return TS_ERROR; - - NetVConnection *vc = cs->get_netvc(); - if (vc == NULL) - return TS_ERROR; - - // Note: SDK spec specifies this API should return port in network byte order - // iocore returns it in host byte order. So we do the conversion. - *portp = htons(vc->get_remote_port()); - - return TS_SUCCESS; -} - /* Matcher Utils */ char * TSMatcherReadIntoBuffer(char *file_name, int *file_len) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2cee56fc/proxy/InkIOCoreAPI.cc ---------------------------------------------------------------------- diff --git a/proxy/InkIOCoreAPI.cc b/proxy/InkIOCoreAPI.cc index 35b55be..661d1d9 100644 --- a/proxy/InkIOCoreAPI.cc +++ b/proxy/InkIOCoreAPI.cc @@ -536,18 +536,6 @@ TSIOBufferStart(TSIOBuffer bufp) return (TSIOBufferBlock)blk; } -void -TSIOBufferAppend(TSIOBuffer bufp, TSIOBufferBlock blockp) -{ - sdk_assert(sdk_sanity_check_iocore_structure(bufp) == TS_SUCCESS); - sdk_assert(sdk_sanity_check_iocore_structure(blockp) == TS_SUCCESS); - - MIOBuffer *b = (MIOBuffer *)bufp; - IOBufferBlock *blk = (IOBufferBlock *)blockp; - - b->append_block(blk); -} - int64_t TSIOBufferCopy(TSIOBuffer bufp, TSIOBufferReader readerp, int64_t length, int64_t offset) { @@ -590,43 +578,6 @@ TSIOBufferProduce(TSIOBuffer bufp, int64_t nbytes) b->fill(nbytes); } -TSIOBufferData -TSIOBufferDataCreate(void *data, int64_t size, TSIOBufferDataFlags flags) -{ - sdk_assert(sdk_sanity_check_null_ptr((void*)data) == TS_SUCCESS); - sdk_assert(size > 0); - - // simply return error_ptr - //ink_assert (size > 0); - - switch (flags) { - case TS_DATA_ALLOCATE: - ink_assert(data == NULL); - return (TSIOBufferData)new_IOBufferData(iobuffer_size_to_index(size)); - - case TS_DATA_MALLOCED: - ink_assert(data != NULL); - return (TSIOBufferData)new_xmalloc_IOBufferData(data, size); - - case TS_DATA_CONSTANT: - ink_assert(data != NULL); - return (TSIOBufferData)new_constant_IOBufferData(data, size); - } - - sdk_assert(!"Invalid flag"); - return NULL; -} - -TSIOBufferBlock -TSIOBufferBlockCreate(TSIOBufferData datap, int64_t size, int64_t offset) -{ - sdk_assert(sdk_sanity_check_iocore_structure(datap) == TS_SUCCESS); - sdk_assert((size >= 0) && (offset > 0)); - - IOBufferData *d = (IOBufferData *)datap; - return (TSIOBufferBlock)new_IOBufferBlock(d, size, offset); -} - // dev API, not exposed void TSIOBufferBlockDestroy(TSIOBufferBlock blockp) http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2cee56fc/proxy/api/ts/ts.h.in ---------------------------------------------------------------------- diff --git a/proxy/api/ts/ts.h.in b/proxy/api/ts/ts.h.in index b0744bd..f3260ae 100644 --- a/proxy/api/ts/ts.h.in +++ b/proxy/api/ts/ts.h.in @@ -2267,19 +2267,6 @@ extern "C" tsapi TSReturnCode TSHttpSsnClientFdGet(TSHttpSsn ssnp, int* fdp); /* TS-1008 END */ - /** @deprecated Use TSHttpTxnClientAddrGet */ - tsapi TS_DEPRECATED unsigned int TSHttpTxnClientIPGet(TSHttpTxn txnp); - /** @deprecated Use TSHttpTxnClientAddrGet */ - tsapi TS_DEPRECATED TSReturnCode TSHttpTxnClientRemotePortGet(TSHttpTxn txnp, int* portp); - /** @deprecated Use TSHttpTxnIncomingAddrGet */ - tsapi TS_DEPRECATED int TSHttpTxnClientIncomingPortGet(TSHttpTxn txnp); - /** @deprecated Use TSHttpTxnServerAddrGet */ - tsapi TS_DEPRECATED unsigned int TSHttpTxnServerIPGet(TSHttpTxn txnp); - /** @deprecated Use TSHttpTxnNextHopAddrGet */ - tsapi TS_DEPRECATED unsigned int TSHttpTxnNextHopIPGet(TSHttpTxn txnp); - /** @deprecated Use TSHttpTxnNextHopAddrGet */ - tsapi TS_DEPRECATED int TSHttpTxnNextHopPortGet(TSHttpTxn txnp); - tsapi void TSHttpTxnErrorBodySet(TSHttpTxn txnp, char* buf, int buflength, char* mimetype); /** @@ -2344,9 +2331,6 @@ extern "C" tsapi TSReturnCode TSHttpArgIndexNameLookup(const char* name, int* arg_idx, const char** description); tsapi TSReturnCode TSHttpArgIndexLookup(int arg_idx, const char** name, const char** description); - /** @deprecated */ - tsapi TS_DEPRECATED int TSHttpTxnMaxArgCntGet(void); - tsapi int TSHttpTxnGetMaxHttpRetBodySize(void); tsapi void TSHttpTxnSetHttpRetBody(TSHttpTxn txnp, const char* body_msg, int plain_msg); tsapi void TSHttpTxnSetHttpRetStatus(TSHttpTxn txnp, TSHttpStatus http_retstatus); @@ -2531,25 +2515,9 @@ extern "C" /* -------------------------------------------------------------------------- Net VConnections */ - /** - Returns the IP address of the remote host with which Traffic Server - is connected through the vconnection vc. - - @deprecated Use TSNetVConnRemoteAddrGet - - @param vc representing a connection that your plugin has opened - between Traffic Server and a (remote) host. - @param ip will be set to the IP address of the remote host in - network byte order. Note: this value is 32-bit, for IPv4. - - */ - tsapi TS_DEPRECATED unsigned int TSNetVConnRemoteIPGet(TSVConn vc); tsapi struct sockaddr const* TSNetVConnRemoteAddrGet(TSVConn vc); - /** @deprecated Use TSNetVConnRemoteAddrGet */ - tsapi TS_DEPRECATED int TSNetVConnRemotePortGet(TSVConn vc); - /** Opens a network connection to the host specified by ip on the port specified by port. If the connection is successfully opened, contp @@ -2603,11 +2571,7 @@ extern "C" /* -------------------------------------------------------------------------- DNS Lookups */ tsapi TSAction TSHostLookup(TSCont contp, const char* hostname, size_t namelen); - /** @deprecated Use TSHostLookupResultAddrGet */ - tsapi TS_DEPRECATED unsigned int TSHostLookupResultIPGet(TSHostLookupResult lookup_result); tsapi struct sockaddr const* TSHostLookupResultAddrGet(TSHostLookupResult lookup_result); - /** @deprecated Use TSHttpTxnServerAddrSet */ - tsapi TS_DEPRECATED void TSOSIpSet(TSHttpTxn txnp, unsigned int ip); /* TODO: Eventually, we might want something like this as well, but it requires support for building the HostDBInfo struct: tsapi void TSHostLookupResultSet(TSHttpTxn txnp, TSHostLookupResult result); @@ -3118,11 +3082,6 @@ extern "C" */ tsapi TSVConn TSVConnCreate(TSEventFunc event_funcp, TSMutex mutexp); - tsapi TS_DEPRECATED void 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); - - /* api functions to access stats */ /* ClientResp APIs exist as well and are exposed in PrivateFrozen */ tsapi int TSHttpTxnClientReqHdrBytesGet(TSHttpTxn txnp); http://git-wip-us.apache.org/repos/asf/trafficserver/blob/2cee56fc/tools/apichecker.pl ---------------------------------------------------------------------- diff --git a/tools/apichecker.pl b/tools/apichecker.pl index 2e1a89c..d1c9c5d 100755 --- a/tools/apichecker.pl +++ b/tools/apichecker.pl @@ -189,9 +189,6 @@ my %TWO_2_THREE = ( "TSVConnAbort" => [$W_VOID_RETURN], "TSVConnShutdown" => [$W_VOID_RETURN], "TSVConnCacheObjectSizeGet" => [$W_RETURN_DIRECT], - "TSNetVConnRemoteIPGet" => [$W_RETURN_DIRECT], # TODO: Change to struct addrinfo?? - "TSNetVConnRemotePortGet" => [$W_RETURN_DIRECT], # TODO: Change to struct addrinfo?? - "TSHostLookupResultIPGet" => [$W_RETURN_DIRECT], # TODO: Change to struct addrinfo?? "TSVIOReenable" => [$W_VOID_RETURN], "TSVIONBytesSet" => [$W_VOID_RETURN], "TSVIONDoneSet" => [$W_VOID_RETURN], @@ -212,7 +209,6 @@ my %TWO_2_THREE = ( "TSTextLogObjectRollingIntervalSecSet" => [$W_VOID_RETURN], "TSTextLogObjectRollingOffsetHrSet" => [$W_VOID_RETURN], "TSHttpTxnAborted" => [$W_TSRETURNCODE], - "TSIOBufferAppend" => [$W_VOID_RETURN], "TSHttpTxnClientReqHdrBytesGet" => [$W_RETURN_DIRECT], "TSHttpTxnClientReqBodyBytesGet" => [$W_RETURN_DIRECT], "TSHttpTxnServerReqHdrBytesGet" => [$W_RETURN_DIRECT],
