5 files changed, 27 insertions, 476 deletions
diff --git a/src/transport/Makefile.am b/src/transport/Makefile.am
index a9b0d19d6..0f5b2e8be 100644
--- a/src/transport/Makefile.am
+++ b/src/transport/Makefile.am
@@ -114,18 +114,12 @@ if HAVE_LIBBLUETOOTH
 BT_QUOTA_TEST = test_quota_compliance_bluetooth \
    test_quota_compliance_bluetooth_asymmetric
 endif
-else
-if MINGW
- BT_BIN = gnunet-helper-transport-bluetooth
- BT_PLUGIN_LA = libgnunet_plugin_transport_bluetooth.la
-endif
 endif
 # end of HAVE_EXPERIMENTAL
 endif
-if !MINGW
 UNIX_PLUGIN_LA = libgnunet_plugin_transport_unix.la
 UNIX_PLUGIN_TEST = test_transport_api_unix
 UNIX_TEST = test_plugin_unix
@@ -136,7 +130,7 @@ UNIX_QUOTA_TEST = test_quota_compliance_unix \
 if LINUX
 UNIX_API_ABSTRACT_TEST = test_transport_api_unix_abstract
 endif
-endif
 noinst_PROGRAMS = \
 gnunet-transport-profiler \
@@ -319,13 +313,9 @@ gnunet_transport_wlan_receiver_LDADD = \
 gnunet_helper_transport_bluetooth_SOURCES = \
 gnunet-helper-transport-bluetooth.c
-if MINGW
- gnunet_helper_transport_bluetooth_LDADD = \
+gnunet_helper_transport_bluetooth_LDFLAGS = -lbluetooth
-  $(top_builddir)/src/util/libgnunetutil.la
- gnunet_helper_transport_bluetooth_LDFLAGS = -lws2_32
-else
- gnunet_helper_transport_bluetooth_LDFLAGS = -lbluetooth
-endif
 gnunet_transport_profiler_SOURCES = \
 gnunet-transport-profiler.c
diff --git a/src/transport/gnunet-helper-transport-bluetooth.c b/src/transport/gnunet-helper-transport-bluetooth.c
index 2ac705996..4696f48f8 100644
--- a/src/transport/gnunet-helper-transport-bluetooth.c
+++ b/src/transport/gnunet-helper-transport-bluetooth.c
@@ -21,30 +21,23 @@
 */
 #include "gnunet_config.h"
-#ifdef MINGW
+#define SOCKTYPE int
-  #include "platform.h"
+#include <bluetooth/bluetooth.h>
-  #include "gnunet_util_lib.h"
+#include <bluetooth/hci.h>
-  #include <bthdef.h>
+#include <bluetooth/hci_lib.h>
-  #include <ws2bth.h>
+#include <bluetooth/rfcomm.h>
-#else
+#include <bluetooth/sdp.h>
-  #define SOCKTYPE int
+#include <bluetooth/sdp_lib.h>
-  #include <bluetooth/bluetooth.h>
+#include <errno.h>
-  #include <bluetooth/hci.h>
+#include <linux/if.h>
-  #include <bluetooth/hci_lib.h>
+#include <stdio.h>
-  #include <bluetooth/rfcomm.h>
+#include <stdlib.h>
-  #include <bluetooth/sdp.h>
+#include <sys/ioctl.h>
-  #include <bluetooth/sdp_lib.h>
+#include <sys/param.h>
-  #include <errno.h>
+#include <sys/socket.h>
-  #include <linux/if.h>
+#include <sys/stat.h>
-  #include <stdio.h>
+#include <sys/types.h>
-  #include <stdlib.h>
+#include <unistd.h>
-  #include <sys/ioctl.h>
-  #include <sys/param.h>
-  #include <sys/socket.h>
-  #include <sys/stat.h>
-  #include <sys/types.h>
-  #include <unistd.h>
-#endif
 #include "plugin_transport_wlan.h"
 #include "gnunet_protocols.h"
@@ -67,34 +60,6 @@
 */
 #define MAX_LOOPS 5
-#ifdef MINGW
-/* Maximum size of the interface's name */
-  #define IFNAMSIZ 16
-  #ifndef NS_BTH
-    #define NS_BTH 16
-  #endif
-/**
- * A copy of the MAC Address.
- */
-struct GNUNET_TRANSPORT_WLAN_MacAddress_Copy {
-  UINT8 mac[MAC_ADDR_SIZE];
-};
-/**
- * The UUID used for the SDP service.
- * {31191E56-FA7E-4517-870E-71B86BBCC52F}
- */
-  #define GNUNET_BLUETOOTH_SDP_UUID \
-  { \
-    0x31, 0x19, 0x1E, 0x56, \
-    0xFA, 0x7E, \
-    0x45, 0x17, \
-    0x87, 0x0E, \
-    0x71, 0xB8, 0x6B, 0xBC, 0xC5, 0x2F \
-  }
-#endif
 /**
 * In bluez library, the maximum name length of a device is 8
 */
@@ -110,17 +75,6 @@ struct HardwareInfos {
   */
  char iface[IFNAMSIZ];
- #ifdef MINGW
-  /**
-   * socket handle
-   */
-  struct GNUNET_NETWORK_Handle *handle;
-  /**
-   * MAC address of our own bluetooth interface.
-   */
-  struct GNUNET_TRANSPORT_WLAN_MacAddress_Copy pl_mac;
- #else
  /**
   * file descriptor for the rfcomm socket
   */
@@ -135,7 +89,6 @@ struct HardwareInfos {
   * SDP session
   */
  sdp_session_t *session;
- #endif
 };
 /**
@@ -606,61 +559,6 @@ check_crc_buf_osdep(const unsigned char *buf, size_t len)
 /* ************** end of clone  ***************** */
-#ifdef MINGW
-/**
- * Function used to get the code of last error and to print the type of error.
- */
-static void
-print_last_error()
-{
-  LPVOID lpMsgBuf = NULL;
-  if (FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
-                    NULL, GetLastError(), 0, (LPTSTR)&lpMsgBuf, 0, NULL))
-    fprintf(stderr, "%s\n", (char *)lpMsgBuf);
-  else
-    fprintf(stderr, "Failed to format the message for the last error! Error number : %d\n", GetLastError());
-}
-/**
- * Function used to initialize the Windows Sockets
- */
-static void
-initialize_windows_sockets()
-{
-  WSADATA wsaData;
-  WORD wVersionRequested = MAKEWORD(2, 0);
-  if (WSAStartup(wVersionRequested, &wsaData) != NO_ERROR)
-    {
-      fprintf(stderr, "Error initializing window sockets!\n");
-      print_last_error();
-      ExitProcess(2);
-    }
-}
-/**
- * Function used to convert the GUID.
- * @param bytes the GUID represented as a char array
- * @param uuid pointer to the GUID
- */
-static void
-convert_guid(char *bytes, GUID * uuid)
-{
-  int i;
-  uuid->Data1 = ((bytes[0] << 24) & 0xff000000) | ((bytes[1] << 16) & 0x00ff0000) | ((bytes[2] << 8) & 0x0000ff00) | (bytes[3] & 0x000000ff);
-  uuid->Data2 = ((bytes[4] << 8) & 0xff00) | (bytes[5] & 0x00ff);
-  uuid->Data3 = ((bytes[6] << 8) & 0xff00) | (bytes[7] & 0x00ff);
-  for (i = 0; i < 8; i++)
-    {
-      uuid->Data4[i] = bytes[i + 8];
-    }
-}
-#endif
 #ifdef LINUX
 /**
 * Function for assigning a port number
@@ -688,79 +586,6 @@ bind_socket(int socket, struct sockaddr_rc *addr)
 }
 #endif
-#ifdef MINGW
-/**
- * Function used for creating the service record and registering it.
- *
- * @param dev pointer to the device struct
- * @return 0 on success
- */
-static int
-register_service(struct HardwareInfos *dev)
-{
-  /* advertise the service */
-  CSADDR_INFO addr_info;
-  WSAQUERYSET wqs;
-  GUID guid;
-  unsigned char uuid[] = GNUNET_BLUETOOTH_SDP_UUID;
-  SOCKADDR_BTH addr;
-  int addr_len = sizeof(SOCKADDR_BTH);
-  int fd;
-  /* get the port on which we are listening on */
-  memset(&addr, 0, sizeof(SOCKADDR_BTH));
-  fd = GNUNET_NETWORK_get_fd(dev->handle);
-  if (fd <= 0)
-    {
-      fprintf(stderr, "Failed to get the file descriptor\n");
-      return -1;
-    }
-  if (SOCKET_ERROR == getsockname(fd, (SOCKADDR*)&addr, &addr_len))
-    {
-      fprintf(stderr, "Failed to get the port on which we are listening on: \n");
-      print_last_error();
-      return -1;
-    }
-  /* save the device address */
-  GNUNET_memcpy(&dev->pl_mac, &addr.btAddr, sizeof(BTH_ADDR));
-  /* set the address information */
-  memset(&addr_info, 0, sizeof(CSADDR_INFO));
-  addr_info.iProtocol = BTHPROTO_RFCOMM;
-  addr_info.iSocketType = SOCK_STREAM;
-  addr_info.LocalAddr.lpSockaddr = (LPSOCKADDR)&addr;
-  addr_info.LocalAddr.iSockaddrLength = sizeof(addr);
-  addr_info.RemoteAddr.lpSockaddr = (LPSOCKADDR)&addr;
-  addr_info.RemoteAddr.iSockaddrLength = sizeof(addr);
-  convert_guid((char *)uuid, &guid);
-  /* register the service */
-  memset(&wqs, 0, sizeof(WSAQUERYSET));
-  wqs.dwSize = sizeof(WSAQUERYSET);
-  wqs.dwNameSpace = NS_BTH;
-  wqs.lpszServiceInstanceName = "GNUnet Bluetooth Service";
-  wqs.lpszComment = "This is the service used by the GNUnnet plugin transport";
-  wqs.lpServiceClassId = &guid;
-  wqs.dwNumberOfCsAddrs = 1;
-  wqs.lpcsaBuffer = &addr_info;
-  wqs.lpBlob = 0;
-  if (SOCKET_ERROR == WSASetService(&wqs, RNRSERVICE_REGISTER, 0))
-    {
-      fprintf(stderr, "Failed to register the SDP service: ");
-      print_last_error();
-      return -1;
-    }
-  else
-    {
-      fprintf(stderr, "The SDP service was registered\n");
-    }
-  return 0;
-}
-#else
 /**
 * Function used for creating the service record and registering it.
 *
@@ -849,96 +674,7 @@ register_service(struct HardwareInfos *dev, int rc_channel)
  return 0;
 }
-#endif
-#ifdef MINGW
-/**
- * Function for searching and browsing for a service. This will return the
- * port number on which the service is running.
- *
- * @param dest target address
- * @return channel
- */
-static int
-get_channel(const char *dest)
-{
-  HANDLE h;
-  WSAQUERYSET *wqs;
-  DWORD wqs_len = sizeof(WSAQUERYSET);
-  int done = 0;
-  int channel = -1;
-  GUID guid;
-  unsigned char uuid[] = GNUNET_BLUETOOTH_SDP_UUID;
-  convert_guid((char *)uuid, &guid);
-  wqs = (WSAQUERYSET*)malloc(wqs_len);
-  ZeroMemory(wqs, wqs_len);
-  wqs->dwSize = sizeof(WSAQUERYSET);
-  wqs->lpServiceClassId = &guid;
-  wqs->dwNameSpace = NS_BTH;
-  wqs->dwNumberOfCsAddrs = 0;
-  wqs->lpszContext = (LPSTR)dest;
-  if (SOCKET_ERROR == WSALookupServiceBegin(wqs, LUP_FLUSHCACHE | LUP_RETURN_ALL, &h))
-    {
-      if (GetLastError() == WSASERVICE_NOT_FOUND)
-        {
-          fprintf(stderr, "WARNING! The device with address %s wasn't found. Skipping the message!", dest);
-          return -1;
-        }
-      else
-        {
-          fprintf(stderr, "Failed to find the port number: ");
-          print_last_error();
-          ExitProcess(2);
-          return -1;
-        }
-    }
-  /* search the sdp service */
-  while (!done)
-    {
-      if (SOCKET_ERROR == WSALookupServiceNext(h, LUP_FLUSHCACHE | LUP_RETURN_ALL, &wqs_len, wqs))
-        {
-          int error = WSAGetLastError();
-          switch (error)
-            {
-            case WSAEFAULT:
-              free(wqs);
-              wqs = (WSAQUERYSET*)malloc(wqs_len);
-              break;
-            case WSANO_DATA:
-              fprintf(stderr, "Failed! The address was valid but there was no data record of requested type\n");
-              done = 1;
-              break;
-            case WSA_E_NO_MORE:
-              done = 1;
-              break;
-            default:
-              fprintf(stderr, "Failed to look over the services: ");
-              print_last_error();
-              WSALookupServiceEnd(h);
-              ExitProcess(2);
-            }
-        }
-      else
-        {
-          channel = ((SOCKADDR_BTH*)wqs->lpcsaBuffer->RemoteAddr.lpSockaddr)->port;
-        }
-    }
-  free(wqs);
-  WSALookupServiceEnd(h);
-  return channel;
-}
-#else
 /**
 * Function used for searching and browsing for a service. This will return the
 * port number on which the service is running.
@@ -1011,7 +747,6 @@ get_channel(struct HardwareInfos *dev, bdaddr_t dest)
  return channel;
 }
-#endif
 /**
 * Read from the socket and put the result into the buffer for transmission to 'stdout'.
@@ -1030,22 +765,14 @@ read_from_the_socket(void *sock,
 {
  unsigned char tmpbuf[buf_size];
  ssize_t count;
-  #ifdef MINGW
-  count = GNUNET_NETWORK_socket_recv((struct GNUNET_NETWORK_Handle *)sock, tmpbuf, buf_size);
-  #else
  count = read(*((int *)sock), tmpbuf, buf_size);
-  #endif
  if (0 > count)
    {
      if (EAGAIN == errno)
        return 0;
-    #if MINGW
-      print_last_error();
-    #else
      fprintf(stderr, "Failed to read from the HCI socket: %s\n", strerror(errno));
-    #endif
      return -1;
    }
@@ -1088,43 +815,6 @@ read_from_the_socket(void *sock,
 static int
 open_device(struct HardwareInfos *dev)
 {
-  #ifdef MINGW
-  SOCKADDR_BTH addr;
-  /* bind the RFCOMM socket to the interface */
-  addr.addressFamily = AF_BTH;
-  addr.btAddr = 0;
-  addr.port = BT_PORT_ANY;
-  if (GNUNET_OK !=
-      GNUNET_NETWORK_socket_bind(dev->handle, (const SOCKADDR*)&addr, sizeof(SOCKADDR_BTH)))
-    {
-      fprintf(stderr, "Failed to bind the socket: ");
-      if (GetLastError() == WSAENETDOWN)
-        {
-          fprintf(stderr, "Please make sure that your Bluetooth device is ON!\n");
-          ExitProcess(2);
-        }
-      print_last_error();
-      return -1;
-    }
-  /* start listening on the socket */
-  if (GNUNET_NETWORK_socket_listen(dev->handle, 4) != GNUNET_OK)
-    {
-      fprintf(stderr, "Failed to listen on the socket: ");
-      print_last_error();
-      return -1;
-    }
-  /* register the sdp service */
-  if (register_service(dev) != 0)
-    {
-      fprintf(stderr, "Failed to register a service: ");
-      print_last_error();
-      return 1;
-    }
-  #else
  int i, dev_id = -1, fd_hci;
  struct {
    struct hci_dev_list_req list;
@@ -1279,7 +969,6 @@ open_device(struct HardwareInfos *dev)
              dev->iface, strerror(errno));
      return 1;
    }
-  #endif
  return 0;
 }
@@ -1299,12 +988,7 @@ mac_set(struct GNUNET_TRANSPORT_WLAN_Ieee80211Frame *taIeeeHeader,
 {
  taIeeeHeader->frame_control = htons(IEEE80211_FC0_TYPE_DATA);
  taIeeeHeader->addr3 = mac_bssid_gnunet;
-  #ifdef MINGW
-  GNUNET_memcpy(&taIeeeHeader->addr2, &dev->pl_mac, sizeof(struct GNUNET_TRANSPORT_WLAN_MacAddress));
-  #else
  taIeeeHeader->addr2 = dev->pl_mac;
-  #endif
 }
 #ifdef LINUX
diff --git a/src/transport/plugin_transport_udp.c b/src/transport/plugin_transport_udp.c
index 755809194..c056bb79c 100644
--- a/src/transport/plugin_transport_udp.c
+++ b/src/transport/plugin_transport_udp.c
@@ -2929,20 +2929,7 @@ udp_select_read(struct Plugin *plugin, struct GNUNET_NETWORK_Handle *rsock)
                                        (struct sockaddr *)&addr,
                                        &fromlen);
  sa = (const struct sockaddr *)&addr;
-#if MINGW
-  /* On SOCK_DGRAM UDP sockets recvfrom might fail with a
-   * WSAECONNRESET error to indicate that previous sendto() (yes, sendto!)
-   * on this socket has failed.
-   * Quote from MSDN:
-   *   WSAECONNRESET - The virtual circuit was reset by the remote side
-   *   executing a hard or abortive close. The application should close
-   *   the socket; it is no longer usable. On a UDP-datagram socket this
-   *   error indicates a previous send operation resulted in an ICMP Port
-   *   Unreachable message.
-   */
-  if ((-1 == size) && (ECONNRESET == errno))
-    return;
-#endif
  if (-1 == size)
    {
      LOG(GNUNET_ERROR_TYPE_DEBUG,
diff --git a/src/transport/plugin_transport_wlan.h b/src/transport/plugin_transport_wlan.h
index cdc3e34ff..bf1a90dba 100644
--- a/src/transport/plugin_transport_wlan.h
+++ b/src/transport/plugin_transport_wlan.h
@@ -32,12 +32,7 @@
 /**
 * Number fo bytes in a mac address.
 */
-#ifdef MINGW
+#define MAC_ADDR_SIZE 6
-  #define MAC_ADDR_SIZE 8
-typedef uint8_t u_int8_t;
-#else
-  #define MAC_ADDR_SIZE 6
-#endif
 /**
 * Value for "Management" in the 'frame_control' field of the
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;
 }