diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-05 11:45:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-05 11:45:41 +0200 |
| commit | b9cbb0d696571134b2ed061804a8ed9fb0d91955 (patch) | |
| tree | 76652a6e080a40eeafaa1a186b28350d8f8580d1 /runtime/netstrm.h | |
| parent | 1784eab77049dc1e606688c03b1b82a2c4d95a3f (diff) | |
| download | rsyslog-b9cbb0d696571134b2ed061804a8ed9fb0d91955.tar.gz rsyslog-b9cbb0d696571134b2ed061804a8ed9fb0d91955.tar.xz rsyslog-b9cbb0d696571134b2ed061804a8ed9fb0d91955.zip | |
made imgssapi work with new netstrm driver model
there were a couple of things where imgssapi was not compatible
with the new encapsulation. I did a somewhat dirty fix. The real
solution would be to turn gssapi functionality into a netstream
driver, which is too much for now (after all, we want to release
some time AND we need to have the code mature in practice
before we go for the next target...).
Diffstat (limited to 'runtime/netstrm.h')
| -rw-r--r-- | runtime/netstrm.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/runtime/netstrm.h b/runtime/netstrm.h index b2131ff7..a15c1d9b 100644 --- a/runtime/netstrm.h +++ b/runtime/netstrm.h @@ -31,7 +31,6 @@ struct netstrm_s { BEGINobjInstance; /* Data to implement generic object - MUST be the first data element! */ nsd_t *pDrvrData; /**< the driver's data elements (at most other places, this is called pNsd) */ nsd_if_t Drvr; /**< our stream driver */ - //int iDrvrMode; /**< mode to be used for our driver */ netstrms_t *pNS; /**< pointer to our netstream subsystem object */ }; @@ -51,6 +50,14 @@ BEGINinterface(netstrm) /* name must also be changed in ENDinterface macro! */ rsRetVal (*GetRemoteHName)(netstrm_t *pThis, uchar **pszName); rsRetVal (*GetRemoteIP)(netstrm_t *pThis, uchar **pszIP); rsRetVal (*SetDrvrMode)(netstrm_t *pThis, int iMode); + /* 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 + * will also tie the caller to nsd_ptcp, because other drivers may not support + * it at all. Once the imgssapi problem is solved, GetSock should be removed from + * this interface. -- rgerhards, 2008-05-05 + */ + rsRetVal (*GetSock)(netstrm_t *pThis, int *pSock); ENDinterface(netstrm) #define netstrmCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */ |