imrcpan/freebsd
1
0 Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2026-10-28 11:25:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

tcpdrop: improve handling of -C and -S

Browse Source 
Handle empty strings for -Cand -S correctly.

Reported by:		maxim
Reviewed by:		maxim
MFC after:		1 week
MFC to:			stable/14
MFC to:			stable/15
Sponsored by:		Netflix, Inc.
Differential Revision:	https://reviews.freebsd.org/D60210
This commit is contained in:
Michael Tuexen committed 2026-10-01 21:14:11 +02:00
1 parent 9deffad274
commit e2279d5ba9
1 file changed
+11 -9
Download Patch File Download Diff File Expand all files Collapse all files
usr.sbin/tcpdrop/tcpdrop.c
+11 -9
View File
@@ -63,16 +63,16 @@ static void usage(void) __dead2;
int
main(int argc, char *argv[])
{
char stack[TCP_FUNCTION_NAME_LEN_MAX];
char ca_name[TCP_CA_NAME_MAX];
char *lport, *fport;
char stack_buf[TCP_FUNCTION_NAME_LEN_MAX];
char ca_name_buf[TCP_CA_NAME_MAX];
char *stack, *ca_name, *lport, *fport;
bool dropall, dropspecific;
int ch, state;
dropall = false;
dropspecific = false;
ca_name[0] = '\0';
stack[0] = '\0';
ca_name = NULL;
stack = NULL;
state = -1;
while ((ch = getopt(argc, argv, "aC:lS:s:")) != -1) {
@@ -82,14 +82,16 @@ main(int argc, char *argv[])
break;
case 'C':
dropspecific = true;
strlcpy(ca_name, optarg, sizeof(ca_name));
strlcpy(ca_name_buf, optarg, sizeof(ca_name_buf));
ca_name = ca_name_buf;
break;
case 'l':
tcpdrop_list_commands = true;
break;
case 'S':
dropspecific = true;
strlcpy(stack, optarg, sizeof(stack));
strlcpy(stack_buf, optarg, sizeof(stack_buf));
stack = stack_buf;
break;
case 's':
dropspecific = true;
@@ -266,12 +268,12 @@ tcpdropall(const char *ca_name, const char *stack, int state)
* If requested, skip sockets not having the requested
* congestion control algorithm.
*/
if (ca_name[0] != '\0' &&
if (ca_name != NULL &&
strncmp(xtp->xt_cc, ca_name, TCP_CA_NAME_MAX))
continue;
/* If requested, skip sockets not having the requested stack. */
if (stack[0] != '\0' &&
if (stack != NULL &&
strncmp(xtp->xt_stack, stack, TCP_FUNCTION_NAME_LEN_MAX))
continue;