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

add rpc update interface

This commit is contained in:
yihaoDeng 2023-09-11 15:17:20 +08:00
parent 05727359ca
commit d549a47cf5
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/mnode/impl/src/mndUser.c
View File

@ -403,7 +403,7 @@ static void ipRangeToStr(SIpV4Range *range, char *buf) {
addr.s_addr = range->ip; addr.s_addr = range->ip;
uv_inet_ntop(AF_INET, &addr, buf, 32); uv_inet_ntop(AF_INET, &addr, buf, 32);
if (range->mask != 0) { if (range->mask != 32) {
sprintf(buf + strlen(buf), "/%d", range->mask); sprintf(buf + strlen(buf), "/%d", range->mask);
} }
return; return;

2
source/libs/parser/src/parAstCreater.c
View File

@ -1676,7 +1676,7 @@ static int32_t getIpV4RangeFromWhitelistItem(char* ipRange, SIpV4Range* pIpRange
struct in_addr addr; struct in_addr addr;
if (uv_inet_pton(AF_INET, ipCopy, &addr) == 0) { if (uv_inet_pton(AF_INET, ipCopy, &addr) == 0) {
pIpRange->ip = addr.s_addr; pIpRange->ip = addr.s_addr;
pIpRange->mask = 0; pIpRange->mask = 32;
code = TSDB_CODE_SUCCESS; code = TSDB_CODE_SUCCESS;
} else { } else {
code = TSDB_CODE_PAR_INVALID_IP_RANGE; code = TSDB_CODE_PAR_INVALID_IP_RANGE;

6
source/libs/transport/src/transComm.c
View File

@ -690,7 +690,7 @@ uint32_t subnetIpRang2Int(SIpV4Range* pRange) {
return (el[0] << 24) | (el[1] << 16) | (el[2] << 8) | (el[0]); return (el[0] << 24) | (el[1] << 16) | (el[2] << 8) | (el[0]);
} }
int32_t subnetInit(SubnetUtils* pUtils, SIpV4Range* pRange) { int32_t subnetInit(SubnetUtils* pUtils, SIpV4Range* pRange) {
if (pRange->mask == 0 || pRange->mask == 32) { if (pRange->mask == 32) {
pUtils->type = 0; pUtils->type = 0;
pUtils->address = pRange->ip; pUtils->address = pRange->ip;
return 0; return 0;
@ -704,7 +704,7 @@ int32_t subnetInit(SubnetUtils* pUtils, SIpV4Range* pRange) {
pUtils->network = pUtils->address & pUtils->netmask; pUtils->network = pUtils->address & pUtils->netmask;
pUtils->broadcast = (pUtils->network) | (pUtils->netmask ^ 0xFFFFFFFF); pUtils->broadcast = (pUtils->network) | (pUtils->netmask ^ 0xFFFFFFFF);
pUtils->type = (pRange->mask == 0 ? 0 : 1); pUtils->type = (pRange->mask == 32 ? 0 : 1);
return 0; return 0;
} }
@ -737,7 +737,7 @@ int32_t transUtilSIpRangeToStr(SIpV4Range* pRange, char* buf) {
len = strlen(buf); len = strlen(buf);
if (pRange->mask != 0 && pRange->mask != 32) { if (pRange->mask != 32) {
len += sprintf(buf + len, "/%d", pRange->mask); len += sprintf(buf + len, "/%d", pRange->mask);
} }
buf[len] = 0; buf[len] = 0;