Skip to content

Fix the incorrect merge conflict resolution in #88. #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weiiwang01 merged 3 commits into from
May 27, 2026
+1 −1
Merged

Fix the incorrect merge conflict resolution in #88. #89

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d44b67e
Fix the incorrect merge conflict resolution in #88.
weiiwang01 May 21, 2026
f2f7385
Merge branch 'main' into fix-merge-conflict
weiiwang01 May 26, 2026
640e028
Merge branch 'main' into fix-merge-conflict
weiiwang01 May 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/aproxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ def _render_nft_rules(self) -> str:
chain input {{
type filter hook input priority filter; policy accept;
iif "lo" accept
ip saddr {server_ip} tcp dport {listen_port} accept
ct status dnat tcp dport {listen_port} accept
ip saddr {server_ip} tcp dport {listen_port} accept
tcp dport {listen_port} drop
}}
Expand Down
Loading