Merge branch 'stable-etxff-bugfix' into stable

diff --git a/src/main.c b/src/main.c
index 8c9e9ea..245f43b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -65,6 +65,7 @@
 #endif
 
 #ifdef WIN32
+#include <winbase.h>
 #define close(x) closesocket(x)
 int __stdcall SignalHandler(unsigned long signo) __attribute__ ((noreturn));
 void ListInterfaces(void);
@@ -109,6 +110,23 @@ static char lock_file_name[FILENAME_MAX];
  * locking file.
  */
 static void olsr_create_lock_file(void) {
+#ifdef WIN32
+  HANDLE lck = CreateEvent(NULL, TRUE, FALSE, lock_file_name);
+  if (NULL == lck || ERROR_ALREADY_EXISTS == GetLastError()) {
+    if (NULL == lck) {
+      fprintf(stderr,
+          "Error, cannot create OLSR lock '%s'.\n",
+          lock_file_name);
+    } else {
+      CloseHandle(lck);
+      fprintf(stderr,
+          "Error, cannot aquire OLSR lock '%s'.\n"
+          "Another OLSR instance might be running.\n",
+          lock_file_name);
+    }
+    olsr_exit("", EXIT_FAILURE);
+  }
+#else
   struct flock lck;
 
   /* create file for lock */
@@ -136,6 +154,7 @@ static void olsr_create_lock_file(void) {
         lock_file_name);
     olsr_exit("", EXIT_FAILURE);
   }
+#endif
   return;
 }
 

diff --git a/src/olsr_switch/main.c b/src/olsr_switch/main.c
index 80ae1dc..1dc5502 100644 (file)
--- a/src/olsr_switch/main.c
+++ b/src/olsr_switch/main.c
@@ -129,6 +129,7 @@ ohs_init_new_connection(int s)
 {
   struct ohs_connection *oc;
   int i;
+  uint32_t addr[4];
 
   if (logbits & LOG_CONNECT) {
     printf("ohs_init_new_connection\n");
@@ -152,7 +153,7 @@ ohs_init_new_connection(int s)
   /* Get "fake IP" */
   for (i = 0; i < 20; i++) {
     /* Win32 needs that cast. */
-    if (recv(oc->socket, (void *)&oc->ip_addr, olsr_cnf->ipsize, 0) == (int)olsr_cnf->ipsize) {
+    if (recv(oc->socket, (void *)addr, olsr_cnf->ipsize, 0) == (int)olsr_cnf->ipsize) {
       break;
     }
 #if defined WIN32
@@ -165,6 +166,12 @@ ohs_init_new_connection(int s)
     return -1;
   }
 
+  addr[0] = ntohl(addr[0]);
+  addr[1] = ntohl(addr[1]);
+  addr[2] = ntohl(addr[2]);
+  addr[3] = ntohl(addr[3]);
+  memcpy(oc->ip_addr.v6.s6_addr, addr, olsr_cnf->ipsize);
+  
   if (logbits & LOG_CONNECT) {
     struct ipaddr_str addrstr;
     printf("IP: %s\n", olsr_ip_to_string(&addrstr, &oc->ip_addr));

diff --git a/src/olsr_types.h b/src/olsr_types.h
index f5be2e0..730978f 100644 (file)
--- a/src/olsr_types.h
+++ b/src/olsr_types.h
@@ -86,8 +86,12 @@ typedef signed int int32_t;
 /* user defined cookies */
 typedef uint16_t olsr_cookie_t;
 
+#ifdef WIN32
+#include <winsock2.h>
+#else
 /* manpage says: fd_set is in sys/select.h with posix (at least with the Android-NDK) */
 #include <sys/select.h>
+#endif
 
 /* OpenBSD wants this here */
 #include <sys/types.h>

diff --git a/src/parser.c b/src/parser.c
index dfe5995..bc00dd9 100644 (file)
--- a/src/parser.c
+++ b/src/parser.c
@@ -59,6 +59,7 @@
 #define EWOULDBLOCK WSAEWOULDBLOCK
 #undef errno
 #define errno WSAGetLastError()
+char *StrError(unsigned int ErrNo);
 #undef strerror
 #define strerror(x) StrError(x)
 #endif

diff --git a/src/process_routes.c b/src/process_routes.c
index 66de3ad..2c8689c 100644 (file)
--- a/src/process_routes.c
+++ b/src/process_routes.c
@@ -54,6 +54,7 @@
 #include "olsr_cookie.h"
 
 #ifdef WIN32
+char *StrError(unsigned int ErrNo);
 #undef strerror
 #define strerror(x) StrError(x)
 #endif

diff --git a/src/scheduler.c b/src/scheduler.c
index 43f8724..04cee21 100644 (file)
--- a/src/scheduler.c
+++ b/src/scheduler.c
@@ -56,6 +56,12 @@
 #include "olsr_spf.h"
 #include "link_set.h"
 #include "olsr_cookie.h"
+#ifdef WIN32
+/* Need stdlib for rand() */
+#include <stdlib.h>
+#define random() rand()
+#define srandom(x) srand(x)
+#endif
 
 /* Timer data, global. Externed in defs.h */
 uint32_t now_times;                    /* relative time compared to startup (in milliseconds */

diff --git a/src/win32/compat.c b/src/win32/compat.c
index 70215dd..b9f1039 100644 (file)
--- a/src/win32/compat.c
+++ b/src/win32/compat.c
@@ -109,7 +109,7 @@ nanosleep(struct timespec *Req, struct timespec *Rem)
   return 0;
 }
 
-void
+int
 gettimeofday(struct timeval *TVal, void *TZone __attribute__ ((unused)))
 {
   SYSTEMTIME SysTime;
@@ -125,6 +125,7 @@ gettimeofday(struct timeval *TVal, void *TZone __attribute__ ((unused)))
 
   TVal->tv_sec = (unsigned int)(Ticks / 10000000);
   TVal->tv_usec = (unsigned int)(Ticks % 10000000) / 10;
+  return 0;
 }
 
 long

diff --git a/src/win32/ifnet.c b/src/win32/ifnet.c
index f09890c..b581116 100644 (file)
--- a/src/win32/ifnet.c
+++ b/src/win32/ifnet.c
@@ -39,6 +39,9 @@
  *
  */
 
+#include <stdlib.h>
+#define random() rand()
+#define srandom(x) srand(x)
 #include <winsock2.h>
 #include "interfaces.h"
 #include "olsr.h"
@@ -973,7 +976,7 @@ chk_if_up(struct olsr_if *IntConf, int DebugLevel __attribute__ ((unused)))
   New->valtimes.mid = reltime_to_me(IntConf->cnf->mid_params.validity_time * MSEC_PER_SEC);
   New->valtimes.hna = reltime_to_me(IntConf->cnf->hna_params.validity_time * MSEC_PER_SEC);
 
-  New->mode = iface->cnf->mode;
+  New->mode = IntConf->cnf->mode;
 
   run_ifchg_cbs(New, IFCHG_IF_ADD);
 

diff --git a/src/win32/net.c b/src/win32/net.c
index 3f6af85..5bc5689 100644 (file)
--- a/src/win32/net.c
+++ b/src/win32/net.c
@@ -60,7 +60,7 @@
 #if defined WINCE
 #define WIDE_STRING(s) L##s
 #else
-#define WIDE_STRING(s) s
+#define WIDE_STRING(s) TEXT(s)
 #endif
 
 void WinSockPError(const char *Str);
@@ -184,7 +184,7 @@ getsocket6(int BuffSize, char *Int __attribute__ ((unused)))
 
   memset(&Addr6, 0, sizeof(Addr6));
   Addr6.sin6_family = AF_INET6;
-  Addr6.sin6_port = htons(OLSRPORT);
+  Addr6.sin6_port = htons(olsr_cnf->olsrport);
   //Addr6.sin6_addr.s_addr = IN6ADDR_ANY_INIT;
   if (bind(Sock, (struct sockaddr *)&Addr6, sizeof(Addr6)) < 0) {
     WinSockPError("getsocket6/bind()");
@@ -201,7 +201,7 @@ int
 enable_ip_forwarding(int Ver)
 {
   HMODULE Lib;
-  unsigned int __stdcall(*EnableRouter) (HANDLE * Hand, OVERLAPPED * Over);
+  unsigned int __stdcall(*enable_router)(HANDLE *, OVERLAPPED *);
   HANDLE Hand;
 
   Ver = Ver;
@@ -211,9 +211,9 @@ enable_ip_forwarding(int Ver)
   if (Lib == NULL)
     return 0;
 
-  EnableRouter = (unsigned int __stdcall(*)(HANDLE *, OVERLAPPED *))GetProcAddress(Lib, WIDE_STRING("EnableRouter"));
+  enable_router = (unsigned int __stdcall(*)(HANDLE *, OVERLAPPED *))GetProcAddress(Lib, WIDE_STRING("EnableRouter"));
 
-  if (EnableRouter == NULL)
+  if (enable_router == NULL)
     return 0;
 
   memset(&RouterOver, 0, sizeof(OVERLAPPED));
@@ -225,7 +225,7 @@ enable_ip_forwarding(int Ver)
     return -1;
   }
 
-  if (EnableRouter(&Hand, &RouterOver) != ERROR_IO_PENDING) {
+  if (enable_router(&Hand, &RouterOver) != ERROR_IO_PENDING) {
     PError("EnableRouter()");
     return -1;
   }
@@ -239,7 +239,7 @@ int
 disable_ip_forwarding(int Ver)
 {
   HMODULE Lib;
-  unsigned int __stdcall(*UnenableRouter) (OVERLAPPED * Over, unsigned int *Count);
+  unsigned int __stdcall(*unenable_router)(OVERLAPPED *, unsigned int *);
   unsigned int Count;
 
   Ver = Ver;
@@ -249,12 +249,12 @@ disable_ip_forwarding(int Ver)
   if (Lib == NULL)
     return 0;
 
-  UnenableRouter = (unsigned int __stdcall(*)(OVERLAPPED *, unsigned int *))GetProcAddress(Lib, WIDE_STRING("UnenableRouter"));
+  unenable_router = (unsigned int __stdcall(*)(OVERLAPPED *, unsigned int *))GetProcAddress(Lib, WIDE_STRING("UnenableRouter"));
 
-  if (UnenableRouter == NULL)
+  if (unenable_router == NULL)
     return 0;
 
-  if (UnenableRouter(&RouterOver, &Count) != NO_ERROR) {
+  if (unenable_router(&RouterOver, &Count) != NO_ERROR) {
     PError("UnenableRouter()");
     return -1;
   }

diff --git a/src/win32/sys/time.h b/src/win32/sys/time.h
index 3c6e811..7c41b5c 100644 (file)
--- a/src/win32/sys/time.h
+++ b/src/win32/sys/time.h
@@ -89,7 +89,7 @@ struct timespec {
 
 int nanosleep(struct timespec *Req, struct timespec *Rem);
 
-void gettimeofday(struct timeval *TVal, void *TZone);
+int gettimeofday(struct timeval *TVal, void *TZone);
 
 #endif