Commit 95cf21ef authored by Thomas Petazzoni's avatar Thomas Petazzoni
Browse files

dhcpdump: move as a proper package, bump version 



dhcpdump 1.7 required tcpdump, but version 1.8 now uses libpcap
instead. Also version 1.8 is no longer autotools based, but just a
simple Makefile.

Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent e3bf4de3

package/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -385,6 +385,7 @@ source "package/cups/Config.in" 
if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS

source "package/dhcp/Config.in"

endif

source "package/dhcpdump/Config.in"

source "package/dnsmasq/Config.in"

source "package/dropbear/Config.in"

source "package/ethtool/Config.in"

package/dhcpdump/Config.in

0 → 100644
+5 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_DHCPDUMP

	bool "dhcpdump"

	select BR2_PACKAGE_LIBPCAP

	help

	  A tool for monitoring dhcp requests using tcpdump.

package/dhcpdump/dhcpdump-1.8-use-non-bsd-structures.patch

0 → 100644
+23 −0
Original line number Diff line number Diff line 
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>)

package/dhcpdump/dhcpdump.mk

0 → 100644
+21 −0
Original line number Diff line number Diff line 
#############################################################

#

# dhcpdump

#

#############################################################



DHCPDUMP_VERSION = 1.8

DHCPDUMP_SITE    = http://www.mavetju.org/download/

DHCPDUMP_SOURCE  = dhcpdump-$(DHCPDUMP_VERSION).tar.gz



DHCPDUMP_DEPENDENCIES = libpcap



define DHCPDUMP_BUILD_CMDS

	$(MAKE) -C $(@D) CC="$(TARGET_CC) $(TARGET_CFLAGS)"

endef



define DHCPDUMP_INSTALL_TARGET_CMDS

	install -m 0755 -D $(@D)/dhcpdump $(TARGET_DIR)/usr/bin/dhcpdump

endef



$(eval $(call GENTARGETS,package,dhcpdump))

package/tcpdump/Config.in

+0 −6
Original line number Diff line number Diff line
@@ -11,9 +11,3 @@ config BR2_PACKAGE_TCPDUMP_SMB 
	depends on BR2_PACKAGE_TCPDUMP

	help

	  enable possibly-buggy SMB printer
 


config BR2_PACKAGE_DHCPDUMP

	bool "dhcpdump"

	select BR2_PACKAGE_LIBPCAP

	help

	  A tool for monitoring dhcp requests using tcpdump.