changeset 452:4cc421ea1213

wip, fix fix not being in the right patch
author Louis Opter <kalessin@kalessin.fr>
date Fri, 06 May 2016 09:05:35 -0700
parents f1446ed50512
children b20040b88de9
files fix_freebsd_build.patch network_discovery.patch
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/fix_freebsd_build.patch	Wed May 04 22:29:55 2016 -0700
+++ b/fix_freebsd_build.patch	Fri May 06 09:05:35 2016 -0700
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  631ea4f01b043da184393acd8cd055619e8eaa1f
+# Parent  28701ca70422b882028b7fd0e6c52401b394041a
 Fix build on FreeBSD 10.3
 
 - properly use _XOPEN_SOURCE=700 instead of _POSIX_C_SOURCE;
--- a/network_discovery.patch	Wed May 04 22:29:55 2016 -0700
+++ b/network_discovery.patch	Fri May 06 09:05:35 2016 -0700
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  d6245f382c7a85dd48328f670698ee9f8c421ef8
+# Parent  3b2d568c18f44ef51ec69c4b8d19eb15e8b7a057
 Properly broadcast LIFX discovery packets on all networks (closes GH-2)
 
 This is really the proper way of achieving the same semantic as
@@ -64,12 +64,13 @@
 diff --git a/lifx/broadcast.c b/lifx/broadcast.c
 --- a/lifx/broadcast.c
 +++ b/lifx/broadcast.c
-@@ -17,12 +17,14 @@
+@@ -17,12 +17,15 @@
  
  #include <sys/queue.h>
  #include <sys/tree.h>
 +#include <sys/socket.h>
  #include <arpa/inet.h>
++#include <net/if.h>
  #include <netinet/in.h>
  #include <assert.h>
  #include <endian.h>
@@ -79,7 +80,7 @@
  #include <stdarg.h>
  #include <stdbool.h>
  #include <stdint.h>
-@@ -52,16 +54,37 @@
+@@ -52,16 +55,37 @@
  };
  
  static bool
@@ -123,7 +124,7 @@
      struct lgtd_lifx_packet_header get_pan_gateway;
      lgtd_lifx_wire_setup_header(
          &get_pan_gateway,
-@@ -71,31 +94,50 @@
+@@ -71,31 +95,50 @@
          LGTD_LIFX_GET_PAN_GATEWAY
      );