diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-08 07:46:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-08 07:46:50 +0000 |
| commit | ae1752da8293ad3db54d891c946cee5dcda17419 (patch) | |
| tree | f791e7142e0de6b6626259355f43e562b2daaa33 | |
| parent | a6c14adf4a2d33dc262fc560c0b2c1b5b9c8d894 (diff) | |
| parent | 6b4fc2a82964e9a8d92f0de6f4b01f766e47f56b (diff) | |
| download | netd-o-mr1-iot-preview-7.tar.gz | |
Merge "Minor netd refactoring (logArguments)"android-o-mr1-iot-preview-7o-mr1-iot-preview-7
| -rw-r--r-- | server/DnsProxyListener.cpp | 27 |
1 files changed, 12 insertions, 15 deletions
diff --git a/server/DnsProxyListener.cpp b/server/DnsProxyListener.cpp index e3c5cf9d..be8cc192 100644 --- a/server/DnsProxyListener.cpp +++ b/server/DnsProxyListener.cpp @@ -62,6 +62,12 @@ namespace net { namespace { +void logArguments(int argc, char** argv) { + for (int i = 0; i < argc; i++) { + ALOGD("argv[%i]=%s", i, argv[i]); + } +} + template<typename T> void tryThreadOrError(SocketClient* cli, T* handler) { cli->incRef(); @@ -345,11 +351,8 @@ DnsProxyListener::GetAddrInfoCmd::GetAddrInfoCmd(DnsProxyListener* dnsProxyListe int DnsProxyListener::GetAddrInfoCmd::runCommand(SocketClient *cli, int argc, char **argv) { - if (DBG) { - for (int i = 0; i < argc; i++) { - ALOGD("argv[%i]=%s", i, argv[i]); - } - } + if (DBG) logArguments(argc, argv); + if (argc != 8) { char* msg = NULL; asprintf( &msg, "Invalid number of arguments to getaddrinfo: %i", argc); @@ -422,11 +425,8 @@ DnsProxyListener::GetHostByNameCmd::GetHostByNameCmd(DnsProxyListener* dnsProxyL int DnsProxyListener::GetHostByNameCmd::runCommand(SocketClient *cli, int argc, char **argv) { - if (DBG) { - for (int i = 0; i < argc; i++) { - ALOGD("argv[%i]=%s", i, argv[i]); - } - } + if (DBG) logArguments(argc, argv); + if (argc != 4) { char* msg = NULL; asprintf(&msg, "Invalid number of arguments to gethostbyname: %i", argc); @@ -558,11 +558,8 @@ DnsProxyListener::GetHostByAddrCmd::GetHostByAddrCmd(const DnsProxyListener* dns int DnsProxyListener::GetHostByAddrCmd::runCommand(SocketClient *cli, int argc, char **argv) { - if (DBG) { - for (int i = 0; i < argc; i++) { - ALOGD("argv[%i]=%s", i, argv[i]); - } - } + if (DBG) logArguments(argc, argv); + if (argc != 5) { char* msg = NULL; asprintf(&msg, "Invalid number of arguments to gethostbyaddr: %i", argc); |