diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-28 09:24:05 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-04-28 09:24:05 +0200 |
| commit | 434e404a6c7181a2b7efa9840506e8963665bdd6 (patch) | |
| tree | e332d2a95705cd4db5e7333a749c218735e2c2e7 /tcps_sess.h | |
| parent | 898d69037de106be8f5b14093daee409f8f7a88f (diff) | |
| parent | 858f1efd05a2f3c8bc6a0edf8a01f40e27f02407 (diff) | |
| download | rsyslog-434e404a6c7181a2b7efa9840506e8963665bdd6.tar.gz rsyslog-434e404a6c7181a2b7efa9840506e8963665bdd6.tar.xz rsyslog-434e404a6c7181a2b7efa9840506e8963665bdd6.zip | |
Merge branch 'klogd-bug'
Diffstat (limited to 'tcps_sess.h')
| -rw-r--r-- | tcps_sess.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tcps_sess.h b/tcps_sess.h index 1d45c482..9f3d10d6 100644 --- a/tcps_sess.h +++ b/tcps_sess.h @@ -32,8 +32,8 @@ struct tcpsrv_s; typedef struct tcps_sess_s { BEGINobjInstance; /* Data to implement generic object - MUST be the first data element! */ struct tcpsrv_s *pSrv; /* pointer back to my server (e.g. for callbacks) */ - int sock; - int iMsg; /* index of next char to store in msg */ + netstrm_t *pStrm; + int iMsg; /* index of next char to store in msg */ int bAtStrtOfFram; /* are we at the very beginning of a new frame? */ enum { eAtStrtFram, @@ -43,7 +43,7 @@ typedef struct tcps_sess_s { int iOctetsRemain; /* Number of Octets remaining in message */ TCPFRAMINGMODE eFraming; char msg[MAXLINE+1]; - char *fromHost; + uchar *fromHost; void *pUsr; /* a user-pointer */ } tcps_sess_t; @@ -61,7 +61,7 @@ BEGINinterface(tcps_sess) /* name must also be changed in ENDinterface macro! */ rsRetVal (*SetTcpsrv)(tcps_sess_t *pThis, struct tcpsrv_s *pSrv); rsRetVal (*SetUsrP)(tcps_sess_t*, void*); rsRetVal (*SetHost)(tcps_sess_t *pThis, uchar*); - rsRetVal (*SetSock)(tcps_sess_t *pThis, int); + rsRetVal (*SetStrm)(tcps_sess_t *pThis, netstrm_t*); rsRetVal (*SetMsgIdx)(tcps_sess_t *pThis, int); ENDinterface(tcps_sess) #define tcps_sessCURR_IF_VERSION 1 /* increment whenever you change the interface structure! */ |