gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

optimize maat_options API

Browse Source
This commit is contained in:
liuwentan
2023-03-16 10:36:04 +08:00
parent 522f426e6f
commit c6478818f0
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/maat.h
View File

@@ -96,9 +96,9 @@ int maat_options_set_accept_tags(struct maat_options *opts, const char *accept_t
int maat_options_set_rule_effect_interval_ms(struct maat_options *opts, int interval_ms); int maat_options_set_rule_effect_interval_ms(struct maat_options *opts, int interval_ms);
int maat_options_set_rule_update_checking_interval_ms(struct maat_options *opts, int interval_ms); int maat_options_set_rule_update_checking_interval_ms(struct maat_options *opts, int interval_ms);
int maat_options_set_gc_timeout_ms(struct maat_options *opts, int interval_ms); int maat_options_set_gc_timeout_ms(struct maat_options *opts, int interval_ms);
int maat_options_set_instance_name(struct maat_options *opts, const char *instance_name); int maat_options_set_instance_name(struct maat_options *opts, const char *instance_name, size_t name_len);
int maat_options_set_deferred_load_on(struct maat_options *opts); int maat_options_set_deferred_load_on(struct maat_options *opts);
int maat_options_set_foreign_cont_dir(struct maat_options *opts, const char *dir); int maat_options_set_foreign_cont_dir(struct maat_options *opts, const char *dir, size_t dir_len);
int maat_options_set_iris(struct maat_options *opts, const char *full_directory, int maat_options_set_iris(struct maat_options *opts, const char *full_directory,
const char *increment_directory); const char *increment_directory);

13
src/maat_api.c
View File

@@ -176,14 +176,13 @@ int maat_options_set_gc_timeout_ms(struct maat_options *opts, int interval_ms)
return 0; return 0;
} }
int maat_options_set_instance_name(struct maat_options *opts, const char *instance_name) int maat_options_set_instance_name(struct maat_options *opts, const char *instance_name, size_t name_len)
{ {
if (NULL == opts || NULL == instance_name || if (NULL == opts || NULL == instance_name || name_len > sizeof(opts->instance_name)) {
strlen(instance_name) >= NAME_MAX) {
return -1; return -1;
} }
memcpy(opts->instance_name, instance_name, strlen(instance_name)); memcpy(opts->instance_name, instance_name, name_len);
return 0; return 0;
} }
@@ -197,13 +196,13 @@ int maat_options_set_deferred_load_on(struct maat_options *opts)
return 0; return 0;
} }
int maat_options_set_foreign_cont_dir(struct maat_options *opts, const char *dir) int maat_options_set_foreign_cont_dir(struct maat_options *opts, const char *dir, size_t dir_len)
{ {
if (NULL == opts || strlen(dir) >= NAME_MAX) { if (NULL == opts || NULL == dir || dir_len > sizeof(opts->foreign_cont_dir)) {
return -1; return -1;
} }
memcpy(opts->foreign_cont_dir, dir, strlen(dir)); memcpy(opts->foreign_cont_dir, dir, dir_len);
return 0; return 0;
} }