Skip to content

Commit c9edddc

Browse files
committed
Fixup the previous commit.
Add a change log entry, use MAXIMUM_SNAPLEN in pcap-hurd.c as suggested by Guy Harris in the pull request, regenerate Autoconf files and get white space right.
1 parent 04b51af commit c9edddc

File tree

5 files changed

+28
-2
lines changed

5 files changed

+28
-2
lines changed

CHANGES

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Monthday, Month DD, YYYY:
2727
Document a standard format for writing out BPF filter programs.
2828
Building and testing:
2929
Remove awk code from mkdep.
30+
Apply GNU Hurd support patch from the Debian package.
3031

3132
Monthday, Month DD, YYYY:
3233
Summary for 1.10.2 libpcap release (so far!)

config.h.in

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@
6969
/* on HP-UX 9.x */
7070
#undef HAVE_HPUX9
7171

72+
/* Define to 1 if you have the <hurd.h> header file. */
73+
#undef HAVE_HURD_H
74+
7275
/* Define to 1 if you have the <inttypes.h> header file. */
7376
#undef HAVE_INTTYPES_H
7477

configure

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7191,6 +7191,18 @@ _ACEOF
71917191
71927192
fi
71937193
7194+
done
7195+
7196+
for ac_header in hurd.h
7197+
do :
7198+
ac_fn_c_check_header_mongrel "$LINENO" "hurd.h" "ac_cv_header_hurd_h" "$ac_includes_default"
7199+
if test "x$ac_cv_header_hurd_h" = xyes; then :
7200+
cat >>confdefs.h <<_ACEOF
7201+
#define HAVE_HURD_H 1
7202+
_ACEOF
7203+
7204+
fi
7205+
71947206
done
71957207
71967208
@@ -7254,6 +7266,11 @@ done
72547266
# Haiku.
72557267
#
72567268
V_PCAP=haiku
7269+
elif test "$ac_cv_header_hurd_h" = yes; then
7270+
#
7271+
# Hurd.
7272+
#
7273+
V_PCAP=hurd
72577274
else
72587275
#
72597276
# Nothing we support.
@@ -8030,6 +8047,11 @@ snoop)
80308047
PLATFORM_C_SRC="pcap-snoop.c"
80318048
;;
80328049
8050+
hurd)
8051+
PLATFORM_C_SRC="pcap-hurd.c"
8052+
LIBS="$LIBS -lrt"
8053+
;;
8054+
80338055
dag)
80348056
#
80358057
# --with-pcap=dag is the only way to get here, and it means

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1064,7 +1064,7 @@ snoop)
10641064
;;
10651065

10661066
hurd)
1067-
PLATFORM_C_SRC="pcap-hurd.c"
1067+
PLATFORM_C_SRC="pcap-hurd.c"
10681068
LIBS="$LIBS -lrt"
10691069
;;
10701070

pcap-hurd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ struct pcap_hurd {
3131

3232
static struct bpf_insn filter[] = {
3333
{ NETF_IN | NETF_OUT | NETF_BPF, 0, 0, 0 },
34-
{ BPF_RET | BPF_K, 0, 0, 1500 },
34+
{ BPF_RET | BPF_K, 0, 0, MAXIMUM_SNAPLEN },
3535
};
3636

3737
#define FILTER_COUNT (sizeof(filter) / sizeof(short))

0 commit comments

Comments
 (0)