github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

comments

pull/1086/head
Darien Raymond 2018-04-17 23:33:39 +02:00
parent b4ff4c7e75
commit a657ec49a0
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
5 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
transport/internet/dialer.go
View File

@ -20,6 +20,7 @@ func RegisterTransportDialer(protocol TransportProtocol, dialer Dialer) error {
return nil return nil
} }
// Dial dials a internet connection towards the given destination.
func Dial(ctx context.Context, dest net.Destination) (Connection, error) { func Dial(ctx context.Context, dest net.Destination) (Connection, error) {
if dest.Network == net.Network_TCP { if dest.Network == net.Network_TCP {
streamSettings := StreamSettingsFromContext(ctx) streamSettings := StreamSettingsFromContext(ctx)

8
transport/internet/tls/config.go
View File

@ -23,6 +23,7 @@ func ParseCertificate(c *cert.Certificate) *Certificate {
} }
} }
// BuildCertificates builds a list of TLS certificates from proto definition.
func (c *Config) BuildCertificates() []tls.Certificate { func (c *Config) BuildCertificates() []tls.Certificate {
certs := make([]tls.Certificate, 0, len(c.Certificate)) certs := make([]tls.Certificate, 0, len(c.Certificate))
for _, entry := range c.Certificate { for _, entry := range c.Certificate {
@ -118,10 +119,11 @@ func getGetCertificateFunc(c *tls.Config, ca []*Certificate) func(hello *tls.Cli
} }
} }
// GetTLSConfig converts this Config into tls.Config.
func (c *Config) GetTLSConfig(opts ...Option) *tls.Config { func (c *Config) GetTLSConfig(opts ...Option) *tls.Config {
config := &tls.Config{ config := &tls.Config{
ClientSessionCache: globalSessionCache, ClientSessionCache: globalSessionCache,
RootCAs: c.GetCertPool(), RootCAs: c.getCertPool(),
} }
if c == nil { if c == nil {
return config return config
@ -153,8 +155,10 @@ func (c *Config) GetTLSConfig(opts ...Option) *tls.Config {
return config return config
} }
// Option for building TLS config.
type Option func(*tls.Config) type Option func(*tls.Config)
// WithDestination sets the server name in TLS config.
func WithDestination(dest net.Destination) Option { func WithDestination(dest net.Destination) Option {
return func(config *tls.Config) { return func(config *tls.Config) {
if dest.Address.Family().IsDomain() && len(config.ServerName) == 0 { if dest.Address.Family().IsDomain() && len(config.ServerName) == 0 {
@ -163,6 +167,7 @@ func WithDestination(dest net.Destination) Option {
} }
} }
// WithNextProto sets the ALPN values in TLS config.
func WithNextProto(protocol ...string) Option { func WithNextProto(protocol ...string) Option {
return func(config *tls.Config) { return func(config *tls.Config) {
if len(config.NextProtos) == 0 { if len(config.NextProtos) == 0 {
@ -171,6 +176,7 @@ func WithNextProto(protocol ...string) Option {
} }
} }
// ConfigFromContext fetches Config from context. Nil if not found.
func ConfigFromContext(ctx context.Context) *Config { func ConfigFromContext(ctx context.Context) *Config {
securitySettings := internet.SecuritySettingsFromContext(ctx) securitySettings := internet.SecuritySettingsFromContext(ctx)
if securitySettings == nil { if securitySettings == nil {

2
transport/internet/tls/config_other.go
View File

@ -4,7 +4,7 @@ package tls
import "crypto/x509" import "crypto/x509"
func (c *Config) GetCertPool() *x509.CertPool { func (c *Config) getCertPool() *x509.CertPool {
pool, err := x509.SystemCertPool() pool, err := x509.SystemCertPool()
if err != nil { if err != nil {
newError("failed to get system cert pool.").Base(err).WriteToLog() newError("failed to get system cert pool.").Base(err).WriteToLog()

2
transport/internet/tls/config_windows.go
View File

@ -4,6 +4,6 @@ package tls
import "crypto/x509" import "crypto/x509"
func (c *Config) GetCertPool() *x509.CertPool { func (c *Config) getCertPool() *x509.CertPool {
return nil return nil
} }

2
transport/internet/tls/tls.go
View File

@ -29,11 +29,13 @@ func (c *conn) WriteMultiBuffer(mb buf.MultiBuffer) error {
return c.mergingWriter.Flush() return c.mergingWriter.Flush()
} }
// Client initiates a TLS client handshake on the given connection.
func Client(c net.Conn, config *tls.Config) net.Conn { func Client(c net.Conn, config *tls.Config) net.Conn {
tlsConn := tls.Client(c, config) tlsConn := tls.Client(c, config)
return &conn{Conn: tlsConn} return &conn{Conn: tlsConn}
} }
// Server initiates a TLS server handshake on the given connection.
func Server(c net.Conn, config *tls.Config) net.Conn { func Server(c net.Conn, config *tls.Config) net.Conn {
tlsConn := tls.Server(c, config) tlsConn := tls.Server(c, config)
return &conn{Conn: tlsConn} return &conn{Conn: tlsConn}