-dos2unix

author: Christian Grothoff <christian@grothoff.org> 2012-09-28 09:12:05 +0000
committer: Christian Grothoff <christian@grothoff.org> 2012-09-28 09:12:05 +0000
commit: 5c70099f12dca398e9e6aaab13610207982f666f (patch)
tree: b91e50b26b735f1f9cf644d132228d093c15223f /src/util
parent: 23e7a5c1060d37c45a955e4bed961661af8cafb9 (diff)
download: gnunet-5c70099f12dca398e9e6aaab13610207982f666f.tar.gz
gnunet-5c70099f12dca398e9e6aaab13610207982f666f.zip
2 files changed, 1316 insertions, 1317 deletions
diff --git a/src/util/crypto_crc.c b/src/util/crypto_crc.c
index 3f4991353..ea50b636c 100644
--- a/src/util/crypto_crc.c
+++ b/src/util/crypto_crc.c
@@ -27,7 +27,6 @@
 * @brief implementation of CRC16 and CRC32
 * @author Christian Grothoff
 */
 #include "platform.h"
 #include "gnunet_common.h"
 #include "gnunet_crypto_lib.h"
diff --git a/src/util/win.c b/src/util/win.c
index 18e3e80c0..6a2da9339 100644
--- a/src/util/win.c
+++ b/src/util/win.c
@@ -1,1262 +1,1262 @@
-/*
+/*
-     This file is part of GNUnet.
+     This file is part of GNUnet.
-     (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
+     (C) 2001, 2002, 2003, 2004, 2005, 2006 Christian Grothoff (and other contributing authors)
-     GNUnet is free software; you can redistribute it and/or modify
+     GNUnet is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published
+     it under the terms of the GNU General Public License as published
-     by the Free Software Foundation; either version 2, or (at your
+     by the Free Software Foundation; either version 2, or (at your
-     option) any later version.
+     option) any later version.
-     GNUnet is distributed in the hope that it will be useful, but
+     GNUnet is distributed in the hope that it will be useful, but
-     WITHOUT ANY WARRANTY; without even the implied warranty of
+     WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     General Public License for more details.
+     General Public License for more details.
-     You should have received a copy of the GNU General Public License
+     You should have received a copy of the GNU General Public License
-     along with GNUnet; see the file COPYING.  If not, write to the
+     along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Boston, MA 02111-1307, USA.
-*/
+*/
-/**
+/**
- * @file util/win.c
+ * @file util/win.c
- * @brief Helper functions for MS Windows in C++
+ * @brief Helper functions for MS Windows in C++
- * @author Nils Durner
+ * @author Nils Durner
- */
+ */
-#ifndef _WIN_C
+#ifndef _WIN_C
-#define _WIN_C
+#define _WIN_C
-#include "winproc.h"
+#include "winproc.h"
-#include "platform.h"
+#include "platform.h"
-#include "gnunet_common.h"
+#include "gnunet_common.h"
-#include "gnunet_connection_lib.h"
+#include "gnunet_connection_lib.h"
-#include <ntdef.h>
+#include <ntdef.h>
-#ifndef INHERITED_ACE
+#ifndef INHERITED_ACE
-#define INHERITED_ACE 0x10
+#define INHERITED_ACE 0x10
-#endif
+#endif
-int plibc_conv_to_win_path(const char *pszUnix, char *pszWindows);
+int plibc_conv_to_win_path(const char *pszUnix, char *pszWindows);
-#define _IP_ADAPTER_UNICAST_ADDRESS_HEAD \
+#define _IP_ADAPTER_UNICAST_ADDRESS_HEAD \
-  union { \
+  union { \
-    struct { \
+    struct { \
-      ULONG Length; \
+      ULONG Length; \
-      DWORD Flags; \
+      DWORD Flags; \
-    }; \
+    }; \
-  }; \
+  }; \
-#define _IP_ADAPTER_UNICAST_ADDRESS_BASE \
+#define _IP_ADAPTER_UNICAST_ADDRESS_BASE \
-  SOCKET_ADDRESS                     Address; \
+  SOCKET_ADDRESS                     Address; \
-  IP_PREFIX_ORIGIN                   PrefixOrigin; \
+  IP_PREFIX_ORIGIN                   PrefixOrigin; \
-  IP_SUFFIX_ORIGIN                   SuffixOrigin; \
+  IP_SUFFIX_ORIGIN                   SuffixOrigin; \
-  IP_DAD_STATE                       DadState; \
+  IP_DAD_STATE                       DadState; \
-  ULONG                              ValidLifetime; \
+  ULONG                              ValidLifetime; \
-  ULONG                              PreferredLifetime; \
+  ULONG                              PreferredLifetime; \
-  ULONG                              LeaseLifetime;
+  ULONG                              LeaseLifetime;
-#define _IP_ADAPTER_UNICAST_ADDRESS_ADD_VISTA \
+#define _IP_ADAPTER_UNICAST_ADDRESS_ADD_VISTA \
-  UINT8                              OnLinkPrefixLength;
+  UINT8                              OnLinkPrefixLength;
-#define _IP_ADAPTER_UNICAST_ADDRESS_DEFINE(suffix,addition) \
+#define _IP_ADAPTER_UNICAST_ADDRESS_DEFINE(suffix,addition) \
-typedef struct _IP_ADAPTER_UNICAST_ADDRESS##suffix { \
+typedef struct _IP_ADAPTER_UNICAST_ADDRESS##suffix { \
-  _IP_ADAPTER_UNICAST_ADDRESS_HEAD \
+  _IP_ADAPTER_UNICAST_ADDRESS_HEAD \
-  struct _IP_ADAPTER_UNICAST_ADDRESS##suffix *Next; \
+  struct _IP_ADAPTER_UNICAST_ADDRESS##suffix *Next; \
-  _IP_ADAPTER_UNICAST_ADDRESS_BASE \
+  _IP_ADAPTER_UNICAST_ADDRESS_BASE \
-  addition \
+  addition \
-} IP_ADAPTER_UNICAST_ADDRESS##suffix, *PIP_ADAPTER_UNICAST_ADDRESS##suffix;
+} IP_ADAPTER_UNICAST_ADDRESS##suffix, *PIP_ADAPTER_UNICAST_ADDRESS##suffix;
-/* _IP_ADAPTER_UNICAST_ADDRESS_DEFINE(,) defined in w32api headers */
+/* _IP_ADAPTER_UNICAST_ADDRESS_DEFINE(,) defined in w32api headers */
-_IP_ADAPTER_UNICAST_ADDRESS_DEFINE(_VISTA,_IP_ADAPTER_UNICAST_ADDRESS_ADD_VISTA)
+_IP_ADAPTER_UNICAST_ADDRESS_DEFINE(_VISTA,_IP_ADAPTER_UNICAST_ADDRESS_ADD_VISTA)
-typedef struct _IP_ADAPTER_WINS_SERVER_ADDRESS {
+typedef struct _IP_ADAPTER_WINS_SERVER_ADDRESS {
-  union {
+  union {
-    ULONGLONG Alignment;
+    ULONGLONG Alignment;
-    struct {
+    struct {
-      ULONG Length;
+      ULONG Length;
-      DWORD Reserved;
+      DWORD Reserved;
-    };
+    };
-  };
+  };
-  struct _IP_ADAPTER_WINS_SERVER_ADDRESS  *Next;
+  struct _IP_ADAPTER_WINS_SERVER_ADDRESS  *Next;
-  SOCKET_ADDRESS                         Address;
+  SOCKET_ADDRESS                         Address;
-} IP_ADAPTER_WINS_SERVER_ADDRESS, *PIP_ADAPTER_WINS_SERVER_ADDRESS, *PIP_ADAPTER_WINS_SERVER_ADDRESS_LH;
+} IP_ADAPTER_WINS_SERVER_ADDRESS, *PIP_ADAPTER_WINS_SERVER_ADDRESS, *PIP_ADAPTER_WINS_SERVER_ADDRESS_LH;
-typedef struct _IP_ADAPTER_GATEWAY_ADDRESS {
+typedef struct _IP_ADAPTER_GATEWAY_ADDRESS {
-  union {
+  union {
-    ULONGLONG Alignment;
+    ULONGLONG Alignment;
-    struct {
+    struct {
-      ULONG Length;
+      ULONG Length;
-      DWORD Reserved;
+      DWORD Reserved;
-    };
+    };
-  };
+  };
-  struct _IP_ADAPTER_GATEWAY_ADDRESS  *Next;
+  struct _IP_ADAPTER_GATEWAY_ADDRESS  *Next;
-  SOCKET_ADDRESS                     Address;
+  SOCKET_ADDRESS                     Address;
-} IP_ADAPTER_GATEWAY_ADDRESS, *PIP_ADAPTER_GATEWAY_ADDRESS, *PIP_ADAPTER_GATEWAY_ADDRESS_LH;
+} IP_ADAPTER_GATEWAY_ADDRESS, *PIP_ADAPTER_GATEWAY_ADDRESS, *PIP_ADAPTER_GATEWAY_ADDRESS_LH;
-typedef UINT32 NET_IF_COMPARTMENT_ID;
+typedef UINT32 NET_IF_COMPARTMENT_ID;
-typedef GUID NET_IF_NETWORK_GUID;
+typedef GUID NET_IF_NETWORK_GUID;
-typedef enum _NET_IF_CONNECTION_TYPE {
+typedef enum _NET_IF_CONNECTION_TYPE {
-  NET_IF_CONNECTION_DEDICATED   = 1,
+  NET_IF_CONNECTION_DEDICATED   = 1,
-  NET_IF_CONNECTION_PASSIVE,
+  NET_IF_CONNECTION_PASSIVE,
-  NET_IF_CONNECTION_DEMAND,
+  NET_IF_CONNECTION_DEMAND,
-  NET_IF_CONNECTION_MAXIMUM 
+  NET_IF_CONNECTION_MAXIMUM 
-} NET_IF_CONNECTION_TYPE, *PNET_IF_CONNECTION_TYPE;
+} NET_IF_CONNECTION_TYPE, *PNET_IF_CONNECTION_TYPE;
-typedef enum  {
+typedef enum  {
-  TUNNEL_TYPE_NONE      = 0,
+  TUNNEL_TYPE_NONE      = 0,
-  TUNNEL_TYPE_OTHER,
+  TUNNEL_TYPE_OTHER,
-  TUNNEL_TYPE_DIRECT,
+  TUNNEL_TYPE_DIRECT,
-  TUNNEL_TYPE_6TO4,
+  TUNNEL_TYPE_6TO4,
-  TUNNEL_TYPE_ISATAP,
+  TUNNEL_TYPE_ISATAP,
-  TUNNEL_TYPE_TEREDO,
+  TUNNEL_TYPE_TEREDO,
-  TUNNEL_TYPE_IPHTTPS 
+  TUNNEL_TYPE_IPHTTPS 
-} TUNNEL_TYPE, *PTUNNEL_TYPE;
+} TUNNEL_TYPE, *PTUNNEL_TYPE;
-/*
+/*
-A DUID consists of a two-octet type code represented in network byte
+A DUID consists of a two-octet type code represented in network byte
-   order, followed by a variable number of octets that make up the
+   order, followed by a variable number of octets that make up the
-   actual identifier.  A DUID can be no more than 128 octets long (not
+   actual identifier.  A DUID can be no more than 128 octets long (not
-   including the type code).
+   including the type code).
-*/
+*/
-#define MAX_DHCPV6_DUID_LENGTH 130
+#define MAX_DHCPV6_DUID_LENGTH 130
-typedef union _NET_LUID {
+typedef union _NET_LUID {
-  ULONG64 Value;
+  ULONG64 Value;
-  struct {
+  struct {
-    ULONG64 Reserved  :24;
+    ULONG64 Reserved  :24;
-    ULONG64 NetLuidIndex  :24;
+    ULONG64 NetLuidIndex  :24;
-    ULONG64 IfType  :16;
+    ULONG64 IfType  :16;
-  } Info;
+  } Info;
-} NET_LUID, *PNET_LUID, IF_LUID;
+} NET_LUID, *PNET_LUID, IF_LUID;
-#define MAX_DNS_SUFFIX_STRING_LENGTH 246
+#define MAX_DNS_SUFFIX_STRING_LENGTH 246
-typedef struct _IP_ADAPTER_DNS_SUFFIX {
+typedef struct _IP_ADAPTER_DNS_SUFFIX {
-  struct _IP_ADAPTER_DNS_SUFFIX  *Next;
+  struct _IP_ADAPTER_DNS_SUFFIX  *Next;
-  WCHAR                         String[MAX_DNS_SUFFIX_STRING_LENGTH];
+  WCHAR                         String[MAX_DNS_SUFFIX_STRING_LENGTH];
-} IP_ADAPTER_DNS_SUFFIX, *PIP_ADAPTER_DNS_SUFFIX;
+} IP_ADAPTER_DNS_SUFFIX, *PIP_ADAPTER_DNS_SUFFIX;
-#define _IP_ADAPTER_ADDRESSES_HEAD \
+#define _IP_ADAPTER_ADDRESSES_HEAD \
-  union { \
+  union { \
-    ULONGLONG Alignment; \
+    ULONGLONG Alignment; \
-    struct { \
+    struct { \
-      ULONG Length; \
+      ULONG Length; \
-      DWORD IfIndex; \
+      DWORD IfIndex; \
-    }; \
+    }; \
-  };
+  };
-#define _IP_ADAPTER_ADDRESSES_BASE \
+#define _IP_ADAPTER_ADDRESSES_BASE \
-  PCHAR                              AdapterName; \
+  PCHAR                              AdapterName; \
-  PIP_ADAPTER_UNICAST_ADDRESS        FirstUnicastAddress; \
+  PIP_ADAPTER_UNICAST_ADDRESS        FirstUnicastAddress; \
-  PIP_ADAPTER_ANYCAST_ADDRESS        FirstAnycastAddress; \
+  PIP_ADAPTER_ANYCAST_ADDRESS        FirstAnycastAddress; \
-  PIP_ADAPTER_MULTICAST_ADDRESS      FirstMulticastAddress; \
+  PIP_ADAPTER_MULTICAST_ADDRESS      FirstMulticastAddress; \
-  PIP_ADAPTER_DNS_SERVER_ADDRESS     FirstDnsServerAddress; \
+  PIP_ADAPTER_DNS_SERVER_ADDRESS     FirstDnsServerAddress; \
-  PWCHAR                             DnsSuffix; \
+  PWCHAR                             DnsSuffix; \
-  PWCHAR                             Description; \
+  PWCHAR                             Description; \
-  PWCHAR                             FriendlyName; \
+  PWCHAR                             FriendlyName; \
-  BYTE                               PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH]; \
+  BYTE                               PhysicalAddress[MAX_ADAPTER_ADDRESS_LENGTH]; \
-  DWORD                              PhysicalAddressLength; \
+  DWORD                              PhysicalAddressLength; \
-  DWORD                              Flags; \
+  DWORD                              Flags; \
-  DWORD                              Mtu; \
+  DWORD                              Mtu; \
-  DWORD                              IfType; \
+  DWORD                              IfType; \
-  IF_OPER_STATUS                     OperStatus;
+  IF_OPER_STATUS                     OperStatus;
-#define _IP_ADAPTER_ADDRESSES_ADD_XPSP1 \
+#define _IP_ADAPTER_ADDRESSES_ADD_XPSP1 \
-  DWORD                              Ipv6IfIndex; \
+  DWORD                              Ipv6IfIndex; \
-  DWORD                              ZoneIndices[16]; \
+  DWORD                              ZoneIndices[16]; \
-  PIP_ADAPTER_PREFIX                 FirstPrefix; \
+  PIP_ADAPTER_PREFIX                 FirstPrefix; \
-#define _IP_ADAPTER_ADDRESSES_ADD_VISTA \
+#define _IP_ADAPTER_ADDRESSES_ADD_VISTA \
-  _IP_ADAPTER_ADDRESSES_ADD_XPSP1 \
+  _IP_ADAPTER_ADDRESSES_ADD_XPSP1 \
-  ULONG64                            TransmitLinkSpeed; \
+  ULONG64                            TransmitLinkSpeed; \
-  ULONG64                            ReceiveLinkSpeed; \
+  ULONG64                            ReceiveLinkSpeed; \
-  PIP_ADAPTER_WINS_SERVER_ADDRESS_LH FirstWinsServerAddress; \
+  PIP_ADAPTER_WINS_SERVER_ADDRESS_LH FirstWinsServerAddress; \
-  PIP_ADAPTER_GATEWAY_ADDRESS_LH     FirstGatewayAddress; \
+  PIP_ADAPTER_GATEWAY_ADDRESS_LH     FirstGatewayAddress; \
-  ULONG                              Ipv4Metric; \
+  ULONG                              Ipv4Metric; \
-  ULONG                              Ipv6Metric; \
+  ULONG                              Ipv6Metric; \
-  IF_LUID                            Luid; \
+  IF_LUID                            Luid; \
-  SOCKET_ADDRESS                     Dhcpv4Server; \
+  SOCKET_ADDRESS                     Dhcpv4Server; \
-  NET_IF_COMPARTMENT_ID              CompartmentId; \
+  NET_IF_COMPARTMENT_ID              CompartmentId; \
-  NET_IF_NETWORK_GUID                NetworkGuid; \
+  NET_IF_NETWORK_GUID                NetworkGuid; \
-  NET_IF_CONNECTION_TYPE             ConnectionType; \
+  NET_IF_CONNECTION_TYPE             ConnectionType; \
-  TUNNEL_TYPE                        TunnelType; \
+  TUNNEL_TYPE                        TunnelType; \
-  SOCKET_ADDRESS                     Dhcpv6Server; \
+  SOCKET_ADDRESS                     Dhcpv6Server; \
-  BYTE                               Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; \
+  BYTE                               Dhcpv6ClientDuid[MAX_DHCPV6_DUID_LENGTH]; \
-  ULONG                              Dhcpv6ClientDuidLength; \
+  ULONG                              Dhcpv6ClientDuidLength; \
-  ULONG                              Dhcpv6Iaid;
+  ULONG                              Dhcpv6Iaid;
-#define _IP_ADAPTER_ADDRESSES_ADD_2008_OR_VISTASP1 \
+#define _IP_ADAPTER_ADDRESSES_ADD_2008_OR_VISTASP1 \
-  _IP_ADAPTER_ADDRESSES_ADD_VISTA \
+  _IP_ADAPTER_ADDRESSES_ADD_VISTA \
-  PIP_ADAPTER_DNS_SUFFIX             FirstDnsSuffix;
+  PIP_ADAPTER_DNS_SUFFIX             FirstDnsSuffix;
-#define _IP_ADAPTER_ADDRESSES_DEFINE(suffix,addition) \
+#define _IP_ADAPTER_ADDRESSES_DEFINE(suffix,addition) \
-typedef struct _IP_ADAPTER_ADDRESSES##suffix { \
+typedef struct _IP_ADAPTER_ADDRESSES##suffix { \
-  _IP_ADAPTER_ADDRESSES_HEAD \
+  _IP_ADAPTER_ADDRESSES_HEAD \
-  struct _IP_ADAPTER_ADDRESSES##suffix *Next; \
+  struct _IP_ADAPTER_ADDRESSES##suffix *Next; \
-  _IP_ADAPTER_ADDRESSES_BASE \
+  _IP_ADAPTER_ADDRESSES_BASE \
-  addition \
+  addition \
-} IP_ADAPTER_ADDRESSES##suffix, *PIP_ADAPTER_ADDRESSES##suffix;
+} IP_ADAPTER_ADDRESSES##suffix, *PIP_ADAPTER_ADDRESSES##suffix;
-  
+  
-/* _IP_ADAPTER_ADDRESSES_DEFINE(,) defined in w32api headers */
+/* _IP_ADAPTER_ADDRESSES_DEFINE(,) defined in w32api headers */
-_IP_ADAPTER_ADDRESSES_DEFINE(_XPSP1,_IP_ADAPTER_ADDRESSES_ADD_XPSP1)
+_IP_ADAPTER_ADDRESSES_DEFINE(_XPSP1,_IP_ADAPTER_ADDRESSES_ADD_XPSP1)
-_IP_ADAPTER_ADDRESSES_DEFINE(_VISTA,_IP_ADAPTER_ADDRESSES_ADD_VISTA)
+_IP_ADAPTER_ADDRESSES_DEFINE(_VISTA,_IP_ADAPTER_ADDRESSES_ADD_VISTA)
-_IP_ADAPTER_ADDRESSES_DEFINE(_2008_OR_VISTASP1,_IP_ADAPTER_ADDRESSES_ADD_2008_OR_VISTASP1)
+_IP_ADAPTER_ADDRESSES_DEFINE(_2008_OR_VISTASP1,_IP_ADAPTER_ADDRESSES_ADD_2008_OR_VISTASP1)
-static int
+static int
-EnumNICs_IPv6_get_ifs_count (SOCKET s)
+EnumNICs_IPv6_get_ifs_count (SOCKET s)
-{
+{
-  DWORD dwret = 0, err;
+  DWORD dwret = 0, err;
-  int iret;
+  int iret;
-  iret = WSAIoctl (s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, 0,
+  iret = WSAIoctl (s, SIO_ADDRESS_LIST_QUERY, NULL, 0, NULL, 0,
-      &dwret, NULL, NULL);
+      &dwret, NULL, NULL);
-  err = GetLastError ();
+  err = GetLastError ();
-  if (iret == SOCKET_ERROR && err == WSAEFAULT)
+  if (iret == SOCKET_ERROR && err == WSAEFAULT)
-    return dwret;
+    return dwret;
-  else if (iret == 0)
+  else if (iret == 0)
-    return 0;
+    return 0;
-  return GNUNET_SYSERR;
+  return GNUNET_SYSERR;
-}
+}
-static int
+static int
-EnumNICs_IPv6_get_ifs (SOCKET s, SOCKET_ADDRESS_LIST *inf, int size)
+EnumNICs_IPv6_get_ifs (SOCKET s, SOCKET_ADDRESS_LIST *inf, int size)
-{
+{
-  int iret;
+  int iret;
-  DWORD dwret = 0;
+  DWORD dwret = 0;
-  iret = WSAIoctl (s, SIO_ADDRESS_LIST_QUERY, NULL, 0, inf, size,
+  iret = WSAIoctl (s, SIO_ADDRESS_LIST_QUERY, NULL, 0, inf, size,
-      &dwret, NULL, NULL);
+      &dwret, NULL, NULL);
-  if (iret != 0 || dwret != size)
+  if (iret != 0 || dwret != size)
-  {
+  {
-    /* It's supposed to succeed! And size should be the same */
+    /* It's supposed to succeed! And size should be the same */
-    return GNUNET_SYSERR;
+    return GNUNET_SYSERR;
-  }
+  }
-  return GNUNET_OK;
+  return GNUNET_OK;
-}
+}
-#undef GNUNET_malloc
+#undef GNUNET_malloc
-#define GNUNET_malloc(a) HeapAlloc(GetProcessHeap (), HEAP_ZERO_MEMORY | \
+#define GNUNET_malloc(a) HeapAlloc(GetProcessHeap (), HEAP_ZERO_MEMORY | \
-    HEAP_GENERATE_EXCEPTIONS, a)
+    HEAP_GENERATE_EXCEPTIONS, a)
-#undef GNUNET_free
+#undef GNUNET_free
-#define GNUNET_free(a) HeapFree(GetProcessHeap (), 0, a)
+#define GNUNET_free(a) HeapFree(GetProcessHeap (), 0, a)
-#undef GNUNET_free_non_null
+#undef GNUNET_free_non_null
-#define GNUNET_free_non_null(a) do { if ((a) != NULL) GNUNET_free(a); } while (0)
+#define GNUNET_free_non_null(a) do { if ((a) != NULL) GNUNET_free(a); } while (0)
-static int
+static int
-EnumNICs_IPv4_get_ifs (SOCKET s, INTERFACE_INFO **inf, int *size)
+EnumNICs_IPv4_get_ifs (SOCKET s, INTERFACE_INFO **inf, int *size)
-{
+{
-  int iret;
+  int iret;
-  DWORD dwret = 0;
+  DWORD dwret = 0;
-  DWORD error;
+  DWORD error;
-  INTERFACE_INFO *ii = NULL;
+  INTERFACE_INFO *ii = NULL;
-  DWORD ii_size = sizeof (INTERFACE_INFO) * 15;
+  DWORD ii_size = sizeof (INTERFACE_INFO) * 15;
-  while (TRUE)
+  while (TRUE)
-  {
+  {
-    if (ii_size >= sizeof (INTERFACE_INFO) * 1000)
+    if (ii_size >= sizeof (INTERFACE_INFO) * 1000)
-      return GNUNET_SYSERR;
+      return GNUNET_SYSERR;
-    ii = (INTERFACE_INFO *) GNUNET_malloc (ii_size);
+    ii = (INTERFACE_INFO *) GNUNET_malloc (ii_size);
-    dwret = 0;
+    dwret = 0;
-    iret = WSAIoctl (s, SIO_GET_INTERFACE_LIST, NULL, 0, ii, ii_size,
+    iret = WSAIoctl (s, SIO_GET_INTERFACE_LIST, NULL, 0, ii, ii_size,
-        &dwret, NULL, NULL);
+        &dwret, NULL, NULL);
-    error = GetLastError ();
+    error = GetLastError ();
-    if (iret == SOCKET_ERROR)
+    if (iret == SOCKET_ERROR)
-    {
+    {
-      if (error == WSAEFAULT)
+      if (error == WSAEFAULT)
-      {
+      {
-        GNUNET_free (ii);
+        GNUNET_free (ii);
-        ii_size *= 2;
+        ii_size *= 2;
-        continue;
+        continue;
-      }
+      }
-      GNUNET_free (ii);
+      GNUNET_free (ii);
-      return GNUNET_SYSERR;
+      return GNUNET_SYSERR;
-    }
+    }
-    else
+    else
-    {
+    {
-      *inf = ii;
+      *inf = ii;
-      *size = dwret;
+      *size = dwret;
-      return GNUNET_OK;
+      return GNUNET_OK;
-    }
+    }
-  }
+  }
-  return GNUNET_SYSERR;
+  return GNUNET_SYSERR;
-}
+}
-int
+int
-EnumNICs2 (INTERFACE_INFO **ifs4, int *ifs4_len, SOCKET_ADDRESS_LIST **ifs6)
+EnumNICs2 (INTERFACE_INFO **ifs4, int *ifs4_len, SOCKET_ADDRESS_LIST **ifs6)
-{
+{
-  int result = 0;
+  int result = 0;
-  SOCKET s4 = INVALID_SOCKET, s6 = INVALID_SOCKET;
+  SOCKET s4 = INVALID_SOCKET, s6 = INVALID_SOCKET;
-  DWORD dwret1 = 0, dwret2;
+  DWORD dwret1 = 0, dwret2;
-  DWORD err1, err2;
+  DWORD err1, err2;
-  int ifs4len = 0, ifs6len = 0;
+  int ifs4len = 0, ifs6len = 0;
-  INTERFACE_INFO *interfaces4 = NULL;
+  INTERFACE_INFO *interfaces4 = NULL;
-  SOCKET_ADDRESS_LIST *interfaces6 = NULL;
+  SOCKET_ADDRESS_LIST *interfaces6 = NULL;
-  SetLastError (0);
+  SetLastError (0);
-  s4 = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
+  s4 = socket (AF_INET, SOCK_STREAM, IPPROTO_TCP);
-  err1 = GetLastError ();
+  err1 = GetLastError ();
-  SetLastError (0);
+  SetLastError (0);
-  s6 = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP);
+  s6 = socket (AF_INET6, SOCK_STREAM, IPPROTO_TCP);
-  err2 = GetLastError ();
+  err2 = GetLastError ();
-  if (s6 != INVALID_SOCKET)
+  if (s6 != INVALID_SOCKET)
-  {
+  {
-    ifs6len = EnumNICs_IPv6_get_ifs_count (s6);
+    ifs6len = EnumNICs_IPv6_get_ifs_count (s6);
-    if (ifs6len > 0)
+    if (ifs6len > 0)
-    {
+    {
-      interfaces6 = (SOCKET_ADDRESS_LIST *) GNUNET_malloc (ifs6len);
+      interfaces6 = (SOCKET_ADDRESS_LIST *) GNUNET_malloc (ifs6len);
-      result = EnumNICs_IPv6_get_ifs (s6, interfaces6, ifs6len) || result;
+      result = EnumNICs_IPv6_get_ifs (s6, interfaces6, ifs6len) || result;
-    }
+    }
-    closesocket (s6);
+    closesocket (s6);
-    s6 = INVALID_SOCKET;
+    s6 = INVALID_SOCKET;
-  }
+  }
-  if (s4 != INVALID_SOCKET)
+  if (s4 != INVALID_SOCKET)
-  {
+  {
-    result = EnumNICs_IPv4_get_ifs (s4, &interfaces4, &ifs4len) || result;
+    result = EnumNICs_IPv4_get_ifs (s4, &interfaces4, &ifs4len) || result;
-    closesocket (s4);
+    closesocket (s4);
-    s4 = INVALID_SOCKET;
+    s4 = INVALID_SOCKET;
-  }
+  }
-  if (ifs6len + ifs4len == 0)
+  if (ifs6len + ifs4len == 0)
-    goto error;
+    goto error;
-  if (!result)
+  if (!result)
-  {
+  {
-    *ifs4 = interfaces4;
+    *ifs4 = interfaces4;
-    *ifs4_len = ifs4len;
+    *ifs4_len = ifs4len;
-    *ifs6 = interfaces6;
+    *ifs6 = interfaces6;
-    return GNUNET_OK;
+    return GNUNET_OK;
-  }
+  }
-error:
+error:
-  if (interfaces4 != NULL)
+  if (interfaces4 != NULL)
-    GNUNET_free (interfaces4);
+    GNUNET_free (interfaces4);
-  if (interfaces6 != NULL)
+  if (interfaces6 != NULL)
-    GNUNET_free (interfaces6);
+    GNUNET_free (interfaces6);
-  if (s4 != INVALID_SOCKET)
+  if (s4 != INVALID_SOCKET)
-    closesocket (s4);
+    closesocket (s4);
-  if (s6 != INVALID_SOCKET)
+  if (s6 != INVALID_SOCKET)
-    closesocket (s6);
+    closesocket (s6);
-  return GNUNET_SYSERR;
+  return GNUNET_SYSERR;
-}
+}
-/**
+/**
- * Returns GNUNET_OK on OK, GNUNET_SYSERR on error
+ * Returns GNUNET_OK on OK, GNUNET_SYSERR on error
- */
+ */
-int
+int
-EnumNICs3 (struct EnumNICs3_results **results, int *results_count)
+EnumNICs3 (struct EnumNICs3_results **results, int *results_count)
-{
+{
-  DWORD dwRetVal = 0;
+  DWORD dwRetVal = 0;
-  int count = 0;
+  int count = 0;
-  ULONG flags = /*GAA_FLAG_INCLUDE_PREFIX |*/ GAA_FLAG_SKIP_ANYCAST |
+  ULONG flags = /*GAA_FLAG_INCLUDE_PREFIX |*/ GAA_FLAG_SKIP_ANYCAST |
-      GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER;
+      GAA_FLAG_SKIP_MULTICAST | GAA_FLAG_SKIP_DNS_SERVER;
-  struct sockaddr_in6 examplecom6;
+  struct sockaddr_in6 examplecom6;
-  IPAddr examplecom;
+  IPAddr examplecom;
-  DWORD best_interface = 0;
+  DWORD best_interface = 0;
-  DWORD best_interface6 = 0;
+  DWORD best_interface6 = 0;
-  int use_enum2 = 0;
+  int use_enum2 = 0;
-  INTERFACE_INFO *interfaces4 = NULL;
+  INTERFACE_INFO *interfaces4 = NULL;
-  int interfaces4_len = 0;
+  int interfaces4_len = 0;
-  SOCKET_ADDRESS_LIST *interfaces6 = NULL;
+  SOCKET_ADDRESS_LIST *interfaces6 = NULL;
-  unsigned long outBufLen = sizeof (IP_ADAPTER_ADDRESSES);
+  unsigned long outBufLen = sizeof (IP_ADAPTER_ADDRESSES);
-  IP_ADAPTER_ADDRESSES *pCurrentAddress = NULL;
+  IP_ADAPTER_ADDRESSES *pCurrentAddress = NULL;
-  IP_ADAPTER_ADDRESSES *pAddresses = (IP_ADAPTER_ADDRESSES *) GNUNET_malloc (outBufLen);
+  IP_ADAPTER_ADDRESSES *pAddresses = (IP_ADAPTER_ADDRESSES *) GNUNET_malloc (outBufLen);
-  if (GetAdaptersAddresses (AF_UNSPEC, flags, NULL, pAddresses, &outBufLen)
+  if (GetAdaptersAddresses (AF_UNSPEC, flags, NULL, pAddresses, &outBufLen)
-      == ERROR_BUFFER_OVERFLOW)
+      == ERROR_BUFFER_OVERFLOW)
-  {
+  {
-    GNUNET_free (pAddresses);
+    GNUNET_free (pAddresses);
-    pAddresses = (IP_ADAPTER_ADDRESSES *) GNUNET_malloc (outBufLen);
+    pAddresses = (IP_ADAPTER_ADDRESSES *) GNUNET_malloc (outBufLen);
-  }
+  }
-  dwRetVal = GetAdaptersAddresses (AF_UNSPEC, flags, NULL, pAddresses, &outBufLen);
+  dwRetVal = GetAdaptersAddresses (AF_UNSPEC, flags, NULL, pAddresses, &outBufLen);
-  if (dwRetVal != NO_ERROR)
+  if (dwRetVal != NO_ERROR)
-  {
+  {
-    GNUNET_free (pAddresses);
+    GNUNET_free (pAddresses);
-    return GNUNET_SYSERR;
+    return GNUNET_SYSERR;
-  }
+  }
-  if (pAddresses->Length < sizeof (IP_ADAPTER_ADDRESSES_VISTA))
+  if (pAddresses->Length < sizeof (IP_ADAPTER_ADDRESSES_VISTA))
-  {
+  {
-    use_enum2 = 1;
+    use_enum2 = 1;
-    /* Enumerate NICs using WSAIoctl() */
+    /* Enumerate NICs using WSAIoctl() */
-    if (GNUNET_OK != EnumNICs2 (&interfaces4, &interfaces4_len, &interfaces6))
+    if (GNUNET_OK != EnumNICs2 (&interfaces4, &interfaces4_len, &interfaces6))
-    {
+    {
-      GNUNET_free (pAddresses);
+      GNUNET_free (pAddresses);
-      return GNUNET_SYSERR;
+      return GNUNET_SYSERR;
-    }
+    }
-  }
+  }
-  examplecom = inet_addr("192.0.34.166"); /* www.example.com */
+  examplecom = inet_addr("192.0.34.166"); /* www.example.com */
-  if (GetBestInterface (examplecom, &best_interface) != NO_ERROR)
+  if (GetBestInterface (examplecom, &best_interface) != NO_ERROR)
-    best_interface = 0;
+    best_interface = 0;
-  if (GNGetBestInterfaceEx != NULL)
+  if (GNGetBestInterfaceEx != NULL)
-  {
+  {
-    examplecom6.sin6_family = AF_INET6;
+    examplecom6.sin6_family = AF_INET6;
-    examplecom6.sin6_port = 0;
+    examplecom6.sin6_port = 0;
-    examplecom6.sin6_flowinfo = 0;
+    examplecom6.sin6_flowinfo = 0;
-    examplecom6.sin6_scope_id = 0;
+    examplecom6.sin6_scope_id = 0;
-    inet_pton (AF_INET6, "2001:500:88:200:0:0:0:10",
+    inet_pton (AF_INET6, "2001:500:88:200:0:0:0:10",
-        (struct sockaddr *) &examplecom6.sin6_addr);
+        (struct sockaddr *) &examplecom6.sin6_addr);
-    dwRetVal = GNGetBestInterfaceEx ((struct sockaddr *) &examplecom6,
+    dwRetVal = GNGetBestInterfaceEx ((struct sockaddr *) &examplecom6,
-        &best_interface6);
+        &best_interface6);
-    if (dwRetVal != NO_ERROR)
+    if (dwRetVal != NO_ERROR)
-      best_interface6 = 0;
+      best_interface6 = 0;
-  }
+  }
-  /* Give IPv6 a priority */
+  /* Give IPv6 a priority */
-  if (best_interface6 != 0)
+  if (best_interface6 != 0)
-    best_interface = best_interface6;
+    best_interface = best_interface6;
-  count = 0;
+  count = 0;
-  for (pCurrentAddress = pAddresses;
+  for (pCurrentAddress = pAddresses;
-      pCurrentAddress != NULL; pCurrentAddress = pCurrentAddress->Next)
+      pCurrentAddress != NULL; pCurrentAddress = pCurrentAddress->Next)
-  {
+  {
-    if (pCurrentAddress->OperStatus == IfOperStatusUp)
+    if (pCurrentAddress->OperStatus == IfOperStatusUp)
-    {
+    {
-      IP_ADAPTER_UNICAST_ADDRESS *unicast = NULL;
+      IP_ADAPTER_UNICAST_ADDRESS *unicast = NULL;
-      for (unicast = pCurrentAddress->FirstUnicastAddress; unicast != NULL;
+      for (unicast = pCurrentAddress->FirstUnicastAddress; unicast != NULL;
-          unicast = unicast->Next)
+          unicast = unicast->Next)
-      {
+      {
-        if ((unicast->Address.lpSockaddr->sa_family == AF_INET ||
+        if ((unicast->Address.lpSockaddr->sa_family == AF_INET ||
-            unicast->Address.lpSockaddr->sa_family == AF_INET6) &&
+            unicast->Address.lpSockaddr->sa_family == AF_INET6) &&
-            (unicast->DadState == IpDadStateDeprecated ||
+            (unicast->DadState == IpDadStateDeprecated ||
-            unicast->DadState == IpDadStatePreferred))
+            unicast->DadState == IpDadStatePreferred))
-          count += 1;
+          count += 1;
-      }
+      }
-    }
+    }
-  }
+  }
-  if (count == 0)
+  if (count == 0)
-  {
+  {
-    *results = NULL;
+    *results = NULL;
-    *results_count = 0;
+    *results_count = 0;
-    GNUNET_free (pAddresses);
+    GNUNET_free (pAddresses);
-    GNUNET_free_non_null (interfaces4);
+    GNUNET_free_non_null (interfaces4);
-    GNUNET_free_non_null (interfaces6);
+    GNUNET_free_non_null (interfaces6);
-    return GNUNET_OK;
+    return GNUNET_OK;
-  }
+  }
-  *results = (struct EnumNICs3_results *) GNUNET_malloc (
+  *results = (struct EnumNICs3_results *) GNUNET_malloc (
-      sizeof (struct EnumNICs3_results) * count);
+      sizeof (struct EnumNICs3_results) * count);
-  *results_count = count;
+  *results_count = count;
-  count = 0;
+  count = 0;
-  for (pCurrentAddress = pAddresses;
+  for (pCurrentAddress = pAddresses;
-      pCurrentAddress != NULL; pCurrentAddress = pCurrentAddress->Next)
+      pCurrentAddress != NULL; pCurrentAddress = pCurrentAddress->Next)
-  {
+  {
-    struct EnumNICs3_results *r;
+    struct EnumNICs3_results *r;
-    IP_ADAPTER_UNICAST_ADDRESS *unicast = NULL;
+    IP_ADAPTER_UNICAST_ADDRESS *unicast = NULL;
-    if (pCurrentAddress->OperStatus != IfOperStatusUp)
+    if (pCurrentAddress->OperStatus != IfOperStatusUp)
-      continue;
+      continue;
-    for (unicast = pCurrentAddress->FirstUnicastAddress; unicast != NULL;
+    for (unicast = pCurrentAddress->FirstUnicastAddress; unicast != NULL;
-        unicast = unicast->Next)
+        unicast = unicast->Next)
-    {
+    {
-      int i, j;
+      int i, j;
-      int mask_length = -1;
+      int mask_length = -1;
-      char dst[INET6_ADDRSTRLEN + 1];
+      char dst[INET6_ADDRSTRLEN + 1];
-      if ((unicast->Address.lpSockaddr->sa_family != AF_INET &&
+      if ((unicast->Address.lpSockaddr->sa_family != AF_INET &&
-          unicast->Address.lpSockaddr->sa_family != AF_INET6) ||
+          unicast->Address.lpSockaddr->sa_family != AF_INET6) ||
-          (unicast->DadState != IpDadStateDeprecated &&
+          (unicast->DadState != IpDadStateDeprecated &&
-          unicast->DadState != IpDadStatePreferred))
+          unicast->DadState != IpDadStatePreferred))
-        continue;
+        continue;
-      r = &(*results)[count];
+      r = &(*results)[count];
-      r->flags = 0;
+      r->flags = 0;
-      if (pCurrentAddress->IfIndex > 0 &&
+      if (pCurrentAddress->IfIndex > 0 &&
-          pCurrentAddress->IfIndex == best_interface &&
+          pCurrentAddress->IfIndex == best_interface &&
-          unicast->Address.lpSockaddr->sa_family == AF_INET)
+          unicast->Address.lpSockaddr->sa_family == AF_INET)
-        r->is_default = 1;
+        r->is_default = 1;
-      else if (pCurrentAddress->Ipv6IfIndex > 0 &&
+      else if (pCurrentAddress->Ipv6IfIndex > 0 &&
-          pCurrentAddress->Ipv6IfIndex == best_interface6 &&
+          pCurrentAddress->Ipv6IfIndex == best_interface6 &&
-          unicast->Address.lpSockaddr->sa_family == AF_INET6)
+          unicast->Address.lpSockaddr->sa_family == AF_INET6)
-        r->is_default = 1;
+        r->is_default = 1;
-      else
+      else
-        r->is_default = 0;
+        r->is_default = 0;
-      /* Don't choose default interface twice */
+      /* Don't choose default interface twice */
-      if (r->is_default)
+      if (r->is_default)
-        best_interface = best_interface6 = 0;
+        best_interface = best_interface6 = 0;
-      if (!use_enum2)
+      if (!use_enum2)
-      {
+      {
-        memcpy (&r->address, unicast->Address.lpSockaddr,
+        memcpy (&r->address, unicast->Address.lpSockaddr,
-            unicast->Address.iSockaddrLength);
+            unicast->Address.iSockaddrLength);
-        memset (&r->mask, 0, sizeof (struct sockaddr));
+        memset (&r->mask, 0, sizeof (struct sockaddr));
-        mask_length = ((IP_ADAPTER_UNICAST_ADDRESS_VISTA *) unicast)->
+        mask_length = ((IP_ADAPTER_UNICAST_ADDRESS_VISTA *) unicast)->
-              OnLinkPrefixLength;
+              OnLinkPrefixLength;
-        /* OnLinkPrefixLength is the number of leading 1s in the mask.
+        /* OnLinkPrefixLength is the number of leading 1s in the mask.
-         * OnLinkPrefixLength is available on Vista and later (hence use_enum2).
+         * OnLinkPrefixLength is available on Vista and later (hence use_enum2).
-         */
+         */
-        if (unicast->Address.lpSockaddr->sa_family == AF_INET)
+        if (unicast->Address.lpSockaddr->sa_family == AF_INET)
-        {
+        {
-          struct sockaddr_in *m = (struct sockaddr_in *) &r->mask;
+          struct sockaddr_in *m = (struct sockaddr_in *) &r->mask;
-          for (i = 0; i < mask_length; i++)
+          for (i = 0; i < mask_length; i++)
-              ((unsigned char *) &m->sin_addr)[i / 8] |= 0x80 >> (i % 8);
+              ((unsigned char *) &m->sin_addr)[i / 8] |= 0x80 >> (i % 8);
-        }
+        }
-        else if (unicast->Address.lpSockaddr->sa_family == AF_INET6)
+        else if (unicast->Address.lpSockaddr->sa_family == AF_INET6)
-        {
+        {
-          struct sockaddr_in6 *m = (struct sockaddr_in6 *) &r->mask;
+          struct sockaddr_in6 *m = (struct sockaddr_in6 *) &r->mask;
-          struct sockaddr_in6 *b = (struct sockaddr_in6 *) &r->broadcast;
+          struct sockaddr_in6 *b = (struct sockaddr_in6 *) &r->broadcast;
-          for (i = 0; i < mask_length; i++)
+          for (i = 0; i < mask_length; i++)
-            ((unsigned char *) &m->sin6_addr)[i / 8] |= 0x80 >> (i % 8);
+            ((unsigned char *) &m->sin6_addr)[i / 8] |= 0x80 >> (i % 8);
-          memcpy (&r->broadcast, &r->address, unicast->Address.iSockaddrLength);
+          memcpy (&r->broadcast, &r->address, unicast->Address.iSockaddrLength);
-          for (i = mask_length; i < 128; i++)
+          for (i = mask_length; i < 128; i++)
-            ((unsigned char *) &b->sin6_addr)[i / 8] |= 0x80 >> (i % 8);
+            ((unsigned char *) &b->sin6_addr)[i / 8] |= 0x80 >> (i % 8);
-        }
+        }
-        r->flags |= ENUMNICS3_MASK_OK;
+        r->flags |= ENUMNICS3_MASK_OK;
-      }
+      }
-      else
+      else
-      {
+      {
-        int found = 0;
+        int found = 0;
-        if (unicast->Address.lpSockaddr->sa_family == AF_INET)
+        if (unicast->Address.lpSockaddr->sa_family == AF_INET)
-        {
+        {
-          for (i = 0; !found && i < interfaces4_len / sizeof (INTERFACE_INFO); i++)
+          for (i = 0; !found && i < interfaces4_len / sizeof (INTERFACE_INFO); i++)
-          {
+          {
-            struct sockaddr_in *m = (struct sockaddr_in *) &r->mask;
+            struct sockaddr_in *m = (struct sockaddr_in *) &r->mask;
-            if (memcpy (&interfaces4[i].iiAddress.Address,
+            if (memcpy (&interfaces4[i].iiAddress.Address,
-                unicast->Address.lpSockaddr,
+                unicast->Address.lpSockaddr,
-                unicast->Address.iSockaddrLength) != 0)
+                unicast->Address.iSockaddrLength) != 0)
-              continue;
+              continue;
-            found = 1;
+            found = 1;
-            memcpy (&r->address, &interfaces4[i].iiAddress.Address,
+            memcpy (&r->address, &interfaces4[i].iiAddress.Address,
-                sizeof (struct sockaddr_in));
+                sizeof (struct sockaddr_in));
-            memcpy (&r->mask, &interfaces4[i].iiNetmask.Address,
+            memcpy (&r->mask, &interfaces4[i].iiNetmask.Address,
-                sizeof (struct sockaddr_in));
+                sizeof (struct sockaddr_in));
-            for (mask_length = 0;
+            for (mask_length = 0;
-                ((unsigned char *) &m->sin_addr)[mask_length / 8] &
+                ((unsigned char *) &m->sin_addr)[mask_length / 8] &
-                0x80 >> (mask_length % 8); mask_length++)
+                0x80 >> (mask_length % 8); mask_length++)
-            {
+            {
-            }
+            }
-            r->flags |= ENUMNICS3_MASK_OK;
+            r->flags |= ENUMNICS3_MASK_OK;
-          }
+          }
-        }
+        }
-        else if (unicast->Address.lpSockaddr->sa_family == AF_INET6)
+        else if (unicast->Address.lpSockaddr->sa_family == AF_INET6)
-        {
+        {
-          for (i = 0;
+          for (i = 0;
-              interfaces6 != NULL && !found && i < interfaces6->iAddressCount;
+              interfaces6 != NULL && !found && i < interfaces6->iAddressCount;
-              i++)
+              i++)
-          {
+          {
-            if (memcpy (interfaces6->Address[i].lpSockaddr,
+            if (memcpy (interfaces6->Address[i].lpSockaddr,
-                unicast->Address.lpSockaddr,
+                unicast->Address.lpSockaddr,
-                unicast->Address.iSockaddrLength) != 0)
+                unicast->Address.iSockaddrLength) != 0)
-              continue;
+              continue;
-            found = 1;
+            found = 1;
-            memcpy (&r->address, interfaces6->Address[i].lpSockaddr,
+            memcpy (&r->address, interfaces6->Address[i].lpSockaddr,
-                sizeof (struct sockaddr_in6));
+                sizeof (struct sockaddr_in6));
-            /* TODO: Find a way to reliably get network mask for IPv6 on XP */
+            /* TODO: Find a way to reliably get network mask for IPv6 on XP */
-            memset (&r->mask, 0, sizeof (struct sockaddr));
+            memset (&r->mask, 0, sizeof (struct sockaddr));
-            r->flags &= ~ENUMNICS3_MASK_OK;
+            r->flags &= ~ENUMNICS3_MASK_OK;
-          }
+          }
-        }
+        }
-        if (!found)
+        if (!found)
-        {
+        {
-          DebugBreak ();
+          DebugBreak ();
-        }
+        }
-      }
+      }
-      if (unicast->Address.lpSockaddr->sa_family == AF_INET)
+      if (unicast->Address.lpSockaddr->sa_family == AF_INET)
-      {
+      {
-        struct sockaddr_in *m = (struct sockaddr_in *) &r->mask;
+        struct sockaddr_in *m = (struct sockaddr_in *) &r->mask;
-        struct sockaddr_in *a = (struct sockaddr_in *) &r->address;
+        struct sockaddr_in *a = (struct sockaddr_in *) &r->address;
-        /* copy address to broadcast, then flip all the trailing bits not
+        /* copy address to broadcast, then flip all the trailing bits not
-         * falling under netmask to 1,
+         * falling under netmask to 1,
-         * so we get, 192.168.0.255 from, say, 192.168.0.43 with mask == 24.
+         * so we get, 192.168.0.255 from, say, 192.168.0.43 with mask == 24.
-         */
+         */
-        memcpy (&r->broadcast, &r->address, unicast->Address.iSockaddrLength);
+        memcpy (&r->broadcast, &r->address, unicast->Address.iSockaddrLength);
-        for (i = mask_length; i < 32; i++)
+        for (i = mask_length; i < 32; i++)
-          ((unsigned char *) &m->sin_addr)[i / 8] |= 0x80 >> (i % 8);
+          ((unsigned char *) &m->sin_addr)[i / 8] |= 0x80 >> (i % 8);
-        r->flags |= ENUMNICS3_BCAST_OK;
+        r->flags |= ENUMNICS3_BCAST_OK;
-        r->addr_size = sizeof (struct sockaddr_in);
+        r->addr_size = sizeof (struct sockaddr_in);
-        inet_ntop (AF_INET, &a->sin_addr, dst, INET_ADDRSTRLEN);
+        inet_ntop (AF_INET, &a->sin_addr, dst, INET_ADDRSTRLEN);
-      }
+      }
-      else if (unicast->Address.lpSockaddr->sa_family == AF_INET6)
+      else if (unicast->Address.lpSockaddr->sa_family == AF_INET6)
-      {
+      {
-        struct sockaddr_in6 *a = (struct sockaddr_in6 *) &r->address;
+        struct sockaddr_in6 *a = (struct sockaddr_in6 *) &r->address;
-        /* for IPv6 broadcast is not defined, zero it down */
+        /* for IPv6 broadcast is not defined, zero it down */
-        memset (&r->broadcast, 0, sizeof (struct sockaddr));
+        memset (&r->broadcast, 0, sizeof (struct sockaddr));
-        r->flags &= ~ENUMNICS3_BCAST_OK;
+        r->flags &= ~ENUMNICS3_BCAST_OK;
-        r->addr_size = sizeof (struct sockaddr_in6);
+        r->addr_size = sizeof (struct sockaddr_in6);
-        inet_ntop (AF_INET6, &a->sin6_addr, dst, INET6_ADDRSTRLEN);
+        inet_ntop (AF_INET6, &a->sin6_addr, dst, INET6_ADDRSTRLEN);
-      }
+      }
-      i = 0;
+      i = 0;
-      i += snprintf (&r->pretty_name[i], 1000 - i > 0 ? 1000 - i : 0,
+      i += snprintf (&r->pretty_name[i], 1000 - i > 0 ? 1000 - i : 0,
-          "%S (%s", pCurrentAddress->FriendlyName, dst);
+          "%S (%s", pCurrentAddress->FriendlyName, dst);
-      for (j = 0; j < pCurrentAddress->PhysicalAddressLength; j++)
+      for (j = 0; j < pCurrentAddress->PhysicalAddressLength; j++)
-        i += snprintf (&r->pretty_name[i], 1000 - i > 0 ? 1000 - i : 0,
+        i += snprintf (&r->pretty_name[i], 1000 - i > 0 ? 1000 - i : 0,
-            "%s%02X",j > 0 ? ":" : " - ", pCurrentAddress->PhysicalAddress[j]);
+            "%s%02X",j > 0 ? ":" : " - ", pCurrentAddress->PhysicalAddress[j]);
-      i += snprintf (&r->pretty_name[i], 1000 - i > 0 ? 1000 - i : 0, ")");
+      i += snprintf (&r->pretty_name[i], 1000 - i > 0 ? 1000 - i : 0, ")");
-      r->pretty_name[1000] = '\0';
+      r->pretty_name[1000] = '\0';
-      count += 1;
+      count += 1;
-    }
+    }
-  }
+  }
-  if (use_enum2)
+  if (use_enum2)
-  {
+  {
-    GNUNET_free_non_null (interfaces4);
+    GNUNET_free_non_null (interfaces4);
-    GNUNET_free_non_null (interfaces6);
+    GNUNET_free_non_null (interfaces6);
-  }
+  }
-  GNUNET_free (pAddresses);
+  GNUNET_free (pAddresses);
-  return GNUNET_OK;
+  return GNUNET_OK;
-}
+}
-void
+void
-EnumNICs3_free (struct EnumNICs3_results *r)
+EnumNICs3_free (struct EnumNICs3_results *r)
-{
+{
-  GNUNET_free_non_null (r);
+  GNUNET_free_non_null (r);
-}
+}
-/**
+/**
- * Lists all network interfaces in a combo box
+ * Lists all network interfaces in a combo box
- * Used by the basic GTK configurator
+ * Used by the basic GTK configurator
- *
+ *
- * @param callback function to call for each NIC
+ * @param callback function to call for each NIC
- * @param callback_cls closure for callback
+ * @param callback_cls closure for callback
- */
+ */
-int
+int
-ListNICs (void (*callback) (void *, const char *, int), void * callback_cls)
+ListNICs (void (*callback) (void *, const char *, int), void * callback_cls)
-{
+{
-  int r;
+  int r;
-  int i;
+  int i;
-  struct EnumNICs3_results *results = NULL;
+  struct EnumNICs3_results *results = NULL;
-  int results_count;
+  int results_count;
-  r = EnumNICs3 (&results, &results_count);
+  r = EnumNICs3 (&results, &results_count);
-  if (r != GNUNET_OK)
+  if (r != GNUNET_OK)
-    return GNUNET_NO;
+    return GNUNET_NO;
-  for (i = 0; i < results_count; i++)
+  for (i = 0; i < results_count; i++)
-    callback (callback_cls, results[i].pretty_name, results[i].is_default);
+    callback (callback_cls, results[i].pretty_name, results[i].is_default);
-  GNUNET_free_non_null (results);
+  GNUNET_free_non_null (results);
-  return GNUNET_YES;
+  return GNUNET_YES;
-}
+}
-/**
+/**
- * @brief Installs the Windows service
+ * @brief Installs the Windows service
- * @param servicename name of the service as diplayed by the SCM
+ * @param servicename name of the service as diplayed by the SCM
- * @param application path to the application binary
+ * @param application path to the application binary
- * @param username the name of the service's user account
+ * @param username the name of the service's user account
- * @returns 0 on success
+ * @returns 0 on success
- *          1 if the Windows version doesn't support services
+ *          1 if the Windows version doesn't support services
- *          2 if the SCM could not be opened
+ *          2 if the SCM could not be opened
- *          3 if the service could not be created
+ *          3 if the service could not be created
- */
+ */
-int InstallAsService(char *servicename, char *application, char *username)
+int InstallAsService(char *servicename, char *application, char *username)
-{
+{
-  SC_HANDLE hManager, hService;
+  SC_HANDLE hManager, hService;
-  char szEXE[_MAX_PATH + 17] = "\"";
+  char szEXE[_MAX_PATH + 17] = "\"";
-  char *user = NULL;
+  char *user = NULL;
-  if (! GNOpenSCManager)
+  if (! GNOpenSCManager)
-    return 1;
+    return 1;
-  plibc_conv_to_win_path(application, szEXE + 1);
+  plibc_conv_to_win_path(application, szEXE + 1);
-  strcat(szEXE, "\" --win-service");
+  strcat(szEXE, "\" --win-service");
-  hManager = GNOpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE);
+  hManager = GNOpenSCManager(NULL, NULL, SC_MANAGER_CREATE_SERVICE);
-  if (! hManager)
+  if (! hManager)
-    return 2;
+    return 2;
-  if (username)
+  if (username)
-  {
+  {
-        user = (char *) malloc(strlen(username) + 3);
+        user = (char *) malloc(strlen(username) + 3);
-        sprintf(user, ".\\%s", username);
+        sprintf(user, ".\\%s", username);
-  }
+  }
-  hService = GNCreateService(hManager, (LPCTSTR) servicename, (LPCTSTR) servicename, 0,
+  hService = GNCreateService(hManager, (LPCTSTR) servicename, (LPCTSTR) servicename, 0,
-    SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, (LPCTSTR) szEXE,
+    SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL, (LPCTSTR) szEXE,
-    NULL, NULL, NULL, (LPCTSTR) user, (LPCTSTR) username);
+    NULL, NULL, NULL, (LPCTSTR) user, (LPCTSTR) username);
-  if (user)
+  if (user)
-    free(user);
+    free(user);
-  if (! hService)
+  if (! hService)
-    return 3;
+    return 3;
-  GNCloseServiceHandle(hService);
+  GNCloseServiceHandle(hService);
-  return 0;
+  return 0;
-}
+}
-/**
+/**
- * @brief Uninstall Windows service
+ * @brief Uninstall Windows service
- * @param servicename name of the service to delete
+ * @param servicename name of the service to delete
- * @returns 0 on success
+ * @returns 0 on success
- *          1 if the Windows version doesn't support services
+ *          1 if the Windows version doesn't support services
- *          2 if the SCM could not be openend
+ *          2 if the SCM could not be openend
- *          3 if the service cannot be accessed
+ *          3 if the service cannot be accessed
- *          4 if the service cannot be deleted
+ *          4 if the service cannot be deleted
- */
+ */
-int UninstallService(char *servicename)
+int UninstallService(char *servicename)
-{
+{
-  SC_HANDLE hManager, hService;
+  SC_HANDLE hManager, hService;
-  if (! GNOpenSCManager)
+  if (! GNOpenSCManager)
-    return 1;
+    return 1;
-  hManager = GNOpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
+  hManager = GNOpenSCManager(NULL, NULL, SC_MANAGER_CONNECT);
-  if (! hManager)
+  if (! hManager)
-    return 2;
+    return 2;
-  if (! (hService = GNOpenService(hManager, (LPCTSTR) servicename, DELETE)))
+  if (! (hService = GNOpenService(hManager, (LPCTSTR) servicename, DELETE)))
-    if (GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST)
+    if (GetLastError() != ERROR_SERVICE_DOES_NOT_EXIST)
-      return 3;
+      return 3;
-     else
+     else
-        goto closeSCM;
+        goto closeSCM;
-  if (! GNDeleteService(hService))
+  if (! GNDeleteService(hService))
-    if (GetLastError() != ERROR_SERVICE_MARKED_FOR_DELETE)
+    if (GetLastError() != ERROR_SERVICE_MARKED_FOR_DELETE)
-      return 4;
+      return 4;
-closeSCM:
+closeSCM:
-  GNCloseServiceHandle(hService);
+  GNCloseServiceHandle(hService);
-  return 0;
+  return 0;
-}
+}
-/**
+/**
- * @author Scott Field, Microsoft
+ * @author Scott Field, Microsoft
- * @see http://support.microsoft.com/?scid=kb;en-us;132958
+ * @see http://support.microsoft.com/?scid=kb;en-us;132958
- * @date 12-Jul-95
+ * @date 12-Jul-95
- */
+ */
-void _InitLsaString(PLSA_UNICODE_STRING LsaString, LPWSTR String)
+void _InitLsaString(PLSA_UNICODE_STRING LsaString, LPWSTR String)
-{
+{
-  DWORD StringLength;
+  DWORD StringLength;
-  if(String == NULL)
+  if(String == NULL)
-  {
+  {
-    LsaString->Buffer = NULL;
+    LsaString->Buffer = NULL;
-    LsaString->Length = 0;
+    LsaString->Length = 0;
-    LsaString->MaximumLength = 0;
+    LsaString->MaximumLength = 0;
-    return;
+    return;
-  }
+  }
-  StringLength = wcslen(String);
+  StringLength = wcslen(String);
-  LsaString->Buffer = String;
+  LsaString->Buffer = String;
-  LsaString->Length = (USHORT) StringLength *sizeof(WCHAR);
+  LsaString->Length = (USHORT) StringLength *sizeof(WCHAR);
-  LsaString->MaximumLength = (USHORT) (StringLength + 1) * sizeof(WCHAR);
+  LsaString->MaximumLength = (USHORT) (StringLength + 1) * sizeof(WCHAR);
-}
+}
-/**
+/**
- * @author Scott Field, Microsoft
+ * @author Scott Field, Microsoft
- * @see http://support.microsoft.com/?scid=kb;en-us;132958
+ * @see http://support.microsoft.com/?scid=kb;en-us;132958
- * @date 12-Jul-95
+ * @date 12-Jul-95
- */
+ */
-NTSTATUS _OpenPolicy(LPWSTR ServerName, DWORD DesiredAccess, PLSA_HANDLE PolicyHandle)
+NTSTATUS _OpenPolicy(LPWSTR ServerName, DWORD DesiredAccess, PLSA_HANDLE PolicyHandle)
-{
+{
-  LSA_OBJECT_ATTRIBUTES ObjectAttributes;
+  LSA_OBJECT_ATTRIBUTES ObjectAttributes;
-  LSA_UNICODE_STRING ServerString;
+  LSA_UNICODE_STRING ServerString;
-  PLSA_UNICODE_STRING Server = NULL;
+  PLSA_UNICODE_STRING Server = NULL;
-  /* Always initialize the object attributes to all zeroes. */
+  /* Always initialize the object attributes to all zeroes. */
-  ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes));
+  ZeroMemory(&ObjectAttributes, sizeof(ObjectAttributes));
-  if(ServerName != NULL)
+  if(ServerName != NULL)
-  {
+  {
-    /* Make a LSA_UNICODE_STRING out of the LPWSTR passed in */
+    /* Make a LSA_UNICODE_STRING out of the LPWSTR passed in */
-    _InitLsaString(&ServerString, ServerName);
+    _InitLsaString(&ServerString, ServerName);
-    Server = &ServerString;
+    Server = &ServerString;
-  }
+  }
-  /* Attempt to open the policy. */
+  /* Attempt to open the policy. */
-  return GNLsaOpenPolicy(Server,
+  return GNLsaOpenPolicy(Server,
-                       &ObjectAttributes, DesiredAccess, PolicyHandle);
+                       &ObjectAttributes, DesiredAccess, PolicyHandle);
-}
+}
-/**
+/**
- * @brief Obtain a SID representing the supplied account on the supplied system
+ * @brief Obtain a SID representing the supplied account on the supplied system
- * @return TRUE on success, FALSE on failure
+ * @return TRUE on success, FALSE on failure
- * @author Scott Field, Microsoft
+ * @author Scott Field, Microsoft
- * @date 12-Jul-95
+ * @date 12-Jul-95
- * @remarks A buffer is allocated which contains the SID representing the
+ * @remarks A buffer is allocated which contains the SID representing the
- *          supplied account. This buffer should be freed when it is no longer
+ *          supplied account. This buffer should be freed when it is no longer
- *          needed by calling\n
+ *          needed by calling\n
- *            HeapFree(GetProcessHeap(), 0, buffer)
+ *            HeapFree(GetProcessHeap(), 0, buffer)
- * @remarks Call GetLastError() to obtain extended error information.
+ * @remarks Call GetLastError() to obtain extended error information.
- * @see http://support.microsoft.com/?scid=kb;en-us;132958
+ * @see http://support.microsoft.com/?scid=kb;en-us;132958
- */
+ */
-BOOL _GetAccountSid(LPCTSTR SystemName, LPCTSTR AccountName, PSID * Sid)
+BOOL _GetAccountSid(LPCTSTR SystemName, LPCTSTR AccountName, PSID * Sid)
-{
+{
-  LPTSTR ReferencedDomain = NULL;
+  LPTSTR ReferencedDomain = NULL;
-  DWORD cbSid = 128;                                                    /* initial allocation attempt */
+  DWORD cbSid = 128;                                                    /* initial allocation attempt */
-  DWORD cchReferencedDomain = 16;       /* initial allocation size */
+  DWORD cchReferencedDomain = 16;       /* initial allocation size */
-  SID_NAME_USE peUse;
+  SID_NAME_USE peUse;
-  BOOL bSuccess = FALSE;                                        /* assume this function will fail */
+  BOOL bSuccess = FALSE;                                        /* assume this function will fail */
-  /* initial memory allocations */
+  /* initial memory allocations */
-  if ((*Sid = HeapAlloc (GetProcessHeap (), 0, cbSid)) == NULL)
+  if ((*Sid = HeapAlloc (GetProcessHeap (), 0, cbSid)) == NULL)
-        return FALSE;
+        return FALSE;
-  if ((ReferencedDomain = (LPTSTR) HeapAlloc (GetProcessHeap (),
+  if ((ReferencedDomain = (LPTSTR) HeapAlloc (GetProcessHeap (),
-                                    0,
+                                    0,
-                                    cchReferencedDomain *
+                                    cchReferencedDomain *
-                                    sizeof (TCHAR))) == NULL)
+                                    sizeof (TCHAR))) == NULL)
-        return FALSE;
+        return FALSE;
-    /* Obtain the SID of the specified account on the specified system. */
+    /* Obtain the SID of the specified account on the specified system. */
-        while (!GNLookupAccountName(SystemName, /* machine to lookup account on */
+        while (!GNLookupAccountName(SystemName, /* machine to lookup account on */
-                   AccountName,                                                                                         /* account to lookup */
+                   AccountName,                                                                                         /* account to lookup */
-                   *Sid,                                                                                                                        /* SID of interest */
+                   *Sid,                                                                                                                        /* SID of interest */
-                   &cbSid,                                                                                                              /* size of SID */
+                   &cbSid,                                                                                                              /* size of SID */
-                   ReferencedDomain,                                                                    /* domain account was found on */
+                   ReferencedDomain,                                                                    /* domain account was found on */
-                   &cchReferencedDomain, &peUse))
+                   &cchReferencedDomain, &peUse))
-        {
+        {
-                if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
+                if (GetLastError() == ERROR_INSUFFICIENT_BUFFER)
-                {
+                {
-                        /* reallocate memory */
+                        /* reallocate memory */
-                        if ((*Sid = HeapReAlloc (GetProcessHeap (), 0, *Sid, cbSid)) == NULL)
+                        if ((*Sid = HeapReAlloc (GetProcessHeap (), 0, *Sid, cbSid)) == NULL)
-                                return FALSE;
+                                return FALSE;
-                        if ((ReferencedDomain = (LPTSTR) HeapReAlloc (GetProcessHeap (),
+                        if ((ReferencedDomain = (LPTSTR) HeapReAlloc (GetProcessHeap (),
-                                              0,
+                                              0,
-                                              ReferencedDomain,
+                                              ReferencedDomain,
-                                              cchReferencedDomain
+                                              cchReferencedDomain
-                                              * sizeof (TCHAR))) == NULL)
+                                              * sizeof (TCHAR))) == NULL)
-                                return FALSE;
+                                return FALSE;
-      }
+      }
-      else
+      else
-        goto end;
+        goto end;
-  }
+  }
-  /* Indicate success. */
+  /* Indicate success. */
-  bSuccess = TRUE;
+  bSuccess = TRUE;
-end:
+end:
-  /* Cleanup and indicate failure, if appropriate. */
+  /* Cleanup and indicate failure, if appropriate. */
-  HeapFree (GetProcessHeap (), 0, ReferencedDomain);
+  HeapFree (GetProcessHeap (), 0, ReferencedDomain);
-  if (!bSuccess)
+  if (!bSuccess)
-  {
+  {
-    if (*Sid != NULL)
+    if (*Sid != NULL)
-    {
+    {
-                HeapFree (GetProcessHeap (), 0, *Sid);
+                HeapFree (GetProcessHeap (), 0, *Sid);
-                *Sid = NULL;
+                *Sid = NULL;
-    }
+    }
-  }
+  }
-  return bSuccess;
+  return bSuccess;
-}
+}
-/**
+/**
- * @author Scott Field, Microsoft
+ * @author Scott Field, Microsoft
- * @see http://support.microsoft.com/?scid=kb;en-us;132958
+ * @see http://support.microsoft.com/?scid=kb;en-us;132958
- * @date 12-Jul-95
+ * @date 12-Jul-95
- */
+ */
-NTSTATUS _SetPrivilegeOnAccount(LSA_HANDLE PolicyHandle,/* open policy handle */
+NTSTATUS _SetPrivilegeOnAccount(LSA_HANDLE PolicyHandle,/* open policy handle */
-                               PSID AccountSid,                         /* SID to grant privilege to */
+                               PSID AccountSid,                         /* SID to grant privilege to */
-                               LPWSTR PrivilegeName,    /* privilege to grant (Unicode) */
+                               LPWSTR PrivilegeName,    /* privilege to grant (Unicode) */
-                               BOOL bEnable                                             /* enable or disable */
+                               BOOL bEnable                                             /* enable or disable */
-  )
+  )
-{
+{
-  LSA_UNICODE_STRING PrivilegeString;
+  LSA_UNICODE_STRING PrivilegeString;
-  /* Create a LSA_UNICODE_STRING for the privilege name. */
+  /* Create a LSA_UNICODE_STRING for the privilege name. */
-  _InitLsaString(&PrivilegeString, PrivilegeName);
+  _InitLsaString(&PrivilegeString, PrivilegeName);
-  /* grant or revoke the privilege, accordingly */
+  /* grant or revoke the privilege, accordingly */
-  if(bEnable)
+  if(bEnable)
-  {
+  {
-    NTSTATUS i;
+    NTSTATUS i;
-    i = GNLsaAddAccountRights(PolicyHandle,                             /* open policy handle */
+    i = GNLsaAddAccountRights(PolicyHandle,                             /* open policy handle */
-                               AccountSid,                              /* target SID */
+                               AccountSid,                              /* target SID */
-                               &PrivilegeString,        /* privileges */
+                               &PrivilegeString,        /* privileges */
-                               1                                                                                        /* privilege count */
+                               1                                                                                        /* privilege count */
-      );
+      );
-  }
+  }
-  else
+  else
-  {
+  {
-    return GNLsaRemoveAccountRights(PolicyHandle,                       /* open policy handle */
+    return GNLsaRemoveAccountRights(PolicyHandle,                       /* open policy handle */
-                                  AccountSid,                           /* target SID */
+                                  AccountSid,                           /* target SID */
-                                  FALSE,                                                        /* do not disable all rights */
+                                  FALSE,                                                        /* do not disable all rights */
-                                  &PrivilegeString,             /* privileges */
+                                  &PrivilegeString,             /* privileges */
-                                  1                                                                             /* privilege count */
+                                  1                                                                             /* privilege count */
-      );
+      );
-  }
+  }
-}
+}
-/**
+/**
- * @brief Create a Windows service account
+ * @brief Create a Windows service account
- * @return 0 on success, > 0 otherwise
+ * @return 0 on success, > 0 otherwise
- * @param pszName the name of the account
+ * @param pszName the name of the account
- * @param pszDesc description of the account
+ * @param pszDesc description of the account
- */
+ */
-int CreateServiceAccount(const char *pszName, const char *pszDesc)
+int CreateServiceAccount(const char *pszName, const char *pszDesc)
-{
+{
-  USER_INFO_1 ui;
+  USER_INFO_1 ui;
-  USER_INFO_1008 ui2;
+  USER_INFO_1008 ui2;
-  NET_API_STATUS nStatus;
+  NET_API_STATUS nStatus;
-  wchar_t wszName[MAX_NAME_LENGTH], wszDesc[MAX_NAME_LENGTH];
+  wchar_t wszName[MAX_NAME_LENGTH], wszDesc[MAX_NAME_LENGTH];
-  DWORD dwErr;
+  DWORD dwErr;
-  LSA_HANDLE hPolicy;
+  LSA_HANDLE hPolicy;
-  PSID pSID;
+  PSID pSID;
-  if (! GNNetUserAdd)
+  if (! GNNetUserAdd)
-        return 1;
+        return 1;
-  mbstowcs(wszName, pszName, strlen(pszName) + 1);
+  mbstowcs(wszName, pszName, strlen(pszName) + 1);
-  mbstowcs(wszDesc, pszDesc, strlen(pszDesc) + 1);
+  mbstowcs(wszDesc, pszDesc, strlen(pszDesc) + 1);
-  memset(&ui, 0, sizeof(ui));
+  memset(&ui, 0, sizeof(ui));
-  ui.usri1_name = wszName;
+  ui.usri1_name = wszName;
-  ui.usri1_password = wszName; /* account is locked anyway */
+  ui.usri1_password = wszName; /* account is locked anyway */
-  ui.usri1_priv = USER_PRIV_USER;
+  ui.usri1_priv = USER_PRIV_USER;
-  ui.usri1_comment = wszDesc;
+  ui.usri1_comment = wszDesc;
-  ui.usri1_flags = UF_SCRIPT;
+  ui.usri1_flags = UF_SCRIPT;
-  nStatus = GNNetUserAdd(NULL, 1, (LPBYTE)&ui, NULL);
+  nStatus = GNNetUserAdd(NULL, 1, (LPBYTE)&ui, NULL);
-  if (nStatus != NERR_Success && nStatus != NERR_UserExists)
+  if (nStatus != NERR_Success && nStatus != NERR_UserExists)
-        return 2;
+        return 2;
-  ui2.usri1008_flags = UF_PASSWD_CANT_CHANGE | UF_DONT_EXPIRE_PASSWD;
+  ui2.usri1008_flags = UF_PASSWD_CANT_CHANGE | UF_DONT_EXPIRE_PASSWD;
-  GNNetUserSetInfo(NULL, wszName, 1008, (LPBYTE)&ui2, NULL);
+  GNNetUserSetInfo(NULL, wszName, 1008, (LPBYTE)&ui2, NULL);
-  if (_OpenPolicy(NULL, POLICY_ALL_ACCESS, &hPolicy) !=
+  if (_OpenPolicy(NULL, POLICY_ALL_ACCESS, &hPolicy) !=
-                                                                                STATUS_SUCCESS)
+                                                                                STATUS_SUCCESS)
-        return 3;
+        return 3;
-  _GetAccountSid(NULL, (LPCTSTR) pszName, &pSID);
+  _GetAccountSid(NULL, (LPCTSTR) pszName, &pSID);
-  if (_SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeServiceLogonRight", TRUE) != STATUS_SUCCESS)
+  if (_SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeServiceLogonRight", TRUE) != STATUS_SUCCESS)
-        return 4;
+        return 4;
-  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyInteractiveLogonRight", TRUE);
+  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyInteractiveLogonRight", TRUE);
-  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyBatchLogonRight", TRUE);
+  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyBatchLogonRight", TRUE);
-  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyNetworkLogonRight", TRUE);
+  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyNetworkLogonRight", TRUE);
-  GNLsaClose(hPolicy);
+  GNLsaClose(hPolicy);
-  return 0;
+  return 0;
-}
+}
-/**
+/**
- * @brief Grant permission to a file
+ * @brief Grant permission to a file
- * @param lpszFileName the name of the file or directory
+ * @param lpszFileName the name of the file or directory
- * @param lpszAccountName the user account
+ * @param lpszAccountName the user account
- * @param dwAccessMask the desired access (e.g. GENERIC_ALL)
+ * @param dwAccessMask the desired access (e.g. GENERIC_ALL)
- * @return TRUE on success
+ * @return TRUE on success
- * @remark based on http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q102102&
+ * @remark based on http://support.microsoft.com/default.aspx?scid=KB;EN-US;Q102102&
- */
+ */
-BOOL AddPathAccessRights(char *lpszFileName, char *lpszAccountName,
+BOOL AddPathAccessRights(char *lpszFileName, char *lpszAccountName,
-      DWORD dwAccessMask)
+      DWORD dwAccessMask)
-{
+{
-  /* SID variables. */
+  /* SID variables. */
-  SID_NAME_USE   snuType;
+  SID_NAME_USE   snuType;
-  TCHAR *        szDomain       = NULL;
+  TCHAR *        szDomain       = NULL;
-  DWORD          cbDomain       = 0;
+  DWORD          cbDomain       = 0;
-  LPVOID         pUserSID       = NULL;
+  LPVOID         pUserSID       = NULL;
-  DWORD          cbUserSID      = 0;
+  DWORD          cbUserSID      = 0;
-  /* File SD variables. */
+  /* File SD variables. */
-  PSECURITY_DESCRIPTOR pFileSD  = NULL;
+  PSECURITY_DESCRIPTOR pFileSD  = NULL;
-  DWORD          cbFileSD       = 0;
+  DWORD          cbFileSD       = 0;
-  /* New SD variables. */
+  /* New SD variables. */
-  SECURITY_DESCRIPTOR  newSD;
+  SECURITY_DESCRIPTOR  newSD;
-  /* ACL variables. */
+  /* ACL variables. */
-  PACL           pACL           = NULL;
+  PACL           pACL           = NULL;
-  BOOL           fDaclPresent;
+  BOOL           fDaclPresent;
-  BOOL           fDaclDefaulted;
+  BOOL           fDaclDefaulted;
-  ACL_SIZE_INFORMATION AclInfo;
+  ACL_SIZE_INFORMATION AclInfo;
-  /* New ACL variables. */
+  /* New ACL variables. */
-  PACL           pNewACL        = NULL;
+  PACL           pNewACL        = NULL;
-  DWORD          cbNewACL       = 0;
+  DWORD          cbNewACL       = 0;
-  /* Temporary ACE. */
+  /* Temporary ACE. */
-  LPVOID         pTempAce       = NULL;
+  LPVOID         pTempAce       = NULL;
-  UINT           CurrentAceIndex = 0;
+  UINT           CurrentAceIndex = 0;
-  UINT           newAceIndex = 0;
+  UINT           newAceIndex = 0;
-  /* Assume function will fail. */
+  /* Assume function will fail. */
-  BOOL           fResult        = FALSE;
+  BOOL           fResult        = FALSE;
-  BOOL           fAPISuccess;
+  BOOL           fAPISuccess;
-  SECURITY_INFORMATION secInfo = DACL_SECURITY_INFORMATION;
+  SECURITY_INFORMATION secInfo = DACL_SECURITY_INFORMATION;
-  /**
+  /**
-   * STEP 1: Get SID of the account name specified.
+   * STEP 1: Get SID of the account name specified.
-   */
+   */
-  fAPISuccess = GNLookupAccountName(NULL, (LPCTSTR) lpszAccountName,
+  fAPISuccess = GNLookupAccountName(NULL, (LPCTSTR) lpszAccountName,
-        pUserSID, &cbUserSID, (LPTSTR) szDomain, &cbDomain, &snuType);
+        pUserSID, &cbUserSID, (LPTSTR) szDomain, &cbDomain, &snuType);
-  /* API should have failed with insufficient buffer. */
+  /* API should have failed with insufficient buffer. */
-  if (fAPISuccess)
+  if (fAPISuccess)
-     goto end;
+     goto end;
-  else if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+  else if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-     goto end;
+     goto end;
-  }
+  }
-  pUserSID = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbUserSID);
+  pUserSID = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbUserSID);
-  if (!pUserSID) {
+  if (!pUserSID) {
-     goto end;
+     goto end;
-  }
+  }
-  szDomain = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbDomain * sizeof(TCHAR));
+  szDomain = (TCHAR *) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbDomain * sizeof(TCHAR));
-  if (!szDomain) {
+  if (!szDomain) {
-     goto end;
+     goto end;
-  }
+  }
-  fAPISuccess = GNLookupAccountName(NULL, (LPCTSTR) lpszAccountName,
+  fAPISuccess = GNLookupAccountName(NULL, (LPCTSTR) lpszAccountName,
-        pUserSID, &cbUserSID, (LPTSTR) szDomain, &cbDomain, &snuType);
+        pUserSID, &cbUserSID, (LPTSTR) szDomain, &cbDomain, &snuType);
-  if (!fAPISuccess) {
+  if (!fAPISuccess) {
-     goto end;
+     goto end;
-  }
+  }
-  /**
+  /**
-   *  STEP 2: Get security descriptor (SD) of the file specified.
+   *  STEP 2: Get security descriptor (SD) of the file specified.
-   */
+   */
-  fAPISuccess = GNGetFileSecurity((LPCTSTR) lpszFileName,
+  fAPISuccess = GNGetFileSecurity((LPCTSTR) lpszFileName,
-        secInfo, pFileSD, 0, &cbFileSD);
+        secInfo, pFileSD, 0, &cbFileSD);
-  /* API should have failed with insufficient buffer. */
+  /* API should have failed with insufficient buffer. */
-  if (fAPISuccess)
+  if (fAPISuccess)
-     goto end;
+     goto end;
-  else if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
+  else if (GetLastError() != ERROR_INSUFFICIENT_BUFFER) {
-     goto end;
+     goto end;
-  }
+  }
-  pFileSD = (PSECURITY_DESCRIPTOR) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
+  pFileSD = (PSECURITY_DESCRIPTOR) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY,
-        cbFileSD);
+        cbFileSD);
-  if (!pFileSD) {
+  if (!pFileSD) {
-     goto end;
+     goto end;
-  }
+  }
-  fAPISuccess = GNGetFileSecurity((LPCTSTR) lpszFileName,
+  fAPISuccess = GNGetFileSecurity((LPCTSTR) lpszFileName,
-        secInfo, pFileSD, cbFileSD, &cbFileSD);
+        secInfo, pFileSD, cbFileSD, &cbFileSD);
-  if (!fAPISuccess) {
+  if (!fAPISuccess) {
-     goto end;
+     goto end;
-  }
+  }
-  /**
+  /**
-   * STEP 3: Initialize new SD.
+   * STEP 3: Initialize new SD.
-   */
+   */
-  if (!GNInitializeSecurityDescriptor(&newSD,
+  if (!GNInitializeSecurityDescriptor(&newSD,
-        SECURITY_DESCRIPTOR_REVISION)) {
+        SECURITY_DESCRIPTOR_REVISION)) {
-     goto end;
+     goto end;
-  }
+  }
-  /**
+  /**
-   * STEP 4: Get DACL from the old SD.
+   * STEP 4: Get DACL from the old SD.
-   */
+   */
-  if (!GNGetSecurityDescriptorDacl(pFileSD, &fDaclPresent, &pACL,
+  if (!GNGetSecurityDescriptorDacl(pFileSD, &fDaclPresent, &pACL,
-        &fDaclDefaulted)) {
+        &fDaclDefaulted)) {
-     goto end;
+     goto end;
-  }
+  }
-  /**
+  /**
-   * STEP 5: Get size information for DACL.
+   * STEP 5: Get size information for DACL.
-   */
+   */
-  AclInfo.AceCount = 0; // Assume NULL DACL.
+  AclInfo.AceCount = 0; // Assume NULL DACL.
-  AclInfo.AclBytesFree = 0;
+  AclInfo.AclBytesFree = 0;
-  AclInfo.AclBytesInUse = sizeof(ACL);
+  AclInfo.AclBytesInUse = sizeof(ACL);
-  if (pACL == NULL)
+  if (pACL == NULL)
-     fDaclPresent = FALSE;
+     fDaclPresent = FALSE;
-  /* If not NULL DACL, gather size information from DACL. */
+  /* If not NULL DACL, gather size information from DACL. */
-  if (fDaclPresent) {
+  if (fDaclPresent) {
-     if (!GNGetAclInformation(pACL, &AclInfo,
+     if (!GNGetAclInformation(pACL, &AclInfo,
-           sizeof(ACL_SIZE_INFORMATION), AclSizeInformation)) {
+           sizeof(ACL_SIZE_INFORMATION), AclSizeInformation)) {
-        goto end;
+        goto end;
-     }
+     }
-  }
+  }
-  /**
+  /**
-   * STEP 6: Compute size needed for the new ACL.
+   * STEP 6: Compute size needed for the new ACL.
-   */
+   */
-  cbNewACL = AclInfo.AclBytesInUse + sizeof(ACCESS_ALLOWED_ACE)
+  cbNewACL = AclInfo.AclBytesInUse + sizeof(ACCESS_ALLOWED_ACE)
-        + GetLengthSid(pUserSID) - sizeof(DWORD);
+        + GetLengthSid(pUserSID) - sizeof(DWORD);
-  /**
+  /**
-   * STEP 7: Allocate memory for new ACL.
+   * STEP 7: Allocate memory for new ACL.
-   */
+   */
-  pNewACL = (PACL) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbNewACL);
+  pNewACL = (PACL) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, cbNewACL);
-  if (!pNewACL) {
+  if (!pNewACL) {
-     goto end;
+     goto end;
-  }
+  }
-  /**
+  /**
-   * STEP 8: Initialize the new ACL.
+   * STEP 8: Initialize the new ACL.
-   */
+   */
-  if (!GNInitializeAcl(pNewACL, cbNewACL, ACL_REVISION2)) {
+  if (!GNInitializeAcl(pNewACL, cbNewACL, ACL_REVISION2)) {
-     goto end;
+     goto end;
-  }
+  }
-  /**
+  /**
-   * STEP 9 If DACL is present, copy all the ACEs from the old DACL
+   * STEP 9 If DACL is present, copy all the ACEs from the old DACL
-   * to the new DACL.
+   * to the new DACL.
-   *
+   *
-   * The following code assumes that the old DACL is
+   * The following code assumes that the old DACL is
-   * already in Windows 2000 preferred order.  To conform
+   * already in Windows 2000 preferred order.  To conform
-   * to the new Windows 2000 preferred order, first we will
+   * to the new Windows 2000 preferred order, first we will
-   * copy all non-inherited ACEs from the old DACL to the
+   * copy all non-inherited ACEs from the old DACL to the
-   * new DACL, irrespective of the ACE type.
+   * new DACL, irrespective of the ACE type.
-   */
+   */
-  newAceIndex = 0;
+  newAceIndex = 0;
-  if (fDaclPresent && AclInfo.AceCount) {
+  if (fDaclPresent && AclInfo.AceCount) {
-     for (CurrentAceIndex = 0;
+     for (CurrentAceIndex = 0;
-           CurrentAceIndex < AclInfo.AceCount;
+           CurrentAceIndex < AclInfo.AceCount;
-           CurrentAceIndex++) {
+           CurrentAceIndex++) {
-        /**
+        /**
-         * TEP 10: Get an ACE.
+         * TEP 10: Get an ACE.
-         */
+         */
-        if (!GNGetAce(pACL, CurrentAceIndex, &pTempAce)) {
+        if (!GNGetAce(pACL, CurrentAceIndex, &pTempAce)) {
-           goto end;
+           goto end;
-        }
+        }
-        /**
+        /**
-         * STEP 11: Check if it is a non-inherited ACE.
+         * STEP 11: Check if it is a non-inherited ACE.
-         * If it is an inherited ACE, break from the loop so
+         * If it is an inherited ACE, break from the loop so
-         * that the new access allowed non-inherited ACE can
+         * that the new access allowed non-inherited ACE can
-         * be added in the correct position, immediately after
+         * be added in the correct position, immediately after
-         * all non-inherited ACEs.
+         * all non-inherited ACEs.
-         */
+         */
-        if (((ACCESS_ALLOWED_ACE *)pTempAce)->Header.AceFlags
+        if (((ACCESS_ALLOWED_ACE *)pTempAce)->Header.AceFlags
-           & INHERITED_ACE)
+           & INHERITED_ACE)
-           break;
+           break;
-        /**
+        /**
-         * STEP 12: Skip adding the ACE, if the SID matches
+         * STEP 12: Skip adding the ACE, if the SID matches
-         * with the account specified, as we are going to
+         * with the account specified, as we are going to
-         * add an access allowed ACE with a different access
+         * add an access allowed ACE with a different access
-         * mask.
+         * mask.
-         */
+         */
-        if (GNEqualSid(pUserSID,
+        if (GNEqualSid(pUserSID,
-           &(((ACCESS_ALLOWED_ACE *)pTempAce)->SidStart)))
+           &(((ACCESS_ALLOWED_ACE *)pTempAce)->SidStart)))
-           continue;
+           continue;
-        /**
+        /**
-         * STEP 13: Add the ACE to the new ACL.
+         * STEP 13: Add the ACE to the new ACL.
-         */
+         */
-        if (!GNAddAce(pNewACL, ACL_REVISION, MAXDWORD, pTempAce,
+        if (!GNAddAce(pNewACL, ACL_REVISION, MAXDWORD, pTempAce,
-              ((PACE_HEADER) pTempAce)->AceSize)) {
+              ((PACE_HEADER) pTempAce)->AceSize)) {
-           goto end;
+           goto end;
-        }
+        }
-        newAceIndex++;
+        newAceIndex++;
-     }
+     }
-  }
+  }
-  /**
+  /**
-   * STEP 14: Add the access-allowed ACE to the new DACL.
+   * STEP 14: Add the access-allowed ACE to the new DACL.
-   * The new ACE added here will be in the correct position,
+   * The new ACE added here will be in the correct position,
-   * immediately after all existing non-inherited ACEs.
+   * immediately after all existing non-inherited ACEs.
-   */
+   */
-  if (!GNAddAccessAllowedAce(pNewACL, ACL_REVISION2, dwAccessMask,
+  if (!GNAddAccessAllowedAce(pNewACL, ACL_REVISION2, dwAccessMask,
-        pUserSID)) {
+        pUserSID)) {
-     goto end;
+     goto end;
-  }
+  }
-  /**
+  /**
-   * STEP 14.5: Make new ACE inheritable
+   * STEP 14.5: Make new ACE inheritable
-   */
+   */
-  if (!GetAce(pNewACL, newAceIndex, &pTempAce))
+  if (!GetAce(pNewACL, newAceIndex, &pTempAce))
-    goto end;
+    goto end;
-  ((ACCESS_ALLOWED_ACE *)pTempAce)->Header.AceFlags |=
+  ((ACCESS_ALLOWED_ACE *)pTempAce)->Header.AceFlags |=
-    (CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE);
+    (CONTAINER_INHERIT_ACE | OBJECT_INHERIT_ACE);
-  /**
+  /**
-   * STEP 15: To conform to the new Windows 2000 preferred order,
+   * STEP 15: To conform to the new Windows 2000 preferred order,
-   * we will now copy the rest of inherited ACEs from the
+   * we will now copy the rest of inherited ACEs from the
-   * old DACL to the new DACL.
+   * old DACL to the new DACL.
-   */
+   */
-  if (fDaclPresent && AclInfo.AceCount) {
+  if (fDaclPresent && AclInfo.AceCount) {
-     for (;
+     for (;
-          CurrentAceIndex < AclInfo.AceCount;
+          CurrentAceIndex < AclInfo.AceCount;
-          CurrentAceIndex++) {
+          CurrentAceIndex++) {
-        /**
+        /**
-         * STEP 16: Get an ACE.
+         * STEP 16: Get an ACE.
-         */
+         */
-        if (!GNGetAce(pACL, CurrentAceIndex, &pTempAce)) {
+        if (!GNGetAce(pACL, CurrentAceIndex, &pTempAce)) {
-           goto end;
+           goto end;
-        }
+        }
-        /**
+        /**
-         * STEP 17: Add the ACE to the new ACL.
+         * STEP 17: Add the ACE to the new ACL.
-         */
+         */
-        if (!GNAddAce(pNewACL, ACL_REVISION, MAXDWORD, pTempAce,
+        if (!GNAddAce(pNewACL, ACL_REVISION, MAXDWORD, pTempAce,
-              ((PACE_HEADER) pTempAce)->AceSize)) {
+              ((PACE_HEADER) pTempAce)->AceSize)) {
-           goto end;
+           goto end;
-        }
+        }
-     }
+     }
-  }
+  }
-  /**
+  /**
-   * STEP 18: Set permissions
+   * STEP 18: Set permissions
-   */
+   */
-  if (GNSetNamedSecurityInfo((LPTSTR) lpszFileName, SE_FILE_OBJECT,
+  if (GNSetNamedSecurityInfo((LPTSTR) lpszFileName, SE_FILE_OBJECT,
-    DACL_SECURITY_INFORMATION, NULL, NULL, pNewACL, NULL) != ERROR_SUCCESS) {
+    DACL_SECURITY_INFORMATION, NULL, NULL, pNewACL, NULL) != ERROR_SUCCESS) {
-        goto end;
+        goto end;
-  }
+  }
-  fResult = TRUE;
+  fResult = TRUE;
-end:
+end:
-  /**
+  /**
-   * STEP 19: Free allocated memory
+   * STEP 19: Free allocated memory
-   */
+   */
-  if (pUserSID)
+  if (pUserSID)
-     HeapFree(GetProcessHeap(), 0, pUserSID);
+     HeapFree(GetProcessHeap(), 0, pUserSID);
-  if (szDomain)
+  if (szDomain)
-     HeapFree(GetProcessHeap(), 0, szDomain);
+     HeapFree(GetProcessHeap(), 0, szDomain);
-  if (pFileSD)
+  if (pFileSD)
-     HeapFree(GetProcessHeap(), 0, pFileSD);
+     HeapFree(GetProcessHeap(), 0, pFileSD);
-  if (pNewACL)
+  if (pNewACL)
-     HeapFree(GetProcessHeap(), 0, pNewACL);
+     HeapFree(GetProcessHeap(), 0, pNewACL);
-  return fResult;
+  return fResult;
-}
+}
-char *winErrorStr(const char *prefix, int dwErr)
+char *winErrorStr(const char *prefix, int dwErr)
-{
+{
-  char *err, *ret;
+  char *err, *ret;
-  int mem;
+  int mem;
-  if (! FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
+  if (! FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER | FORMAT_MESSAGE_FROM_SYSTEM,
-    NULL, (DWORD) dwErr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &err,
+    NULL, (DWORD) dwErr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &err,
-    0, NULL ))
+    0, NULL ))
-  {
+  {
-    err = (char *) LocalAlloc (LMEM_FIXED | LMEM_ZEROINIT, 1);
+    err = (char *) LocalAlloc (LMEM_FIXED | LMEM_ZEROINIT, 1);
-  }
+  }
-  mem = strlen(err) + strlen(prefix) + 20;
+  mem = strlen(err) + strlen(prefix) + 20;
-  ret = (char *) malloc(mem);
+  ret = (char *) malloc(mem);
-  snprintf(ret, mem, "%s: %s (#%u)", prefix, err, dwErr);
+  snprintf(ret, mem, "%s: %s (#%u)", prefix, err, dwErr);
-  LocalFree(err);
+  LocalFree(err);
-  return ret;
+  return ret;
-}
+}
 /**
 * Terminate a process by creating a remote thread within it,
 * which proceeds to call ExitProcess() inside that process.
@@ -1269,61 +1269,61 @@ char *winErrorStr(const char *prefix, int dwErr)
 * @param dwTimeout number of ms to wait for the process to terminate
 * @return TRUE on success, FALSE on failure (check last error for the code)
 */
-BOOL
+BOOL
-SafeTerminateProcess (HANDLE hProcess, UINT uExitCode, DWORD dwTimeout)
+SafeTerminateProcess (HANDLE hProcess, UINT uExitCode, DWORD dwTimeout)
-{
+{
-  DWORD dwTID, dwCode, dwErr = 0;
+  DWORD dwTID, dwCode, dwErr = 0;
-  HANDLE hProcessDup = INVALID_HANDLE_VALUE;
+  HANDLE hProcessDup = INVALID_HANDLE_VALUE;
-  HANDLE hRT = NULL;
+  HANDLE hRT = NULL;
-  HINSTANCE hKernel = GetModuleHandle ("Kernel32");
+  HINSTANCE hKernel = GetModuleHandle ("Kernel32");
-  BOOL bSuccess = FALSE;
+  BOOL bSuccess = FALSE;
-  BOOL bDup = DuplicateHandle (GetCurrentProcess (), hProcess,
+  BOOL bDup = DuplicateHandle (GetCurrentProcess (), hProcess,
-      GetCurrentProcess (), &hProcessDup, PROCESS_ALL_ACCESS,
+      GetCurrentProcess (), &hProcessDup, PROCESS_ALL_ACCESS,
-      FALSE, 0);
+      FALSE, 0);
-  /* Detect the special case where the process is
+  /* Detect the special case where the process is
-   * already dead...
+   * already dead...
-   */
+   */
-  if (GetExitCodeProcess (bDup ? hProcessDup : hProcess, &dwCode) &&
+  if (GetExitCodeProcess (bDup ? hProcessDup : hProcess, &dwCode) &&
-      (STILL_ACTIVE ==  dwCode))
+      (STILL_ACTIVE ==  dwCode))
-  {
+  {
-    FARPROC pfnExitProc;
+    FARPROC pfnExitProc;
-    pfnExitProc = GetProcAddress (hKernel, "ExitProcess");
+    pfnExitProc = GetProcAddress (hKernel, "ExitProcess");
-    hRT = CreateRemoteThread ((bDup) ? hProcessDup : hProcess, NULL, 0,
+    hRT = CreateRemoteThread ((bDup) ? hProcessDup : hProcess, NULL, 0,
-        (LPTHREAD_START_ROUTINE) pfnExitProc, (PVOID) uExitCode, 0, &dwTID);
+        (LPTHREAD_START_ROUTINE) pfnExitProc, (PVOID) uExitCode, 0, &dwTID);
-    dwErr = GetLastError ();
+    dwErr = GetLastError ();
-  }
+  }
-  else
+  else
-  {
+  {
-    dwErr = ERROR_PROCESS_ABORTED;
+    dwErr = ERROR_PROCESS_ABORTED;
-  }
+  }
-  if (hRT)
+  if (hRT)
-  {
+  {
-    /* Must wait process to terminate to
+    /* Must wait process to terminate to
-     * guarantee that it has exited...
+     * guarantee that it has exited...
-     */
+     */
-    DWORD dwWaitResult = WaitForSingleObject ((bDup) ? hProcessDup : hProcess,
+    DWORD dwWaitResult = WaitForSingleObject ((bDup) ? hProcessDup : hProcess,
-        dwTimeout);
+        dwTimeout);
-    if (dwWaitResult == WAIT_TIMEOUT)
+    if (dwWaitResult == WAIT_TIMEOUT)
-      dwErr = WAIT_TIMEOUT;
+      dwErr = WAIT_TIMEOUT;
-    else
+    else
-      dwErr = GetLastError ();
+      dwErr = GetLastError ();
-    CloseHandle (hRT);
+    CloseHandle (hRT);
-    bSuccess = dwErr == NO_ERROR;
+    bSuccess = dwErr == NO_ERROR;
-  }
+  }
-  if (bDup)
+  if (bDup)
-    CloseHandle (hProcessDup);
+    CloseHandle (hProcessDup);
-  SetLastError (dwErr);
+  SetLastError (dwErr);
-  return bSuccess;
+  return bSuccess;
 }
-#endif
+#endif
author	Christian Grothoff <christian@grothoff.org>	2012-09-28 09:12:05 +0000
committer	Christian Grothoff <christian@grothoff.org>	2012-09-28 09:12:05 +0000
commit	5c70099f12dca398e9e6aaab13610207982f666f (patch)
tree	b91e50b26b735f1f9cf644d132228d093c15223f /src/util
parent	23e7a5c1060d37c45a955e4bed961661af8cafb9 (diff)
download	gnunet-5c70099f12dca398e9e6aaab13610207982f666f.tar.gz gnunet-5c70099f12dca398e9e6aaab13610207982f666f.zip