summaryrefslogtreecommitdiffstats
path: root/src/vnet/tcp
diff options
context:
space:
mode:
authorDave Barach <dave@barachs.net>2020-08-06 12:10:09 -0400
committerDave Barach <dave@barachs.net>2020-08-06 12:10:50 -0400
commit11fb09e38ffcbadc2629361377413f3ce12ec4da (patch)
tree65d2a0a16b6e1fce5bec0dba1368dca5db3bc9e3 /src/vnet/tcp
parent586462fabcc913a5a4fa9115d4b5caf33dfdb347 (diff)
misc: harmonize names
Type: fix Signed-off-by: Dave Barach <dave@barachs.net> Change-Id: Ibad744788e200ce012ad88ff59c2c34920742454
Diffstat (limited to 'src/vnet/tcp')
-rw-r--r--src/vnet/tcp/tcp_cli.c29
1 files changed, 15 insertions, 14 deletions
diff --git a/src/vnet/tcp/tcp_cli.c b/src/vnet/tcp/tcp_cli.c
index 6030440435d..6ad2425b53d 100644
--- a/src/vnet/tcp/tcp_cli.c
+++ b/src/vnet/tcp/tcp_cli.c
@@ -688,7 +688,7 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
int i, trace_len;
scoreboard_trace_elt_t *trace;
u32 next_ack, left, group, has_new_ack = 0;
- tcp_connection_t _dummy_tc, *dummy_tc = &_dummy_tc;
+ tcp_connection_t _placeholder_tc, *placeholder_tc = &_placeholder_tc;
sack_block_t *block;
if (!TCP_SCOREBOARD_TRACE)
@@ -700,10 +700,10 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
if (!tc)
return s;
- clib_memset (dummy_tc, 0, sizeof (*dummy_tc));
- tcp_connection_timers_init (dummy_tc);
- scoreboard_init (&dummy_tc->sack_sb);
- dummy_tc->rcv_opts.flags |= TCP_OPTS_FLAG_SACK;
+ clib_memset (placeholder_tc, 0, sizeof (*placeholder_tc));
+ tcp_connection_timers_init (placeholder_tc);
+ scoreboard_init (&placeholder_tc->sack_sb);
+ placeholder_tc->rcv_opts.flags |= TCP_OPTS_FLAG_SACK;
#if TCP_SCOREBOARD_TRACE
trace = tc->sack_sb.trace;
@@ -714,8 +714,8 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
{
if (trace[i].ack != 0)
{
- dummy_tc->snd_una = trace[i].ack - 1448;
- dummy_tc->snd_una_max = trace[i].ack;
+ placeholder_tc->snd_una = trace[i].ack - 1448;
+ placeholder_tc->snd_una_max = trace[i].ack;
}
}
@@ -723,7 +723,7 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
while (left < trace_len)
{
group = trace[left].group;
- vec_reset_length (dummy_tc->rcv_opts.sacks);
+ vec_reset_length (placeholder_tc->rcv_opts.sacks);
has_new_ack = 0;
while (trace[left].group == group)
{
@@ -732,7 +732,7 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
if (verbose)
s = format (s, "Adding ack %u, snd_una_max %u, segs: ",
trace[left].ack, trace[left].snd_una_max);
- dummy_tc->snd_una_max = trace[left].snd_una_max;
+ placeholder_tc->snd_una_max = trace[left].snd_una_max;
next_ack = trace[left].ack;
has_new_ack = 1;
}
@@ -741,7 +741,7 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
if (verbose)
s = format (s, "[%u, %u], ", trace[left].start,
trace[left].end);
- vec_add2 (dummy_tc->rcv_opts.sacks, block, 1);
+ vec_add2 (placeholder_tc->rcv_opts.sacks, block, 1);
block->start = trace[left].start;
block->end = trace[left].end;
}
@@ -749,16 +749,17 @@ tcp_scoreboard_replay (u8 * s, tcp_connection_t * tc, u8 verbose)
}
/* Push segments */
- tcp_rcv_sacks (dummy_tc, next_ack);
+ tcp_rcv_sacks (placeholder_tc, next_ack);
if (has_new_ack)
- dummy_tc->snd_una = next_ack;
+ placeholder_tc->snd_una = next_ack;
if (verbose)
s = format (s, "result: %U", format_tcp_scoreboard,
- &dummy_tc->sack_sb);
+ &placeholder_tc->sack_sb);
}
- s = format (s, "result: %U", format_tcp_scoreboard, &dummy_tc->sack_sb);
+ s =
+ format (s, "result: %U", format_tcp_scoreboard, &placeholder_tc->sack_sb);
return s;
}