LRN patch from Mantis #1615

diff --git a/configure.ac b/configure.ac
index 1176ff5fb937978ab4d17efc12dbdf5038992dee..eddb10ff05d3a6d6f42d61a48a07d93cfc7c7b32 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -23,6 +23,7 @@
 AC_PREREQ(2.61)
 AC_INIT([gnunet], [0.9.0pre1],[bug-gnunet@gnu.org])
 AM_INIT_AUTOMAKE([gnunet], [0.9.0pre1])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_HEADERS([gnunet_config.h])
 
 AH_TOP([#define _GNU_SOURCE  1])
@@ -141,6 +142,7 @@ netbsd*)
      LDFLAGS="$LDFLAGS -no-undefined -Wl,--export-all-symbols"
      LIBS="$LIBS -lws2_32 -lplibc"
      CFLAGS="-mms-bitfields $CFLAGS"
+     CPPFLAGS="-D_WIN32_WINNT=0x0501 $CPPFLAGS"
      build_target="mingw"
      AC_PROG_CXX
      LIBPREFIX=lib

diff --git a/src/include/gnunet_common.h b/src/include/gnunet_common.h
index 57008fa08326399de69c2b8567911ebdc84ddc2e..badb528805ef54482a081a86d7f6bb4734ab5beb 100644 (file)
--- a/src/include/gnunet_common.h
+++ b/src/include/gnunet_common.h
@@ -138,6 +138,7 @@ typedef int (*GNUNET_FileNameCallback) (void *cls, const char *filename);
  */
 enum GNUNET_ErrorType
 {
+  GNUNET_ERROR_TYPE_NONE = 0,
   GNUNET_ERROR_TYPE_ERROR = 1,
   GNUNET_ERROR_TYPE_WARNING = 2,
   GNUNET_ERROR_TYPE_INFO = 4,

diff --git a/src/include/platform.h b/src/include/platform.h
index 1b279d1230565eb274b8201734c8dce9ef8b2068..cc2aa03aee95ab62d9419a63cd458a4b1a31bc71 100644 (file)
--- a/src/include/platform.h
+++ b/src/include/platform.h
@@ -78,6 +78,7 @@
 
 #ifdef _MSC_VER
 #include <Winsock2.h>
+#include <ws2tcpip.h>
 #else
 #ifndef MINGW
 #include <netdb.h>
@@ -108,6 +109,9 @@
 #include <stdarg.h>
 #include <errno.h>
 #include <signal.h>
+#ifdef WINDOWS
+#include <malloc.h> /* for alloca(), on other OSes it's in stdlib.h */
+#endif
 #ifndef _MSC_VER
 #include <unistd.h>             /* KLB_FIX */
 #endif

diff --git a/src/include/plibc.h b/src/include/plibc.h
index 4e3204c9829d3fbb1447c360ef0a7b6544de6549..a59e53de9c982dfc6e643e9591c67f7fe5b394ec 100644 (file)
--- a/src/include/plibc.h
+++ b/src/include/plibc.h
@@ -50,8 +50,9 @@ extern "C" {
   #include "langinfo.h"
 #endif
 
-#include <windows.h>
+#include <winsock2.h>
 #include <ws2tcpip.h>
+#include <windows.h>
 #include <sys/types.h>
 #include <time.h>
 #include <stdio.h>
@@ -334,7 +335,7 @@ BOOL _plibc_CreateShortcut(const char *pszSrc, const char *pszDest);
 BOOL _plibc_DereferenceShortcut(char *pszShortcut);
 char *plibc_ChooseDir(char *pszTitle, unsigned long ulFlags);
 char *plibc_ChooseFile(char *pszTitle, unsigned long ulFlags);
-long QueryRegistry(HKEY hMainKey, char *pszKey, char *pszSubKey,
+long QueryRegistry(HKEY hMainKey, const char *pszKey, const char *pszSubKey,
               char *pszBuffer, long *pdLength);
 
 BOOL __win_IsHandleMarkedAsBlocking(int hHandle);

diff --git a/src/include/winproc.h b/src/include/winproc.h
index 0298c2d595eb20d0f4b1de035d5b3039c1a8dbbb..595180a96d4d83f0c9bb954ce3323c539c5288bf 100644 (file)
--- a/src/include/winproc.h
+++ b/src/include/winproc.h
@@ -34,8 +34,9 @@
 #include <sys/timeb.h>
 #include <time.h>
 #include <dirent.h>
+#include <winsock2.h>
+#include <ws2tcpip.h>
 #include <windows.h>
-#include <winsock.h>
 #include <winerror.h>
 #include <iphlpapi.h>
 #include <shlobj.h>
@@ -198,7 +199,7 @@ extern "C"
 
   BOOL CreateShortcut (const char *pszSrc, const char *pszDest);
   BOOL DereferenceShortcut (char *pszShortcut);
-  long QueryRegistry (HKEY hMainKey, char *pszKey, char *pszSubKey,
+  long QueryRegistry (HKEY hMainKey, const char *pszKey, const char *pszSubKey,
                       char *pszBuffer, long *pdLength);
   int ListNICs (void (*callback) (void *, const char *, int), void *cls);
   BOOL AddPathAccessRights (char *lpszFileName, char *lpszAccountName,

diff --git a/src/transport/gnunet-nat-client-windows.c b/src/transport/gnunet-nat-client-windows.c
index 911f4962af8ca8da3855d3cae44adf493980e3b9..2e7c8a86e4d0ccfd40cfa803fea53c9fd687581f 100644 (file)
--- a/src/transport/gnunet-nat-client-windows.c
+++ b/src/transport/gnunet-nat-client-windows.c
@@ -43,8 +43,8 @@
  */
 #define _GNU_SOURCE
 
-#include <ws2tcpip.h>
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #include <sys/time.h>
 #include <sys/types.h>
 #include <unistd.h>

diff --git a/src/util/common_logging.c b/src/util/common_logging.c
index 223c9221835c4b3aa09be1c61205503703ce7212..74f28ff7686662434b8c71c38fe4591c6394336b 100644 (file)
--- a/src/util/common_logging.c
+++ b/src/util/common_logging.c
@@ -152,6 +152,8 @@ get_type (const char *log)
     return GNUNET_ERROR_TYPE_WARNING;
   if (0 == strcasecmp (log, _("ERROR")))
     return GNUNET_ERROR_TYPE_ERROR;
+  if (0 == strcasecmp (log, _("NONE")))
+    return GNUNET_ERROR_TYPE_NONE;
   return GNUNET_ERROR_TYPE_INVALID;
 }
 

diff --git a/src/util/connection.c b/src/util/connection.c
index efab4edd80230dc644bf045395eec28f15d442a4..04d0c864d83b5a2ce476c1b23e79464d610ad03d 100644 (file)
--- a/src/util/connection.c
+++ b/src/util/connection.c
@@ -719,7 +719,7 @@ connect_probe_continuation (void *cls,
   struct GNUNET_CONNECTION_Handle *h = ap->h;
   struct AddressProbe *pos;
   int error;
-  unsigned int len;
+  socklen_t len;
 
   GNUNET_assert (ap->sock != NULL);
   GNUNET_CONTAINER_DLL_remove (h->ap_head, h->ap_tail, ap);

diff --git a/src/util/os_priority.c b/src/util/os_priority.c
index 8bb7757f46de159e600fea9e148fa6d294372df1..baeeb2d9ad29e8825ef403d422b7227edac3a41f 100644 (file)
--- a/src/util/os_priority.c
+++ b/src/util/os_priority.c
@@ -551,7 +551,6 @@ GNUNET_OS_start_process_v (const int *lsocks,
   PROCESS_INFORMATION proc;
   int argcount = 0;
   char non_const_filename[MAX_PATH +1];
-  int filenamelen = 0;
   struct GNUNET_OS_Process *gnunet_proc = NULL;
 
   GNUNET_assert (lsocks == NULL);

diff --git a/src/util/scheduler.c b/src/util/scheduler.c
index 6e5a06db5d8766d6c9f1c16f7d5b9982ddfc3b9e..9b8ab4b2968838b1d77f1ae23525fe681cbae7f5 100644 (file)
--- a/src/util/scheduler.c
+++ b/src/util/scheduler.c
@@ -692,12 +692,13 @@ static struct GNUNET_DISK_PipeHandle *shutdown_pipe_handle;
 /**
  * Signal handler called for SIGPIPE.
  */
+#ifndef MINGW
 static void
 sighandler_pipe ()
 {
   return;
 }
-
+#endif
 /**
  * Signal handler called for signals that should cause us to shutdown.
  */

diff --git a/src/util/signal.c b/src/util/signal.c
index 1fc3cf68f98226d1aa23577d996c24b2eeb82008..0fe4bfc96e6a1cac3ea8f505b0072090ec4c4138 100644 (file)
--- a/src/util/signal.c
+++ b/src/util/signal.c
@@ -68,7 +68,7 @@ GNUNET_SIGNAL_handler_install (int signum, GNUNET_SIGNAL_Handler handler)
     w32_sigchld_handler = handler;
   else
     {
-      __p_sig_fn_t sigret = signal (signum, handler);
+      __p_sig_fn_t sigret = signal (signum, (__p_sig_fn_t) handler);
       if (sigret == SIG_ERR)
         {
           GNUNET_log (GNUNET_ERROR_TYPE_WARNING,

diff --git a/src/util/strings.c b/src/util/strings.c
index c8e5191bfab692cec0ee30fabc09860434ad91a2..fa445f69423c3b0bcfde1fe799e910433e05b82e 100644 (file)
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -199,7 +199,7 @@ GNUNET_STRINGS_to_utf8 (const char *input, size_t len, const char *charset)
   itmp = tmp;
   finSize = tmpSize;
   if (iconv (cd,
-#if FREEBSD || DARWIN
+#if FREEBSD || DARWIN || WINDOWS
              (const char **) &input,
 #else
              (char **) &input,

diff --git a/src/util/win.cc b/src/util/win.cc
index 2cc3b8f716ca272a5fb843b80e812f66ebe0b627..b462033b921dec64a6b0ba087420bdf10b1c3fdd 100644 (file)
--- a/src/util/win.cc
+++ b/src/util/win.cc
@@ -346,7 +346,7 @@ NTSTATUS _OpenPolicy(LPWSTR ServerName, DWORD DesiredAccess, PLSA_HANDLE PolicyH
  * @remarks Call GetLastError() to obtain extended error information.\r
  * @see http://support.microsoft.com/?scid=kb;en-us;132958\r
  */\r
-BOOL _GetAccountSid(LPTSTR SystemName, LPTSTR AccountName, PSID * Sid)\r
+BOOL _GetAccountSid(LPCTSTR SystemName, LPCTSTR AccountName, PSID * Sid)\r
 {\r
   LPTSTR ReferencedDomain = NULL;\r
   DWORD cbSid = 128;                                                   /* initial allocation attempt */\r
@@ -452,7 +452,7 @@ NTSTATUS _SetPrivilegeOnAccount(LSA_HANDLE PolicyHandle,/* open policy handle */
  * @param pszName the name of the account\r
  * @param pszDesc description of the account\r
  */\r
-int CreateServiceAccount(char *pszName, char *pszDesc)\r
+int CreateServiceAccount(const char *pszName, const char *pszDesc)\r
 {\r
   USER_INFO_1 ui;\r
   USER_INFO_1008 ui2;\r
@@ -486,14 +486,14 @@ int CreateServiceAccount(char *pszName, char *pszDesc)
                                                                                STATUS_SUCCESS)\r
        return 3;\r
 \r
-  _GetAccountSid(NULL, (LPTSTR) pszName, &pSID);\r
+  _GetAccountSid(NULL, (LPCTSTR) pszName, &pSID);\r
 \r
-  if (_SetPrivilegeOnAccount(hPolicy, pSID, L"SeServiceLogonRight", TRUE) != STATUS_SUCCESS)\r
+  if (_SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeServiceLogonRight", TRUE) != STATUS_SUCCESS)\r
        return 4;\r
 \r
-  _SetPrivilegeOnAccount(hPolicy, pSID, L"SeDenyInteractiveLogonRight", TRUE);\r
-  _SetPrivilegeOnAccount(hPolicy, pSID, L"SeDenyBatchLogonRight", TRUE);\r
-  _SetPrivilegeOnAccount(hPolicy, pSID, L"SeDenyNetworkLogonRight", TRUE);\r
+  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyInteractiveLogonRight", TRUE);\r
+  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyBatchLogonRight", TRUE);\r
+  _SetPrivilegeOnAccount(hPolicy, pSID, (LPWSTR) L"SeDenyNetworkLogonRight", TRUE);\r
 \r
   GNLsaClose(hPolicy);\r
 \r
@@ -801,7 +801,7 @@ char *winErrorStr(const char *prefix, int dwErr)
     NULL, (DWORD) dwErr, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), (LPTSTR) &err,\r
     0, NULL ))\r
   {\r
-    err = "";\r
+    err = (char *) LocalAlloc (LMEM_FIXED | LMEM_ZEROINIT, 1);\r
   }\r
 \r
   mem = strlen(err) + strlen(prefix) + 20;\r

diff --git a/src/vpn/gnunet-service-dns.c b/src/vpn/gnunet-service-dns.c
index 151561fe46836e9fbc8c28ed33588e17ab87eb6b..7997112c47a639e7b686070ef774ae89e4ce7d1c 100644 (file)
--- a/src/vpn/gnunet-service-dns.c
+++ b/src/vpn/gnunet-service-dns.c
@@ -452,7 +452,7 @@ read_response (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc) {
 
     struct sockaddr_in addr;
     memset(&addr, 0, sizeof addr);
-    unsigned int addrlen = sizeof addr;
+    socklen_t addrlen = sizeof addr;
 
     int r;
     r = GNUNET_NETWORK_socket_recvfrom(dnsout,

diff --git a/src/vpn/gnunet-vpn-pretty-print.c b/src/vpn/gnunet-vpn-pretty-print.c
index 1aeb167f1e23ca8aef5dd34a1a11310abcfeea05..09aa05b0d8570bcc8b5987b80952cb8f383b4acd 100644 (file)
--- a/src/vpn/gnunet-vpn-pretty-print.c
+++ b/src/vpn/gnunet-vpn-pretty-print.c
@@ -5,6 +5,7 @@
 #ifndef _WIN32
 #include <arpa/inet.h>
 #else
+#include <winsock2.h>
 #include <ws2tcpip.h>
 #endif