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-05 12:03:23 +08:00
parent 685bdea44a
commit 6257bf1e10
2 changed files with 38 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/dnode/mnode/impl/inc/mndDef.h
View File

@ -276,8 +276,8 @@ typedef struct {
SAcctInfo info; SAcctInfo info;
} SAcctObj; } SAcctObj;
typedef struct { typedef struct {
int32_t num; int32_t num;
SIpV4Range* pIpRange; SIpV4Range pIpRange[];
} SIpWhiteList; } SIpWhiteList;
typedef struct { typedef struct {

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

@ -145,14 +145,48 @@ SIpWhiteList *createIpWhiteList(void *buf, int32_t len) {
return p; return p;
} }
int32_t ipRangeListCvtIp2Int(char *ip, int16_t *dest) {
int k = 0;
char *start = ip;
char *end = start;
for (k = 0; *start != 0; start = end) {
for (end = start; *end != '.' && *end != '/' && *end != 0; end++) {
}
if (*end == '.' || *end == '/') {
*end = 0;
end++;
}
dest[k++] = atoi(start);
}
return k;
}
uint32_t util_cvtIp2Int(char *ip, uint32_t *mask) {
int16_t dst[5] = {0};
char buf[20] = {0};
memcpy(buf, ip, strlen(ip));
int32_t sz = ipRangeListCvtIp2Int(buf, dst);
uint32_t ret = 0;
for (int i = 0; i < 4; i++) {
uint8_t n = dst[i];
ret |= (n & 0xFF) << 8 * (4 - i - 1);
}
if (sz >= 5) {
*mask = dst[4];
} else {
*mask = 0;
}
return ret;
}
static SIpWhiteList *createDefaultIpWhiteList() { static SIpWhiteList *createDefaultIpWhiteList() {
SIpWhiteList *pWhiteList = taosMemoryCalloc(1, sizeof(SIpWhiteList) + sizeof(SIpV4Range) * 1); SIpWhiteList *pWhiteList = taosMemoryCalloc(1, sizeof(SIpWhiteList) + sizeof(SIpV4Range) * 1);
pWhiteList->num = 1; pWhiteList->num = 1;
// pWhiteList->pIpRange =
SIpV4Range *range = &(pWhiteList->pIpRange[0]); SIpV4Range *range = &(pWhiteList->pIpRange[0]);
range->ip = ip2uint("127.0.0.1"); // refactor later range->ip = util_cvtIp2Int("127.0.0.1", &range->mask); // refactor later
range->mask = 0;
return pWhiteList; return pWhiteList;
} }
static bool isRangeInIpWhiteList(SIpWhiteList *pList, SIpV4Range *tgt) { static bool isRangeInIpWhiteList(SIpWhiteList *pList, SIpV4Range *tgt) {
@ -1415,8 +1449,6 @@ static int32_t mndRetrieveUsers(SRpcMsg *pReq, SShowObj *pShow, SSDataBlock *pBl
pColInfo = taosArrayGet(pBlock->pDataBlock, cols); pColInfo = taosArrayGet(pBlock->pDataBlock, cols);
colDataSetVal(pColInfo, numOfRows, (const char *)&pUser->createdTime, false); colDataSetVal(pColInfo, numOfRows, (const char *)&pUser->createdTime, false);
// get ip white list
// char *buf = taosMemoryCalloc(1, (sizeof(SIpV4Range) + 1) * pUser->pIpWhiteList->num);
char *buf = NULL; char *buf = NULL;
int32_t tlen = convertIpWhiteListToStr(pUser->pIpWhiteList, &buf); int32_t tlen = convertIpWhiteListToStr(pUser->pIpWhiteList, &buf);