From 9404a077a044264bae9c71fafc57bf5a894758f3 Mon Sep 17 00:00:00 2001 From: Florin Coras Date: Tue, 24 Nov 2020 17:29:17 -0800 Subject: tcp: enable lc if any other debug option enabled Also fix debug build after snd_una_nxt removal. Type: fix Signed-off-by: Florin Coras Change-Id: Ife52689cd30cdebf36057cf4d20d7f6207f1e29e --- src/vnet/tcp/tcp_debug.h | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'src/vnet/tcp/tcp_debug.h') diff --git a/src/vnet/tcp/tcp_debug.h b/src/vnet/tcp/tcp_debug.h index f4e7c39712e..1202f7f44d3 100644 --- a/src/vnet/tcp/tcp_debug.h +++ b/src/vnet/tcp/tcp_debug.h @@ -345,14 +345,13 @@ ed = ELOG_TRACK_DATA (&vlib_global_main.elog_main, _e, \ { \ ELOG_TYPE_DECLARE (_e) = \ { \ - .format = "syn-tx: iss %u snd_una %u snd_una_max %u snd_nxt %u", \ - .format_args = "i4i4i4i4", \ + .format = "syn-tx: iss %u snd_una %u snd_nxt %u", \ + .format_args = "i4i4i4", \ }; \ - TCP_DECLARE_ETD(_tc, _e, 4); \ + TCP_DECLARE_ETD(_tc, _e, 3); \ ed->data[0] = _tc->iss; \ ed->data[1] = _tc->snd_una - _tc->iss; \ - ed->data[2] = _tc->snd_una_max - _tc->iss; \ - ed->data[3] = _tc->snd_nxt - _tc->iss; \ + ed->data[2] = _tc->snd_nxt - _tc->iss; \ TCP_EVT_STATE_CHANGE_HANDLER(_tc); \ } @@ -548,8 +547,8 @@ if (_tc) \ { \ ELOG_TYPE_DECLARE (_e) = \ { \ - .format = "ack-err: %s ack %u snd_una %u snd_nxt %u una_max %u", \ - .format_args = "t4i4i4i4i4", \ + .format = "ack-err: %s ack %u snd_una %u snd_nxt %u", \ + .format_args = "t4i4i4i4", \ .n_enum_strings = 3, \ .enum_strings = { \ "invalid", \ @@ -557,12 +556,11 @@ if (_tc) \ "future", \ }, \ }; \ - TCP_DECLARE_ETD(_tc, _e, 5); \ + TCP_DECLARE_ETD(_tc, _e, 4); \ ed->data[0] = _type; \ ed->data[1] = _ack - _tc->iss; \ ed->data[2] = _tc->snd_una - _tc->iss; \ ed->data[3] = _tc->snd_nxt - _tc->iss; \ - ed->data[4] = _tc->snd_una_max - _tc->iss; \ } #define TCP_EVT_RCV_WND_SHRUNK_HANDLER(_tc, _obs, _av, ...) \ @@ -787,12 +785,12 @@ if (_av > 0) \ { \ ELOG_TYPE_DECLARE (_e) = \ { \ - .format = "pack: snd_una %u snd_una_max %u", \ + .format = "pack: snd_una %u snd_nxt %u", \ .format_args = "i4i4", \ }; \ TCP_DECLARE_ETD(_tc, _e, 2); \ ed->data[0] = _tc->snd_una - _tc->iss; \ - ed->data[1] = _tc->snd_una_max - _tc->iss; \ + ed->data[1] = _tc->snd_nxt - _tc->iss; \ } #define TCP_EVT_CC_SCOREBOARD_HANDLER(_tc, ...) \ { \ -- cgit 1.2.3-korg