Skip to content

Commit d763b9f

Browse files
committed
subprojects: add libpcap with plugin loader support
The packet capture feature needs libpcap with the plugin loader API proposed in the-tcpdump-group/libpcap#1659 which is not yet merged upstream. Add libpcap as a meson wrap subproject with three patches on top of upstream commit bac2884b implementing the runtime plugin loader, timestamp type accessors and a complete accessor API for tcpdump feature parity. The meson.build exposes a plugindir variable via declare_dependency() so consumers can install plugins in the right location. Signed-off-by: Robin Jarry <rjarry@redhat.com>
1 parent 4a3621f commit d763b9f

8 files changed

Lines changed: 2320 additions & 1 deletion

.github/workflows/check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
# grout dependencies
7878
sudo apt-get update -qy
7979
sudo apt-get install -qy --no-install-recommends \
80-
make gcc gdb ccache ninja-build meson git scdoc \
80+
make gcc gdb ccache ninja-build meson git scdoc bison flex \
8181
libibverbs-dev libasan8 libcmocka-dev libedit-dev libarchive-dev \
8282
libevent-dev libmnl-dev libnuma-dev python3-pyelftools \
8383
socat tcpdump traceroute graphviz iproute2 iputils-ping ndisc6 jq \

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,6 @@
2121
/subprojects/dpdk-*
2222
/subprojects/libecoli-*
2323
/subprojects/frr-*
24+
/subprojects/libpcap
2425
/subprojects/packagecache
2526
/subprojects/.wraplock

subprojects/libpcap.wrap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[wrap-git]
2+
url = https://github.com/the-tcpdump-group/libpcap
3+
revision = bac2884bfabe20f9ff0f711eb9eb7589569e6a01
4+
depth = 1
5+
patch_directory = libpcap
6+
diff_files =
7+
libpcap/0001-plugin-add-runtime-plugin-loader-for-external-captur.patch,
8+
libpcap/0002-plugin-expose-timestamp-type-accessors-for-adapter-c.patch,
9+
libpcap/0003-plugin-complete-accessor-API-for-tcpdump-feature-par.patch
10+
11+
[provide]
12+
dependency_names = libpcap

0 commit comments

Comments
 (0)