From 8222d05f5ddf3fdc8a8973ddf99e0c88dbba9945 Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Mon, 11 Apr 2016 23:02:12 +0300
Subject: [PATCH] Re-enable to reuse address for msearch protocol.

---
 msearch.c | 2 +-
 socket.c  | 8 ++++++--
 socket.h  | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/msearch.c b/msearch.c
index f5edafc..c7bf224 100644
--- a/msearch.c
+++ b/msearch.c
@@ -29,7 +29,7 @@ cSatipMsearch::cSatipMsearch(cSatipDiscoverIf &discoverP)
      memset(bufferM, 0, bufferLenM);
   else
      error("Cannot create Msearch buffer!");
-  if (!Open(eDiscoveryPort))
+  if (!Open(eDiscoveryPort, true))
      error("Cannot open Msearch port!");
 }
 
diff --git a/socket.c b/socket.c
index 35bc035..c545a09 100644
--- a/socket.c
+++ b/socket.c
@@ -34,10 +34,11 @@ cSatipSocket::~cSatipSocket()
   Close();
 }
 
-bool cSatipSocket::Open(const int portP, const bool reuseAddrP)
+bool cSatipSocket::Open(const int portP, const bool reuseP)
 {
   // Bind to the socket if it is not active already
   if (socketDescM < 0) {
+     int yes;
      socklen_t len = sizeof(sockAddrM);
      // Create socket
      socketDescM = socket(PF_INET, SOCK_DGRAM, 0);
@@ -46,9 +47,12 @@ bool cSatipSocket::Open(const int portP, const bool reuseAddrP)
      ERROR_IF_FUNC(fcntl(socketDescM, F_SETFL, O_NONBLOCK), "fcntl(O_NONBLOCK)",
                    Close(), return false);
      // Allow multiple sockets to use the same PORT number
-     int yes = reuseAddrP;
+     yes = reuseP;
      ERROR_IF_FUNC(setsockopt(socketDescM, SOL_SOCKET, SO_REUSEADDR, &yes, sizeof(yes)) < 0,
                    "setsockopt(SO_REUSEADDR)", Close(), return false);
+     yes = reuseP;
+     ERROR_IF_FUNC(setsockopt(socketDescM, SOL_SOCKET, SO_REUSEPORT, &yes, sizeof(yes)) < 0 && errno != ENOPROTOOPT,
+                   "setsockopt(SO_REUSEPORT)", Close(), return false);
      // Bind socket
      memset(&sockAddrM, 0, sizeof(sockAddrM));
      sockAddrM.sin_family = AF_INET;
diff --git a/socket.h b/socket.h
index 79bc991..a3228bf 100644
--- a/socket.h
+++ b/socket.h
@@ -19,7 +19,7 @@ private:
 public:
   cSatipSocket();
   virtual ~cSatipSocket();
-  bool Open(const int portP = 0, const bool reuseAddrP = false);
+  bool Open(const int portP = 0, const bool reuseP = false);
   virtual void Close(void);
   int Fd(void) { return socketDescM; }
   int Port(void) { return socketPortM; }