From f72bde2f701b1a1ff42273e8f9b07de47b480ce9 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 19 Apr 2011 09:43:36 +0200 Subject: milestone: templates are now in config object --- runtime/typedefs.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index b6cfbd57..f38bcdd4 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -80,6 +80,8 @@ typedef struct strgen_s strgen_t; typedef struct strgenList_s strgenList_t; typedef struct statsobj_s statsobj_t; typedef struct nsd_epworkset_s nsd_epworkset_t; +typedef struct templates_s templates_t; +typedef struct rsconf_s rsconf_t; typedef rsRetVal (*prsf_t)(struct vmstk_s*, int); /* pointer to a RainerScript function */ typedef uint64 qDeqID; /* queue Dequeue order ID. 32 bits is considered dangerously few */ -- cgit From d348558a51402d08310d95cfd6e8a2d6b9fce1b2 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 19 Apr 2011 11:26:37 +0200 Subject: milestone: conf obj interface now utilzes rsconf_t --- runtime/typedefs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index f38bcdd4..d79612bc 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -81,6 +81,7 @@ typedef struct strgenList_s strgenList_t; typedef struct statsobj_s statsobj_t; typedef struct nsd_epworkset_s nsd_epworkset_t; typedef struct templates_s templates_t; +typedef struct actions_s actions_t; typedef struct rsconf_s rsconf_t; typedef rsRetVal (*prsf_t)(struct vmstk_s*, int); /* pointer to a RainerScript function */ typedef uint64 qDeqID; /* queue Dequeue order ID. 32 bits is considered dangerously few */ -- cgit From b722cd3fe608a0bbf4a6df962f9d5c5e547fdc09 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 19 Apr 2011 12:18:26 +0200 Subject: milestone: ruleset now supports rsconf_t --- runtime/typedefs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index d79612bc..11cc467d 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -81,6 +81,7 @@ typedef struct strgenList_s strgenList_t; typedef struct statsobj_s statsobj_t; typedef struct nsd_epworkset_s nsd_epworkset_t; typedef struct templates_s templates_t; +typedef struct rulesets_s rulesets_t; typedef struct actions_s actions_t; typedef struct rsconf_s rsconf_t; typedef rsRetVal (*prsf_t)(struct vmstk_s*, int); /* pointer to a RainerScript function */ -- cgit From 28e750eebd8ccb5655bdc18693b3b7c9d9ad826b Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 19 Apr 2011 14:58:31 +0200 Subject: step: slowly migrating config settings... ;) --- runtime/typedefs.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index 11cc467d..e46f509b 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -82,6 +82,8 @@ typedef struct statsobj_s statsobj_t; typedef struct nsd_epworkset_s nsd_epworkset_t; typedef struct templates_s templates_t; typedef struct rulesets_s rulesets_t; +typedef struct globals_s globals_t; +typedef struct defaults_s defaults_t; typedef struct actions_s actions_t; typedef struct rsconf_s rsconf_t; typedef rsRetVal (*prsf_t)(struct vmstk_s*, int); /* pointer to a RainerScript function */ @@ -150,7 +152,8 @@ typedef enum cslCmdHdlrType { eCmdHdlrGetChar, eCmdHdlrFacility, eCmdHdlrSeverity, - eCmdHdlrGetWord + eCmdHdlrGetWord, + eCmdHdlrGoneAway /* statment existed, but is no longer supported */ } ecslCmdHdrlType; -- cgit From 13ecf8a6ef5a5b69819865a2b9b524d4c561f5de Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 21 Apr 2011 14:27:41 +0200 Subject: step: config handler setting from syslogd.c moved to rsconf.c --- runtime/typedefs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index e46f509b..b7df0464 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -81,6 +81,7 @@ typedef struct strgenList_s strgenList_t; typedef struct statsobj_s statsobj_t; typedef struct nsd_epworkset_s nsd_epworkset_t; typedef struct templates_s templates_t; +typedef struct queuecnf_s queuecnf_t; typedef struct rulesets_s rulesets_t; typedef struct globals_s globals_t; typedef struct defaults_s defaults_t; -- cgit From 19c8bed08dbeb9ce0313ec92d7de85c9c51c4f48 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 26 Apr 2011 17:30:59 +0200 Subject: step: outchannel list integrated into main config object --- runtime/typedefs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index b7df0464..0d23e880 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -87,6 +87,7 @@ typedef struct globals_s globals_t; typedef struct defaults_s defaults_t; typedef struct actions_s actions_t; typedef struct rsconf_s rsconf_t; +typedef struct outchannels_s outchannels_t; typedef rsRetVal (*prsf_t)(struct vmstk_s*, int); /* pointer to a RainerScript function */ typedef uint64 qDeqID; /* queue Dequeue order ID. 32 bits is considered dangerously few */ -- cgit From 17e3f6b49cccb99316f2907eb3c131ec998ee3c3 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 27 Apr 2011 14:02:00 +0200 Subject: step: $ModLoad handler no longe requries conf obj re-doing the interface, global var "loadConf" now holds that data. Makes things simpler with legacy handler, as well as new functionality. --- runtime/typedefs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index 0d23e880..ca78d820 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -87,6 +87,7 @@ typedef struct globals_s globals_t; typedef struct defaults_s defaults_t; typedef struct actions_s actions_t; typedef struct rsconf_s rsconf_t; +typedef struct cfgmodules_s cfgmodules_t; typedef struct outchannels_s outchannels_t; typedef rsRetVal (*prsf_t)(struct vmstk_s*, int); /* pointer to a RainerScript function */ typedef uint64 qDeqID; /* queue Dequeue order ID. 32 bits is considered dangerously few */ -- cgit From 4f8457ffe3bc0a104a86ac79622844c4206adbbb Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Wed, 27 Apr 2011 15:38:06 +0200 Subject: step: added config-specific module list --- runtime/typedefs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index ca78d820..1c8e93ce 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -88,6 +88,7 @@ typedef struct defaults_s defaults_t; typedef struct actions_s actions_t; typedef struct rsconf_s rsconf_t; typedef struct cfgmodules_s cfgmodules_t; +typedef struct cfgmodules_etry_s cfgmodules_etry_t; typedef struct outchannels_s outchannels_t; typedef rsRetVal (*prsf_t)(struct vmstk_s*, int); /* pointer to a RainerScript function */ typedef uint64 qDeqID; /* queue Dequeue order ID. 32 bits is considered dangerously few */ -- cgit From c0d1334f6e23b1cfb21d302e3a4b32c449c26547 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Thu, 5 May 2011 11:36:05 +0200 Subject: step: imtcp moved to new config interface as far as we know that new interface right now ;) --- runtime/typedefs.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index 1c8e93ce..11061e14 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -90,6 +90,8 @@ typedef struct rsconf_s rsconf_t; typedef struct cfgmodules_s cfgmodules_t; typedef struct cfgmodules_etry_s cfgmodules_etry_t; typedef struct outchannels_s outchannels_t; +typedef struct modConfData_s modConfData_t; +typedef struct instanceConf_s instanceConf_t; typedef rsRetVal (*prsf_t)(struct vmstk_s*, int); /* pointer to a RainerScript function */ typedef uint64 qDeqID; /* queue Dequeue order ID. 32 bits is considered dangerously few */ -- cgit From 127d61fea78c967d2cdc536f898da425ffdd8a11 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Tue, 19 Jul 2011 09:31:17 +0200 Subject: milestone: first steps at global() conf obj implementation also, the foundation for accessing conf file params has been laid. Still more work to do... --- runtime/typedefs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index 11061e14..d46851f6 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -159,6 +159,7 @@ typedef enum cslCmdHdlrType { eCmdHdlrFacility, eCmdHdlrSeverity, eCmdHdlrGetWord, + eCmdHdlrString, eCmdHdlrGoneAway /* statment existed, but is no longer supported */ } ecslCmdHdrlType; -- cgit From 9757aeb56445eee3aca2b43e6b3efa1f1cb59ba3 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Fri, 22 Jul 2011 18:03:43 +0200 Subject: milestone: queue object now has a param handler for new conf interface ... and action queue defs use this new interface (but not yet the main queues) --- runtime/typedefs.h | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/typedefs.h') diff --git a/runtime/typedefs.h b/runtime/typedefs.h index d46851f6..f994cbc4 100644 --- a/runtime/typedefs.h +++ b/runtime/typedefs.h @@ -160,6 +160,7 @@ typedef enum cslCmdHdlrType { eCmdHdlrSeverity, eCmdHdlrGetWord, eCmdHdlrString, + eCmdHdlrQueueType, eCmdHdlrGoneAway /* statment existed, but is no longer supported */ } ecslCmdHdrlType; -- cgit