3 files changed, 91 insertions, 22 deletions
diff --git a/host/lib/transport/CMakeLists.txt b/host/lib/transport/CMakeLists.txt
new file mode 100644
index 000000000..a36f0fc03
--- /dev/null
+++ b/host/lib/transport/CMakeLists.txt
@@ -0,0 +1,52 @@
+#
+# Copyright 2010 Ettus Research LLC
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+#This file will be included by cmake, use absolute paths!
+
+########################################################################
+# Setup defines for interface address discovery
+########################################################################
+MESSAGE(STATUS "Configuring interface address discovery...")
+
+INCLUDE(CheckIncludeFileCXX)
+CHECK_INCLUDE_FILE_CXX(ifaddrs.h HAVE_IFADDRS_H)
+CHECK_INCLUDE_FILE_CXX(winsock2.h HAVE_WINSOCK2_H)
+
+IF(HAVE_IFADDRS_H)
+    MESSAGE(STATUS "  Interface address discovery supported through getifaddrs.")
+    ADD_DEFINITIONS(-DHAVE_IFADDRS_H)
+ELSEIF(HAVE_WINSOCK2_H)
+    MESSAGE(STATUS "  Interface address discovery supported through SIO_GET_INTERFACE_LIST.")
+    ADD_DEFINITIONS(-DHAVE_WINSOCK2_H)
+ELSE(HAVE_IFADDRS_H)
+    MESSAGE(STATUS "  Interface address discovery not supported.")
+ENDIF(HAVE_IFADDRS_H)
+
+########################################################################
+# Append to the list of sources for lib uhd
+########################################################################
+LIBUHD_PYTHON_GEN_SOURCE(
+    ${CMAKE_SOURCE_DIR}/lib/transport/gen_vrt.py
+    ${CMAKE_BINARY_DIR}/lib/transport/vrt.cpp
+)
+
+LIBUHD_APPEND_SOURCES(
+    ${CMAKE_SOURCE_DIR}/lib/transport/convert_types.cpp
+    ${CMAKE_SOURCE_DIR}/lib/transport/if_addrs.cpp
+    ${CMAKE_SOURCE_DIR}/lib/transport/udp_simple.cpp
+    ${CMAKE_SOURCE_DIR}/lib/transport/udp_zero_copy_asio.cpp
+)
diff --git a/host/lib/transport/gen_vrt.py b/host/lib/transport/gen_vrt.py
index 38a394dee..9a57c83c3 100755
--- a/host/lib/transport/gen_vrt.py
+++ b/host/lib/transport/gen_vrt.py
@@ -200,15 +200,11 @@ void vrt::unpack(
 }
 """
 
-import os
 import sys
 
 from Cheetah.Template import Template
 def parse_tmpl(_tmpl_text, **kwargs):
     return str(Template(_tmpl_text, kwargs))
-def safe_makedirs(path):
-    not os.path.isdir(path) and os.makedirs(path)
 
 if __name__ == '__main__':
-    safe_makedirs(os.path.dirname(sys.argv[1]))
     open(sys.argv[1], 'w').write(parse_tmpl(TMPL_TEXT, file=__file__))
diff --git a/host/lib/transport/udp_zero_copy_asio.cpp b/host/lib/transport/udp_zero_copy_asio.cpp
index 09386a60c..ee44803f4 100644
--- a/host/lib/transport/udp_zero_copy_asio.cpp
+++ b/host/lib/transport/udp_zero_copy_asio.cpp
@@ -19,6 +19,8 @@
 #include <boost/cstdint.hpp>
 #include <boost/asio.hpp>
 #include <boost/thread.hpp>
+#include <boost/format.hpp>
+#include <iostream>
 
 using namespace uhd::transport;
 
@@ -103,8 +105,18 @@ public:
     managed_send_buffer::sptr get_send_buff(void);
 
     //resize
-    size_t resize_recv_buff_size(size_t num_bytes);
-    size_t resize_send_buff_size(size_t num_bytes);
+    size_t resize_recv_buff(size_t num_bytes){
+        boost::asio::socket_base::receive_buffer_size option(num_bytes);
+        _socket->set_option(option);
+        _socket->get_option(option);
+        return option.value();
+    }
+    size_t resize_send_buff(size_t num_bytes){
+        boost::asio::socket_base::send_buffer_size option(num_bytes);
+        _socket->set_option(option);
+        _socket->get_option(option);
+        return option.value();
+    }
 
 private:
     boost::asio::ip::udp::socket   *_socket;
@@ -157,25 +169,34 @@ managed_send_buffer::sptr udp_zero_copy_impl::get_send_buff(void){
     );
 }
 
-size_t udp_zero_copy_impl::resize_recv_buff_size(size_t num_bytes){
-    boost::asio::socket_base::receive_buffer_size option(num_bytes);
-    _socket->set_option(option);
-    _socket->get_option(option);
-    return option.value();
-}
-
-size_t udp_zero_copy_impl::resize_send_buff_size(size_t num_bytes){
-    boost::asio::socket_base::send_buffer_size option(num_bytes);
-    _socket->set_option(option);
-    _socket->get_option(option);
-    return option.value();
-}
-
 /***********************************************************************
  * UDP zero copy make function
  **********************************************************************/
 udp_zero_copy::sptr udp_zero_copy::make(
-    const std::string &addr, const std::string &port
+    const std::string &addr,
+    const std::string &port,
+    size_t recv_buff_size,
+    size_t send_buff_size
 ){
-    return sptr(new udp_zero_copy_impl(addr, port));
+    boost::shared_ptr<udp_zero_copy_impl> udp_trans(new udp_zero_copy_impl(addr, port));
+
+    //resize the recv buffer if size was provided
+    if (recv_buff_size > 0){
+        size_t actual_bytes = udp_trans->resize_recv_buff(recv_buff_size);
+        if (recv_buff_size != actual_bytes) std::cout << boost::format(
+            "Target recv buffer size: %d\n"
+            "Actual recv byffer size: %d"
+        ) % recv_buff_size % actual_bytes << std::endl;
+    }
+
+    //resize the send buffer if size was provided
+    if (send_buff_size > 0){
+        size_t actual_bytes = udp_trans->resize_send_buff(send_buff_size);
+        if (send_buff_size != actual_bytes) std::cout << boost::format(
+            "Target send buffer size: %d\n"
+            "Actual send byffer size: %d"
+        ) % send_buff_size % actual_bytes << std::endl;
+    }
+
+    return udp_trans;
 }