X-Git-Url: https://review.fuel-infra.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fdhcpdump%2F0001-use-non-bsd-structures.patch;fp=cirros-testvm%2Fsrc-cirros%2Fbuildroot-2015.05%2Fpackage%2Fdhcpdump%2F0001-use-non-bsd-structures.patch;h=40115fb640f7baf58fc31a070614959aab8e10af;hb=b0a0f15dfaa205161a7fcb20cf1b8cd4948c2ef3;hp=0000000000000000000000000000000000000000;hpb=c6ac3cd55ee2da956195eee393b0882105dfad4e;p=packages%2Ftrusty%2Fcirros-testvm.git

diff --git a/cirros-testvm/src-cirros/buildroot-2015.05/package/dhcpdump/0001-use-non-bsd-structures.patch b/cirros-testvm/src-cirros/buildroot-2015.05/package/dhcpdump/0001-use-non-bsd-structures.patch
new file mode 100644
index 0000000..40115fb
--- /dev/null
+++ b/cirros-testvm/src-cirros/buildroot-2015.05/package/dhcpdump/0001-use-non-bsd-structures.patch
@@ -0,0 +1,23 @@
+The udphdr structure has uh_* fields when _FAVOR_BSD is
+defined. Otherwise, the fields are just named source, dest, len and
+check. See <netinet/udp.h>.
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+
+Index: dhcpdump-1.8/dhcpdump.c
+===================================================================
+--- dhcpdump-1.8.orig/dhcpdump.c	2011-05-17 20:20:46.506980003 +0200
++++ dhcpdump-1.8/dhcpdump.c	2011-05-17 20:20:59.338979999 +0200
+@@ -163,10 +163,10 @@
+ 	strcpy(ip_origin, (u_char *)inet_ntoa(ip->ip_src));
+ 	strcpy(ip_destination, (u_char *)inet_ntoa(ip->ip_dst));
+ 
+-	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->uh_ulen)))
++	if (hmask && check_ch((u_char *)(sp + offset), ntohs(udp->len)))
+ 		return;
+ 
+-	printdata((u_char *)(sp + offset), ntohs(udp->uh_ulen));
++	printdata((u_char *)(sp + offset), ntohs(udp->len));
+ }
+ 
+ // check for matching CHADDR (Peter Apian-Bennewitz <apian@ise.fhg.de>)