diff options
author | Josh Blum <josh@joshknows.com> | 2010-04-12 14:31:46 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-04-12 14:31:46 -0700 |
commit | 24ca9fbd0784c7c53af6ad4f9035e8d43e888290 (patch) | |
tree | c55d3198ecb389054e5990e45190c3c63b2cddf9 /host/lib/transport | |
parent | e611e610f64b473cdd9d0aa5e40690d7550c3cc0 (diff) | |
download | uhd-24ca9fbd0784c7c53af6ad4f9035e8d43e888290.tar.gz uhd-24ca9fbd0784c7c53af6ad4f9035e8d43e888290.tar.bz2 uhd-24ca9fbd0784c7c53af6ad4f9035e8d43e888290.zip |
store the mtu and hdr len stuff only in the usrp2 impl
Diffstat (limited to 'host/lib/transport')
-rw-r--r-- | host/lib/transport/udp_zero_copy_asio.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/host/lib/transport/udp_zero_copy_asio.cpp b/host/lib/transport/udp_zero_copy_asio.cpp index 3e0e80bd8..7e643abad 100644 --- a/host/lib/transport/udp_zero_copy_asio.cpp +++ b/host/lib/transport/udp_zero_copy_asio.cpp @@ -110,9 +110,6 @@ private: size_t get_recv_buff_size(void); void set_recv_buff_size(size_t); - - static const size_t _mtu = 1500; //FIXME we have no idea - static const size_t _hdrs = (2 + 14 + 20 + 8); //size of headers (pad, eth, ip, udp) }; udp_zero_copy_impl::udp_zero_copy_impl(const std::string &addr, const std::string &port){ @@ -146,8 +143,6 @@ udp_zero_copy_impl::~udp_zero_copy_impl(void){ } managed_recv_buffer::sptr udp_zero_copy_impl::get_recv_buff(void){ - boost::uint32_t *buff_mem = new boost::uint32_t[_mtu/sizeof(boost::uint32_t)]; - //implement timeout through polling and sleeping size_t available = 0; boost::asio::deadline_timer timer(_socket->get_io_service()); @@ -157,8 +152,9 @@ managed_recv_buffer::sptr udp_zero_copy_impl::get_recv_buff(void){ } //receive only if data is available + boost::uint32_t *buff_mem = new boost::uint32_t[available/sizeof(boost::uint32_t)]; if (available){ - available = _socket->receive(boost::asio::buffer(buff_mem, _mtu)); + available = _socket->receive(boost::asio::buffer(buff_mem, available)); } //create a new managed buffer to house the data @@ -168,9 +164,9 @@ managed_recv_buffer::sptr udp_zero_copy_impl::get_recv_buff(void){ } managed_send_buffer::sptr udp_zero_copy_impl::get_send_buff(void){ - boost::uint32_t *buff_mem = new boost::uint32_t[_mtu/sizeof(boost::uint32_t)]; + boost::uint32_t *buff_mem = new boost::uint32_t[2000/sizeof(boost::uint32_t)]; return managed_send_buffer::sptr( - new managed_send_buffer_impl(boost::asio::buffer(buff_mem, _mtu-_hdrs), _socket) + new managed_send_buffer_impl(boost::asio::buffer(buff_mem, 2000), _socket) ); } |