xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge pull request #11978 from taosdata/fix/tsim 

fix: invalid port described in TD-15165
This commit is contained in:
Shengliang Guan 2022-04-28 10:25:54 +08:00 committed by GitHub
parent 1c8910de73 8253e019be
commit 3dd54a5969
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/shell/inc/shellInt.h
View File

@ -62,7 +62,7 @@ typedef struct {
bool is_check;
bool is_startup;
bool is_help;
uint16_t port;
int32_t port;
int32_t pktLen;
int32_t pktNum;
int32_t displayWidth;

6
tools/shell/src/shellArguments.c
View File

@ -99,6 +99,7 @@ static int32_t shellParseSingleOpt(int32_t key, char *arg) {
break;
case 'P':
pArgs->port = atoi(arg);
if (pArgs->port == 0) pArgs->port = -1;
break;
case 'u':
pArgs->user = arg;
@ -304,6 +305,11 @@ static int32_t shellCheckArgs() {
return -1;
}
if (pArgs->port < 0 || pArgs->port > 65535) {
printf("Invalid port\n");
return -1;
}
if (pArgs->pktLen < SHELL_MIN_PKG_LEN || pArgs->pktLen > SHELL_MAX_PKG_LEN) {
printf("Invalid pktLen:%d, range:[%d, %d]\n", pArgs->pktLen, SHELL_MIN_PKG_LEN, SHELL_MAX_PKG_LEN);
return -1;