Pim van Pelt
1f144f4c19
v0.3.0's listen wrapper treated every listen beyond the first at a
given sockaddr as a skip-core "duplicate", which was correct for
two `listen 80 device=X/Y;` lines in one server block but broke on
the real deployment pattern where every server-*.conf pulls in the
same `include listens.conf;`. Symptoms:
* every server block after the first ended up with no listen
directive processed, so nginx assigned them the default
`*:80`, producing a flood of "conflicting server name"
warnings and attaching every server block to an unrelated
wildcard bind;
* the bindings list grew linearly with the number of server
blocks, so init_module tried to create (server_blocks) ×
(devices × families) listening sockets and hit EMFILE.
Replace the single dedup with two independent checks:
* listens_seen is a (cscf, sockaddr) ledger. The core listen
handler is invoked at most once per (server block, sockaddr),
matching nginx's own duplicate check so server-block N just
attaches its cscf to the existing address via
ngx_http_add_server.
* `bind` is added only for the first global occurrence of each
sockaddr; subsequent cscfs inherit opt.set/opt.bind from the
first, which is what keeps nginx's "duplicate listen options"
check happy across server blocks.
* bindings dedup on (sockaddr, device) globally, so init_module
creates one socket per unique pair regardless of how many
server blocks reference it.
Add a regression test at tests/01-module/ that wires three server
blocks to the same ipng-listens.inc and asserts that nginx -t is
clean and exactly four sockets are bound on port 8080.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
59 lines
1.7 KiB
YAML
59 lines
1.7 KiB
YAML
# SPDX-License-Identifier: Apache-2.0
|
|
# Containerlab topology for nginx-ipng-stats-plugin end-to-end tests.
|
|
#
|
|
# Three nodes:
|
|
# server — nginx with the module, a slow Python backend, two data-plane interfaces
|
|
# client1 — sends traffic via eth1 (attributed to source_tag=tag1 for both v4 and v6)
|
|
# client2 — sends traffic via eth2 (attributed to source_tag=tag2-v4 for v4,
|
|
# tag2-v6 for v6 — demonstrates per-(device, family) attribution)
|
|
#
|
|
# Links (each carries a /24 and a /64):
|
|
# server:eth1 ←→ client1:eth1 (10.0.1.0/24 + 2001:db8:1::/64)
|
|
# server:eth2 ←→ client2:eth1 (10.0.2.0/24 + 2001:db8:2::/64)
|
|
|
|
name: ipng-stats-test
|
|
|
|
mgmt:
|
|
network: ipng-stats-test-net
|
|
ipv4-subnet: 172.20.40.0/24
|
|
|
|
topology:
|
|
nodes:
|
|
server:
|
|
kind: linux
|
|
image: debian:trixie-slim
|
|
mgmt-ipv4: 172.20.40.2
|
|
binds:
|
|
- ../../../build:/opt/build:ro
|
|
- ./server/nginx.conf:/opt/config/nginx.conf:ro
|
|
- ./server/ipng-listens.inc:/opt/config/ipng-listens.inc:ro
|
|
- ./server/slow-backend.py:/opt/config/slow-backend.py:ro
|
|
- ./server/start.sh:/start.sh:ro
|
|
cmd: bash /start.sh
|
|
|
|
client1:
|
|
kind: linux
|
|
image: debian:trixie-slim
|
|
mgmt-ipv4: 172.20.40.11
|
|
binds:
|
|
- ./client/start.sh:/start.sh:ro
|
|
cmd: bash /start.sh
|
|
env:
|
|
MY_IP: 10.0.1.2/24
|
|
MY_IP6: 2001:db8:1::2/64
|
|
|
|
client2:
|
|
kind: linux
|
|
image: debian:trixie-slim
|
|
mgmt-ipv4: 172.20.40.12
|
|
binds:
|
|
- ./client/start.sh:/start.sh:ro
|
|
cmd: bash /start.sh
|
|
env:
|
|
MY_IP: 10.0.2.2/24
|
|
MY_IP6: 2001:db8:2::2/64
|
|
|
|
links:
|
|
- endpoints: ["server:eth1", "client1:eth1"]
|
|
- endpoints: ["server:eth2", "client2:eth1"]
|