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

rm dup ip

This commit is contained in:
yihaoDeng 2023-09-14 19:09:56 +08:00
parent 250fed499f
commit 167be7c519
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1121,34 +1121,35 @@ static int32_t mndCreateUser(SMnode *pMnode, char *acct, SCreateUserReq *pCreate
userObj.pIpWhiteList = createDefaultIpWhiteList(); userObj.pIpWhiteList = createDefaultIpWhiteList();
} else { } else {
if (pCreate->numIpRanges > MND_MAX_USE_HOST) { SHashObj *pUniqueTab = taosHashInit(64, MurmurHash3_32, false, HASH_NO_LOCK);
int32_t dummpy = 0;
for (int i = 0; i < pCreate->numIpRanges; i++) {
SIpV4Range range = {.ip = pCreate->pIpRanges[i].ip, .mask = pCreate->pIpRanges[i].mask};
taosHashPut(pUniqueTab, &range, sizeof(range), &dummpy, sizeof(dummpy));
}
taosHashPut(pUniqueTab, &defaultIpRange, sizeof(defaultIpRange), &dummpy, sizeof(dummpy));
if (taosHashGetSize(pUniqueTab) > MND_MAX_USE_HOST) {
terrno = TSDB_CODE_MND_TOO_MANY_USER_HOST; terrno = TSDB_CODE_MND_TOO_MANY_USER_HOST;
taosHashCleanup(pUniqueTab);
return terrno; return terrno;
} }
bool localHost = false; int32_t numOfRanges = taosHashGetSize(pUniqueTab);
for (int i = 0; i < pCreate->numIpRanges; i++) {
SIpV4Range *pRange = &pCreate->pIpRanges[i];
if (isDefaultRange(pRange)) {
localHost = true;
break;
}
}
int32_t numOfRanges = localHost ? pCreate->numIpRanges : pCreate->numIpRanges + 1;
SIpWhiteList *p = taosMemoryCalloc(1, sizeof(SIpWhiteList) + numOfRanges * sizeof(SIpV4Range)); SIpWhiteList *p = taosMemoryCalloc(1, sizeof(SIpWhiteList) + numOfRanges * sizeof(SIpV4Range));
int idx = 0; void *pIter = taosHashIterate(pUniqueTab, NULL);
if (localHost == false) { int32_t i = 0;
p->pIpRange[idx].ip = defaultIpRange.ip; while (pIter) {
p->pIpRange[idx].mask = defaultIpRange.mask; size_t len = 0;
idx++; SIpV4Range *key = taosHashGetKey(pIter, &len);
} p->pIpRange[i].ip = key->ip;
p->pIpRange[i].mask = key->mask;
for (int i = idx, j = 0; i < numOfRanges && j < pCreate->numIpRanges; i++, j++) { pIter = taosHashIterate(pUniqueTab, pIter);
p->pIpRange[i].ip = pCreate->pIpRanges[j].ip;
p->pIpRange[i].mask = pCreate->pIpRanges[j].mask; i++;
} }
taosHashCleanup(pUniqueTab);
p->num = numOfRanges; p->num = numOfRanges;
userObj.pIpWhiteList = p; userObj.pIpWhiteList = p;
} }