commit 685fc68ed5ba3a385db10fe83c193c4a6ea564ad
author Nucca Chen <nuccachen@google.com> Mon Dec 13 07:04:19 2021 +0000
committer Nucca Chen <nuccachen@google.com> Mon Dec 13 07:04:19 2021 +0000
tree 95c93a0fc57eb7a09f49d43f7c36fb1f293227ab
parent 6006d17eab888bcd2c91d975e005c862477b4787

Revert "[RFCLAT#1] Move the raw socket creation from clatd to netd"

Revert submission 1902610-clat_move_raw_socket

Reason for revert: security patch (aosp/1903466) and clean up patch (aosp/1911234) have not merged yet
Reverted Changes:
I9b4ea3de7:[RFCLAT#1] Move the raw socket creation from clatd...
Ibc46981a8:[RFNETD#1] Move the raw socket creation from clatd...

Change-Id: Ic4fad13f522e06815168db4abbd047cf99956122

main.c

diff --git a/main.c b/main.c
index e4f7356..d452985 100644
--- a/main.c
+++ b/main.c
@@ -51,7 +51,6 @@
   printf("-6 [IPv6 address]\n");
   printf("-m [socket mark]\n");
   printf("-t [tun file descriptor number]\n");
-  printf("-w [write socket descriptor number]\n");
 }
 
 /* function: main
@@ -61,11 +60,11 @@
   struct tun_data tunnel;
   int opt;
   char *uplink_interface = NULL, *plat_prefix = NULL, *mark_str = NULL;
-  char *v4_addr = NULL, *v6_addr = NULL, *tunfd_str = NULL, *write_sock_str = NULL;
+  char *v4_addr = NULL, *v6_addr = NULL, *tunfd_str = NULL;
   uint32_t mark   = MARK_UNSET;
   unsigned len;
 
-  while ((opt = getopt(argc, argv, "i:p:4:6:m:t:w:h")) != -1) {
+  while ((opt = getopt(argc, argv, "i:p:4:6:m:t:h")) != -1) {
     switch (opt) {
       case 'i':
         uplink_interface = optarg;
@@ -85,9 +84,6 @@
       case 't':
         tunfd_str = optarg;
         break;
-      case 'w':
-        write_sock_str = optarg;
-        break;
       case 'h':
         print_help();
         exit(0);
@@ -116,15 +112,6 @@
     exit(1);
   }
 
-  if (write_sock_str != NULL && !parse_int(write_sock_str, &tunnel.write_fd6)) {
-    logmsg(ANDROID_LOG_FATAL, "invalid sock_write %s", write_sock_str);
-    exit(1);
-  }
-  if (!tunnel.write_fd6) {
-    logmsg(ANDROID_LOG_FATAL, "no write_fd6 specified on commandline.");
-    exit(1);
-  }
-
   len = snprintf(tunnel.device4, sizeof(tunnel.device4), "%s%s", DEVICEPREFIX, uplink_interface);
   if (len >= sizeof(tunnel.device4)) {
     logmsg(ANDROID_LOG_FATAL, "interface name too long '%s'", tunnel.device4);
@@ -137,7 +124,7 @@
          v6_addr ? v6_addr : "(none)");
 
   // open our raw sockets before dropping privs
-  open_sockets(&tunnel);
+  open_sockets(&tunnel, mark);
 
   configure_interface(uplink_interface, plat_prefix, v4_addr, v6_addr, &tunnel, mark);