summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHaru <haru@dotalux.com>2016-02-16 17:12:36 +0100
committerHaru <haru@dotalux.com>2016-02-17 10:40:41 +0100
commit0b491e07714f7c9d81a5618756c7b663c8cfcf5d (patch)
tree15232b0c981928c7d971ce0708613419f1fad3b8
parentd38019541508d0efb3477ef4938ea8e939444333 (diff)
downloadhercules-0b491e07714f7c9d81a5618756c7b663c8cfcf5d.tar.gz
hercules-0b491e07714f7c9d81a5618756c7b663c8cfcf5d.tar.bz2
hercules-0b491e07714f7c9d81a5618756c7b663c8cfcf5d.tar.xz
hercules-0b491e07714f7c9d81a5618756c7b663c8cfcf5d.zip
HPM Hooks Update
-rw-r--r--src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc24
-rw-r--r--src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc6
-rw-r--r--src/plugins/HPMHooking/HPMHooking_char.Hooks.inc94
-rw-r--r--src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc24
-rw-r--r--src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc6
-rw-r--r--src/plugins/HPMHooking/HPMHooking_login.Hooks.inc94
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc24
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc6
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.Hooks.inc94
9 files changed, 186 insertions, 186 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
index 9d8a2750d..a6805a723 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HPMHooksCore.inc
@@ -610,10 +610,10 @@ struct {
struct HPMHookPoint *HP_libconfig_read_post;
struct HPMHookPoint *HP_libconfig_write_pre;
struct HPMHookPoint *HP_libconfig_write_post;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_post;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_post;
+ struct HPMHookPoint *HP_libconfig_set_options_pre;
+ struct HPMHookPoint *HP_libconfig_set_options_post;
+ struct HPMHookPoint *HP_libconfig_get_options_pre;
+ struct HPMHookPoint *HP_libconfig_get_options_post;
struct HPMHookPoint *HP_libconfig_read_string_pre;
struct HPMHookPoint *HP_libconfig_read_string_post;
struct HPMHookPoint *HP_libconfig_read_file_src_pre;
@@ -638,6 +638,8 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_get_bool_post;
struct HPMHookPoint *HP_libconfig_setting_get_string_pre;
struct HPMHookPoint *HP_libconfig_setting_get_string_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre;
@@ -700,8 +702,6 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_set_hook_post;
struct HPMHookPoint *HP_libconfig_lookup_pre;
struct HPMHookPoint *HP_libconfig_lookup_post;
- struct HPMHookPoint *HP_libconfig_lookup_from_pre;
- struct HPMHookPoint *HP_libconfig_lookup_from_post;
struct HPMHookPoint *HP_libconfig_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_lookup_int_post;
struct HPMHookPoint *HP_libconfig_lookup_int64_pre;
@@ -1989,10 +1989,10 @@ struct {
int HP_libconfig_read_post;
int HP_libconfig_write_pre;
int HP_libconfig_write_post;
- int HP_libconfig_set_auto_convert_pre;
- int HP_libconfig_set_auto_convert_post;
- int HP_libconfig_get_auto_convert_pre;
- int HP_libconfig_get_auto_convert_post;
+ int HP_libconfig_set_options_pre;
+ int HP_libconfig_set_options_post;
+ int HP_libconfig_get_options_pre;
+ int HP_libconfig_get_options_post;
int HP_libconfig_read_string_pre;
int HP_libconfig_read_string_post;
int HP_libconfig_read_file_src_pre;
@@ -2017,6 +2017,8 @@ struct {
int HP_libconfig_setting_get_bool_post;
int HP_libconfig_setting_get_string_pre;
int HP_libconfig_setting_get_string_post;
+ int HP_libconfig_setting_lookup_pre;
+ int HP_libconfig_setting_lookup_post;
int HP_libconfig_setting_lookup_int_pre;
int HP_libconfig_setting_lookup_int_post;
int HP_libconfig_setting_lookup_int64_pre;
@@ -2079,8 +2081,6 @@ struct {
int HP_libconfig_setting_set_hook_post;
int HP_libconfig_lookup_pre;
int HP_libconfig_lookup_post;
- int HP_libconfig_lookup_from_pre;
- int HP_libconfig_lookup_from_post;
int HP_libconfig_lookup_int_pre;
int HP_libconfig_lookup_int_post;
int HP_libconfig_lookup_int64_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
index fe3e806b1..6055235bd 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.HookingPoints.inc
@@ -335,8 +335,8 @@ struct HookingPointData HookingPoints[] = {
/* libconfig */
{ HP_POP(libconfig->read, HP_libconfig_read) },
{ HP_POP(libconfig->write, HP_libconfig_write) },
- { HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) },
- { HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) },
+ { HP_POP(libconfig->set_options, HP_libconfig_set_options) },
+ { HP_POP(libconfig->get_options, HP_libconfig_get_options) },
{ HP_POP(libconfig->read_string, HP_libconfig_read_string) },
{ HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) },
{ HP_POP(libconfig->write_file, HP_libconfig_write_file) },
@@ -349,6 +349,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) },
{ HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) },
{ HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) },
+ { HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) },
{ HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) },
{ HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) },
{ HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) },
@@ -380,7 +381,6 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) },
{ HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) },
{ HP_POP(libconfig->lookup, HP_libconfig_lookup) },
- { HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) },
{ HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) },
{ HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) },
{ HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) },
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index e6100ffdd..efc743ed2 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -7877,14 +7877,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
}
return;
}
-void HP_libconfig_set_auto_convert(config_t *config, int flag) {
+void HP_libconfig_set_options(config_t *config, int options) {
int hIndex = 0;
- if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) {
- void (*preHookFunc) (config_t *config, int *flag);
+ if( HPMHooks.count.HP_libconfig_set_options_pre ) {
+ void (*preHookFunc) (config_t *config, int *options);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func;
- preHookFunc(config, &flag);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func;
+ preHookFunc(config, &options);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -7892,25 +7892,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) {
}
}
{
- HPMHooks.source.libconfig.set_auto_convert(config, flag);
+ HPMHooks.source.libconfig.set_options(config, options);
}
- if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) {
- void (*postHookFunc) (config_t *config, int *flag);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func;
- postHookFunc(config, &flag);
+ if( HPMHooks.count.HP_libconfig_set_options_post ) {
+ void (*postHookFunc) (config_t *config, int *options);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func;
+ postHookFunc(config, &options);
}
}
return;
}
-int HP_libconfig_get_auto_convert(const config_t *config) {
+int HP_libconfig_get_options(const config_t *config) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) {
+ if( HPMHooks.count.HP_libconfig_get_options_pre ) {
int (*preHookFunc) (const config_t *config);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func;
retVal___ = preHookFunc(config);
}
if( *HPMforce_return ) {
@@ -7919,12 +7919,12 @@ int HP_libconfig_get_auto_convert(const config_t *config) {
}
}
{
- retVal___ = HPMHooks.source.libconfig.get_auto_convert(config);
+ retVal___ = HPMHooks.source.libconfig.get_options(config);
}
- if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) {
+ if( HPMHooks.count.HP_libconfig_get_options_post ) {
int (*postHookFunc) (int retVal___, const config_t *config);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config);
}
}
@@ -8250,6 +8250,33 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
}
return retVal___;
}
+config_setting_t* HP_libconfig_setting_lookup(config_setting_t *setting, const char *name) {
+ int hIndex = 0;
+ config_setting_t* retVal___ = NULL;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) {
+ config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *name);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_post ) {
+ config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *name);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name);
+ }
+ }
+ return retVal___;
+}
int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) {
int hIndex = 0;
int retVal___ = 0;
@@ -9086,33 +9113,6 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
}
return retVal___;
}
-config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) {
- int hIndex = 0;
- config_setting_t* retVal___ = NULL;
- if( HPMHooks.count.HP_libconfig_lookup_from_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath);
- *HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func;
- retVal___ = preHookFunc(setting, filepath);
- }
- if( *HPMforce_return ) {
- *HPMforce_return = false;
- return retVal___;
- }
- }
- {
- retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath);
- }
- if( HPMHooks.count.HP_libconfig_lookup_from_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, setting, filepath);
- }
- }
- return retVal___;
-}
int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) {
int hIndex = 0;
int retVal___ = 0;
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
index a9abae542..21abd7559 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HPMHooksCore.inc
@@ -94,10 +94,10 @@ struct {
struct HPMHookPoint *HP_libconfig_read_post;
struct HPMHookPoint *HP_libconfig_write_pre;
struct HPMHookPoint *HP_libconfig_write_post;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_post;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_post;
+ struct HPMHookPoint *HP_libconfig_set_options_pre;
+ struct HPMHookPoint *HP_libconfig_set_options_post;
+ struct HPMHookPoint *HP_libconfig_get_options_pre;
+ struct HPMHookPoint *HP_libconfig_get_options_post;
struct HPMHookPoint *HP_libconfig_read_string_pre;
struct HPMHookPoint *HP_libconfig_read_string_post;
struct HPMHookPoint *HP_libconfig_read_file_src_pre;
@@ -122,6 +122,8 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_get_bool_post;
struct HPMHookPoint *HP_libconfig_setting_get_string_pre;
struct HPMHookPoint *HP_libconfig_setting_get_string_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre;
@@ -184,8 +186,6 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_set_hook_post;
struct HPMHookPoint *HP_libconfig_lookup_pre;
struct HPMHookPoint *HP_libconfig_lookup_post;
- struct HPMHookPoint *HP_libconfig_lookup_from_pre;
- struct HPMHookPoint *HP_libconfig_lookup_from_post;
struct HPMHookPoint *HP_libconfig_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_lookup_int_post;
struct HPMHookPoint *HP_libconfig_lookup_int64_pre;
@@ -673,10 +673,10 @@ struct {
int HP_libconfig_read_post;
int HP_libconfig_write_pre;
int HP_libconfig_write_post;
- int HP_libconfig_set_auto_convert_pre;
- int HP_libconfig_set_auto_convert_post;
- int HP_libconfig_get_auto_convert_pre;
- int HP_libconfig_get_auto_convert_post;
+ int HP_libconfig_set_options_pre;
+ int HP_libconfig_set_options_post;
+ int HP_libconfig_get_options_pre;
+ int HP_libconfig_get_options_post;
int HP_libconfig_read_string_pre;
int HP_libconfig_read_string_post;
int HP_libconfig_read_file_src_pre;
@@ -701,6 +701,8 @@ struct {
int HP_libconfig_setting_get_bool_post;
int HP_libconfig_setting_get_string_pre;
int HP_libconfig_setting_get_string_post;
+ int HP_libconfig_setting_lookup_pre;
+ int HP_libconfig_setting_lookup_post;
int HP_libconfig_setting_lookup_int_pre;
int HP_libconfig_setting_lookup_int_post;
int HP_libconfig_setting_lookup_int64_pre;
@@ -763,8 +765,6 @@ struct {
int HP_libconfig_setting_set_hook_post;
int HP_libconfig_lookup_pre;
int HP_libconfig_lookup_post;
- int HP_libconfig_lookup_from_pre;
- int HP_libconfig_lookup_from_post;
int HP_libconfig_lookup_int_pre;
int HP_libconfig_lookup_int_post;
int HP_libconfig_lookup_int64_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
index 5e501c62c..f061d1343 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.HookingPoints.inc
@@ -64,8 +64,8 @@ struct HookingPointData HookingPoints[] = {
/* libconfig */
{ HP_POP(libconfig->read, HP_libconfig_read) },
{ HP_POP(libconfig->write, HP_libconfig_write) },
- { HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) },
- { HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) },
+ { HP_POP(libconfig->set_options, HP_libconfig_set_options) },
+ { HP_POP(libconfig->get_options, HP_libconfig_get_options) },
{ HP_POP(libconfig->read_string, HP_libconfig_read_string) },
{ HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) },
{ HP_POP(libconfig->write_file, HP_libconfig_write_file) },
@@ -78,6 +78,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) },
{ HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) },
{ HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) },
+ { HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) },
{ HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) },
{ HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) },
{ HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) },
@@ -109,7 +110,6 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) },
{ HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) },
{ HP_POP(libconfig->lookup, HP_libconfig_lookup) },
- { HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) },
{ HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) },
{ HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) },
{ HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) },
diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
index bf0610688..ced7b4cc9 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
@@ -971,14 +971,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
}
return;
}
-void HP_libconfig_set_auto_convert(config_t *config, int flag) {
+void HP_libconfig_set_options(config_t *config, int options) {
int hIndex = 0;
- if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) {
- void (*preHookFunc) (config_t *config, int *flag);
+ if( HPMHooks.count.HP_libconfig_set_options_pre ) {
+ void (*preHookFunc) (config_t *config, int *options);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func;
- preHookFunc(config, &flag);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func;
+ preHookFunc(config, &options);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -986,25 +986,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) {
}
}
{
- HPMHooks.source.libconfig.set_auto_convert(config, flag);
+ HPMHooks.source.libconfig.set_options(config, options);
}
- if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) {
- void (*postHookFunc) (config_t *config, int *flag);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func;
- postHookFunc(config, &flag);
+ if( HPMHooks.count.HP_libconfig_set_options_post ) {
+ void (*postHookFunc) (config_t *config, int *options);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func;
+ postHookFunc(config, &options);
}
}
return;
}
-int HP_libconfig_get_auto_convert(const config_t *config) {
+int HP_libconfig_get_options(const config_t *config) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) {
+ if( HPMHooks.count.HP_libconfig_get_options_pre ) {
int (*preHookFunc) (const config_t *config);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func;
retVal___ = preHookFunc(config);
}
if( *HPMforce_return ) {
@@ -1013,12 +1013,12 @@ int HP_libconfig_get_auto_convert(const config_t *config) {
}
}
{
- retVal___ = HPMHooks.source.libconfig.get_auto_convert(config);
+ retVal___ = HPMHooks.source.libconfig.get_options(config);
}
- if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) {
+ if( HPMHooks.count.HP_libconfig_get_options_post ) {
int (*postHookFunc) (int retVal___, const config_t *config);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config);
}
}
@@ -1344,6 +1344,33 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
}
return retVal___;
}
+config_setting_t* HP_libconfig_setting_lookup(config_setting_t *setting, const char *name) {
+ int hIndex = 0;
+ config_setting_t* retVal___ = NULL;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) {
+ config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *name);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_post ) {
+ config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *name);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name);
+ }
+ }
+ return retVal___;
+}
int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) {
int hIndex = 0;
int retVal___ = 0;
@@ -2180,33 +2207,6 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
}
return retVal___;
}
-config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) {
- int hIndex = 0;
- config_setting_t* retVal___ = NULL;
- if( HPMHooks.count.HP_libconfig_lookup_from_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath);
- *HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func;
- retVal___ = preHookFunc(setting, filepath);
- }
- if( *HPMforce_return ) {
- *HPMforce_return = false;
- return retVal___;
- }
- }
- {
- retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath);
- }
- if( HPMHooks.count.HP_libconfig_lookup_from_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, setting, filepath);
- }
- }
- return retVal___;
-}
int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) {
int hIndex = 0;
int retVal___ = 0;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index 911e84586..6c1efa226 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -2742,10 +2742,10 @@ struct {
struct HPMHookPoint *HP_libconfig_read_post;
struct HPMHookPoint *HP_libconfig_write_pre;
struct HPMHookPoint *HP_libconfig_write_post;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_set_auto_convert_post;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_pre;
- struct HPMHookPoint *HP_libconfig_get_auto_convert_post;
+ struct HPMHookPoint *HP_libconfig_set_options_pre;
+ struct HPMHookPoint *HP_libconfig_set_options_post;
+ struct HPMHookPoint *HP_libconfig_get_options_pre;
+ struct HPMHookPoint *HP_libconfig_get_options_post;
struct HPMHookPoint *HP_libconfig_read_string_pre;
struct HPMHookPoint *HP_libconfig_read_string_post;
struct HPMHookPoint *HP_libconfig_read_file_src_pre;
@@ -2770,6 +2770,8 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_get_bool_post;
struct HPMHookPoint *HP_libconfig_setting_get_string_pre;
struct HPMHookPoint *HP_libconfig_setting_get_string_post;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_pre;
+ struct HPMHookPoint *HP_libconfig_setting_lookup_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_setting_lookup_int_post;
struct HPMHookPoint *HP_libconfig_setting_lookup_int64_pre;
@@ -2832,8 +2834,6 @@ struct {
struct HPMHookPoint *HP_libconfig_setting_set_hook_post;
struct HPMHookPoint *HP_libconfig_lookup_pre;
struct HPMHookPoint *HP_libconfig_lookup_post;
- struct HPMHookPoint *HP_libconfig_lookup_from_pre;
- struct HPMHookPoint *HP_libconfig_lookup_from_post;
struct HPMHookPoint *HP_libconfig_lookup_int_pre;
struct HPMHookPoint *HP_libconfig_lookup_int_post;
struct HPMHookPoint *HP_libconfig_lookup_int64_pre;
@@ -8593,10 +8593,10 @@ struct {
int HP_libconfig_read_post;
int HP_libconfig_write_pre;
int HP_libconfig_write_post;
- int HP_libconfig_set_auto_convert_pre;
- int HP_libconfig_set_auto_convert_post;
- int HP_libconfig_get_auto_convert_pre;
- int HP_libconfig_get_auto_convert_post;
+ int HP_libconfig_set_options_pre;
+ int HP_libconfig_set_options_post;
+ int HP_libconfig_get_options_pre;
+ int HP_libconfig_get_options_post;
int HP_libconfig_read_string_pre;
int HP_libconfig_read_string_post;
int HP_libconfig_read_file_src_pre;
@@ -8621,6 +8621,8 @@ struct {
int HP_libconfig_setting_get_bool_post;
int HP_libconfig_setting_get_string_pre;
int HP_libconfig_setting_get_string_post;
+ int HP_libconfig_setting_lookup_pre;
+ int HP_libconfig_setting_lookup_post;
int HP_libconfig_setting_lookup_int_pre;
int HP_libconfig_setting_lookup_int_post;
int HP_libconfig_setting_lookup_int64_pre;
@@ -8683,8 +8685,6 @@ struct {
int HP_libconfig_setting_set_hook_post;
int HP_libconfig_lookup_pre;
int HP_libconfig_lookup_post;
- int HP_libconfig_lookup_from_pre;
- int HP_libconfig_lookup_from_post;
int HP_libconfig_lookup_int_pre;
int HP_libconfig_lookup_int_post;
int HP_libconfig_lookup_int64_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 303f5ed7e..b71165e53 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -1405,8 +1405,8 @@ struct HookingPointData HookingPoints[] = {
/* libconfig */
{ HP_POP(libconfig->read, HP_libconfig_read) },
{ HP_POP(libconfig->write, HP_libconfig_write) },
- { HP_POP(libconfig->set_auto_convert, HP_libconfig_set_auto_convert) },
- { HP_POP(libconfig->get_auto_convert, HP_libconfig_get_auto_convert) },
+ { HP_POP(libconfig->set_options, HP_libconfig_set_options) },
+ { HP_POP(libconfig->get_options, HP_libconfig_get_options) },
{ HP_POP(libconfig->read_string, HP_libconfig_read_string) },
{ HP_POP(libconfig->read_file_src, HP_libconfig_read_file_src) },
{ HP_POP(libconfig->write_file, HP_libconfig_write_file) },
@@ -1419,6 +1419,7 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_get_float, HP_libconfig_setting_get_float) },
{ HP_POP(libconfig->setting_get_bool, HP_libconfig_setting_get_bool) },
{ HP_POP(libconfig->setting_get_string, HP_libconfig_setting_get_string) },
+ { HP_POP(libconfig->setting_lookup, HP_libconfig_setting_lookup) },
{ HP_POP(libconfig->setting_lookup_int, HP_libconfig_setting_lookup_int) },
{ HP_POP(libconfig->setting_lookup_int64, HP_libconfig_setting_lookup_int64) },
{ HP_POP(libconfig->setting_lookup_float, HP_libconfig_setting_lookup_float) },
@@ -1450,7 +1451,6 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(libconfig->setting_remove_elem, HP_libconfig_setting_remove_elem) },
{ HP_POP(libconfig->setting_set_hook, HP_libconfig_setting_set_hook) },
{ HP_POP(libconfig->lookup, HP_libconfig_lookup) },
- { HP_POP(libconfig->lookup_from, HP_libconfig_lookup_from) },
{ HP_POP(libconfig->lookup_int, HP_libconfig_lookup_int) },
{ HP_POP(libconfig->lookup_int64, HP_libconfig_lookup_int64) },
{ HP_POP(libconfig->lookup_float, HP_libconfig_lookup_float) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index ee07b99cb..86fc423e3 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -36107,14 +36107,14 @@ void HP_libconfig_write(const config_t *config, FILE *stream) {
}
return;
}
-void HP_libconfig_set_auto_convert(config_t *config, int flag) {
+void HP_libconfig_set_options(config_t *config, int options) {
int hIndex = 0;
- if( HPMHooks.count.HP_libconfig_set_auto_convert_pre ) {
- void (*preHookFunc) (config_t *config, int *flag);
+ if( HPMHooks.count.HP_libconfig_set_options_pre ) {
+ void (*preHookFunc) (config_t *config, int *options);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_pre[hIndex].func;
- preHookFunc(config, &flag);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_set_options_pre[hIndex].func;
+ preHookFunc(config, &options);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -36122,25 +36122,25 @@ void HP_libconfig_set_auto_convert(config_t *config, int flag) {
}
}
{
- HPMHooks.source.libconfig.set_auto_convert(config, flag);
+ HPMHooks.source.libconfig.set_options(config, options);
}
- if( HPMHooks.count.HP_libconfig_set_auto_convert_post ) {
- void (*postHookFunc) (config_t *config, int *flag);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_set_auto_convert_post[hIndex].func;
- postHookFunc(config, &flag);
+ if( HPMHooks.count.HP_libconfig_set_options_post ) {
+ void (*postHookFunc) (config_t *config, int *options);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_set_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_set_options_post[hIndex].func;
+ postHookFunc(config, &options);
}
}
return;
}
-int HP_libconfig_get_auto_convert(const config_t *config) {
+int HP_libconfig_get_options(const config_t *config) {
int hIndex = 0;
int retVal___ = 0;
- if( HPMHooks.count.HP_libconfig_get_auto_convert_pre ) {
+ if( HPMHooks.count.HP_libconfig_get_options_pre ) {
int (*preHookFunc) (const config_t *config);
*HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_pre[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_get_options_pre[hIndex].func;
retVal___ = preHookFunc(config);
}
if( *HPMforce_return ) {
@@ -36149,12 +36149,12 @@ int HP_libconfig_get_auto_convert(const config_t *config) {
}
}
{
- retVal___ = HPMHooks.source.libconfig.get_auto_convert(config);
+ retVal___ = HPMHooks.source.libconfig.get_options(config);
}
- if( HPMHooks.count.HP_libconfig_get_auto_convert_post ) {
+ if( HPMHooks.count.HP_libconfig_get_options_post ) {
int (*postHookFunc) (int retVal___, const config_t *config);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_auto_convert_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_get_auto_convert_post[hIndex].func;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_get_options_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_get_options_post[hIndex].func;
retVal___ = postHookFunc(retVal___, config);
}
}
@@ -36480,6 +36480,33 @@ const char* HP_libconfig_setting_get_string(const config_setting_t *setting) {
}
return retVal___;
}
+config_setting_t* HP_libconfig_setting_lookup(config_setting_t *setting, const char *name) {
+ int hIndex = 0;
+ config_setting_t* retVal___ = NULL;
+ if( HPMHooks.count.HP_libconfig_setting_lookup_pre ) {
+ config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *name);
+ *HPMforce_return = false;
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_pre; hIndex++ ) {
+ preHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_pre[hIndex].func;
+ retVal___ = preHookFunc(setting, name);
+ }
+ if( *HPMforce_return ) {
+ *HPMforce_return = false;
+ return retVal___;
+ }
+ }
+ {
+ retVal___ = HPMHooks.source.libconfig.setting_lookup(setting, name);
+ }
+ if( HPMHooks.count.HP_libconfig_setting_lookup_post ) {
+ config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *name);
+ for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_setting_lookup_post; hIndex++ ) {
+ postHookFunc = HPMHooks.list.HP_libconfig_setting_lookup_post[hIndex].func;
+ retVal___ = postHookFunc(retVal___, setting, name);
+ }
+ }
+ return retVal___;
+}
int HP_libconfig_setting_lookup_int(const config_setting_t *setting, const char *name, int *value) {
int hIndex = 0;
int retVal___ = 0;
@@ -37316,33 +37343,6 @@ config_setting_t* HP_libconfig_lookup(const config_t *config, const char *filepa
}
return retVal___;
}
-config_setting_t* HP_libconfig_lookup_from(config_setting_t *setting, const char *filepath) {
- int hIndex = 0;
- config_setting_t* retVal___ = NULL;
- if( HPMHooks.count.HP_libconfig_lookup_from_pre ) {
- config_setting_t* (*preHookFunc) (config_setting_t *setting, const char *filepath);
- *HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_libconfig_lookup_from_pre[hIndex].func;
- retVal___ = preHookFunc(setting, filepath);
- }
- if( *HPMforce_return ) {
- *HPMforce_return = false;
- return retVal___;
- }
- }
- {
- retVal___ = HPMHooks.source.libconfig.lookup_from(setting, filepath);
- }
- if( HPMHooks.count.HP_libconfig_lookup_from_post ) {
- config_setting_t* (*postHookFunc) (config_setting_t* retVal___, config_setting_t *setting, const char *filepath);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_libconfig_lookup_from_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_libconfig_lookup_from_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, setting, filepath);
- }
- }
- return retVal___;
-}
int HP_libconfig_lookup_int(const config_t *config, const char *filepath, int *value) {
int hIndex = 0;
int retVal___ = 0;