Support IPv6 in InputUDP

diff --git a/inputudp.cc b/inputudp.cc
index b8765122c749d67d8ced9cb2e0298f2b0cc6a30c..b8750dcde0bc041a165fc96e2f08ee4cf9b6273e 100644 (file)
--- a/inputudp.cc
+++ b/inputudp.cc
@@ -41,9 +41,9 @@ bool InputUDP::init()
 
   log->debug(TAG, "Starting InputUDP command server on port {}", port);
 
-  if (!udp4.init(static_cast<USHORT>(port)))
+  if (!udp6.init(static_cast<USHORT>(port)))
   {
-    log->debug(TAG, "UDP4 init error");
+    log->debug(TAG, "UDP6 init error");
     initted = false;
     return false;
   }
@@ -58,7 +58,7 @@ bool InputUDP::init()
   {
     log->error(TAG, "pipe2() fail");
 #endif
-    udp4.shutdown();
+    udp6.shutdown();
     initted = false;
     return false;
   }
@@ -72,7 +72,7 @@ void InputUDP::shutdown()
   CLOSESOCKET(quitPipe);
 #endif
 
-  udp4.shutdown();
+  udp6.shutdown();
 
 #ifndef WIN32
   CLOSESOCKET(pfds[1]);
@@ -122,15 +122,15 @@ void InputUDP::listenLoop()
   while(1)
   {
 #ifdef WIN32
-    retval = udp4.waitforMessage(3, quitPipe);
+    retval = udp6.waitforMessage(3, quitPipe);
 #else
-    retval = udp4.waitforMessage(3, pfds[0]);
+    retval = udp6.waitforMessage(3, pfds[0]);
 #endif
     log->debug(TAG, "Back from waitForMessage");
 
     if (retval == 2)
     {
-      processRequest(udp4.getData(), udp4.getDataLength());
+      processRequest(udp6.getData(), udp6.getDataLength());
     }
     else if (retval == 3) // quit
     {

diff --git a/inputudp.h b/inputudp.h
index f8752907c8b7d3b5eb2d4e9f25207725819c619b..3d866b338ffe1d73130301adfeb99e4f6d1d3c07 100644 (file)
--- a/inputudp.h
+++ b/inputudp.h
@@ -29,7 +29,7 @@
 #endif
 
 #include "defines.h"
-#include "udp4.h"
+#include "udp6.h"
 #include "input.h"
 
 class LogNT;
@@ -54,7 +54,7 @@ class InputUDP : public Input
     const char* modName() { return myModName; }
 
     bool initted{};
-    UDP4 udp4; // FIXME UDP6 ?
+    UDP6 udp6;
     LogNT* log{};
 
     std::thread listenThread;

diff --git a/udp6.cc b/udp6.cc
index 1edc8956e570a7e41bbcb43fde51b9ce741186cc..4d665fcf7fe22aad7aa1fa3fa50b93a8faad8ec8 100644 (file)
--- a/udp6.cc
+++ b/udp6.cc
@@ -58,24 +58,19 @@ int UDP6::init(USHORT tPort)
   if ((socketnum = socket(AF_INET6, SOCK_DGRAM, 0)) == -1)
   { perror("socket"); return 0; }
 
-  // FIXME - implement server side
-
-  /*
-
   memset(&myAddr, 0, sizeof(myAddr));
   myAddr.sin6_family = AF_INET6;        // host byte order
   myAddr.sin6_port = htons(myPort);     // short, network byte order
+  myAddr.sin6_addr = in6addr_any;
 
-//  myAddr.sin_addr.s_addr = getIPNumber(iterate_ip++); // auto-fill with my IP
-
-  inet_pton(AF_INET6, "", &myAddr.sin6_addr);
+  /*
+   * FIXME This _might_ need porting to Windows
+    myAddr.sin_addr.s_addr = getIPNumber(iterate_ip++); // auto-fill with my IP
+    inet_pton(AF_INET6, "", &myAddr.sin6_addr);
+  */
 
-/ *
   if (bind(socketnum, reinterpret_cast<struct sockaddr *>(&myAddr), addrlen) == -1)
-  { perror("bind"); return 0; }
-* /
-
-*/
+  { perror("bind6"); return 0; }
 
   FD_ZERO(&readfds);
   FD_SET(socketnum, &readfds);

diff --git a/udp6.h b/udp6.h
index 9caad45927187a7ee26d69f8ca3b83cc86609337..413a2a2ebe7e428263dda9fc54a1f778d6628e85 100644 (file)
--- a/udp6.h
+++ b/udp6.h
@@ -53,7 +53,7 @@ class UDP6
     ULONG iterate_ip{};
     int socketnum;                  // Socket descriptor
     USHORT myPort{};                // My port number
-//    struct sockaddr_in6 myAddr;     // My address
+    struct sockaddr_in6 myAddr;     // My address
     struct sockaddr_in6 theirAddr;  // User address
     socklen_t addrlen;              // length of sockaddr struct
     char buf[MAXBUFLEN];            // main data buffer