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

Support Dial WebSocket Connection

pull/238/head
Shelikhoo 2016-08-13 21:42:56 +08:00
parent 20f16309e6
commit 29f69d63c4
No known key found for this signature in database
GPG Key ID: 7791BDB0709ABD21
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
transport/internet/dialer.go
View File

@ -20,9 +20,11 @@ var (
KCPDialer Dialer KCPDialer Dialer
RawTCPDialer Dialer RawTCPDialer Dialer
UDPDialer Dialer UDPDialer Dialer
WSDialer Dialer
) )
func Dial(src v2net.Address, dest v2net.Destination, settings *StreamSettings) (Connection, error) { func Dial(src v2net.Address, dest v2net.Destination, settings *StreamSettings) (Connection, error) {
var connection Connection var connection Connection
var err error var err error
if dest.IsTCP() { if dest.IsTCP() {
@ -31,6 +33,15 @@ func Dial(src v2net.Address, dest v2net.Destination, settings *StreamSettings) (
connection, err = TCPDialer(src, dest) connection, err = TCPDialer(src, dest)
case settings.IsCapableOf(StreamConnectionTypeKCP): case settings.IsCapableOf(StreamConnectionTypeKCP):
connection, err = KCPDialer(src, dest) connection, err = KCPDialer(src, dest)
case settings.IsCapableOf(StreamConnectionTypeWebSocket):
connection, err = WSDialer(src, dest)
/*Warning: Hours wasted: the following item must be last one
internet.StreamConnectionType have a default value of 1,
so the following attempt will catch all.
*/
case settings.IsCapableOf(StreamConnectionTypeRawTCP): case settings.IsCapableOf(StreamConnectionTypeRawTCP):
connection, err = RawTCPDialer(src, dest) connection, err = RawTCPDialer(src, dest)
default: default:
@ -39,6 +50,7 @@ func Dial(src v2net.Address, dest v2net.Destination, settings *StreamSettings) (
if err != nil { if err != nil {
return nil, err return nil, err
} }
if settings.Security == StreamSecurityTypeNone { if settings.Security == StreamSecurityTypeNone {
return connection, nil return connection, nil
} }