From 868d131d6f968bc65746afe1247c10e4a55e8186 Mon Sep 17 00:00:00 2001
From: Haru <haru@dotalux.com>
Date: Tue, 29 Sep 2015 16:08:26 +0200
Subject: HPM Hooks Update
---
src/common/HPMDataCheck.h | 1 +
src/plugins/HPMHooking/HPMHooking_char.Hooks.inc | 12 ++++++------
src/plugins/HPMHooking/HPMHooking_login.Hooks.inc | 12 ++++++------
src/plugins/HPMHooking/HPMHooking_map.Hooks.inc | 12 ++++++------
4 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/src/common/HPMDataCheck.h b/src/common/HPMDataCheck.h
index 4fd16114b..510ea9d4e 100644
--- a/src/common/HPMDataCheck.h
+++ b/src/common/HPMDataCheck.h
@@ -201,6 +201,7 @@ HPExport const struct s_HPMDataCheck HPMDataCheck[] = {
#ifdef COMMON_SOCKET_H
{ "hSockOpt", sizeof(struct hSockOpt), SERVER_TYPE_ALL },
{ "s_subnet", sizeof(struct s_subnet), SERVER_TYPE_ALL },
+ { "s_subnet_vector", sizeof(struct s_subnet_vector), SERVER_TYPE_ALL },
{ "socket_data", sizeof(struct socket_data), SERVER_TYPE_ALL },
{ "socket_interface", sizeof(struct socket_interface), SERVER_TYPE_ALL },
#else
diff --git a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
index 2e35992bc..e113611e4 100644
--- a/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_char.Hooks.inc
@@ -15775,15 +15775,15 @@ bool HP_sockt_trusted_ip_check(uint32 ip) {
}
return retVal___;
}
-int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet **list, int *count, const char *filename, const char *groupname) {
+int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) {
- int (*preHookFunc) (config_setting_t *t, struct s_subnet **list, int *count, const char *filename, const char *groupname);
+ int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func;
- retVal___ = preHookFunc(t, list, count, filename, groupname);
+ retVal___ = preHookFunc(t, list, filename, groupname);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -15791,13 +15791,13 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet **list, in
}
}
{
- retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, count, filename, groupname);
+ retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname);
}
if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet **list, int *count, const char *filename, const char *groupname);
+ int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, t, list, count, filename, groupname);
+ retVal___ = postHookFunc(retVal___, t, list, filename, groupname);
}
}
return retVal___;
diff --git a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
index 94b298d36..5d4fad4d8 100644
--- a/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_login.Hooks.inc
@@ -5048,15 +5048,15 @@ bool HP_sockt_trusted_ip_check(uint32 ip) {
}
return retVal___;
}
-int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet **list, int *count, const char *filename, const char *groupname) {
+int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) {
- int (*preHookFunc) (config_setting_t *t, struct s_subnet **list, int *count, const char *filename, const char *groupname);
+ int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func;
- retVal___ = preHookFunc(t, list, count, filename, groupname);
+ retVal___ = preHookFunc(t, list, filename, groupname);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -5064,13 +5064,13 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet **list, in
}
}
{
- retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, count, filename, groupname);
+ retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname);
}
if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet **list, int *count, const char *filename, const char *groupname);
+ int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, t, list, count, filename, groupname);
+ retVal___ = postHookFunc(retVal___, t, list, filename, groupname);
}
}
return retVal___;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 8f5ca680d..7ae0d9d48 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -69770,15 +69770,15 @@ bool HP_sockt_trusted_ip_check(uint32 ip) {
}
return retVal___;
}
-int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet **list, int *count, const char *filename, const char *groupname) {
+int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname) {
int hIndex = 0;
int retVal___ = 0;
if( HPMHooks.count.HP_sockt_net_config_read_sub_pre ) {
- int (*preHookFunc) (config_setting_t *t, struct s_subnet **list, int *count, const char *filename, const char *groupname);
+ int (*preHookFunc) (config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
*HPMforce_return = false;
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_pre; hIndex++ ) {
preHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_pre[hIndex].func;
- retVal___ = preHookFunc(t, list, count, filename, groupname);
+ retVal___ = preHookFunc(t, list, filename, groupname);
}
if( *HPMforce_return ) {
*HPMforce_return = false;
@@ -69786,13 +69786,13 @@ int HP_sockt_net_config_read_sub(config_setting_t *t, struct s_subnet **list, in
}
}
{
- retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, count, filename, groupname);
+ retVal___ = HPMHooks.source.sockt.net_config_read_sub(t, list, filename, groupname);
}
if( HPMHooks.count.HP_sockt_net_config_read_sub_post ) {
- int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet **list, int *count, const char *filename, const char *groupname);
+ int (*postHookFunc) (int retVal___, config_setting_t *t, struct s_subnet_vector *list, const char *filename, const char *groupname);
for(hIndex = 0; hIndex < HPMHooks.count.HP_sockt_net_config_read_sub_post; hIndex++ ) {
postHookFunc = HPMHooks.list.HP_sockt_net_config_read_sub_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, t, list, count, filename, groupname);
+ retVal___ = postHookFunc(retVal___, t, list, filename, groupname);
}
}
return retVal___;
--
cgit v1.2.3-70-g09d2