logos-storage/nim-libplum
1
0
Fork 0
mirror of https://github.com/logos-storage/nim-libplum.git synced 2026-06-07 09:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update Docker files comment

Browse Source
This commit is contained in:
Arnaud 2026-05-19 11:28:39 +04:00
parent 9f7833edf1
commit c5adcb2353
No known key found for this signature in database
GPG Key ID: A6C7C781817146FA
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/Dockerfile
View File

@ -16,7 +16,10 @@ RUN git clone --depth=1 --branch miniupnpd_2_3_9 \
&& cp /tmp/stub_rdr.c . \
&& make NETFILTEROBJS=stub_rdr.o miniupnpd \
&& install -m 755 miniupnpd /usr/local/sbin/miniupnpd \
&& sed -i 's/^#define ENABLE_PCP$/\/*#define ENABLE_PCP*\//' config.h \
# Build another miniupnpd for pmp: we need to disable explictly PCP for that
# check miniupnpd configure for more info.
# https://github.com/miniupnp/miniupnp/blob/50cb0582d4a659e319050069aa84efbc1f353b14/miniupnpd/configure#L878-L880
&& sed -i 's/^#idefine ENABLE_PCP$/\/*#define ENABLE_PCP*\//' config.h \
&& make NETFILTEROBJS=stub_rdr.o miniupnpd \
&& install -m 755 miniupnpd /usr/local/sbin/miniupnpd-natpmponly \
&& rm -rf /tmp/miniupnp /tmp/stub_rdr.c

20
tests/docker-entrypoint.sh
View File

@ -4,11 +4,14 @@ set -euo pipefail
RUNDIR=/tmp/plum-test
mkdir -p "$RUNDIR"
# miniupnpd must listen on the same interface as libplum.
# we get the default route interface (e.g. eth0) and use it to receive libplum requests.
LAN_IF=$(ip route show default | awk '/default/{print $5; exit}')
# get its IP and use it as a fake router so libplum sends PCP/NAT-PMP requests to miniupnpd.
LAN_IP=$(ip -4 addr show "$LAN_IF" | awk '/inet /{print $2; exit}' | cut -d/ -f1)
# Use a public (non-reserved) WAN IP. miniupnpd disables port forwarding when
# the external interface has a private/RFC1918 address (treats it as double-NAT).
# we use a public WAN IP (1.2.3.4) on a dummy interface because miniupnpd disables
# port forwarding when the external interface has a private/RFC1918 address (treats it as double-NAT).
ip link add plum-wan type dummy
ip addr add 1.2.3.4/24 dev plum-wan
ip link set plum-wan up
@ -52,11 +55,8 @@ run_tests() {
}
if [ "${TEST_MINIUPNP_PCP:-}" = "1" ]; then
# PCP requires the UDP source IP to equal the client_address field in the
# MAP request header. libplum sets client_address by connecting a UDP socket
# to the gateway IP. Pointing the default route at LAN_IP makes libplum
# use LAN_IP as both the gateway (where it sends PCP) and the source IP,
# so the two match and miniupnpd accepts the request without ADDRESS_MISMATCH.
# PCP requires the UDP source IP to match the client_address in the MAP request.
# we point the default route at LAN_IP so libplum uses it as both gateway and source IP.
ip route replace default via "$LAN_IP" dev "$LAN_IF"
start_miniupnpd pcp yes "$LAN_IF"
run_tests pcp "$RUNDIR/miniupnpd-pcp.log"
@ -68,10 +68,8 @@ if [ "${TEST_MINIUPNP_UPNP:-}" = "1" ]; then
fi
if [ "${TEST_MINIUPNP_NATPMP:-}" = "1" ]; then
# miniupnpd-natpmponly is compiled without ENABLE_PCP: PCP probes get no
# response (timeout) and libplum must fall back to NAT-PMP on its own.
# Same route trick as PCP: point the default route at LAN_IP so libplum
# sends NAT-PMP to the local miniupnpd rather than the real gateway.
# miniupnpd-natpmponly has no PCP support, so libplum falls back to NAT-PMP.
# same route trick as PCP: point the default route at LAN_IP so libplum sends NAT-PMP to miniupnpd.
ip route replace default via "$LAN_IP" dev "$LAN_IF"
start_miniupnpd natpmp yes "$LAN_IF" miniupnpd-natpmponly
run_tests natpmp "$RUNDIR/miniupnpd-natpmp.log"