From 699c8a0461a89b1e343290500f51c2b9d1f8b103 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Fri, 6 May 2022 14:42:06 +0800 Subject: [PATCH] enh(rpc): validate fqdn --- source/libs/transport/src/trans.c | 1 + source/libs/transport/src/transSrv.c | 2 +- tools/shell/src/shellNettest.c | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/libs/transport/src/trans.c b/source/libs/transport/src/trans.c index f8277c575e..846cf6f967 100644 --- a/source/libs/transport/src/trans.c +++ b/source/libs/transport/src/trans.c @@ -51,6 +51,7 @@ void* rpcOpen(const SRpcInit* pInit) { ip = taosGetIpv4FromFqdn(pInit->localFqdn); if (ip == 0xFFFFFFFF) { tError("invalid fqdn: %s", pInit->localFqdn); + terrno = TSDB_CODE_RPC_FQDN_ERROR; taosMemoryFree(pRpc); return NULL; } diff --git a/source/libs/transport/src/transSrv.c b/source/libs/transport/src/transSrv.c index e1b0871135..ad3f520210 100644 --- a/source/libs/transport/src/transSrv.c +++ b/source/libs/transport/src/transSrv.c @@ -841,7 +841,7 @@ void* transInitServer(uint32_t ip, uint32_t port, char* label, int numOfThreads, } } if (false == taosValidIpAndPort(srv->ip, srv->port)) { - tError("failed to bind, reason: %s", strerror(errno)); + tError("failed to bind, reason: %s", terrstr()); goto End; } if (false == addHandleToAcceptloop(srv)) { diff --git a/tools/shell/src/shellNettest.c b/tools/shell/src/shellNettest.c index 9b68beb4e1..345b85d896 100644 --- a/tools/shell/src/shellNettest.c +++ b/tools/shell/src/shellNettest.c @@ -127,7 +127,7 @@ static void shellWorkAsServer() { void *serverRpc = rpcOpen(&rpcInit); if (serverRpc == NULL) { - printf("failed to init net test server since %s", terrstr()); + printf("failed to init net test server since %s\n", terrstr()); } else { printf("network test server is initialized, port:%u\n", pArgs->port); taosSetSignal(SIGTERM, shellNettestHandler);