diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-05 12:45:14 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-10-05 12:45:14 +0200 |
| commit | 5a596871194cb4c573bea7cbbd9c96e07dd27dd4 (patch) | |
| tree | 5b2062fcdae0a2f43724b7b659c351d069320434 /runtime/stream.h | |
| parent | 805061b34a2273b487f799fc8e8554abbd70a2d7 (diff) | |
| parent | 5df935249e85c842f5fcbd636d300c17ab31f0f5 (diff) | |
| download | rsyslog-5a596871194cb4c573bea7cbbd9c96e07dd27dd4.tar.gz rsyslog-5a596871194cb4c573bea7cbbd9c96e07dd27dd4.tar.bz2 rsyslog-5a596871194cb4c573bea7cbbd9c96e07dd27dd4.zip | |
Merge branch 'c1-streamzip' into master-streamzip
Conflicts:
ChangeLog
configure.ac
doc/rsyslog_conf_global.html
runtime/stream.c
tools/omfile.c
Diffstat (limited to 'runtime/stream.h')
| -rw-r--r-- | runtime/stream.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/runtime/stream.h b/runtime/stream.h index a01929f2..fdfefaa3 100644 --- a/runtime/stream.h +++ b/runtime/stream.h @@ -124,6 +124,8 @@ typedef struct strm_s { sbool bAsyncWrite; /* do asynchronous writes (always if a flush interval is given) */ sbool bStopWriter; /* shall writer thread terminate? */ sbool bDoTimedWait; /* instruct writer thread to do a times wait to support flush timeouts */ + sbool bzInitDone; /* did we do an init of zstrm already? */ + sbool bVeryReliableZip; /* shall we write interim headers to create a very reliable ZIP file? */ int iFlushInterval; /* flush in which interval - 0, no flushing */ pthread_mutex_t mut;/* mutex for flush in async mode */ pthread_cond_t notFull; @@ -132,6 +134,7 @@ typedef struct strm_s { unsigned short iEnq; /* this MUST be unsigned as we use module arithmetic (else invalid indexing happens!) */ unsigned short iDeq; /* this MUST be unsigned as we use module arithmetic (else invalid indexing happens!) */ short iCnt; /* current nbr of elements in buffer */ + z_stream zstrm; /* zip stream to use */ struct { uchar *pBuf; size_t lenBuf; @@ -181,8 +184,10 @@ BEGINinterface(strm) /* name must also be changed in ENDinterface macro! */ INTERFACEpropSetMeth(strm, pszSizeLimitCmd, uchar*); /* v6 added */ rsRetVal (*ReadLine)(strm_t *pThis, cstr_t **ppCStr, int mode); + /* v7 added 2012-09-14 */ + INTERFACEpropSetMeth(strm, bVeryReliableZip, int); ENDinterface(strm) -#define strmCURR_IF_VERSION 6 /* increment whenever you change the interface structure! */ +#define strmCURR_IF_VERSION 7 /* increment whenever you change the interface structure! */ /* prototypes */ |