cmhi
/
vcpe
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.0.1_dev' into v1.0.1_dev

This commit is contained in:
huangxin 2023-02-21 09:07:19 +08:00
parent 782847018f 13434794ac
commit 18ff9d155b
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
srcs/opendhcp183/query.cpp
View File

@ -594,7 +594,6 @@ static int delete_dhcpd_rangeset(data19 *req, const char *pRequest) {
HASH_DEL(delMap, delRange);
} else {
//Write dhcpRanges
memcpy(&dhcpRanges[resCount], &cfig.dhcpRanges[i], sizeof(struct data13));
resCount++;
}
@ -602,7 +601,6 @@ static int delete_dhcpd_rangeset(data19 *req, const char *pRequest) {
//The input parameter does not exist
if (resCount > cfig.rangeCount - cJSON_GetArraySize(pdhcp_range)) {
cJSON *pdel_Item = cJSON_CreateObject();
auto *s = (PHASH_MAP)malloc(sizeof(HASH_MAP));
PHASH_MAP tmp;
char saddr[128];
@ -611,6 +609,7 @@ static int delete_dhcpd_rangeset(data19 *req, const char *pRequest) {
memset(del_range, 0, 256);
HASH_ITER(hh, delMap, s, tmp) {
cJSON *pdel_Item = cJSON_CreateObject();
IP2String(saddr, ntohl(s->key));
IP2String(eaddr, ntohl(s->value));