Repository: trafficserver Updated Branches: refs/heads/master 2a2c8bdf1 -> 700875f18
TS-2548: Add client IP to SSLError() calls in SSLNetVConnection Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/700875f1 Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/700875f1 Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/700875f1 Branch: refs/heads/master Commit: 700875f18db67df6e2a530a74d5f1ac4f6814d6d Parents: 2a2c8bd Author: Kang Li <[email protected]> Authored: Thu Apr 17 15:15:16 2014 -0700 Committer: Bryan Call <[email protected]> Committed: Thu Apr 17 15:15:16 2014 -0700 ---------------------------------------------------------------------- iocore/net/SSLUtils.cc | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/trafficserver/blob/700875f1/iocore/net/SSLUtils.cc ---------------------------------------------------------------------- diff --git a/iocore/net/SSLUtils.cc b/iocore/net/SSLUtils.cc index b96823e..43548fc 100644 --- a/iocore/net/SSLUtils.cc +++ b/iocore/net/SSLUtils.cc @@ -776,21 +776,29 @@ SSLDiagnostic(const SrcLoc& loc, bool debug, SSLNetVConnection * vc, const char const char *file, *data; int line, flags; unsigned long es; - va_list ap; + ip_text_buffer ip_buf; + bool ip_buf_flag = false; + if (vc) { + ats_ip_ntop(vc->get_remote_addr(), ip_buf, sizeof(ip_buf)); + ip_buf_flag = true; + } + es = CRYPTO_thread_id(); while ((l = ERR_get_error_line_data(&file, &line, &data, &flags)) != 0) { if (debug) { if (unlikely(diags->on())) { diags->log("ssl", DL_Debug, loc.file, loc.func, loc.line, - "SSL::%lu:%s:%s:%d%s%s", es, ERR_error_string(l, buf), file, line, - (flags & ERR_TXT_STRING) ? ":" : "", (flags & ERR_TXT_STRING) ? data : ""); + "SSL::%lu:%s:%s:%d%s%s%s%s", es, ERR_error_string(l, buf), file, line, + (flags & ERR_TXT_STRING) ? ":" : "", (flags & ERR_TXT_STRING) ? data : "", + ip_buf_flag? ": peer address is " : "", ip_buf); } } else { diags->error(DL_Error, loc.file, loc.func, loc.line, - "SSL::%lu:%s:%s:%d%s%s", es, ERR_error_string(l, buf), file, line, - (flags & ERR_TXT_STRING) ? ":" : "", (flags & ERR_TXT_STRING) ? data : ""); + "SSL::%lu:%s:%s:%d%s%s%s%s", es, ERR_error_string(l, buf), file, line, + (flags & ERR_TXT_STRING) ? ":" : "", (flags & ERR_TXT_STRING) ? data : "", + ip_buf_flag? ": peer address is " : "", ip_buf); } // Tally desired stats (only client/server connection stats, not init
