Skip to content

Commit 47f0c44

Browse files
committed
subprojects: add libpcap with plugin loader support
Add libpcap as a meson wrap subproject with three patches on top of upstream commit bac2884b. These patches implement the plugin loader proposed in the-tcpdump-group/libpcap#1659: - runtime plugin loader for external capture modules - timestamp type accessors for adapter code - 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 e81e331 commit 47f0c44

8 files changed

Lines changed: 2321 additions & 2 deletions

.github/workflows/check.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
set -xe
7070
sudo apt-get update -qy
7171
sudo apt-get install -qy --no-install-recommends \
72-
make gcc gdb ccache ninja-build meson git scdoc \
72+
make gcc gdb ccache ninja-build meson git scdoc bison flex \
7373
libibverbs-dev libasan8 libcmocka-dev libedit-dev libarchive-dev \
7474
libevent-dev libmnl-dev libnuma-dev python3-pyelftools \
7575
socat tcpdump traceroute graphviz iproute2 iputils-ping ndisc6 jq \
@@ -148,7 +148,7 @@ jobs:
148148
apt install -qy --no-install-recommends \
149149
make gcc ccache git meson scdoc python3-pyelftools ca-certificates pkg-config \
150150
crossbuild-essential-arm64 libcmocka-dev:arm64 libedit-dev:arm64 \
151-
libevent-dev:arm64 libmnl-dev:arm64 libnuma-dev:arm64
151+
libevent-dev:arm64 libmnl-dev:arm64 libnuma-dev:arm64 bison flex
152152
- uses: actions/checkout@v4
153153
with:
154154
persist-credentials: false

.gitignore

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

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)