w4kek/WSJT-X
1
0
Fork 0
mirror of https://github.com/saitohirga/WSJT-X.git synced 2024-11-24 13:18:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

Allow flush to send a receiver info data set without any spots

Browse Source
This commit is contained in:
Bill Somerville 2020-06-21 16:11:36 +01:00
parent af894c6039
commit 147f29e271
No known key found for this signature in database
GPG Key ID: D864B06D1E81618F
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Network/PSKReporter.cpp
View File

@ -32,13 +32,13 @@
namespace namespace
{ {
constexpr QLatin1String HOST {"report.pskreporter.info"}; // constexpr QLatin1String HOST {"report.pskreporter.info"};
// constexpr QLatin1String HOST {"127.0.0.1"}; // constexpr QLatin1String HOST {"127.0.0.1"};
// constexpr QLatin1String HOST {"192.168.1.195"}; constexpr QLatin1String HOST {"192.168.1.195"};
constexpr quint16 SERVICE_PORT {4739}; constexpr quint16 SERVICE_PORT {4739};
// constexpr quint16 SERVICE_PORT {14739}; // constexpr quint16 SERVICE_PORT {14739};
constexpr int MIN_SEND_INTERVAL {60}; // in seconds constexpr int MIN_SEND_INTERVAL {15}; // in seconds
constexpr int FLUSH_INTERVAL {5}; // in send intervals constexpr int FLUSH_INTERVAL {4 * 5}; // in send intervals
constexpr bool ALIGNMENT_PADDING {true}; constexpr bool ALIGNMENT_PADDING {true};
constexpr int MIN_PAYLOAD_LENGTH {508}; constexpr int MIN_PAYLOAD_LENGTH {508};
constexpr int MAX_PAYLOAD_LENGTH {1400}; constexpr int MAX_PAYLOAD_LENGTH {1400};
@ -363,7 +363,7 @@ void PSKReporter::impl::send_report (bool send_residue)
auto flush = flushing () || send_residue; auto flush = flushing () || send_residue;
qDebug () << "PSKReporter::impl::send_report: flush:" << flush; qDebug () << "PSKReporter::impl::send_report: flush:" << flush;
while (spots_.size () || (flush && (tx_data_.size () || tx_residue_.size ()))) while (spots_.size () || flush)
{ {
if (!payload_.size ()) if (!payload_.size ())
{ {
@ -371,7 +371,7 @@ void PSKReporter::impl::send_report (bool send_residue)
build_preamble (message); build_preamble (message);
} }
if (!tx_data_.size ()) if (!tx_data_.size () && (spots_.size () || tx_residue_.size ()))
{ {
// Set Header // Set Header
tx_out tx_out
@ -388,7 +388,7 @@ void PSKReporter::impl::send_report (bool send_residue)
qDebug () << "PSKReporter::impl::send_report: inserted data residue"; qDebug () << "PSKReporter::impl::send_report: inserted data residue";
} }
while (spots_.size () || (flush && tx_data_.size ())) while (spots_.size () || flush)
{ {
auto tx_data_size = tx_data_.size (); auto tx_data_size = tx_data_.size ();
if (spots_.size ()) if (spots_.size ())
@ -413,18 +413,21 @@ void PSKReporter::impl::send_report (bool send_residue)
len += num_pad_bytes (len); len += num_pad_bytes (len);
if (len > MAX_PAYLOAD_LENGTH // our upper datagram size limit if (len > MAX_PAYLOAD_LENGTH // our upper datagram size limit
|| (!spots_.size () && len > MIN_PAYLOAD_LENGTH) // spots drained and above lower datagram size limit || (!spots_.size () && len > MIN_PAYLOAD_LENGTH) // spots drained and above lower datagram size limit
|| (flush && !spots_.size () && tx_data_.size ())) // send what we have || (flush && !spots_.size ())) // send what we have, possibly no spots
{ {
if (len <= MAX_PAYLOAD_LENGTH) if (tx_data_.size ())
{ {
tx_data_size = tx_data_.size (); if (len <= MAX_PAYLOAD_LENGTH)
qDebug () << "PSKReporter::impl::send_report: sending short payload:" << tx_data_size; {
tx_data_size = tx_data_.size ();
qDebug () << "PSKReporter::impl::send_report: sending short payload:" << tx_data_size;
}
QByteArray tx {tx_data_.left (tx_data_size)};
QDataStream out {&tx, QIODevice::WriteOnly | QIODevice::Append};
// insert Length
set_length (out, tx);
message.writeRawData (tx.constData (), tx.size ());
} }
QByteArray tx {tx_data_.left (tx_data_size)};
QDataStream out {&tx, QIODevice::WriteOnly | QIODevice::Append};
// insert Length
set_length (out, tx);
message.writeRawData (tx.constData (), tx.size ());
// insert Length and Export Time // insert Length and Export Time
set_length (message, payload_); set_length (message, payload_);
@ -434,6 +437,7 @@ void PSKReporter::impl::send_report (bool send_residue)
// Send data to PSK Reporter site // Send data to PSK Reporter site
socket_->write (payload_); // TODO: handle errors socket_->write (payload_); // TODO: handle errors
qDebug () << "PSKReporter::impl::send_report: sent payload:" << payload_.size () << "observation id:" << observation_id_; qDebug () << "PSKReporter::impl::send_report: sent payload:" << payload_.size () << "observation id:" << observation_id_;
flush = false; // break loop
message.device ()->seek (0u); message.device ()->seek (0u);
payload_.clear (); // Fresh message payload_.clear (); // Fresh message
// Save unsent spots // Save unsent spots