1 files changed, 26 insertions, 39 deletions

diff --git a/src/dabOutput/dabOutputUdp.cpp b/src/dabOutput/dabOutputUdp.cpp
index c129569..b9c22db 100644
--- a/src/dabOutput/dabOutputUdp.cpp
+++ b/src/dabOutput/dabOutputUdp.cpp
@@ -38,18 +38,12 @@
 #include <cstdio>
 #include <limits.h>
 #include "dabOutput.h"
-#include "UdpSocket.h"
-
-#ifdef _WIN32
-#   include <fscfg.h>
-#   include <sdci.h>
-#else
-#   include <netinet/in.h>
-#   include <sys/types.h>
-#   include <sys/socket.h>
-#   include <sys/ioctl.h>
-#   include <net/if_arp.h>
-#endif
+#include "Socket.h"
+
+DabOutputUdp::DabOutputUdp() :
+    socket_(),
+    packet_(6144)
+{ }
 
 int DabOutputUdp::Open(const char* name)
 {
@@ -64,12 +58,6 @@ int DabOutputUdp::Open(const char* name)
                 regex_constants::match_default)) {
         string address = what[1];
 
-        if (this->packet_->getAddress().setAddress(address.c_str()) == -1) {
-            etiLog.level(error) << "can't set address " <<
-               address <<  "(" << inetErrDesc << ": " << inetErrMsg << ")";
-            return -1;
-        }
-
         string port_str = what[2];
         long port = std::strtol(port_str.c_str(), nullptr, 0);
 
@@ -79,7 +67,7 @@ int DabOutputUdp::Open(const char* name)
             return -1;
         }
 
-        this->packet_->getAddress().setPort(port);
+        packet_.address.resolveUdpDestination(address, port);
 
         string query_params = what[3];
         smatch query_what;
@@ -87,28 +75,25 @@ int DabOutputUdp::Open(const char* name)
                     regex_constants::match_default)) {
             string src = query_what[1];
 
-            int err = socket_->setMulticastSource(src.c_str());
-            if (err) {
-                etiLog.level(error) << "UDP output socket set source failed!";
-                return -1;
-            }
+            try {
+                socket_.setMulticastSource(src.c_str());
 
-            string ttl_str = query_what[2];
+                string ttl_str = query_what[2];
 
-            if (not ttl_str.empty()) {
-                long ttl = std::strtol(ttl_str.c_str(), nullptr, 0);
-                if ((ttl <= 0) || (ttl >= 255)) {
-                    etiLog.level(error) << "Invalid TTL setting in " <<
-                        uri_without_proto;
-                    return -1;
-                }
+                if (not ttl_str.empty()) {
+                    long ttl = std::strtol(ttl_str.c_str(), nullptr, 0);
+                    if ((ttl <= 0) || (ttl >= 255)) {
+                        etiLog.level(error) << "Invalid TTL setting in " <<
+                            uri_without_proto;
+                        return -1;
+                    }
 
-                err = socket_->setMulticastTTL(ttl);
-                if (err) {
-                    etiLog.level(error) << "UDP output socket set TTL failed!";
-                    return -1;
+                    socket_.setMulticastTTL(ttl);
                 }
             }
+            catch (const std::runtime_error& e) {
+                etiLog.level(error) << "Failed to set UDP output settings" << e.what();
+            }
         }
         else if (not query_params.empty()) {
             etiLog.level(error) << "UDP output: could not parse parameters " <<
@@ -129,9 +114,11 @@ int DabOutputUdp::Open(const char* name)
 
 int DabOutputUdp::Write(void* buffer, int size)
 {
-    this->packet_->setSize(0);
-    this->packet_->addData(buffer, size);
-    return this->socket_->send(*this->packet_);
+    const uint8_t *buf = reinterpret_cast<uint8_t*>(buffer);
+    packet_.buffer.resize(0);
+    std::copy(buf, buf + size, std::back_inserter(packet_.buffer));
+    socket_.send(packet_);
+    return 0;
 }
 #endif // defined(HAVE_OUTPUT_UDP)