[osc] Allow OSC devices to be exposed over OSCQuery and as a TCP server

src/plugins/score-plugin-avnd/AvndProcesses/Teleplot.hpp

@@ -92,7 +92,7 @@ struct Teleplot : PatternObject
       if(!ip.empty() && port > 1)
       {
         socket = std::make_shared<ossia::net::udp_send_socket>(
-            ossia::net::send_socket_configuration{{.host = ip, .port = port}},
+            ossia::net::outbound_socket_configuration{.host = ip, .port = port},
             *io_context);
         socket->connect();
       }
@@ -201,7 +201,7 @@ struct Teleplot : PatternObject
     if(!socket)
     {
       socket = std::make_shared<ossia::net::udp_send_socket>(
-          ossia::net::send_socket_configuration{{.host = "127.0.0.1", .port = 47269}},
+          ossia::net::outbound_socket_configuration{.host = "127.0.0.1", .port = 47269},
           *io_context);
       socket->connect();
     }

src/plugins/score-plugin-protocols/Protocols/Artnet/ArtnetDevice.cpp

@@ -238,16 +238,25 @@ bool ArtnetDevice::reconnect()
         if(host.empty())
           host = "0.0.0.0";
 
-        ossia::net::socket_configuration sock_conf;
-        sock_conf.host = host;
-        sock_conf.port = ossia::net::e131_protocol::default_port;
-
         if(set.mode == ArtnetSpecificSettings::Source)
+        {
+          ossia::net::outbound_socket_configuration sock_conf;
+          sock_conf.host = host;
+          sock_conf.port = ossia::net::e131_protocol::default_port;
+
           artnet_proto
               = std::make_unique<ossia::net::e131_protocol>(m_ctx, conf, sock_conf);
+        }
         else
+        {
+          ossia::net::inbound_socket_configuration sock_conf;
+          sock_conf.bind = host;
+          sock_conf.port = ossia::net::e131_protocol::default_port;
+
           artnet_proto = std::make_unique<ossia::net::e131_input_protocol>(
               m_ctx, conf, sock_conf);
+        }
+
         break;
       }
       case ArtnetSpecificSettings::DMXUSBPRO:

src/plugins/score-plugin-protocols/Protocols/CoAP/CoAPProtocolFactory.cpp

@@ -91,7 +91,7 @@ class CoAPTCPEnumerator final : public DNSSDEnumerator
     set.protocol = CoAPProtocolFactory::static_concreteKey();
 
     CoAPSpecificSettings sub;
-    ossia::net::tcp_configuration conf;
+    ossia::net::tcp_client_configuration conf;
     conf.host = ip.toStdString();
     conf.port = port.toInt();
     sub.configuration.transport = conf;
@@ -129,7 +129,7 @@ const Device::DeviceSettings& CoAPProtocolFactory::defaultSettings() const noexc
     CoAPSpecificSettings specif;
     specif.configuration.transport = ossia::net::udp_configuration{
         {.local = {},
-         .remote = ossia::net::send_socket_configuration{"127.0.0.1", 5683}}};
+         .remote = ossia::net::outbound_socket_configuration{"127.0.0.1", 5683}}};
     s.deviceSpecificSettings = QVariant::fromValue(specif);
     return s;
   }();

src/plugins/score-plugin-protocols/Protocols/CoAP/CoAPProtocolSettingsWidget.cpp

@@ -104,7 +104,7 @@ CoAPTransportWidget::setConfiguration(const ossia::net::coap_client_configuratio
       self.m_udp->setSettings(conf);
       proto = CoapProtocol::UDP;
     }
-    void operator()(const ossia::net::tcp_configuration& conf)
+    void operator()(const ossia::net::tcp_client_configuration& conf)
     {
       self.m_tcp->setSettings(conf);
       proto = CoapProtocol::TCP;

src/plugins/score-plugin-protocols/Protocols/MQTT/MQTTProtocolFactory.cpp

@@ -44,7 +44,7 @@ QString MQTTProtocolFactory::category() const noexcept
 static ossia::net::mqtt5_configuration defaultMQTTConfig() noexcept
 {
   ossia::net::mqtt5_configuration config;
-  config.transport = ossia::net::tcp_configuration{{.host = "127.0.0.1", .port = 1883}};
+  config.transport = ossia::net::tcp_client_configuration{{.host = "127.0.0.1", .port = 1883}};
   return config;
 }
 
@@ -90,7 +90,7 @@ class MQTTTCPEnumerator final : public DNSSDEnumerator
     set.protocol = MQTTProtocolFactory::static_concreteKey();
 
     MQTTSpecificSettings sub;
-    ossia::net::tcp_configuration conf;
+    ossia::net::tcp_client_configuration conf;
     conf.host = ip.toStdString();
     conf.port = port.toInt();
     sub.configuration.transport = conf;
@@ -127,7 +127,7 @@ const Device::DeviceSettings& MQTTProtocolFactory::defaultSettings() const noexc
     s.protocol = concreteKey();
     s.name = "MQTT";
     MQTTSpecificSettings specif;
-    specif.configuration.transport = ossia::net::tcp_configuration{"127.0.0.1", 1883};
+    specif.configuration.transport = ossia::net::tcp_client_configuration{"127.0.0.1", 1883};
     s.deviceSpecificSettings = QVariant::fromValue(specif);
     return s;
   }();

src/plugins/score-plugin-protocols/Protocols/MQTT/MQTTProtocolSettingsWidget.cpp

@@ -91,7 +91,7 @@ MQTTTransportWidget::setConfiguration(const ossia::net::mqtt5_configuration& osc
     MQTTTransportWidget& self;
     const ossia::net::mqtt5_configuration& osc_conf;
     MqttProtocol proto{};
-    void operator()(const ossia::net::tcp_configuration& conf)
+    void operator()(const ossia::net::tcp_client_configuration& conf)
     {
       self.m_tcp->setSettings(conf);
       proto = MqttProtocol::TCP;

src/plugins/score-plugin-protocols/Protocols/NetworkWidgets/Serialization.hpp

@@ -5,7 +5,9 @@
 #include <ossia/protocols/osc/osc_factory.hpp>
 
 JSON_METADATA(ossia::net::udp_configuration, "UDP")
-JSON_METADATA(ossia::net::tcp_configuration, "TCP")
+JSON_METADATA(ossia::net::udp_server_configuration, "UDPServer")
+JSON_METADATA(ossia::net::tcp_client_configuration, "TCP")
+JSON_METADATA(ossia::net::tcp_server_configuration, "TCPServer")
 JSON_METADATA(ossia::net::unix_dgram_configuration, "UnixDatagram")
 JSON_METADATA(ossia::net::unix_stream_configuration, "UnixStream")
 JSON_METADATA(ossia::net::serial_configuration, "Serial")

src/plugins/score-plugin-protocols/Protocols/NetworkWidgets/TCPServerWidget.hpp

@@ -0,0 +1,60 @@
+#pragma once
+#include <Device/Protocol/ProtocolSettingsWidget.hpp>
+
+#include <Protocols/NetworkWidgets/TCPWidget.hpp>
+
+#include <ossia/network/sockets/configuration.hpp>
+
+#include <QComboBox>
+#include <QFormLayout>
+#include <QSpinBox>
+namespace Protocols
+{
+
+class TCPServerWidget : public QWidget
+{
+public:
+  TCPServerWidget(Device::ProtocolSettingsWidget& proto, QWidget* parent)
+      : QWidget{parent}
+  {
+    auto layout = new QFormLayout{this};
+    layout->setContentsMargins(0, 0, 0, 0);
+
+    m_remotePort = new QSpinBox(this);
+    m_remotePort->setRange(0, 65535);
+    m_remotePort->setValue(9996);
+    proto.checkForChanges(m_remotePort);
+
+    m_framing = new QComboBox{this};
+    m_framing->addItems({"Size prefixing", "SLIP"});
+    m_framing->setCurrentIndex(1);
+
+    layout->addRow(tr("Port"), m_remotePort);
+    layout->addRow(tr("Framing"), m_framing);
+  }
+
+  framing_type framing() const noexcept
+  {
+    return (framing_type)m_framing->currentIndex();
+  }
+
+  ossia::net::tcp_server_configuration settings() const noexcept
+  {
+    ossia::net::tcp_server_configuration conf;
+    conf.port = m_remotePort->value();
+    return conf;
+  }
+
+  void setSettings(
+      const ossia::net::osc_protocol_configuration& c,
+      const ossia::net::tcp_server_configuration& conf)
+  {
+    m_remotePort->setValue(conf.port);
+    m_framing->setCurrentIndex(c.framing);
+  }
+
+private:
+  QSpinBox* m_remotePort{};
+  QComboBox* m_framing{};
+};
+}

src/plugins/score-plugin-protocols/Protocols/NetworkWidgets/TCPWidget.hpp

@@ -26,6 +26,7 @@ class BasicTCPWidget : public QWidget
     m_remotePort->setValue(9996);
     m_remotePort->setWhatsThis(
         tr("This is the communication port used for the TCP connection."));
+    proto.checkForChanges(m_remotePort);
 
     m_host = new QLineEdit(this);
     m_host->setText("127.0.0.1");
@@ -38,15 +39,15 @@ class BasicTCPWidget : public QWidget
     layout->addRow(tr("Host"), m_host);
   }
 
-  ossia::net::tcp_configuration settings() const noexcept
+  ossia::net::tcp_client_configuration settings() const noexcept
   {
-    ossia::net::tcp_configuration conf;
+    ossia::net::tcp_client_configuration conf;
     conf.port = m_remotePort->value();
     conf.host = m_host->text().toStdString();
     return conf;
   }
 
-  void setSettings(const ossia::net::tcp_configuration& conf)
+  void setSettings(const ossia::net::tcp_client_configuration& conf)
   {
     m_remotePort->setValue(conf.port);
     m_host->setText(QString::fromStdString(conf.host));
@@ -71,6 +72,7 @@ class TCPWidget : public QWidget
     m_remotePort->setValue(9996);
     m_remotePort->setWhatsThis(
         tr("This is the communication port used for the TCP connection."));
+    proto.checkForChanges(m_remotePort);
 
     m_host = new QLineEdit(this);
     m_host->setText("127.0.0.1");
@@ -93,17 +95,17 @@ class TCPWidget : public QWidget
     return (framing_type)m_framing->currentIndex();
   }
 
-  ossia::net::tcp_configuration settings() const noexcept
+  ossia::net::tcp_client_configuration settings() const noexcept
   {
-    ossia::net::tcp_configuration conf;
+    ossia::net::tcp_client_configuration conf;
     conf.port = m_remotePort->value();
     conf.host = m_host->text().toStdString();
     return conf;
   }
 
   void setSettings(
       const ossia::net::osc_protocol_configuration& c,
-      const ossia::net::tcp_configuration& conf)
+      const ossia::net::tcp_client_configuration& conf)
   {
     m_remotePort->setValue(conf.port);
     m_framing->setCurrentIndex(c.framing);

src/plugins/score-plugin-protocols/Protocols/NetworkWidgets/UDPWidget.hpp

@@ -58,9 +58,9 @@ class UDPWidget : public QWidget
   ossia::net::udp_configuration settings() const noexcept
   {
     ossia::net::udp_configuration conf;
-    conf.local = ossia::net::receive_socket_configuration{
+    conf.local = ossia::net::inbound_socket_configuration{
         "0.0.0.0", (uint16_t)m_localPort->value()};
-    conf.remote = ossia::net::send_socket_configuration{
+    conf.remote = ossia::net::outbound_socket_configuration{
         m_host->text().toStdString(), (uint16_t)m_remotePort->value(),
         m_broadcast->isChecked()};
     return conf;