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 13:57:45 +08:00
parent 2a30e12547
commit 9abfbbab5e
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/common/src/tmsg.c
View File

@ -1308,6 +1308,7 @@ int32_t tDeserializeSStatusRsp(void *buf, int32_t bufLen, SStatusRsp *pRsp) {
} }
if (tDecodeI32(&decoder, &pRsp->statusSeq) < 0) return -1; if (tDecodeI32(&decoder, &pRsp->statusSeq) < 0) return -1;
if (!tDecodeIsEnd(&decoder)) { if (!tDecodeIsEnd(&decoder)) {
if (tDecodeI64(&decoder, &pRsp->ipWhiteVer) < 0) return -1; if (tDecodeI64(&decoder, &pRsp->ipWhiteVer) < 0) return -1;
} }

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

@ -678,20 +678,23 @@ void subnetIp2int(const char* const ip_addr, uint8_t* dst) {
} }
} }
uint32_t subnetIpRang2Int(SIpV4Range* pRange) {
SIpV4Range range = {.ip = pRange->ip, .mask = 0};
uint8_t el[4] = {0};
char buf[32] = {0};
transUtilSIpRangeToStr(&range, buf);
subnetIp2int(buf, el);
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) { if (pRange->mask == 0) {
pUtils->address = pRange->ip; pUtils->address = pRange->ip;
pUtils->type = 0; pUtils->type = 0;
return 0; return 0;
} }
pUtils->address = subnetIpRang2Int(pRange);
SIpV4Range tRange = {.ip = pRange->ip, .mask = 0};
char tbuf[32] = {0};
transUtilSIpRangeToStr(&tRange, tbuf);
uint8_t el[4] = {0};
subnetIp2int(tbuf, el);
pUtils->address = (el[0] << 24) | (el[1] << 16) | (el[2] << 8) | (el[0]);
for (int i = 0; i < pRange->mask; i++) { for (int i = 0; i < pRange->mask; i++) {
pUtils->netmask |= (1 << (31 - i)); pUtils->netmask |= (1 << (31 - i));
@ -714,14 +717,9 @@ int32_t subnetCheckIp(SubnetUtils* pUtils, uint32_t ip) {
if (pUtils->type == 0) { if (pUtils->type == 0) {
return pUtils->address == ip; return pUtils->address == ip;
} else { } else {
SIpV4Range tRange = {.ip = ip, .mask = 0}; SIpV4Range range = {.ip = ip, .mask = 0};
char tbuf[32] = {0};
transUtilSIpRangeToStr(&tRange, tbuf);
uint8_t el[4] = {0};
subnetIp2int(tbuf, el);
ip = (el[0] << 24) | (el[1] << 16) | (el[2] << 8) | (el[0]);
uint32_t ip = subnetIpRang2Int(&range);
return ip >= pUtils->network && ip <= pUtils->broadcast; return ip >= pUtils->network && ip <= pUtils->broadcast;
} }
} }
@ -757,7 +755,9 @@ int32_t transUtilSWhiteListToStr(SIpWhiteList* pList, char** ppBuf) {
int tlen = transUtilSIpRangeToStr(pRange, tbuf); int tlen = transUtilSIpRangeToStr(pRange, tbuf);
len += sprintf(pBuf + len, "%s,", tbuf); len += sprintf(pBuf + len, "%s,", tbuf);
} }
pBuf[len] = 0; if (len > 0) {
pBuf[len - 1] = 0;
}
*ppBuf = pBuf; *ppBuf = pBuf;
return len; return len;