diff --git a/doc/admin-guide/plugins/tcpinfo.en.rst b/doc/admin-guide/plugins/tcpinfo.en.rst index 28ca98758d7..6c806e8b9ee 100644 --- a/doc/admin-guide/plugins/tcpinfo.en.rst +++ b/doc/admin-guide/plugins/tcpinfo.en.rst @@ -45,7 +45,6 @@ The following options may be specified in :file:`plugin.config`: Event Name Triggered when ============== =============================================== send_resp_hdr The server begins sending an HTTP response. - ssn_close The TCP connection closes. ssn_start A new TCP connection is accepted. txn_close A HTTP transaction is completed. txn_start A HTTP transaction is initiated. diff --git a/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/tcpinfo.en.po b/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/tcpinfo.en.po index 0b180032772..88ae2c51245 100644 --- a/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/tcpinfo.en.po +++ b/doc/locale/ja/LC_MESSAGES/admin-guide/plugins/tcpinfo.en.po @@ -232,10 +232,6 @@ msgstr "" msgid "snd_ssthresh" msgstr "" -#: ../../admin-guide/plugins/tcpinfo.en.rst:48 -msgid "ssn_close" -msgstr "" - #: ../../admin-guide/plugins/tcpinfo.en.rst:69 #: ../../admin-guide/plugins/tcpinfo.en.rst:81 msgid "timestamp" diff --git a/plugins/tcpinfo/tcpinfo.cc b/plugins/tcpinfo/tcpinfo.cc index cb8a82043ba..0c9d07fd250 100644 --- a/plugins/tcpinfo/tcpinfo.cc +++ b/plugins/tcpinfo/tcpinfo.cc @@ -54,7 +54,6 @@ #define TCPI_HOOK_SSN_START 0x01u #define TCPI_HOOK_TXN_START 0x02u #define TCPI_HOOK_SEND_RESPONSE 0x04u -#define TCPI_HOOK_SSN_CLOSE 0x08u #define TCPI_HOOK_TXN_CLOSE 0x10u // Log format headers. These are emitted once at the start of a log file. Note that we @@ -215,10 +214,6 @@ tcp_info_hook(TSCont contp, TSEvent event, void *edata) ssnp = TSHttpTxnSsnGet(txnp); event_name = "send_resp_hdr"; break; - case TS_EVENT_HTTP_SSN_CLOSE: - ssnp = static_cast(edata); - event_name = "ssn_close"; - break; default: return 0; } @@ -291,8 +286,11 @@ parse_hook_list(const char *hook_list) const struct hookmask { const char *name; unsigned mask; - } hooks[] = {{"ssn_start", TCPI_HOOK_SSN_START}, {"txn_start", TCPI_HOOK_TXN_START}, {"send_resp_hdr", TCPI_HOOK_SEND_RESPONSE}, - {"ssn_close", TCPI_HOOK_SSN_CLOSE}, {"txn_close", TCPI_HOOK_TXN_CLOSE}, {nullptr, 0u}}; + } hooks[] = {{"ssn_start", TCPI_HOOK_SSN_START}, + {"txn_start", TCPI_HOOK_TXN_START}, + {"send_resp_hdr", TCPI_HOOK_SEND_RESPONSE}, + {"txn_close", TCPI_HOOK_TXN_CLOSE}, + {nullptr, 0u}}; str = TSstrdup(hook_list); @@ -461,11 +459,6 @@ TSPluginInit(int argc, const char *argv[]) TSDebug("tcpinfo", "added hook to the sending of the headers"); } - if (hooks & TCPI_HOOK_SSN_CLOSE) { - TSHttpHookAdd(TS_HTTP_SSN_CLOSE_HOOK, cont); - TSDebug("tcpinfo", "added hook to the close of the TCP connection"); - } - if (hooks & TCPI_HOOK_TXN_CLOSE) { TSHttpHookAdd(TS_HTTP_TXN_CLOSE_HOOK, cont); TSDebug("tcpinfo", "added hook to the close of the transaction");