Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_modules_DnsResolver / 21ac624087082595b5b2d96a60e72a47ddac0b83
commit21ac624087082595b5b2d96a60e72a47ddac0b83[log] [tgz]
authorLuke Huang <huangluke@google.com>Fri Aug 20 11:07:17 2021 +0800
committerLuke Huang <huangluke@google.com>Wed Sep 01 22:04:12 2021 +0800
tree6a738c727d17ccef315ffcd65a3aa7ce736785c5
parenta2f85fb635b9cfa54a0d1f9b7ec5bdb9ad531300 [diff]
Fix the wrong condition statement in tokio select for doh_handler and correct some return code in doh_query

1. Currently, the first branch of tokio select in doh_handler is not
strict enough, which causes the first branch can never return PENDING
state if no doh_conn is available. If that happen, tokio select! might
end up comsuming all the budget and get stuck.
To fix this problem, make the precondition stricter.

2. Correct some return code in doh_query, which is used to notify
   DnsResolver fallback to DoT or UDP.

Test: manual test && atest
Bug: 196717322

Change-Id: Ib1f38f2ab7c227780213325a859e19e17fd11d3c
2 files changed
tree: 6a738c727d17ccef315ffcd65a3aa7ce736785c5
  1. aidl_api/
  2. apex/
  3. binder/
  4. include/
  5. tests/
  6. .clang-format ⇨ ../../../build/soong/scripts/system-clang-format
  7. rustfmt.toml ⇨ ../../../build/soong/scripts/rustfmt.toml
  8. .editorconfig
  9. Android.bp
  10. cbindgen.toml
  11. Dns64Configuration.cpp
  12. Dns64Configuration.h
  13. DnsProxyListener.cpp
  14. DnsProxyListener.h
  15. DnsQueryLog.cpp
  16. DnsQueryLog.h
  17. DnsQueryLogTest.cpp
  18. DnsResolver.cpp
  19. DnsResolver.h
  20. DnsResolverService.cpp
  21. DnsResolverService.h
  22. DnsStats.cpp
  23. DnsStats.h
  24. DnsStatsTest.cpp
  25. DnsTlsDispatcher.cpp
  26. DnsTlsDispatcher.h
  27. DnsTlsQueryMap.cpp
  28. DnsTlsQueryMap.h
  29. DnsTlsServer.cpp
  30. DnsTlsServer.h
  31. DnsTlsSessionCache.cpp
  32. DnsTlsSessionCache.h
  33. DnsTlsSocket.cpp
  34. DnsTlsSocket.h
  35. DnsTlsSocketFactory.h
  36. DnsTlsTransport.cpp
  37. DnsTlsTransport.h
  38. doh.h
  39. doh.rs
  40. Experiments.cpp
  41. Experiments.h
  42. ExperimentsTest.cpp
  43. getaddrinfo.cpp
  44. getaddrinfo.h
  45. gethnamaddr.cpp
  46. gethnamaddr.h
  47. hostent.h
  48. IDnsTlsSocket.h
  49. IDnsTlsSocketFactory.h
  50. IDnsTlsSocketObserver.h
  51. IPrivateDnsServer.h
  52. libnetd_resolv.map.txt
  53. LockedQueue.h
  54. NOTICE
  55. OperationLimiter.h
  56. OperationLimiterTest.cpp
  57. OWNERS
  58. params.h
  59. PREUPLOAD.cfg
  60. PrivateDnsCommon.h
  61. PrivateDnsConfiguration.cpp
  62. PrivateDnsConfiguration.h
  63. PrivateDnsConfigurationTest.cpp
  64. PrivateDnsValidationObserver.h
  65. README-DoT.md
  66. README.md
  67. res_cache.cpp
  68. res_comp.cpp
  69. res_comp.h
  70. res_debug.cpp
  71. res_debug.h
  72. res_mkquery.cpp
  73. res_query.cpp
  74. res_send.cpp
  75. res_send.h
  76. res_stats.cpp
  77. resolv_cache.h
  78. resolv_private.h
  79. resolv_rust_test_config_template.xml
  80. resolv_test_config_template.xml
  81. ResolverController.cpp
  82. ResolverController.h
  83. ResolverEventReporter.cpp
  84. ResolverEventReporter.h
  85. ResolverStats.h
  86. sethostent.cpp
  87. stats.h
  88. stats.proto
  89. TEST_MAPPING
  90. util.cpp
  91. 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.