history-museum/clash
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Feature: add inbounds for flexible binding inbound (#2818)

Browse Source
This commit is contained in:
fuyun
2023-08-03 22:30:08 +08:00
committed by GitHub
parent 10f4d5375a
commit 9e78137768
25 changed files with 552 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
config/config.go
View File

@ -28,25 +28,14 @@ import (
// General config
type General struct {
Inbound
LagecyInbound
Controller
Mode T.TunnelMode `json:"mode"`
LogLevel log.LogLevel `json:"log-level"`
IPv6 bool `json:"ipv6"`
Interface string `json:"-"`
RoutingMark int `json:"-"`
}
// Inbound
type Inbound struct {
Port int `json:"port"`
SocksPort int `json:"socks-port"`
RedirPort int `json:"redir-port"`
TProxyPort int `json:"tproxy-port"`
MixedPort int `json:"mixed-port"`
Authentication []string `json:"authentication"`
AllowLan bool `json:"allow-lan"`
BindAddress string `json:"bind-address"`
Authentication []string `json:"authentication"`
Mode T.TunnelMode `json:"mode"`
LogLevel log.LogLevel `json:"log-level"`
IPv6 bool `json:"ipv6"`
Interface string `json:"-"`
RoutingMark int `json:"-"`
}
// Controller
@ -56,6 +45,16 @@ type Controller struct {
Secret string `json:"-"`
}
type LagecyInbound struct {
Port int `json:"port"`
SocksPort int `json:"socks-port"`
RedirPort int `json:"redir-port"`
TProxyPort int `json:"tproxy-port"`
MixedPort int `json:"mixed-port"`
AllowLan bool `json:"allow-lan"`
BindAddress string `json:"bind-address"`
}
// DNS config
type DNS struct {
Enable bool `yaml:"enable"`
@ -98,6 +97,7 @@ type Config struct {
Experimental *Experimental
Hosts *trie.DomainTrie
Profile *Profile
Inbounds []C.Inbound
Rules []C.Rule
Users []auth.AuthUser
Proxies map[string]C.Proxy
@ -207,6 +207,7 @@ type RawConfig struct {
ProxyProvider map[string]map[string]any `yaml:"proxy-providers"`
Hosts map[string]string `yaml:"hosts"`
Inbounds []C.Inbound `yaml:"inbounds"`
DNS RawDNS `yaml:"dns"`
Experimental Experimental `yaml:"experimental"`
Profile Profile `yaml:"profile"`
@ -275,6 +276,8 @@ func ParseRawConfig(rawCfg *RawConfig) (*Config, error) {
}
config.General = general
config.Inbounds = rawCfg.Inbounds
proxies, providers, err := parseProxies(rawCfg)
if err != nil {
return nil, err
@ -326,7 +329,7 @@ func parseGeneral(cfg *RawConfig) (*General, error) {
}
return &General{
Inbound: Inbound{
LagecyInbound: LagecyInbound{
Port: cfg.Port,
SocksPort: cfg.SocksPort,
RedirPort: cfg.RedirPort,