[GNUnet-SVN] r30685 - in gnunet/src: mysql postgres transport

[gnunet]

Author: grothoff
Date: 2013-11-14 13:06:18 +0100 (Thu, 14 Nov 2013)
New Revision: 30685

Modified:
   gnunet/src/mysql/Makefile.am
   gnunet/src/postgres/Makefile.am
   gnunet/src/transport/plugin_transport_udp.c
   gnunet/src/transport/plugin_transport_udp.h
   gnunet/src/transport/plugin_transport_udp_broadcasting.c
Log:
-make buildbots happier

Modified: gnunet/src/mysql/Makefile.am
===================================================================
--- gnunet/src/mysql/Makefile.am        2013-11-14 12:01:56 UTC (rev 30684)
+++ gnunet/src/mysql/Makefile.am        2013-11-14 12:06:18 UTC (rev 30685)
@@ -8,13 +8,14 @@
   AM_CFLAGS = --coverage
 endif
 
+if HAVE_MYSQL
 lib_LTLIBRARIES = libgnunetmysql.la
+endif
 
 libgnunetmysql_la_SOURCES = \
   mysql.c
 libgnunetmysql_la_LIBADD = $(MYSQL_LDFLAGS) -lmysqlclient \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 libgnunetmysql_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0
-

Modified: gnunet/src/postgres/Makefile.am
===================================================================
--- gnunet/src/postgres/Makefile.am     2013-11-14 12:01:56 UTC (rev 30684)
+++ gnunet/src/postgres/Makefile.am     2013-11-14 12:06:18 UTC (rev 30685)
@@ -8,12 +8,14 @@
   AM_CFLAGS = --coverage
 endif
 
+if HAVE_POSTGRES
 lib_LTLIBRARIES = libgnunetpostgres.la
+endif
 
 libgnunetpostgres_la_SOURCES = \
   postgres.c
 libgnunetpostgres_la_LIBADD = -lpq \
- $(top_builddir)/src/util/libgnunetutil.la  
+ $(top_builddir)/src/util/libgnunetutil.la
 libgnunetpostgres_la_LDFLAGS = \
  $(GN_LIB_LDFLAGS) \
   -version-info 0:0:0

Modified: gnunet/src/transport/plugin_transport_udp.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp.c 2013-11-14 12:01:56 UTC (rev 
30684)
+++ gnunet/src/transport/plugin_transport_udp.c 2013-11-14 12:06:18 UTC (rev 
30685)
@@ -2438,7 +2438,7 @@
   switch (ntohs (msg->type))
   {
   case GNUNET_MESSAGE_TYPE_TRANSPORT_BROADCAST_BEACON:
-    udp_broadcast_receive (plugin, &buf, size, addr, fromlen);
+    udp_broadcast_receive (plugin, buf, size, addr, fromlen);
     return;
 
   case GNUNET_MESSAGE_TYPE_TRANSPORT_UDP_MESSAGE:
@@ -2905,7 +2905,7 @@
       sockets_created++;
     }
     else
-    {          
+    {
       LOG (GNUNET_ERROR_TYPE_ERROR,
                "Failed to bind UDP socket to %s: %s\n",
                GNUNET_a2s (server_addr, addrlen), STRERROR (eno));

Modified: gnunet/src/transport/plugin_transport_udp.h
===================================================================
--- gnunet/src/transport/plugin_transport_udp.h 2013-11-14 12:01:56 UTC (rev 
30684)
+++ gnunet/src/transport/plugin_transport_udp.h 2013-11-14 12:06:18 UTC (rev 
30685)
@@ -57,10 +57,10 @@
  */
 struct IPv4UdpAddress
 {
-       /**
-        * Optional options and flags for this address
-        */
-       uint32_t options GNUNET_PACKED;
+  /**
+   * Optional options and flags for this address
+   */
+  uint32_t options GNUNET_PACKED;
 
   /**
    * IPv4 address, in network byte order.
@@ -79,10 +79,10 @@
  */
 struct IPv6UdpAddress
 {
-       /**
-        * Optional options and flags for this address
-        */
-       uint32_t options GNUNET_PACKED;
+  /**
+   * Optional options and flags for this address
+   */
+  uint32_t options GNUNET_PACKED;
 
   /**
    * IPv6 address.
@@ -296,10 +296,16 @@
 udp_address_to_string (void *cls, const void *addr, size_t addrlen);
 
 void
-udp_broadcast_receive ();
+udp_broadcast_receive (struct Plugin *plugin,
+                       const char * buf,
+                       ssize_t size,
+                       const struct sockaddr *addr,
+                       size_t addrlen);
 
 void
-setup_broadcast (struct Plugin *plugin, struct sockaddr_in6 *server_addrv6, 
struct sockaddr_in *server_addrv4);
+setup_broadcast (struct Plugin *plugin,
+                 struct sockaddr_in6 *server_addrv6,
+                 struct sockaddr_in *server_addrv4);
 
 void
 stop_broadcast (struct Plugin *plugin);

Modified: gnunet/src/transport/plugin_transport_udp_broadcasting.c
===================================================================
--- gnunet/src/transport/plugin_transport_udp_broadcasting.c    2013-11-14 
12:01:56 UTC (rev 30684)
+++ gnunet/src/transport/plugin_transport_udp_broadcasting.c    2013-11-14 
12:06:18 UTC (rev 30685)
@@ -187,8 +187,13 @@
   return GNUNET_OK;
 }
 
+
 void
-udp_broadcast_receive (struct Plugin *plugin, const char * buf, ssize_t size, 
struct sockaddr *addr, size_t addrlen)
+udp_broadcast_receive (struct Plugin *plugin,
+                       const char * buf,
+                       ssize_t size,
+                       const struct sockaddr *addr,
+                       size_t addrlen)
 {
   struct GNUNET_ATS_Information ats;
 
@@ -235,6 +240,7 @@
   }
 }
 
+
 static unsigned int
 prepare_beacon (struct Plugin *plugin, struct UDP_Beacon_Message *msg)
 {
@@ -259,6 +265,7 @@
   return msg_size;
 }
 
+
 static void
 udp_ipv4_broadcast_send (void *cls,
                          const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -312,6 +319,7 @@
                                     &udp_ipv4_broadcast_send, plugin);
 }
 
+
 static void
 udp_ipv6_broadcast_send (void *cls,
                          const struct GNUNET_SCHEDULER_TaskContext *tc)
@@ -421,7 +429,7 @@
     }
     else
     {
-      GNUNET_OS_network_interfaces_list (iface_proc, plugin);
+      GNUNET_OS_network_interfaces_list (&iface_proc, plugin);
       plugin->send_ipv4_broadcast_task =
           GNUNET_SCHEDULER_add_now (&udp_ipv4_broadcast_send, plugin);
 
@@ -484,6 +492,7 @@
   }
 }
 
+
 void
 stop_broadcast (struct Plugin *plugin)
 {