1 files changed, 3 insertions, 108 deletions

diff --git a/src/transport/tcp_service_legacy.c b/src/transport/tcp_service_legacy.c
index 8f3f43718..129511fec 100644
--- a/src/transport/tcp_service_legacy.c
+++ b/src/transport/tcp_service_legacy.c
@@ -849,95 +849,6 @@ LEGACY_SERVICE_get_server_addresses(
 }
 
 
-#ifdef MINGW
-/**
- * Read listen sockets from the parent process (ARM).
- *
- * @param sctx service context to initialize
- * @return #GNUNET_YES if ok, #GNUNET_NO if not ok (must bind yourself),
- * and #GNUNET_SYSERR on error.
- */
-static int
-receive_sockets_from_parent(struct LEGACY_SERVICE_Context *sctx)
-{
-  const char *env_buf;
-  int fail;
-  uint64_t count;
-  uint64_t i;
-  HANDLE lsocks_pipe;
-
-  env_buf = getenv("GNUNET_OS_READ_LSOCKS");
-  if ((NULL == env_buf) || (strlen(env_buf) <= 0))
-    return GNUNET_NO;
-  /* Using W32 API directly here, because this pipe will
-   * never be used outside of this function, and it's just too much of a bother
-   * to create a GNUnet API that boxes a HANDLE (the way it is done with socks)
-   */
-  lsocks_pipe = (HANDLE)strtoul(env_buf, NULL, 10);
-  if ((0 == lsocks_pipe) || (INVALID_HANDLE_VALUE == lsocks_pipe))
-    return GNUNET_NO;
-  fail = 1;
-  do
-    {
-      int ret;
-      int fail2;
-      DWORD rd;
-
-      ret = ReadFile(lsocks_pipe, &count, sizeof(count), &rd, NULL);
-      if ((0 == ret) || (sizeof(count) != rd) || (0 == count))
-        break;
-      sctx->lsocks =
-        GNUNET_malloc(sizeof(struct GNUNET_NETWORK_Handle *) * (count + 1));
-
-      fail2 = 1;
-      for (i = 0; i < count; i++)
-        {
-          WSAPROTOCOL_INFOA pi;
-          uint64_t size;
-          socket s;
-
-          ret = ReadFile(lsocks_pipe, &size, sizeof(size), &rd, NULL);
-          if ((0 == ret) || (sizeof(size) != rd) || (sizeof(pi) != size))
-            break;
-          ret = ReadFile(lsocks_pipe, &pi, sizeof(pi), &rd, NULL);
-          if ((0 == ret) || (sizeof(pi) != rd))
-            break;
-          s = WSASocketA(pi.iAddressFamily,
-                         pi.iSocketType,
-                         pi.iProtocol,
-                         &pi,
-                         0,
-                         WSA_FLAG_OVERLAPPED);
-          sctx->lsocks[i] = GNUNET_NETWORK_socket_box_native(s);
-          if (NULL == sctx->lsocks[i])
-            break;
-          else if (i == count - 1)
-            fail2 = 0;
-        }
-      if (fail2)
-        break;
-      sctx->lsocks[count] = NULL;
-      fail = 0;
-    }
-  while (fail);
-
-  CloseHandle(lsocks_pipe);
-
-  if (fail)
-    {
-      LOG(GNUNET_ERROR_TYPE_ERROR,
-          _("Could not access a pre-bound socket, will try to bind myself\n"));
-      for (i = 0; (i < count) && (NULL != sctx->lsocks[i]); i++)
-        GNUNET_break(0 == GNUNET_NETWORK_socket_close(sctx->lsocks[i]));
-      GNUNET_free_non_null(sctx->lsocks);
-      sctx->lsocks = NULL;
-      return GNUNET_NO;
-    }
-  return GNUNET_YES;
-}
-#endif
-
-
 /**
  * Setup addr, addrlen, idle_timeout
  * based on configuration!
@@ -961,12 +872,9 @@ setup_service(struct LEGACY_SERVICE_Context *sctx)
 {
   struct GNUNET_TIME_Relative idleout;
   int tolerant;
-
-#ifndef MINGW
   const char *nfds;
   unsigned int cnt;
   int flags;
-#endif
 
   if (GNUNET_CONFIGURATION_have_value(sctx->cfg,
                                       sctx->service_name,
@@ -1007,7 +915,6 @@ setup_service(struct LEGACY_SERVICE_Context *sctx)
   else
     tolerant = GNUNET_NO;
 
-#ifndef MINGW
   errno = 0;
   if ((NULL != (nfds = getenv("LISTEN_FDS"))) &&
       (1 == sscanf(nfds, "%u", &cnt)) && (cnt > 0) && (cnt < FD_SETSIZE) &&
@@ -1036,13 +943,6 @@ setup_service(struct LEGACY_SERVICE_Context *sctx)
         }
       unsetenv("LISTEN_FDS");
     }
-#else
-  if (getenv("GNUNET_OS_READ_LSOCKS") != NULL)
-    {
-      receive_sockets_from_parent(sctx);
-      putenv("GNUNET_OS_READ_LSOCKS=");
-    }
-#endif
 
   if ((NULL == sctx->lsocks) &&
       (GNUNET_SYSERR == LEGACY_SERVICE_get_server_addresses(sctx->service_name,
@@ -1257,7 +1157,6 @@ service_task(void *cls)
 static int
 detach_terminal(struct LEGACY_SERVICE_Context *sctx)
 {
-#ifndef MINGW
   pid_t pid;
   int nullfd;
   int filedes[2];
@@ -1324,11 +1223,7 @@ detach_terminal(struct LEGACY_SERVICE_Context *sctx)
   if (-1 == pid)
     LOG_STRERROR(GNUNET_ERROR_TYPE_ERROR, "setsid");
   sctx->ready_confirm_fd = filedes[1];
-#else
-  /* FIXME: we probably need to do something else
-   * elsewhere in order to fork the process itself... */
-  FreeConsole();
-#endif
+
   return GNUNET_OK;
 }
 
@@ -1346,7 +1241,7 @@ set_user_id(struct LEGACY_SERVICE_Context *sctx)
 
   if (NULL == (user = get_user_name(sctx)))
     return GNUNET_OK; /* keep */
-#ifndef MINGW
+
   struct passwd *pws;
 
   errno = 0;
@@ -1377,7 +1272,7 @@ set_user_id(struct LEGACY_SERVICE_Context *sctx)
           return GNUNET_SYSERR;
         }
     }
-#endif
+
   GNUNET_free(user);
   return GNUNET_OK;
 }