[Commit-gnuradio] r8100 - gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io

[jcorgan]

Author: jcorgan
Date: 2008-03-24 10:08:52 -0600 (Mon, 24 Mar 2008)
New Revision: 8100

Modified:
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_sink.cc
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_sink.h
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_source.cc
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_source.h
   gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/io.i
Log:
Applied changeset r8097 on trunk to release branch.

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_sink.cc
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_sink.cc      
2008-03-24 16:07:38 UTC (rev 8099)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_sink.cc      
2008-03-24 16:08:52 UTC (rev 8100)
@@ -26,7 +26,14 @@
 #include <gr_udp_sink.h>
 #include <gr_io_signature.h>
 #include <stdexcept>
+#if defined(HAVE_SOCKET)
 #include <netdb.h>
+typedef void* optval_t;
+#else
+#define SHUT_RDWR 2
+#define inet_aton(N,A) ( (A)->s_addr = inet_addr(N), ( (A)->s_addr != 
INADDR_NONE ) )
+typedef char* optval_t;
+#endif
 
 #define SNK_VERBOSE 0
 
@@ -112,7 +119,7 @@
 
   // Turn on reuse address
   int opt_val = true;
-  if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (void*)&opt_val, 
sizeof(int)) == -1) {
+  if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (optval_t)&opt_val, 
sizeof(int)) == -1) {
     perror("SO_REUSEADDR");
     throw std::runtime_error("can't set socket option SO_REUSEADDR");
   }
@@ -121,7 +128,7 @@
   linger lngr;
   lngr.l_onoff  = 1;
   lngr.l_linger = 0;
-  if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (void*)&lngr, sizeof(linger)) 
== -1) {
+  if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (optval_t)&lngr, 
sizeof(linger)) == -1) {
     perror("SO_LINGER");
     throw std::runtime_error("can't set socket option SO_LINGER");
   }

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_sink.h
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_sink.h       
2008-03-24 16:07:38 UTC (rev 8099)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_sink.h       
2008-03-24 16:08:52 UTC (rev 8100)
@@ -25,9 +25,13 @@
 
 #include <gr_sync_block.h>
 #include <omnithread.h>
+#if defined(HAVE_SOCKET)
 #include <sys/socket.h>
 #include <arpa/inet.h>
-#include <sys/socket.h>
+#elif defined(HAVE_WINDOWS_H)
+#include <winsock2.h>
+#include <windows.h>
+#endif
 #if defined(HAVE_NETINET_IN_H)
 #include <netinet/in.h>
 #endif

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_source.cc
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_source.cc    
2008-03-24 16:07:38 UTC (rev 8099)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_source.cc    
2008-03-24 16:08:52 UTC (rev 8100)
@@ -27,7 +27,14 @@
 #include <gr_io_signature.h>
 #include <stdexcept>
 #include <errno.h>
+#if defined(HAVE_SOCKET)
 #include <netdb.h>
+typedef void* optval_t;
+#else
+#define SHUT_RDWR 2
+#define inet_aton(N,A) ( (A)->s_addr = inet_addr(N), ( (A)->s_addr != 
INADDR_NONE ) )
+typedef char* optval_t;
+#endif
 
 #define SRC_VERBOSE 0
 
@@ -91,7 +98,7 @@
 
   // Turn on reuse address
   int opt_val = 1;
-  if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (void*)&opt_val, 
sizeof(int)) == -1) {
+  if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (optval_t)&opt_val, 
sizeof(int)) == -1) {
     perror("SO_REUSEADDR");
     throw std::runtime_error("can't set socket option SO_REUSEADDR");
   }
@@ -100,7 +107,7 @@
   linger lngr;
   lngr.l_onoff  = 1;
   lngr.l_linger = 0;
-  if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (void*)&lngr, sizeof(linger)) 
== -1) {
+  if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (optval_t)&lngr, 
sizeof(linger)) == -1) {
     perror("SO_LINGER");
     throw std::runtime_error("can't set socket option SO_LINGER");
   }
@@ -110,7 +117,7 @@
   timeval timeout;
   timeout.tv_sec = 1;
   timeout.tv_usec = 0;
-  if(setsockopt(d_socket, SOL_SOCKET, SO_RCVTIMEO, (void*)&timeout, 
sizeof(timeout)) == -1) {
+  if(setsockopt(d_socket, SOL_SOCKET, SO_RCVTIMEO, (optval_t)&timeout, 
sizeof(timeout)) == -1) {
     perror("SO_RCVTIMEO");
     throw std::runtime_error("can't set socket option SO_RCVTIMEO");
   }

Modified: 
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_source.h
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_source.h     
2008-03-24 16:07:38 UTC (rev 8099)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/gr_udp_source.h     
2008-03-24 16:08:52 UTC (rev 8100)
@@ -25,8 +25,13 @@
 
 #include <gr_sync_block.h>
 #include <omnithread.h>
+#if defined(HAVE_SOCKET)
 #include <sys/socket.h>
 #include <arpa/inet.h>
+#elif defined(HAVE_WINDOWS_H)
+#include <winsock2.h>
+#include <windows.h>
+#endif
 #if defined(HAVE_NETINET_IN_H)
 #include <netinet/in.h>
 #endif

Modified: gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/io.i
===================================================================
--- gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/io.i        
2008-03-24 16:07:38 UTC (rev 8099)
+++ gnuradio/branches/releases/3.1/gnuradio-core/src/lib/io/io.i        
2008-03-24 16:08:52 UTC (rev 8100)
@@ -22,6 +22,10 @@
 
 %{
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <gr_file_sink.h>
 #include <gr_file_source.h>
 #include <gr_file_descriptor_sink.h>