diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-06 11:55:23 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-06-06 11:55:23 +0200 |
| commit | f27cff39a3ec4c904e366ac3927e4975b158aafe (patch) | |
| tree | 3e0f89c4feb0d70983e2bf875229be33ca574ecd /runtime/queue.h | |
| parent | 82688df6b52c9c1d42ca9919da13f25e2cdb9961 (diff) | |
| parent | 127671fed1707e686e8d7b316b2641b663892fec (diff) | |
| download | rsyslog-f27cff39a3ec4c904e366ac3927e4975b158aafe.tar.gz rsyslog-f27cff39a3ec4c904e366ac3927e4975b158aafe.tar.bz2 rsyslog-f27cff39a3ec4c904e366ac3927e4975b158aafe.zip | |
Merge branch 'nextmaster'
Conflicts:
ChangeLog
Diffstat (limited to 'runtime/queue.h')
| -rw-r--r-- | runtime/queue.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/runtime/queue.h b/runtime/queue.h index 886fac8d..844523ad 100644 --- a/runtime/queue.h +++ b/runtime/queue.h @@ -30,6 +30,7 @@ #include "batch.h" #include "stream.h" #include "statsobj.h" +#include "cryprov.h" /* support for the toDelete list */ typedef struct toDeleteLst_s toDeleteLst_t; @@ -168,6 +169,11 @@ struct queue_s { strm_t *pReadDel; /* current file for deleting */ } disk; } tVars; + sbool useCryprov; /* quicker than checkig ptr (1 vs 8 bytes!) */ + uchar *cryprovName; /* crypto provider to use */ + cryprov_if_t cryprov; /* ptr to crypto provider interface */ + void *cryprovData; /* opaque data ptr for provider use */ + uchar *cryprovNameFull;/* full internal crypto provider name */ DEF_ATOMIC_HELPER_MUT(mutQueueSize); DEF_ATOMIC_HELPER_MUT(mutLogDeq); /* for statistics subsystem */ @@ -197,9 +203,8 @@ rsRetVal qqueueSetFilePrefix(qqueue_t *pThis, uchar *pszPrefix, size_t iLenPrefi rsRetVal qqueueConstruct(qqueue_t **ppThis, queueType_t qType, int iWorkerThreads, int iMaxQueueSize, rsRetVal (*pConsumer)(void*,batch_t*, int*)); rsRetVal qqueueEnqObjDirectBatch(qqueue_t *pThis, batch_t *pBatch); -rsRetVal qqueueDoCnfParams(struct nvlst *lst, struct cnfparamvals **ppvals); -int queueCnfParamsSet(struct cnfparamvals *pvals); -rsRetVal qqueueApplyCnfParam(qqueue_t *pThis, struct cnfparamvals *pvals); +int queueCnfParamsSet(struct nvlst *lst); +rsRetVal qqueueApplyCnfParam(qqueue_t *pThis, struct nvlst *lst); void qqueueSetDefaultsRulesetQueue(qqueue_t *pThis); void qqueueSetDefaultsActionQueue(qqueue_t *pThis); void qqueueDbgPrint(qqueue_t *pThis); |