1
0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-03 08:46:47 -05:00

tls settings for http proxy

This commit is contained in:
v2ray 2016-04-25 15:30:28 +02:00
parent 6486891b18
commit c044234e4a
2 changed files with 28 additions and 1 deletions

View File

@ -4,8 +4,15 @@ import (
v2net "github.com/v2ray/v2ray-core/common/net"
)
type TlsConfig struct {
Enabled bool
CertFile string
KeyFile string
}
type Config struct {
OwnHosts []v2net.Address
OwnHosts []v2net.Address
TlsConfig *TlsConfig
}
func (this *Config) IsOwnHost(host v2net.Address) bool {

View File

@ -9,9 +9,27 @@ import (
"github.com/v2ray/v2ray-core/proxy/internal/config"
)
func (this *TlsConfig) UnmarshalJSON(data []byte) error {
type JsonConfig struct {
Enabled bool
CertFile string
KeyFile string
}
jsonConfig := new(JsonConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil {
return err
}
this.Enabled = jsonConfig.Enabled
this.CertFile = jsonConfig.CertFile
this.KeyFile = jsonConfig.KeyFile
return nil
}
func (this *Config) UnmarshalJSON(data []byte) error {
type JsonConfig struct {
Hosts []v2net.AddressJson `json:"ownHosts"`
Tls *TlsConfig `json:"tls"`
}
jsonConfig := new(JsonConfig)
if err := json.Unmarshal(data, jsonConfig); err != nil {
@ -27,6 +45,8 @@ func (this *Config) UnmarshalJSON(data []byte) error {
this.OwnHosts = append(this.OwnHosts, v2rayHost)
}
this.TlsConfig = jsonConfig.Tls
return nil
}