mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-11-10 04:37:37 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

more progress on the network source

Browse Source
This commit is contained in:
AlexandreRouma 2024-02-13 16:17:17 +01:00
parent 95052c34ff
commit edc08ddc08
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -17,7 +17,7 @@ option(OPT_BUILD_FILE_SOURCE "Wav file source" ON)
option(OPT_BUILD_HACKRF_SOURCE "Build HackRF Source Module (Dependencies: libhackrf)" ON)
option(OPT_BUILD_HERMES_SOURCE "Build Hermes Source Module (no dependencies required)" ON)
option(OPT_BUILD_LIMESDR_SOURCE "Build LimeSDR Source Module (Dependencies: liblimesuite)" OFF)
option(OPT_BUILD_NETWORK_SOURCE "Build Network Source Module (no dependencies required)" on)
option(OPT_BUILD_NETWORK_SOURCE "Build Network Source Module (no dependencies required)" ON)
option(OPT_BUILD_PERSEUS_SOURCE "Build Perseus Source Module (Dependencies: libperseus-sdr)" OFF)
option(OPT_BUILD_PLUTOSDR_SOURCE "Build PlutoSDR Source Module (Dependencies: libiio, libad9361)" ON)
option(OPT_BUILD_RFSPACE_SOURCE "Build RFspace Source Module (no dependencies required)" ON)

44
source_modules/network_source/src/main.cpp
View File

@ -73,7 +73,7 @@ public:
}
// Define protocols
protocols.define("TCP (Server)", PROTOCOL_TCP_SERVER);
// protocols.define("TCP (Server)", PROTOCOL_TCP_SERVER);
protocols.define("TCP (Client)", PROTOCOL_TCP_CLIENT);
protocols.define("UDP", PROTOCOL_UDP);
@ -164,8 +164,32 @@ private:
NetworkSourceModule* _this = (NetworkSourceModule*)ctx;
if (_this->running) { return; }
// Depends on protocol
try {
if (_this->proto == PROTOCOL_TCP_SERVER) {
// Create TCP listener
// TODO
// Start listen worker
// TODO
}
else if (_this->proto == PROTOCOL_TCP_CLIENT) {
// Connect to TCP server
_this->sock = net::connect(_this->hostname, _this->port);
}
else if (_this->proto == PROTOCOL_UDP) {
// Open UDP socket
_this->sock = net::openudp("0.0.0.0", _this->port, _this->hostname, _this->port, true);
}
}
catch (const std::exception& e) {
flog::error("Could not start Network Source: {}", e.what());
return;
}
// Start receive worker
_this->workerThread = std::thread(&NetworkSourceModule::worker, _this);
_this->running = true;
flog::info("NetworkSourceModule '{0}': Start!", _this->name);
}
@ -174,8 +198,17 @@ private:
NetworkSourceModule* _this = (NetworkSourceModule*)ctx;
if (!_this->running) { return; }
// Stop listen worker
// TODO
// Close connection
if (_this->sock) { _this->sock->close(); }
// Stop worker thread
_this->stream.stopWriter();
if (_this->workerThread.joinable()) { _this->workerThread.join(); }
_this->stream.clearWriteStop();
_this->running = false;
flog::info("NetworkSourceModule '{0}': Stop!", _this->name);
}
@ -254,12 +287,8 @@ private:
while (true) {
// Read samples from socket
int bytes;
{
std::lock_guard lck(sockMtx);
bytes = sock->recv(buffer, frameSize, true);
int bytes = sock->recv(buffer, frameSize, true);
if (bytes <= 0) { break; }
}
// Convert to CF32 (note: problem if partial sample)
int count = bytes / sampleSize;
@ -297,7 +326,7 @@ private:
int samplerate = 1000000;
int srId;
Protocol proto = PROTOCOL_TCP_SERVER;
Protocol proto = PROTOCOL_UDP;
int protoId;
SampleType sampType = SAMPLE_TYPE_INT16;
int sampTypeId;
@ -308,6 +337,7 @@ private:
OptionList<std::string, Protocol> protocols;
OptionList<std::string, SampleType> sampleTypes;
std::thread workerThread;
std::thread listenWorkerThread;
std::mutex sockMtx;