Skip to content
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

feat(generator/client): Add mixed inbound #48

Merged
merged 1 commit into from
Nov 30, 2023
Merged

feat(generator/client): Add mixed inbound #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions root/etc/config/homeproxy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
config homeproxy 'infra'
option __warning 'DO NOT EDIT THIS SECTION, OR YOU ARE ON YOUR OWN!'
option common_port '22,53,80,143,443,465,853,873,993,995,8080,8443,9418'
option mixed_port '5330'
option redirect_port '5331'
option tproxy_port '5332'
option dns_port '5333'
Expand Down
11 changes: 11 additions & 0 deletions root/etc/homeproxy/scripts/generate_client.uc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ if (wan_dns.exitcode === 0 && trim(wan_dns.stdout))
else
wan_dns = (routing_mode in ['proxy_mainland_china', 'global']) ? '208.67.222.222' : '114.114.114.114';

const mixed_port = uci.get(uciconfig, uciinfra, 'mixed_port') || '5330';
const dns_port = uci.get(uciconfig, uciinfra, 'dns_port') || '5333';

let main_node, main_udp_node, dedicated_udp_node, default_outbound, sniff_override = '1',
Expand Down Expand Up @@ -414,6 +415,16 @@ push(config.inbounds, {
listen_port: int(dns_port)
});

push(config.inbounds, {
type: 'mixed',
Copy link
Member

Choose a reason for hiding this comment

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

I don't see why must we have a mixed inbound here.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

This is a fallback option
Sometimes I need to let some programs that don't normally go via the tunnel temporarily go via the tunnel.
Using mixed inbound is the most convenient way
Or is there any way to add inbound manually?

tag: 'mixed-in',
listen: '::',
listen_port: int(mixed_port),
sniff: true,
sniff_override_destination: (sniff_override === '1'),
set_system_proxy: false
});

if (match(proxy_mode, /redirect/))
push(config.inbounds, {
type: 'redirect',
Expand Down