From 7a47ecf93bc7ab9a7d9307aa5997f0b98e8e4a5d Mon Sep 17 00:00:00 2001 From: Fabian Mauchle Date: Fri, 24 Mar 2017 16:40:49 +0100 Subject: add msg-id to debug log output --- ChangeLog | 1 + radsecproxy.c | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8819261..f39a120 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2017-10-?? 1.6.9 Bug fixes: - Completely reload CAs and CRLs with cacheExpiry (RADSECPROXY-50). + - Tie Access-Request log lines to response log lines (RADSECPROXY-60). 2016-09-21 1.6.8 Bug fixes: diff --git a/radsecproxy.c b/radsecproxy.c index 815e927..58c4bc6 100644 --- a/radsecproxy.c +++ b/radsecproxy.c @@ -1521,7 +1521,7 @@ int radsrv(struct request *rq) { userascii = radattr2ascii(attr); if (!userascii) goto rmclrqexit; - debug(DBG_DBG, "%s with username: %s", radmsgtype2string(msg->code), userascii); + debug(DBG_DBG, "radsrv: got %s (id %d) with username: %s from client %s (%s)", radmsgtype2string(msg->code), msg->id, userascii, from->conf->name, addr2string(from->addr)); /* will return with lock on the realm */ to = findserver(&realm, attr, msg->code == RAD_Accounting_Request); @@ -1770,8 +1770,7 @@ void replyh(struct server *server, unsigned char *buf) { if (ttlres == -1 && (options.addttl || from->conf->addttl)) addttlattr(msg, options.ttlattrtype, from->conf->addttl ? from->conf->addttl : options.addttl); - debug(msg->code == RAD_Access_Accept || msg->code == RAD_Access_Reject || msg->code == RAD_Accounting_Response ? DBG_WARN : DBG_INFO, - "replyh: passing %s to client %s (%s)", radmsgtype2string(msg->code), from->conf->name, addr2string(from->addr)); + debug(DBG_DBG, "replyh: passing %s (id %d) to client %s (%s)", radmsgtype2string(msg->code), msg->id, from->conf->name, addr2string(from->addr)); radmsg_free(rqout->rq->msg); rqout->rq->msg = msg; -- cgit v1.1