diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-10-07 04:52:50 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2019-10-07 04:52:50 +0200 |
| commit | 0aa6201a490bfabc0ae021ceb9f1fb0f46727c5d (patch) | |
| tree | a71d934d8151dd43e7c16555fef17fd749c5da70 /src/output | |
| parent | 558d74bffd9f069955af52c0b308a1d6169bcff0 (diff) | |
| parent | 0330221d51421caa110b8c5dcb567cc3d0620eb9 (diff) | |
| download | dabmod-0aa6201a490bfabc0ae021ceb9f1fb0f46727c5d.tar.gz dabmod-0aa6201a490bfabc0ae021ceb9f1fb0f46727c5d.tar.bz2 dabmod-0aa6201a490bfabc0ae021ceb9f1fb0f46727c5d.zip | |
Merge lime output into next branch
Diffstat (limited to 'src/output')
| -rw-r--r-- | src/output/Feedback.cpp | 7 | ||||
| -rw-r--r-- | src/output/SDR.cpp | 8 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/output/Feedback.cpp b/src/output/Feedback.cpp index 17e45bf..88d8319 100644 --- a/src/output/Feedback.cpp +++ b/src/output/Feedback.cpp @@ -200,14 +200,13 @@ void DPDFeedbackServer::ReceiveBurstThread() void DPDFeedbackServer::ServeFeedback() { - TCPSocket m_server_sock; - m_server_sock.listen(m_port); + Socket::TCPSocket m_server_sock; + m_server_sock.listen(m_port, "127.0.0.1"); etiLog.level(info) << "DPD Feedback server listening on port " << m_port; while (m_running) { - struct sockaddr_in client; - TCPSocket client_sock = m_server_sock.accept_with_timeout(1000, &client); + auto client_sock = m_server_sock.accept(1000); if (not m_running) { break; diff --git a/src/output/SDR.cpp b/src/output/SDR.cpp index 01312ff..ad65c1c 100644 --- a/src/output/SDR.cpp +++ b/src/output/SDR.cpp @@ -314,7 +314,7 @@ void SDR::handle_frame(struct FrameData& frame) } if (expected_sec != tx_second or expected_pps != tx_pps) { - etiLog.level(warn) << "OutputSDR: timestamp irregularity!" << + etiLog.level(warn) << "OutputSDR: timestamp irregularity at FCT=" << frame.ts.fct << std::fixed << " Expected " << expected_sec << "+" << (double)expected_pps/16384000.0 << @@ -337,7 +337,7 @@ void SDR::handle_frame(struct FrameData& frame) if (time_spec.get_real_secs() + tx_timeout < device_time) { etiLog.level(warn) << - "OutputSDR: Timestamp in the past! offset: " << + "OutputSDR: Timestamp in the past at FCT=" << frame.ts.fct << " offset: " << std::fixed << time_spec.get_real_secs() - device_time << " (" << device_time << ")" @@ -349,7 +349,7 @@ void SDR::handle_frame(struct FrameData& frame) if (time_spec.get_real_secs() > device_time + TIMESTAMP_ABORT_FUTURE) { etiLog.level(error) << - "OutputSDR: Timestamp way too far in the future! offset: " << + "OutputSDR: Timestamp way too far in the future at FCT=" << frame.ts.fct << " offset: " << std::fixed << time_spec.get_real_secs() - device_time; throw std::runtime_error("Timestamp error. Aborted."); @@ -358,7 +358,7 @@ void SDR::handle_frame(struct FrameData& frame) if (m_config.muting) { etiLog.log(info, - "OutputSDR: Muting sample %d requested\n", + "OutputSDR: Muting FCT=%d requested", frame.ts.fct); return; } |