Gitiles
Code Review Sign In
review.blissroms.org / platform_packages_modules_DnsResolver / 5d2a10711b6194098a62a309e718117ec93238ca
commit5d2a10711b6194098a62a309e718117ec93238ca[log] [tgz]
authorMike Yu <yumike@google.com>Mon Nov 29 14:57:54 2021 +0800
committerMike Yu <yumike@google.com>Fri Dec 03 21:01:57 2021 +0800
tree37c096229bdc769a0d374e4ad8bf1417e3d600bc
parent4bdc8678435acac88ea8bd79b06cc9114367b211 [diff]
DoH: Change Network to use try_send

As send() blocks until channel has capacity, Dispatcher gets blocked
at sending commands to a Network object if the Network's mpsc channel
has no capacity. This happens when there are excess DNS requests while
the connection has not been established. Therefore, change all the DoH
code to use try_send() that returns an error immediate if the channel
is full.

If a Network's mpsc channel has no capacity, DNS query threads that
called doh_query() with the associated net_id will get DOH_RESULT_CAN_NOT_SEND
error immediately. Since it's not a timeout error, they will try DoT.

Bug: 207301204
Test: cd packages/modules/DnsResolver && atest
Change-Id: I9575e6f410b8b552c07af15284b67b305ecce6b9
9 files changed
tree: 37c096229bdc769a0d374e4ad8bf1417e3d600bc
  1. aidl_api/
  2. apex/
  3. binder/
  4. doh/
  5. include/
  6. tests/
  7. .clang-format ⇨ ../../../build/soong/scripts/system-clang-format
  8. rustfmt.toml ⇨ ../../../build/soong/scripts/rustfmt.toml
  9. .editorconfig
  10. Android.bp
  11. cbindgen.toml
  12. Dns64Configuration.cpp
  13. Dns64Configuration.h
  14. DnsProxyListener.cpp
  15. DnsProxyListener.h
  16. DnsQueryLog.cpp
  17. DnsQueryLog.h
  18. DnsQueryLogTest.cpp
  19. DnsResolver.cpp
  20. DnsResolver.h
  21. DnsResolverService.cpp
  22. DnsResolverService.h
  23. DnsStats.cpp
  24. DnsStats.h
  25. DnsStatsTest.cpp
  26. DnsTlsDispatcher.cpp
  27. DnsTlsDispatcher.h
  28. DnsTlsQueryMap.cpp
  29. DnsTlsQueryMap.h
  30. DnsTlsServer.cpp
  31. DnsTlsServer.h
  32. DnsTlsSessionCache.cpp
  33. DnsTlsSessionCache.h
  34. DnsTlsSocket.cpp
  35. DnsTlsSocket.h
  36. DnsTlsSocketFactory.h
  37. DnsTlsTransport.cpp
  38. DnsTlsTransport.h
  39. doh.h
  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.