[paparazzi-commits] [5020] Allow caller to optionally set broadcast socket option for fms network

[Allen Ibara]

Revision: 5020
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=5020
Author:   aibara
Date:     2010-07-06 18:17:58 +0000 (Tue, 06 Jul 2010)
Log Message:
-----------
Allow caller to optionally set broadcast socket option for fms network

Modified Paths:
--------------
    paparazzi3/trunk/sw/airborne/fms/fms_network.c
    paparazzi3/trunk/sw/airborne/fms/fms_network.h

Modified: paparazzi3/trunk/sw/airborne/fms/fms_network.c
===================================================================
--- paparazzi3/trunk/sw/airborne/fms/fms_network.c      2010-07-06 18:15:31 UTC 
(rev 5019)
+++ paparazzi3/trunk/sw/airborne/fms/fms_network.c      2010-07-06 18:17:58 UTC 
(rev 5020)
@@ -6,8 +6,7 @@
 
 #include "fms_debug.h"
 
-struct FmsNetwork* network_new(const char* str_ip_out, const int port_out, 
const int port_in, 
-                              const enum FmsNetworkMode mode) {
+struct FmsNetwork* network_new(const char* str_ip_out, const int port_out, 
const int port_in, const int broadcast) {
 
   struct FmsNetwork* me = malloc(sizeof(struct FmsNetwork));
  
@@ -17,11 +16,10 @@
   setsockopt(me->socket_out, SOL_SOCKET, SO_REUSEADDR, 
              &so_reuseaddr, sizeof(so_reuseaddr));
 
-  /* only set broadcast option if explicitly enabled */
-  const int val = 1;
-  if (mode == FMS_NETWORK_BROADCAST)
+       /* only set broadcast option if explicitly enabled */
+  if (broadcast)
     setsockopt(me->socket_out, SOL_SOCKET, SO_BROADCAST,
-               &val, sizeof(val));
+               &broadcast, sizeof(broadcast));
   
   me->addr_out.sin_family = PF_INET;
   me->addr_out.sin_port = htons(port_out);

Modified: paparazzi3/trunk/sw/airborne/fms/fms_network.h
===================================================================
--- paparazzi3/trunk/sw/airborne/fms/fms_network.h      2010-07-06 18:15:31 UTC 
(rev 5019)
+++ paparazzi3/trunk/sw/airborne/fms/fms_network.h      2010-07-06 18:17:58 UTC 
(rev 5020)
@@ -4,11 +4,6 @@
 #include <sys/socket.h>
 #include <arpa/inet.h>
 
-enum FmsNetworkMode {
-  FMS_NETWORK_UNICAST,
-  FMS_NETWORK_BROADCAST
-};
-
 #define FMS_UNICAST 0
 #define FMS_BROADCAST 1
 
@@ -20,8 +15,7 @@
 };
 
 
-extern struct FmsNetwork* network_new(const char* str_ip_out, const int 
port_out, const int port_in, 
-                                     enum FmsNetworkMode mode);
+extern struct FmsNetwork* network_new(const char* str_ip_out, const int 
port_out, const int port_in, const int broadcast);
 extern int network_write(struct FmsNetwork* me, char* buf, int len);
 
 #endif /* FMS_NETWORK_H */