Skip to content

feat(p2p/nat): limit UPNP request concurrency #21390#2426

Open
gzliudan wants to merge 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:p2p-nat-concurrency-limit
Open

feat(p2p/nat): limit UPNP request concurrency #21390#2426
gzliudan wants to merge 1 commit into
XinFinOrg:dev-upgradefrom
gzliudan:p2p-nat-concurrency-limit

Conversation

@gzliudan

Copy link
Copy Markdown
Collaborator

Proposed changes

This adds a lock around requests because some routers can't handle concurrent requests. Requests are also rate-limited.

The Map function request a new mapping exactly when the map timeout occurs instead of 5 minutes earlier. This should prevent duplicate mappings.

Ref: ethereum#21390

Types of changes

What types of changes does your code introduce to XDC network?
Put an in the boxes that apply

  • build: Changes that affect the build system or external dependencies
  • ci: Changes to CI configuration files and scripts
  • chore: Changes that don't change source code or tests
  • docs: Documentation only changes
  • feat: A new feature
  • fix: A bug fix
  • perf: A code change that improves performance
  • refactor: A code change that neither fixes a bug nor adds a feature
  • revert: Revert something
  • style: Changes that do not affect the meaning of the code
  • test: Adding missing tests or correcting existing tests

Impacted Components

Which parts of the codebase does this PR touch?
Put an in the boxes that apply

  • Consensus
  • Account
  • Network
  • Geth
  • Smart Contract
  • External components
  • Not sure (Please specify below)

Checklist

Put an in the boxes once you have confirmed below actions (or provide reasons on not doing so) that

  • This PR has sufficient test coverage (unit/integration test) OR I have provided reason in the PR description for not having test coverage
  • Tested on a private network from the genesis block and monitored the chain operating correctly for multiple epochs.
  • Provide an end-to-end test plan in the PR description on how to manually test it on the devnet/testnet.
  • Tested the backwards compatibility.
  • Tested with XDC nodes running this version co-exist with those running the previous version.
  • Relevant documentation has been updated as part of this PR
  • N/A

@coderabbitai

coderabbitai Bot commented Jun 29, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 6ab085ce-1dac-4d4e-a7de-d1f85af3b2fa

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull request overview

This PR updates the UPnP NAT implementation to better handle routers that misbehave under concurrent SOAP requests by serializing and rate-limiting requests, and adjusts port-mapping refresh timing to avoid overlapping/duplicate mappings.

Changes:

  • Add per-UPnP-instance request serialization and a 200ms minimum delay between SOAP requests (withRateLimit), and route UPnP client calls through it.
  • Change UPnP discovery to check NAT enablement via a rate-limited helper (natEnabled) and refactor the matcher callback signature.
  • Adjust nat.Map refresh scheduling to renew mappings exactly at the mapping timeout (but also changes the timeout value).

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 4 comments.

File Description
p2p/nat/natupnp.go Serializes and rate-limits UPnP SOAP requests; refactors discovery and NAT status check.
p2p/nat/nat.go Changes mapping refresh logic to align renewal with the timeout; modifies Map channel type.

Comment thread p2p/nat/natupnp.go
Comment thread p2p/nat/natupnp.go Outdated
Comment thread p2p/nat/natupnp.go
Comment thread p2p/nat/nat.go
@gzliudan gzliudan force-pushed the p2p-nat-concurrency-limit branch from 542fe53 to f500f88 Compare June 30, 2026 10:09
This adds a lock around requests because some routers can't handle
concurrent requests. Requests are also rate-limited.

The Map function request a new mapping exactly when the map timeout
occurs instead of 5 minutes earlier. This should prevent duplicate mappings.
@gzliudan gzliudan force-pushed the p2p-nat-concurrency-limit branch from f500f88 to 2a3d79c Compare June 30, 2026 10:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants