diff options
| author | michael-west <michael.west@ettus.com> | 2016-07-18 14:34:00 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-09-02 11:10:46 -0700 |
| commit | 59ed6e1a0f9710c7bfca0a348d07f8c96f9f6bc0 (patch) | |
| tree | 368f9aa5e9b2031beb92bc3916fa2a7bba8b372a /host/lib/transport | |
| parent | 196e93a387dea47ab8a3ad600b90446e98840a54 (diff) | |
| download | uhd-59ed6e1a0f9710c7bfca0a348d07f8c96f9f6bc0.tar.gz uhd-59ed6e1a0f9710c7bfca0a348d07f8c96f9f6bc0.tar.bz2 uhd-59ed6e1a0f9710c7bfca0a348d07f8c96f9f6bc0.zip | |
GPSDO: Make sure read_uart() returns only complete strings for all devices.
Diffstat (limited to 'host/lib/transport')
| -rw-r--r-- | host/lib/transport/udp_simple.cpp | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/host/lib/transport/udp_simple.cpp b/host/lib/transport/udp_simple.cpp index 347373c71..8b6e5eb2b 100644 --- a/host/lib/transport/udp_simple.cpp +++ b/host/lib/transport/udp_simple.cpp @@ -114,9 +114,16 @@ public: do{ //drain anything in current buffer while (_off < _len){ - const char ch = _buf[_off]; _off++; - line += std::string(1, ch); - if (ch == '\n' or ch == '\r') return line; + const char ch = _buf[_off++]; + if (ch == '\r') continue; + if (ch == '\n' and _line.empty()) continue; + _line += ch; + if (ch == '\n') + { + line = _line; + _line.clear(); + return line; + } } //recv a new packet into the buffer @@ -131,6 +138,7 @@ private: udp_simple::sptr _udp; size_t _len, _off; boost::uint8_t _buf[udp_simple::mtu]; + std::string _line; }; uhd::uart_iface::sptr udp_simple::make_uart(sptr udp){ |