Disable sensitive logs
- PII logs can only appear in VERBOSE level
- logSeverityStrToEnum() no more support VERBOSE level input, only
accept DEBUG, INFO, WARNING, and ERROR.
- developer can set DBG flag from code to have a debug build, the DEBUG
level is automatically promote to VERBOSE.
- uniform log format to [FILE NAME]: [FUNC NAME]: [MSG]
- move from ALOG to LOG on DnsProxyListener
- adjust severity for some logs
- correct print format on uint8_t type
Bug: 128736560
Test: builds, boots
Test: atest resolv_integration_test
Change-Id: I0ff03824901168165bbe1f5abae9ff3e74db63d6
diff --git a/resolv/gethnamaddr.cpp b/resolv/gethnamaddr.cpp
index efbbdc5..5a35dbb 100644
--- a/resolv/gethnamaddr.cpp
+++ b/resolv/gethnamaddr.cpp
@@ -277,17 +277,16 @@
}
if (type != qtype) {
if (type != T_KEY && type != T_SIG)
- LOG(DEBUG) << __func__ << "(getanswer): asked for \"" << qname << " "
- << p_class(C_IN) << " " << p_type(qtype) << "\", got type \""
- << p_type(type) << "\"";
+ LOG(DEBUG) << __func__ << ": asked for \"" << qname << " " << p_class(C_IN) << " "
+ << p_type(qtype) << "\", got type \"" << p_type(type) << "\"";
cp += n;
continue; /* XXX - had_error++ ? */
}
switch (type) {
case T_PTR:
if (strcasecmp(tname, bp) != 0) {
- LOG(DEBUG) << __func__ << "(getanswer): asked for \"" << qname << "\", got \""
- << bp << "\"";
+ LOG(DEBUG) << __func__ << ": asked for \"" << qname << "\", got \"" << bp
+ << "\"";
cp += n;
continue; /* XXX - had_error++ ? */
}
@@ -314,8 +313,8 @@
case T_A:
case T_AAAA:
if (strcasecmp(hent->h_name, bp) != 0) {
- LOG(DEBUG) << __func__ << "(getanswer): asked for \"" << hent->h_name
- << "\", got \"" << bp << "\"";
+ LOG(DEBUG) << __func__ << ": asked for \"" << hent->h_name << "\", got \"" << bp
+ << "\"";
cp += n;
continue; /* XXX - had_error++ ? */
}
@@ -342,13 +341,13 @@
bp += sizeof(align) - (size_t)((u_long) bp % sizeof(align));
if (bp + n >= ep) {
- LOG(DEBUG) << "size (" << n << ") too big";
+ LOG(DEBUG) << __func__ << ": size (" << n << ") too big";
had_error++;
continue;
}
if (hap >= &addr_ptrs[MAXADDRS - 1]) {
if (!toobig++) {
- LOG(DEBUG) << "Too many addresses (" << MAXADDRS << ")";
+ LOG(DEBUG) << __func__ << ": Too many addresses (" << MAXADDRS << ")";
}
cp += n;
continue;
@@ -784,7 +783,7 @@
int herrno = NETDB_INTERNAL;
n = res_nsearch(res, name, C_IN, type, buf->buf, (int) sizeof(buf->buf), &herrno);
if (n < 0) {
- LOG(DEBUG) << "res_nsearch failed (" << n << ")";
+ LOG(DEBUG) << __func__ << ": res_nsearch failed (" << n << ")";
// Pass herrno to catch more detailed errors rather than EAI_NODATA.
return herrnoToAiErrno(herrno);
}
@@ -842,7 +841,7 @@
int herrno = NETDB_INTERNAL;
n = res_nquery(res, qbuf, C_IN, T_PTR, buf->buf, (int) sizeof(buf->buf), &herrno);
if (n < 0) {
- LOG(DEBUG) << "res_nquery failed (" << n << ")";
+ LOG(DEBUG) << __func__ << ": res_nquery failed (" << n << ")";
return herrnoToAiErrno(herrno);
}
hostent* hp =