diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:00:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2012-09-06 12:00:05 +0200 |
| commit | 74b81c8c01b26a142793a4861340996ed956f5f6 (patch) | |
| tree | 0a01b48d6bcc6a3fae57a0ed073e8a70f7fe9099 /runtime/netstrm.h | |
| parent | 0426ad7dd27fda6854f7d306e46331387b20947a (diff) | |
| parent | 88faed212c045cd53671155bd4af8a606b08b706 (diff) | |
| download | rsyslog-74b81c8c01b26a142793a4861340996ed956f5f6.tar.gz rsyslog-74b81c8c01b26a142793a4861340996ed956f5f6.tar.bz2 rsyslog-74b81c8c01b26a142793a4861340996ed956f5f6.zip | |
Merge branch 'v6-stable' into v6-devel
Diffstat (limited to 'runtime/netstrm.h')
| -rw-r--r-- | runtime/netstrm.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/netstrm.h b/runtime/netstrm.h index f6931104..ee8d9e59 100644 --- a/runtime/netstrm.h +++ b/runtime/netstrm.h @@ -53,7 +53,7 @@ BEGINinterface(netstrm) /* name must also be changed in ENDinterface macro! */ rsRetVal (*SetDrvrMode)(netstrm_t *pThis, int iMode); rsRetVal (*SetDrvrAuthMode)(netstrm_t *pThis, uchar*); rsRetVal (*SetDrvrPermPeers)(netstrm_t *pThis, permittedPeers_t*); - void (*CheckConnection)(netstrm_t *pThis); /* This is a trick mostly for plain tcp syslog */ + rsRetVal (*CheckConnection)(netstrm_t *pThis); /* This is a trick mostly for plain tcp syslog */ /* the GetSock() below is a hack to make imgssapi work. In the long term, * we should migrate imgssapi to a stream driver, which will relieve us of * this problem. Please note that nobody else should use GetSock(). Using it @@ -72,9 +72,10 @@ BEGINinterface(netstrm) /* name must also be changed in ENDinterface macro! */ /* v4 */ rsRetVal (*EnableKeepAlive)(netstrm_t *pThis); ENDinterface(netstrm) -#define netstrmCURR_IF_VERSION 4 /* increment whenever you change the interface structure! */ +#define netstrmCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */ /* interface version 3 added GetRemAddr() * interface version 4 added EnableKeepAlive() -- rgerhards, 2009-06-02 + * interface version 5 changed return of CheckConnection from void to rsRetVal -- alorbach, 2012-09-06 * */ /* prototypes */ |