mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-23 10:04:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

NFLOG: remove header dependency, add a test case

Browse Source 
This change removes detection of linux/netfilter/nfnetlink_log.h, which
was only used to provide two constants. The constants are now defined in
print-nflog.c, making it possible to compile (and test) the NFLOG
decoder on all systems, not only Linux.

There is now a test case for the decoder, it was produced on a Linux
host with:

iptables -A INPUT -p udp --source 74.82.42.42 -j NFLOG --nflog-group 20
dig @74.82.42.42 ...
This commit is contained in:
Denis Ovsienko 2013-09-09 14:45:31 +04:00
parent ee87840d97
commit af23176926
7 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -33,7 +33,7 @@ if test "$ac_cv___attribute__" = "yes"; then
AC_C___ATTRIBUTE___FORMAT_FUNCTION_POINTER
fi
fi
AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h netdnet/dnetdb.h linux/netfilter/nfnetlink_log.h)
AC_CHECK_HEADERS(fcntl.h rpc/rpc.h rpc/rpcent.h netdnet/dnetdb.h)
AC_CHECK_HEADERS(net/pfvar.h, , , [#include <sys/types.h>
#include <sys/socket.h>
#include <net/if.h>])

4
netdissect.h
View File

@ -482,11 +482,7 @@ extern void pptp_print(netdissect_options *,const u_char *, u_int);
extern u_int ipnet_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
extern u_int ppi_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
#ifdef HAVE_LINUX_NETFILTER_NFNETLINK_LOG_H
extern u_int nflog_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
#endif
extern u_int ieee802_15_4_if_print(netdissect_options *,const struct pcap_pkthdr *, const u_char *);
#ifdef INET6

6
print-nflog.c
View File

@ -37,12 +37,13 @@
#include "netdissect.h"
#include "interface.h"
#ifdef HAVE_LINUX_NETFILTER_NFNETLINK_LOG_H
#include <linux/netfilter/nfnetlink_log.h>
#include "nflog.h"
#ifdef DLT_NFLOG
#define NFULA_PAYLOAD 9
#define NFULA_MAX 17
const struct tok nflog_values[] = {
{ AF_INET, "IPv4" },
{ AF_INET6, "IPv6" },
@ -150,5 +151,4 @@ nflog_if_print(struct netdissect_options *ndo,
return (sizeof(nflog_hdr_t));
}
#endif /* HAVE_LINUX_NETFILTER_NFNETLINK_LOG_H */
#endif /* DLT_NFLOG */

2
tcpdump.c
View File

@ -332,9 +332,7 @@ static struct ndo_printer ndo_printers[] = {
{ netanalyzer_transparent_if_print, DLT_NETANALYZER_TRANSPARENT },
#endif
#ifdef DLT_NFLOG
#ifdef HAVE_LINUX_NETFILTER_NFNETLINK_LOG_H
{ nflog_if_print, DLT_NFLOG},
#endif
#endif
{ NULL, 0 },
};

3
tests/TESTLIST
View File

@ -134,3 +134,6 @@ of10_pf5240-vv of10_pf5240.pcap of10_pf5240-vv.out -t -vv
# GeoNetworking and CALM FAST tests
geonet-calm-fast geonet_and_calm_fast.pcap geonet_and_calm_fast.out -t -vv -n
# NFLOG test case
nflog-e nflog.pcap nflog-e.out -t -e

4
tests/nflog-e.out Normal file
View File

@ -0,0 +1,4 @@
version 0, resource ID 20, family IPv4 (2), length 180: 74.82.42.42.53 > 10.0.0.20.42585: 17265 1/0/0 A 93.184.216.119 (45)
version 0, resource ID 20, family IPv4 (2), length 192: 74.82.42.42.53 > 10.0.0.20.45190: 52954 1/0/0 AAAA 2606:2800:220:6d:26bf:1447:1097:aa7 (57)
version 0, resource ID 20, family IPv4 (2), length 184: 74.82.42.42.53 > 10.0.0.20.44031: 8279 1/0/0 A 93.184.216.119 (49)
version 0, resource ID 20, family IPv4 (2), length 196: 74.82.42.42.53 > 10.0.0.20.48736: 2122 1/0/0 AAAA 2606:2800:220:6d:26bf:1447:1097:aa7 (61)

BIN
tests/nflog.pcap Normal file
View File

Binary file not shown.