diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-16 15:11:24 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2008-05-16 15:11:24 +0200 |
| commit | 29ebd4ab3e391aea53b6e337061d226359aeb993 (patch) | |
| tree | 4ae2c32da9e8ed71109a2de600911df6dfdbd0d5 /tcpsrv.c | |
| parent | ffa17a25d2c2098d4977d377cbf20d0136fea820 (diff) | |
| parent | dfb1f20ce71e69bf164c9b1d59e0b4cd9f81c252 (diff) | |
| download | rsyslog-29ebd4ab3e391aea53b6e337061d226359aeb993.tar.gz rsyslog-29ebd4ab3e391aea53b6e337061d226359aeb993.tar.bz2 rsyslog-29ebd4ab3e391aea53b6e337061d226359aeb993.zip | |
Merge branch 'master' into ietf-tls
Diffstat (limited to 'tcpsrv.c')
| -rw-r--r-- | tcpsrv.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -314,6 +314,7 @@ SessAccept(tcpsrv_t *pThis, tcps_sess_t **ppSess, netstrm_t *pStrm) int iSess = -1; struct sockaddr_storage addr; uchar *fromHostFQDN = NULL; + uchar *fromHostIP = NULL; ISOBJ_TYPE_assert(pThis, tcpsrv); @@ -333,7 +334,8 @@ SessAccept(tcpsrv_t *pThis, tcps_sess_t **ppSess, netstrm_t *pStrm) /* OK, we have a "good" index... */ /* get the host name */ - CHKiRet(netstrm.GetRemoteHName(pStrm, &fromHostFQDN)); + CHKiRet(netstrm.GetRemoteHName(pNewStrm, &fromHostFQDN)); + CHKiRet(netstrm.GetRemoteIP(pNewStrm, &fromHostIP)); /* TODO: check if we need to strip the domain name here -- rgerhards, 2008-04-24 */ /* Here we check if a host is permitted to send us messages. If it isn't, we do not further @@ -353,6 +355,7 @@ SessAccept(tcpsrv_t *pThis, tcps_sess_t **ppSess, netstrm_t *pStrm) * means we can finally fill in the session object. */ CHKiRet(tcps_sess.SetHost(pSess, fromHostFQDN)); + CHKiRet(tcps_sess.SetHostIP(pSess, fromHostIP)); CHKiRet(tcps_sess.SetStrm(pSess, pNewStrm)); pNewStrm = NULL; /* prevent it from being freed in error handler, now done in tcps_sess! */ CHKiRet(tcps_sess.SetMsgIdx(pSess, 0)); |