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

Jump to bottom

Add DomainStrategy to JSONv5 outbound #2550

Merged
merged 3 commits into from
Nov 19, 2023
Merged

Add DomainStrategy to JSONv5 outbound #2550

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
eed6794
Add DomainStrategy for JSONv5 outbound
57a4c324e742 Jun 4, 2023
d3ed405
Add DomainStrategy for JSONv5 outbound
57a4c324e742 Jun 4, 2023
09c5a33
make domain strategy in v5 less forgiving to reduce complexity
xiaokangwang Nov 19, 2023
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
11 changes: 11 additions & 0 deletions infra/conf/v5cfg/outbound.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package v5cfg

import (
"context"
"strings"

"github.com/golang/protobuf/proto"

Expand Down Expand Up @@ -41,6 +42,16 @@ func (c OutboundConfig) BuildV5(ctx context.Context) (proto.Message, error) {
if c.MuxSettings != nil {
senderSettings.MultiplexSettings = c.MuxSettings.Build()
}

senderSettings.DomainStrategy = proxyman.SenderConfig_AS_IS
switch strings.ToLower(c.DomainStrategy) {
case "useip", "use_ip", "use-ip":
senderSettings.DomainStrategy = proxyman.SenderConfig_USE_IP
case "useip4", "useipv4", "use_ip4", "use_ipv4", "use_ip_v4", "use-ip4", "use-ipv4", "use-ip-v4":
senderSettings.DomainStrategy = proxyman.SenderConfig_USE_IP4
case "useip6", "useipv6", "use_ip6", "use_ipv6", "use_ip_v6", "use-ip6", "use-ipv6", "use-ip-v6":
senderSettings.DomainStrategy = proxyman.SenderConfig_USE_IP6
}

if c.Settings == nil {
c.Settings = []byte("{}")
Expand Down
15 changes: 8 additions & 7 deletions infra/conf/v5cfg/skeleton.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,14 @@ type InboundConfig struct {
}

type OutboundConfig struct {
Protocol string `json:"protocol"`
SendThrough *cfgcommon.Address `json:"sendThrough"`
Tag string `json:"tag"`
Settings json.RawMessage `json:"settings"`
StreamSetting *StreamConfig `json:"streamSettings"`
ProxySettings *proxycfg.ProxyConfig `json:"proxySettings"`
MuxSettings *muxcfg.MuxConfig `json:"mux"`
Protocol string `json:"protocol"`
SendThrough *cfgcommon.Address `json:"sendThrough"`
Tag string `json:"tag"`
Settings json.RawMessage `json:"settings"`
StreamSetting *StreamConfig `json:"streamSettings"`
ProxySettings *proxycfg.ProxyConfig `json:"proxySettings"`
MuxSettings *muxcfg.MuxConfig `json:"mux"`
DomainStrategy string `json:"domainStrategy"`
}

type StreamConfig struct {
Expand Down