pdxx
/
libfastcommon
mirror of https://github.com/happyfish100/libfastcommon.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ini_file_reader.c function annotations LOCAL_IP_GET support index

pull/37/head
yuqing 2018-02-24 14:10:22 +08:00
parent b3c89b2316
commit 87dc7dd4d8
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
HISTORY
View File

@ -1,4 +1,9 @@
Version 1.37 2018-02-24
* ini_file_reader.c function annotations LOCAL_IP_GET support index, such as:
#@function LOCAL_IP_GET
bind_addr=private[0]
Version 1.36 2017-03-08 Version 1.36 2017-03-08
* correct getFileContentEx read bytes * correct getFileContentEx read bytes

32
src/ini_file_reader.c
View File

@ -140,10 +140,24 @@ static int iniAnnotationFuncLocalIpGet(char *param, char **pOutValue, int max_va
{ {
bool need_private_ip; bool need_private_ip;
int count; int count;
int index;
const char *next_ip; const char *next_ip;
char *square_start;
char name_part[16];
need_private_ip = strcasecmp(param, "inner") == 0 || memset(name_part, 0, sizeof(name_part));
strcasecmp(param, "private") == 0; square_start = strchr(param, '[');
if (square_start != NULL && param[strlen(param) - 1] == ']') {
snprintf(name_part, sizeof(name_part) - 1, "%.*s",
(int)(square_start - param), param);
index = atoi(square_start + 1);
} else {
snprintf(name_part, sizeof(name_part) - 1, "%s", param);
index = -2;
}
need_private_ip = strcasecmp(name_part, "inner") == 0 ||
strcasecmp(name_part, "private") == 0;
next_ip = NULL; next_ip = NULL;
count = 0; count = 0;
while ((next_ip=get_next_local_ip(next_ip)) != NULL) { while ((next_ip=get_next_local_ip(next_ip)) != NULL) {
@ -163,6 +177,20 @@ static int iniAnnotationFuncLocalIpGet(char *param, char **pOutValue, int max_va
if (count == 0) { if (count == 0) {
pOutValue[count++] = ""; pOutValue[count++] = "";
} else if (index > -2) {
if (index == -1) { //get the last one
if (count > 1) {
pOutValue[0] = pOutValue[count - 1];
}
} else if (index >= count) { //index overflow
logWarning("file: "__FILE__", line: %d, "
"index: %d >= count: %d, set value to empty",
__LINE__, index, count);
pOutValue[0] = "";
} else if (index > 0) {
pOutValue[0] = pOutValue[index];
}
count = 1;
} }
return count; return count;
} }