diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-26 17:30:59 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2011-04-26 17:30:59 +0200 |
| commit | 19c8bed08dbeb9ce0313ec92d7de85c9c51c4f48 (patch) | |
| tree | 625acfbc535b2b84e0f4cfaf8ee322f38f0bbc2b /runtime | |
| parent | 8fb8c0d37b68d633e562bbc96f9971917620d181 (diff) | |
| download | rsyslog-19c8bed08dbeb9ce0313ec92d7de85c9c51c4f48.tar.gz rsyslog-19c8bed08dbeb9ce0313ec92d7de85c9c51c4f48.tar.xz rsyslog-19c8bed08dbeb9ce0313ec92d7de85c9c51c4f48.zip | |
step: outchannel list integrated into main config object
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/rsconf.c | 4 | ||||
| -rw-r--r-- | runtime/rsconf.h | 6 | ||||
| -rw-r--r-- | runtime/typedefs.h | 1 |
3 files changed, 11 insertions, 0 deletions
diff --git a/runtime/rsconf.c b/runtime/rsconf.c index eecdbb01..47a6f00b 100644 --- a/runtime/rsconf.c +++ b/runtime/rsconf.c @@ -59,6 +59,7 @@ #include "smfwd.h" #include "smtradfwd.h" #include "parser.h" +#include "outchannel.h" /* static data */ DEFobjStaticHelpers @@ -162,6 +163,8 @@ BEGINobjDebugPrint(rsconf) /* be sure to specify the object type also in END and pThis->globals.bLogStatusMsgs); dbgprintf(" bErrMsgToStderr.....................: %d\n", pThis->globals.bErrMsgToStderr); + dbgprintf(" drop Msgs with malicious PTR Record : %d\n", + glbl.GetDropMalPTRMsgs()); ruleset.DebugPrintAll(pThis); DBGPRINTF("\n"); if(pThis->globals.bDebugPrintTemplateList) @@ -190,6 +193,7 @@ BEGINobjDebugPrint(rsconf) /* be sure to specify the object type also in END and setQPROP(qqueueSetbSaveOnShutdown, "$MainMsgQueueSaveOnShutdown", 1); */ DBGPRINTF("Work Directory: '%s'.\n", glbl.GetWorkDir()); + ochPrintList(); CODESTARTobjDebugPrint(rsconf) ENDobjDebugPrint(rsconf) diff --git a/runtime/rsconf.h b/runtime/rsconf.h index 5229b9f7..5cd6bfd0 100644 --- a/runtime/rsconf.h +++ b/runtime/rsconf.h @@ -91,6 +91,11 @@ struct globals_s { struct defaults_s { }; +/* outchannel-specific data */ +struct outchannels_s { + struct outchannel *ochRoot; /* the root of the outchannel list */ + struct outchannel *ochLast; /* points to the last element of the outchannel list */ +}; struct templates_s { struct template *root; /* the root of the template list */ @@ -121,6 +126,7 @@ struct rsconf_s { globals_t globals; defaults_t defaults; templates_t templates; + outchannels_t och; actions_t actions; rulesets_t rulesets; /* note: rulesets include the complete output part: 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 */ |