From 9f0e71bb81dfaa8ed9b4e8d6a79bff793ce7c535 Mon Sep 17 00:00:00 2001 From: attermann Date: Sat, 2 Dec 2023 10:14:08 -0700 Subject: [PATCH] WIP: Exposed Interface mode for setting --- src/Interface.h | 1 + src/Interfaces/UDPInterface.cpp | 4 ++-- src/main.cpp | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Interface.h b/src/Interface.h index a50d304..8247e24 100644 --- a/src/Interface.h +++ b/src/Interface.h @@ -96,6 +96,7 @@ namespace RNS { inline std::string name() const { assert(_object); return _object->_name; } inline const Bytes& ifac_identity() const { assert(_object); return _object->_ifac_identity; } inline Type::Interface::modes mode() const { assert(_object); return _object->_mode; } + inline void mode(Type::Interface::modes mode) { assert(_object); _object->_mode = mode; } inline uint32_t bitrate() const { assert(_object); return _object->_bitrate; } inline double announce_allowed_at() const { assert(_object); return _object->_announce_allowed_at; } inline float announce_cap() const { assert(_object); return _object->_announce_cap; } diff --git a/src/Interfaces/UDPInterface.cpp b/src/Interfaces/UDPInterface.cpp index 5adcf50..6a6cf65 100644 --- a/src/Interfaces/UDPInterface.cpp +++ b/src/Interfaces/UDPInterface.cpp @@ -60,8 +60,8 @@ bool UDPInterface::start(const char* wifi_ssid, const char* wifi_password, int p extreme("UDPInterface: wifi ssid: " + _wifi_ssid); extreme("UDPInterface: wifi password: " + _wifi_password); extreme("UDPInterface: local host: " + _local_host); - extreme("UDPInterface: local port: " + std::to_string(_remote_port)); - extreme("UDPInterface: remote host: " + _local_host); + extreme("UDPInterface: local port: " + std::to_string(_local_port)); + extreme("UDPInterface: remote host: " + _remote_host); extreme("UDPInterface: remote port: " + std::to_string(_remote_port)); #ifdef ARDUINO diff --git a/src/main.cpp b/src/main.cpp index bc601a8..66ff596 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -259,15 +259,17 @@ void setup_reticulum() { RNS::Transport::register_interface(ininterface); RNS::Transport::register_interface(loopinterface); #ifdef UDP_INTERFACE + udp_interface.mode(RNS::Type::Interface::MODE_GATEWAY); RNS::Transport::register_interface(udp_interface); #endif #ifdef LORA_INTERFACE + lora_interface.mode(RNS::Type::Interface::MODE_GATEWAY); RNS::Transport::register_interface(lora_interface); #endif #ifdef UDP_INTERFACE RNS::head("Starting UDPInterface...", RNS::LOG_EXTREME); - udp_interface.start("some_ssid", "some_password"); + udp_interface.start("some_ssid", "some_password", 2424); #endif #ifdef LORA_INTERFACE