Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_modules_DnsResolver / c0000255a734fe68d767e1706345963ca6d23eec
commitc0000255a734fe68d767e1706345963ca6d23eec[log] [tgz]
authorMike Yu <yumike@google.com>Thu Mar 19 07:14:23 2020 +0000
committerMike Yu <yumike@google.com>Mon Mar 23 16:56:21 2020 +0800
tree28b2d63c8fd973fdd9170c1825c20d83abdbcaad
parentb6402aea0a93a69438dab624df1eed11beaca183 [diff]
Merge the changes about the tests repeated setResolverConfiguration

===
Refactor the test code that checks the cleartext DNS stats

The test code for stats check is slightly stricter than before since
now it checks almost every field rathern few of them.

Bug: 150678049
Test: resolv_integration_test passed
Change-Id: I86294a9d3a6050ccf8057b34eaa3463e00742850
===
Add tests to cover repeated setResolverConfiguration

Two tests are added to protect the resolver when it continually
receives the same setup requests.

When the resolver receives repeated and same setup:
[1] Do not clear the cache.
[2] Do not clear the stats (the stats for cleartext DNS servers
    got from GetResolverInfo()).
[3] Do not start a new re-evaluation process for the private DNS
    servers if they have been marked as in_progress.
[4] Need not to re-validate the private DNS servers if they have
    been validated.

Another test is added to protect the implementation of aosp/1108695.

Fix: 150678049
Test: resolv_integration_test passed
Change-Id: I7a866e7e305c0fb703ccb9546d1c70ce77e2d3c7
===

Bug: 150678049
Merged-In: I86294a9d3a6050ccf8057b34eaa3463e00742850
Merged-In: I7a866e7e305c0fb703ccb9546d1c70ce77e2d3c7
Change-Id: I69f449c578799a9437e38743557b8c1bc52d4046
(cherry picked from commit 3ccd410b1726933dac860b8e021b1edb3fe4b4a0)
7 files changed
tree: 28b2d63c8fd973fdd9170c1825c20d83abdbcaad
  1. aidl_api/
  2. apex/
  3. binder/
  4. include/
  5. tests/
  6. .clang-format ⇨ ../../../build/soong/scripts/system-clang-format
  7. .editorconfig
  8. Android.bp
  9. Dns64Configuration.cpp
  10. Dns64Configuration.h
  11. DnsProxyListener.cpp
  12. DnsProxyListener.h
  13. DnsQueryLog.cpp
  14. DnsQueryLog.h
  15. DnsQueryLogTest.cpp
  16. DnsResolver.cpp
  17. DnsResolver.h
  18. DnsResolverService.cpp
  19. DnsResolverService.h
  20. DnsStats.cpp
  21. DnsStats.h
  22. DnsStatsTest.cpp
  23. DnsTlsDispatcher.cpp
  24. DnsTlsDispatcher.h
  25. DnsTlsQueryMap.cpp
  26. DnsTlsQueryMap.h
  27. DnsTlsServer.cpp
  28. DnsTlsServer.h
  29. DnsTlsSessionCache.cpp
  30. DnsTlsSessionCache.h
  31. DnsTlsSocket.cpp
  32. DnsTlsSocket.h
  33. DnsTlsSocketFactory.h
  34. DnsTlsTransport.cpp
  35. DnsTlsTransport.h
  36. getaddrinfo.cpp
  37. getaddrinfo.h
  38. gethnamaddr.cpp
  39. gethnamaddr.h
  40. hostent.h
  41. IDnsTlsSocket.h
  42. IDnsTlsSocketFactory.h
  43. IDnsTlsSocketObserver.h
  44. libnetd_resolv.map.txt
  45. LockedQueue.h
  46. NOTICE
  47. OWNERS
  48. params.h
  49. PREUPLOAD.cfg
  50. PrivateDnsConfiguration.cpp
  51. PrivateDnsConfiguration.h
  52. README-DoT.md
  53. README.md
  54. res_cache.cpp
  55. res_comp.cpp
  56. res_comp.h
  57. res_debug.cpp
  58. res_debug.h
  59. res_init.cpp
  60. res_init.h
  61. res_mkquery.cpp
  62. res_query.cpp
  63. res_send.cpp
  64. res_send.h
  65. res_stats.cpp
  66. resolv_cache.h
  67. resolv_cache_unit_test.cpp
  68. resolv_callback_unit_test.cpp
  69. resolv_private.h
  70. resolv_tls_unit_test.cpp
  71. resolv_unit_test.cpp
  72. ResolverController.cpp
  73. ResolverController.h
  74. ResolverEventReporter.cpp
  75. ResolverEventReporter.h
  76. ResolverStats.h
  77. sethostent.cpp
  78. stats.h
  79. stats.proto
  80. TEST_MAPPING
  81. util.cpp
  82. util.h
README.md

Logging

This code uses LOG(X) for logging. Log levels are VERBOSE,DEBUG,INFO,WARNING and ERROR. The default setting is WARNING and logs relate to WARNING and ERROR will be shown. If you want to enable the DEBUG level logs, using following command. adb shell service call dnsresolver 10 i32 1 VERBOSE 0 DEBUG 1 INFO 2 WARNING 3 ERROR 4 Verbose resolver logs could contain PII -- do NOT enable in production builds.