[Commit-gnuradio] r4297 - gnuradio/trunk/gnuradio-core/src/lib/io

[eb]

Author: eb
Date: 2007-01-27 11:21:55 -0700 (Sat, 27 Jan 2007)
New Revision: 4297

Modified:
   gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc
Log:
fixed error handling and warning

Modified: gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc
===================================================================
--- gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc      2007-01-26 
20:08:37 UTC (rev 4296)
+++ gnuradio/trunk/gnuradio-core/src/lib/io/gr_udp_sink.cc      2007-01-27 
18:21:55 UTC (rev 4297)
@@ -85,14 +85,14 @@
   omni_mutex_lock l(d_mutex);  // hold mutex for duration of this function
 
   // create socket
-  if((d_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == NULL) {
+  if((d_socket = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == -1) {
     perror("socket open");
     throw std::runtime_error("can't open socket");
   }
 
   // Turn on reuse address
   bool opt_val = true;
-  if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (void*)&opt_val, 
sizeof(int))) {
+  if(setsockopt(d_socket, SOL_SOCKET, SO_REUSEADDR, (void*)&opt_val, 
sizeof(int)) == -1) {
     perror("SO_REUSEADDR");
     throw std::runtime_error("can't set socket option SO_REUSEADDR");
   }
@@ -101,19 +101,19 @@
   linger lngr;
   lngr.l_onoff  = 1;
   lngr.l_linger = 0;
-  if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (void*)&lngr, 
sizeof(linger))) {
+  if(setsockopt(d_socket, SOL_SOCKET, SO_LINGER, (void*)&lngr, sizeof(linger)) 
== -1) {
     perror("SO_LINGER");
     throw std::runtime_error("can't set socket option SO_LINGER");
   }
 
   // bind socket to an address and port number to listen on
-  if(bind (d_socket, (sockaddr*)&d_sockaddr_local, sizeof(struct sockaddr))) {
+  if(bind (d_socket, (sockaddr*)&d_sockaddr_local, sizeof(struct sockaddr)) == 
-1) {
     perror("socket bind");
     throw std::runtime_error("can't bind socket");
   }
 
   // Not sure if we should throw here or allow retries
-  if(connect(d_socket, (sockaddr*)&d_sockaddr_remote, sizeof(struct 
sockaddr))) {
+  if(connect(d_socket, (sockaddr*)&d_sockaddr_remote, sizeof(struct sockaddr)) 
== -1) {
     perror("socket connect");
     throw std::runtime_error("can't connect to socket");
   }
@@ -145,7 +145,7 @@
 
   while(bytes_sent < total_size) {
     bytes_to_send = (bytes_sent+d_mtu < total_size ? d_mtu : 
total_size-bytes_sent);
-    bytes =send(d_socket, (in+bytes_sent), bytes_to_send, MSG_DONTWAIT);
+    bytes = send(d_socket, (in+bytes_sent), bytes_to_send, MSG_DONTWAIT);
     bytes_sent += bytes;
   }