NDC migration to binder ver.
Make ndc communicating with netd via binder
Bug: 65862741
Test: built, flashed, booted
system/netd/tests/runtests.sh pass
manual test ndc commands
Merged-In: I88ff2f3871124dd3b6eec655a1a02412cf257842
(cherry picked from commit f87c80d306a835eb8af1a40d1061a80acc19e0f0)
Change-Id: I8a9c64eaee94f414ef701a8524dff6dd03f6a4ff
diff --git a/server/ndc.cpp b/server/ndc.cpp
index ec59637..dbf6458 100644
--- a/server/ndc.cpp
+++ b/server/ndc.cpp
@@ -16,165 +16,23 @@
#include <stdio.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
-#include <signal.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <sys/poll.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/un.h>
+#include "NdcDispatcher.h"
-#include <cutils/sockets.h>
-#include <private/android_filesystem_config.h>
+namespace {
-static void usage(char *progname);
-static int do_monitor(int sock, int stop_after_cmd);
-static int do_cmd(int sock, int argc, char **argv);
-
-int main(int argc, char **argv) {
- int sock;
- int cmdOffset = 0;
-
- if (argc < 2)
- usage(argv[0]);
-
- // try interpreting the first arg as the socket name - if it fails go back to netd
-
- if ((sock = socket_local_client(argv[1],
- ANDROID_SOCKET_NAMESPACE_RESERVED,
- SOCK_STREAM)) < 0) {
- if ((sock = socket_local_client("netd",
- ANDROID_SOCKET_NAMESPACE_RESERVED,
- SOCK_STREAM)) < 0) {
- fprintf(stderr, "Error connecting (%s)\n", strerror(errno));
- exit(4);
- }
- } else {
- if (argc < 3) usage(argv[0]);
- printf("Using alt socket %s\n", argv[1]);
- cmdOffset = 1;
- }
-
- if (!strcmp(argv[1+cmdOffset], "monitor"))
- exit(do_monitor(sock, 0));
- exit(do_cmd(sock, argc-cmdOffset, &(argv[cmdOffset])));
-}
-
-static int do_cmd(int sock, int argc, char **argv) {
- char *final_cmd;
- char *conv_ptr;
- int i;
-
- /* Check if 1st arg is cmd sequence number */
- strtol(argv[1], &conv_ptr, 10);
- if (conv_ptr == argv[1]) {
- final_cmd = strdup("0 ");
- } else {
- final_cmd = strdup("");
- }
- if (final_cmd == nullptr) {
- int res = errno;
- perror("strdup failed");
- return res;
- }
-
- for (i = 1; i < argc; i++) {
- if (strchr(argv[i], '"')) {
- perror("argument with embedded quotes not allowed");
- free(final_cmd);
- return 1;
- }
- bool needs_quoting = strchr(argv[i], ' ');
- const char *format = needs_quoting ? "%s\"%s\"%s" : "%s%s%s";
- char *tmp_final_cmd;
-
- if (asprintf(&tmp_final_cmd, format, final_cmd, argv[i],
- (i == (argc - 1)) ? "" : " ") < 0) {
- int res = errno;
- perror("failed asprintf");
- free(final_cmd);
- return res;
- }
- free(final_cmd);
- final_cmd = tmp_final_cmd;
- }
-
- if (write(sock, final_cmd, strlen(final_cmd) + 1) < 0) {
- int res = errno;
- perror("write");
- free(final_cmd);
- return res;
- }
- free(final_cmd);
-
- return do_monitor(sock, 1);
-}
-
-static int do_monitor(int sock, int stop_after_cmd) {
- char *buffer = (char *)malloc(4096);
-
- if (!stop_after_cmd)
- printf("[Connected to Netd]\n");
-
- while(1) {
- int rc = 0;
- struct pollfd fds = { .fd = sock, .events = POLLIN };
- const int timeout_msecs = 10 * 1000;
- rc = TEMP_FAILURE_RETRY(poll(&fds, 1, timeout_msecs));
- if (rc < 0) {
- int res = errno;
- fprintf(stderr, "Error in poll(): %s\n", strerror(res));
- free(buffer);
- return res;
- }
- if (rc == 0) {
- continue;
- }
- if (!(fds.revents & (POLLIN | POLLERR))) {
- continue;
- }
-
- memset(buffer, 0, 4096);
- if ((rc = read(sock, buffer, 4096)) <= 0) {
- int res = errno;
- if (rc == 0)
- fprintf(stderr, "Lost connection to Netd - did it crash?\n");
- else
- fprintf(stderr, "Error reading data (%s)\n", strerror(res));
- free(buffer);
- if (rc == 0)
- return ECONNRESET;
- return res;
- }
-
- int offset = 0;
- int i = 0;
-
- for (i = 0; i < rc; i++) {
- if (buffer[i] == '\0') {
- char tmp[4];
- strncpy(tmp, buffer + offset, 3);
- tmp[3] = '\0';
- long code = strtol(tmp, nullptr, 10);
-
- printf("%s\n", buffer + offset);
- if (stop_after_cmd) {
- if (code >= 200 && code < 600)
- return 0;
- }
- offset = i + 1;
- }
- }
- }
- free(buffer);
- return 0;
-}
-
-static void usage(char *progname) {
- fprintf(stderr, "Usage: %s [<sockname>] ([monitor] | ([<cmd_seq_num>] <cmd> [arg ...]))\n", progname);
+void usage(char* progname) {
+ fprintf(stderr, "Usage: %s (<cmd> [arg ...])\n", progname);
exit(1);
}
+
+} // namespace
+
+int main(int argc, char** argv) {
+ if (argc < 2) {
+ usage(argv[0]);
+ }
+
+ android::net::NdcDispatcher nd;
+ exit(nd.dispatchCommand(argc - 1, argv + 1));
+}