GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 08:46:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

made macro usage safer

Browse Source 
That solves an issue where the pid_file would be overwritten on
a configuration file reload.
This commit is contained in:
Nikos Mavrogiannopoulos
2014-07-26 10:57:26 +02:00
parent bf39dc0398
commit 6de26b9408
2 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/config.c
View File

@@ -158,7 +158,7 @@ unsigned j;
return NULL;
}
#define READ_MULTI_LINE(name, s_name, num) \
#define READ_MULTI_LINE(name, s_name, num) { \
val = get_option(name, &mand); \
if (val != NULL && val->valType == OPARG_TYPE_STRING) { \
if (s_name == NULL) { \
@@ -181,9 +181,9 @@ unsigned j;
} else if (mand != 0) { \
fprintf(stderr, "Configuration option %s is mandatory.\n", name); \
exit(1); \
}
}}
#define READ_MULTI_BRACKET_LINE(name, s_name, s_name2, num) \
#define READ_MULTI_BRACKET_LINE(name, s_name, s_name2, num) { \
val = get_option(name, &mand); \
if (val != NULL && val->valType == OPARG_TYPE_STRING) { \
if (s_name == NULL || s_name2 == NULL) { \
@@ -211,25 +211,25 @@ unsigned j;
} else if (mand != 0) { \
fprintf(stderr, "Configuration option %s is mandatory.\n", name); \
exit(1); \
}
}}
#define READ_STRING(name, s_name) \
#define READ_STRING(name, s_name) { \
val = get_option(name, &mand); \
if (val != NULL && val->valType == OPARG_TYPE_STRING) \
s_name = talloc_strdup(config, val->v.strVal); \
else if (mand != 0) { \
fprintf(stderr, "Configuration option %s is mandatory.\n", name); \
exit(1); \
}
}}
#define READ_STATIC_STRING(name, s_name) \
#define READ_STATIC_STRING(name, s_name) { \
val = get_option(name, &mand); \
if (val != NULL && val->valType == OPARG_TYPE_STRING) \
snprintf(s_name, sizeof(s_name), "%s", val->v.strVal); \
else if (mand != 0) { \
fprintf(stderr, "Configuration option %s is mandatory.\n", name); \
exit(1); \
}
}}
#define READ_TF(name, s_name, def) \
{ char* tmp_tf = NULL; \
@@ -244,7 +244,7 @@ unsigned j;
talloc_free(tmp_tf); \
}
#define READ_NUMERIC(name, s_name) \
#define READ_NUMERIC(name, s_name) { \
val = get_option(name, &mand); \
if (val != NULL) { \
if (val->valType == OPARG_TYPE_NUMERIC) \
@@ -254,9 +254,9 @@ unsigned j;
} else if (mand != 0) { \
fprintf(stderr, "Configuration option %s is mandatory.\n", name); \
exit(1); \
}
}}
#define READ_PRIO_TOS(name, s_name) \
#define READ_PRIO_TOS(name, s_name) { \
val = get_option(name, &mand); \
if (val != NULL) { \
if (val->valType == OPARG_TYPE_STRING) { \
@@ -271,7 +271,7 @@ unsigned j;
} else if (mand != 0) { \
fprintf(stderr, "Configuration option %s is mandatory.\n", name); \
exit(1); \
}
}}
static int handle_option(const tOptionValue* val)

20
src/sup-config/file.c
View File

@@ -61,7 +61,7 @@ static struct cfg_options available_options[] = {
{ .name = "cgroup", .type = OPTION_STRING, },
};
#define READ_RAW_MULTI_LINE(name, s_name, num) \
#define READ_RAW_MULTI_LINE(name, s_name, num) { \
val = optionGetValue(pov, name); \
if (val != NULL && val->valType == OPARG_TYPE_STRING) { \
if (s_name == NULL) { \
@@ -77,26 +77,26 @@ static struct cfg_options available_options[] = {
num++; \
} while((val = optionNextValue(pov, val)) != NULL); \
s_name[num] = NULL; \
}
}}
#define READ_RAW_STRING(name, s_name) \
#define READ_RAW_STRING(name, s_name) { \
val = optionGetValue(pov, name); \
if (val != NULL && val->valType == OPARG_TYPE_STRING) { \
if (s_name != NULL) \
talloc_free(s_name); \
s_name = talloc_strdup(proc, val->v.strVal); \
}
}}
#define READ_RAW_NUMERIC(name, s_name) \
#define READ_RAW_NUMERIC(name, s_name) { \
val = optionGetValue(pov, name); \
if (val != NULL) { \
if (val->valType == OPARG_TYPE_NUMERIC) \
s_name = val->v.longVal; \
else if (val->valType == OPARG_TYPE_STRING) \
s_name = atoi(val->v.strVal); \
}
}}
#define READ_RAW_PRIO_TOS(name, s_name) \
#define READ_RAW_PRIO_TOS(name, s_name) { \
val = optionGetValue(pov, name); \
if (val != NULL) { \
if (val->valType == OPARG_TYPE_STRING) { \
@@ -108,9 +108,9 @@ static struct cfg_options available_options[] = {
s_name++; \
} \
} \
}
}}
#define READ_TF(name, s_name, def) \
#define READ_TF(name, s_name, def) { \
{ char* tmp_tf = NULL; \
READ_RAW_STRING(name, tmp_tf); \
if (tmp_tf == NULL) s_name = def; \
@@ -121,7 +121,7 @@ static struct cfg_options available_options[] = {
s_name = 0; \
} \
talloc_free(tmp_tf); \
}
}}
static int handle_option(const tOptionValue* val)
{