diff --git a/doc/admin-guide/plugins/lua.en.rst b/doc/admin-guide/plugins/lua.en.rst index 53c9f05a89e..38738271890 100644 --- a/doc/admin-guide/plugins/lua.en.rst +++ b/doc/admin-guide/plugins/lua.en.rst @@ -4228,28 +4228,6 @@ ts.http.server_packet_mark_set **description:** This function can be used to set packet mark for server connection. -:ref:`TOP ` - -ts.http.client_packet_tos_set ------------------------------ -**syntax:** *ts.http.client_packet_tos_set(NUMBER)* - -**context:** do_remap/do_os_response or do_global_* or later. - -**description:** This function can be used to set packet tos for client connection. - - -:ref:`TOP ` - -ts.http.server_packet_tos_set ------------------------------ -**syntax:** *ts.http.server_packet_tos_set(NUMBER)* - -**context:** do_remap/do_os_response or do_global_* or later. - -**description:** This function can be used to set packet tos for server connection. - - :ref:`TOP ` ts.http.client_packet_dscp_set diff --git a/doc/developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst b/doc/developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst deleted file mode 100644 index 47b6dce243a..00000000000 --- a/doc/developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst +++ /dev/null @@ -1,52 +0,0 @@ -.. Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to you under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. See the License for the specific language governing - permissions and limitations under the License. - -.. include:: ../../../common.defs - -.. default-domain:: c - -TSHttpTxnClientPacketTosSet -*************************** - -Synopsis -======== - -.. code-block:: cpp - - #include - -.. function:: TSReturnCode TSHttpTxnClientPacketTosSet(TSHttpTxn txnp, int tos) - -Description -=========== - -Change packet :arg:`tos` for the client side connection. - -.. important:: - - Changes take effect immediately - -.. note:: - - TOS is deprecated and replaced by DSCP. This is still used to set - DSCP, however the first 2 bits of this value will be ignored as they - now belong to the ECN field. - -See Also -======== - -.. _Traffic Shaping: - https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping - :ts:cv:`proxy.config.net.sock_packet_tos_in` and TS-1090 diff --git a/doc/developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst b/doc/developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst deleted file mode 100644 index 04ef74c3c5e..00000000000 --- a/doc/developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst +++ /dev/null @@ -1,54 +0,0 @@ -.. Licensed to the Apache Software Foundation (ASF) under one or more - contributor license agreements. See the NOTICE file distributed with - this work for additional information regarding copyright ownership. - The ASF licenses this file to you under the Apache License, Version - 2.0 (the "License"); you may not use this file except in compliance - with the License. You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied. See the License for the specific language governing - permissions and limitations under the License. - -.. include:: ../../../common.defs - -.. default-domain:: c - -TSHttpTxnServerPacketTosSet -*************************** - -Change packet TOS for the server side connection. - -Synopsis -======== - -.. code-block:: cpp - - #include - -.. function:: TSReturnCode TSHttpTxnServerPacketTosSet(TSHttpTxn txnp, int tos) - -Description -=========== - -.. note:: - - The change takes effect immediately. If no OS connection has been - made, then this sets the mark that will be used. If an OS connection - is established - - TOS is deprecated and replaced by DSCP. This is still used to set - DSCP, however the first 2 bits of this value will be ignored as they - now belong to the ECN field. - -.. XXX Third sentence in the first paragraph above needs to be completed. - -See Also -======== - -.. _Traffic Shaping: - https://cwiki.apache.org/confluence/display/TS/Traffic+Shaping - :ts:cv:`proxy.config.net.sock_packet_tos_out` and TS-1090 diff --git a/doc/developer-guide/api/types/TSRecordType.en.rst b/doc/developer-guide/api/types/TSRecordType.en.rst index 1e7493d3a2f..8fb4e28a15f 100644 --- a/doc/developer-guide/api/types/TSRecordType.en.rst +++ b/doc/developer-guide/api/types/TSRecordType.en.rst @@ -42,14 +42,6 @@ Synopsis .. c:enumerator:: TS_RECORDTYPE_NODE - .. c:enumerator:: TS_RECORDTYPE_CLUSTER - - Deprecated - shared among a cluster. - - .. c:enumerator:: TS_RECORDTYPE_LOCAL - - Deprecated - not shared among a cluster. - .. c:enumerator:: TS_RECORDTYPE_PLUGIN Created by a plugin. diff --git a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.po b/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.po deleted file mode 100644 index 29925d9fe8c..00000000000 --- a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.po +++ /dev/null @@ -1,65 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: Apache Traffic Server 6.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-02 21:32+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: ja_JP\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.1.1\n" - -#: ../../developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst:31 -msgid "Description" -msgstr "解説" - -#: ../../developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst:24 -msgid "Synopsis" -msgstr "概要" - -#: ../../developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst:21 -msgid "TSHttpTxnClientPacketTosSet" -msgstr "" - -#: ../../developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst:26 -msgid "`#include `" -msgstr "`#include `" - -#: ../../developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst:33 -msgid "Change packet :arg:`tos` for the client side connection." -msgstr "" - -#: ../../developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst:37 -msgid "Changes take effect immediately" -msgstr "" - -#: ../../developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst:46 -msgid "See Also" -msgstr "参照" - -#: ../../developer-guide/api/functions/TSHttpTxnClientPacketTosSet.en.rst:41 -msgid "" -"TOS is deprecated and replaced by DSCP. This is still used to set DSCP, " -"however the first 2 bits of this value will be ignored as they now belong " -"to the ECN field." -msgstr "" diff --git a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.po b/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.po deleted file mode 100644 index 9546528d691..00000000000 --- a/doc/locale/ja/LC_MESSAGES/developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.po +++ /dev/null @@ -1,68 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: Apache Traffic Server 6.2\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-02 21:32+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: ja_JP\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=utf-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.1.1\n" - -#: ../../developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst:23 -msgid "Change packet TOS for the server side connection." -msgstr "" - -#: ../../developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst:26 -msgid "Synopsis" -msgstr "概要" - -#: ../../developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst:21 -msgid "TSHttpTxnServerPacketTosSet" -msgstr "" - -#: ../../developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst:28 -msgid "`#include `" -msgstr "`#include `" - -#: ../../developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst:33 -msgid "Description" -msgstr "解説" - -#: ../../developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst:48 -msgid "See Also" -msgstr "参照" - -#: ../../developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst:41 -msgid "" -"TOS is deprecated and replaced by DSCP. This is still used to set DSCP, " -"however the first 2 bits of this value will be ignored as they now belong " -"to the ECN field." -msgstr "" - -#: ../../developer-guide/api/functions/TSHttpTxnServerPacketTosSet.en.rst:37 -msgid "" -"The change takes effect immediately. If no OS connection has been made, " -"then this sets the mark that will be used. If an OS connection is " -"established" -msgstr "" diff --git a/include/ts/apidefs.h.in b/include/ts/apidefs.h.in index d1fd899658b..e725ff9958a 100644 --- a/include/ts/apidefs.h.in +++ b/include/ts/apidefs.h.in @@ -704,7 +704,6 @@ typedef enum { TS_RECORDTYPE_CONFIG = 0x01, TS_RECORDTYPE_PROCESS = 0x02, TS_RECORDTYPE_NODE = 0x04, - TS_RECORDTYPE_LOCAL = 0x10, TS_RECORDTYPE_PLUGIN = 0x20, TS_RECORDTYPE_ALL = 0x3F } TSRecordType; diff --git a/include/ts/experimental.h b/include/ts/experimental.h index cf0b913ea10..b78c1d0863e 100644 --- a/include/ts/experimental.h +++ b/include/ts/experimental.h @@ -324,12 +324,6 @@ tsapi char *TSMatcherLineName(TSMatcherLine ml, int element); ****************************************************************************/ tsapi char *TSMatcherLineValue(TSMatcherLine ml, int element); -/**************************************************************************** - * Set a records.yaml integer variable - ****************************************************************************/ -// DEPRECATED -tsapi TSReturnCode TSMgmtConfigIntSet(const char *var_name, TSMgmtInt value); - tsapi TSReturnCode TSMgmtConfigFileAdd(const char *parent, const char *fileName); /* ---------------------------------------------------------------------- * Interfaces used by Wireless group diff --git a/include/ts/ts.h b/include/ts/ts.h index b3cd21042d2..cfe74790569 100644 --- a/include/ts/ts.h +++ b/include/ts/ts.h @@ -1520,33 +1520,6 @@ tsapi TSReturnCode TSHttpTxnClientPacketMarkSet(TSHttpTxn txnp, int mark); */ tsapi TSReturnCode TSHttpTxnServerPacketMarkSet(TSHttpTxn txnp, int mark); -/** Change packet TOS for the client side connection - * - @note The change takes effect immediately - - @note TOS is deprecated and replaced by DSCP, this is still used to - set DSCP however the first 2 bits of this value will be ignored as - they now belong to the ECN field. - - @return TS_SUCCESS if the client connection was modified -*/ -tsapi TSReturnCode TSHttpTxnClientPacketTosSet(TSHttpTxn txnp, int tos); - -/** Change packet TOS for the server side connection - * - - @note The change takes effect immediately, if no OS connection has been - made, then this sets the mark that will be used IF an OS connection - is established - - @note TOS is deprecated and replaced by DSCP, this is still used to - set DSCP however the first 2 bits of this value will be ignored as - they now belong to the ECN field. - - @return TS_SUCCESS if the (future?) server connection was modified -*/ -tsapi TSReturnCode TSHttpTxnServerPacketTosSet(TSHttpTxn txnp, int tos); - /** Change packet DSCP for the client side connection * @note The change takes effect immediately diff --git a/plugins/lua/ts_lua_http_config.c b/plugins/lua/ts_lua_http_config.c index 86f00791960..ed95eb8f28d 100644 --- a/plugins/lua/ts_lua_http_config.c +++ b/plugins/lua/ts_lua_http_config.c @@ -311,8 +311,6 @@ static int ts_lua_http_config_string_get(lua_State *L); static int ts_lua_http_timeout_set(lua_State *L); static int ts_lua_http_client_packet_mark_set(lua_State *L); static int ts_lua_http_server_packet_mark_set(lua_State *L); -static int ts_lua_http_client_packet_tos_set(lua_State *L); -static int ts_lua_http_server_packet_tos_set(lua_State *L); static int ts_lua_http_client_packet_dscp_set(lua_State *L); static int ts_lua_http_server_packet_dscp_set(lua_State *L); static int ts_lua_http_enable_redirect(lua_State *L); @@ -350,12 +348,6 @@ ts_lua_inject_http_config_api(lua_State *L) lua_pushcfunction(L, ts_lua_http_server_packet_mark_set); lua_setfield(L, -2, "server_packet_mark_set"); - lua_pushcfunction(L, ts_lua_http_client_packet_tos_set); - lua_setfield(L, -2, "client_packet_tos_set"); - - lua_pushcfunction(L, ts_lua_http_server_packet_tos_set); - lua_setfield(L, -2, "server_packet_tos_set"); - lua_pushcfunction(L, ts_lua_http_client_packet_dscp_set); lua_setfield(L, -2, "client_packet_dscp_set"); @@ -565,22 +557,6 @@ ts_lua_http_server_packet_mark_set(lua_State *L) return 0; } -static int -ts_lua_http_client_packet_tos_set(lua_State *L) -{ - int value; - ts_lua_http_ctx *http_ctx; - - GET_HTTP_CONTEXT(http_ctx, L); - - value = luaL_checkinteger(L, 1); - - TSDebug(TS_LUA_DEBUG_TAG, "client packet tos set"); - TSHttpTxnClientPacketTosSet(http_ctx->txnp, value); - - return 0; -} - /* ToDo: This should be removed, it's not needed */ static int ts_lua_http_enable_redirect(lua_State *L) @@ -614,22 +590,6 @@ ts_lua_http_set_debug(lua_State *L) return 0; } -static int -ts_lua_http_server_packet_tos_set(lua_State *L) -{ - int value; - ts_lua_http_ctx *http_ctx; - - GET_HTTP_CONTEXT(http_ctx, L); - - value = luaL_checkinteger(L, 1); - - TSDebug(TS_LUA_DEBUG_TAG, "server packet tos set"); - TSHttpTxnServerPacketTosSet(http_ctx->txnp, value); - - return 0; -} - static int ts_lua_http_client_packet_dscp_set(lua_State *L) { diff --git a/src/traffic_server/InkAPI.cc b/src/traffic_server/InkAPI.cc index 553f246082f..8514653d20d 100644 --- a/src/traffic_server/InkAPI.cc +++ b/src/traffic_server/InkAPI.cc @@ -5981,46 +5981,6 @@ TSHttpTxnServerPacketMarkSet(TSHttpTxn txnp, int mark) return TS_SUCCESS; } -TSReturnCode -TSHttpTxnClientPacketTosSet(TSHttpTxn txnp, int tos) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - HttpSM *sm = (HttpSM *)txnp; - if (nullptr == sm->ua_txn) { - return TS_ERROR; - } - - NetVConnection *vc = sm->ua_txn->get_netvc(); - if (nullptr == vc) { - return TS_ERROR; - } - - vc->options.packet_tos = (uint32_t)tos; - vc->apply_options(); - return TS_SUCCESS; -} - -TSReturnCode -TSHttpTxnServerPacketTosSet(TSHttpTxn txnp, int tos) -{ - sdk_assert(sdk_sanity_check_txn(txnp) == TS_SUCCESS); - HttpSM *sm = (HttpSM *)txnp; - - // change the tos on an active server session - ProxyTransaction *ssn = sm->get_server_txn(); - if (nullptr != ssn) { - NetVConnection *vc = ssn->get_netvc(); - if (vc != nullptr) { - vc->options.packet_tos = (uint32_t)tos; - vc->apply_options(); - } - } - - // update the transactions mark config for future connections - TSHttpTxnConfigIntSet(txnp, TS_CONFIG_NET_SOCK_PACKET_TOS_OUT, tos); - return TS_SUCCESS; -} - TSReturnCode TSHttpTxnClientPacketDscpSet(TSHttpTxn txnp, int dscp) { @@ -7625,20 +7585,6 @@ TSStatFindName(const char *name, int *idp) return TS_SUCCESS; } -/************************** Stats API ****************************/ -// THESE APIS ARE DEPRECATED, USE THE REC APIs INSTEAD -// #define ink_sanity_check_stat_structure(_x) TS_SUCCESS - -inline TSReturnCode -ink_sanity_check_stat_structure(void *obj) -{ - if (obj == nullptr) { - return TS_ERROR; - } - - return TS_SUCCESS; -} - /************************** Tracing API ****************************/ // returns 1 or 0 to indicate whether TS is being run with a debug tag. int @@ -7924,14 +7870,6 @@ TSMatcherLineValue(TSMatcherLine ml, int element) return (((matcher_line *)ml)->line)[1][element]; } -/* Configuration Setting */ -TSReturnCode -TSMgmtConfigIntSet(const char *var_name, TSMgmtInt value) -{ - Warning("This API is no longer supported."); - return TS_SUCCESS; -} - extern void load_config_file_callback(const char *parent, const char *remap_file); /* Config file name setting */