diff options
author | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 03:27:41 +0200 |
---|---|---|
committer | Rainer Gerhards <rgerhards@adiscon.com> | 2009-06-04 03:27:41 +0200 |
commit | 92d10abc1b66907f84b82d2d34552a90b852aa5f (patch) | |
tree | 8a90476f1ab39e133ff741ea2ad18010335b2b87 /runtime/nsd.h | |
parent | b22990c6d359ffdedbf266672b8c875964b81d64 (diff) | |
parent | 4f742a8e32c43dc9b514ceaf80f4d17e697dfdf6 (diff) | |
download | rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.gz rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.tar.bz2 rsyslog-92d10abc1b66907f84b82d2d34552a90b852aa5f.zip |
Merge branch 'master' into v5-devel
Conflicts:
ChangeLog
runtime/rsyslog.h
Diffstat (limited to 'runtime/nsd.h')
-rw-r--r-- | runtime/nsd.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/nsd.h b/runtime/nsd.h index f0c9b9b6..8668c934 100644 --- a/runtime/nsd.h +++ b/runtime/nsd.h @@ -69,9 +69,13 @@ BEGINinterface(nsd) /* name must also be changed in ENDinterface macro! */ * sockets - not really desirable, but not the end of the world... TODO: should be * reconsidered when a new ACL system is build. -- rgerhards, 2008-12-01 */ + /* v5 */ + rsRetVal (*EnableKeepAlive)(nsd_t *pThis); ENDinterface(nsd) -#define nsdCURR_IF_VERSION 4 /* increment whenever you change the interface structure! */ -/* interface version 4 added GetRemAddr() */ +#define nsdCURR_IF_VERSION 5 /* increment whenever you change the interface structure! */ +/* interface version 4 added GetRemAddr() + * interface version 5 added EnableKeepAlive() -- rgerhards, 2009-06-02 + */ /* interface for the select call */ BEGINinterface(nsdsel) /* name must also be changed in ENDinterface macro! */ |