Websocket transport support for v2ray #238
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Current coverage is 87.70% (diff: 68.66%)@@ master #238 diff @@
==========================================
Files 157 166 +9
Lines 14725 15151 +426
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
+ Hits 12993 13288 +295
- Misses 1320 1428 +108
- Partials 412 435 +23
|
| type JsonConfig struct { | ||
| ConnectionReuse bool `json:"connectionReuse"` | ||
| Path string `json:"Path"` | ||
| Pto string `json:"Pto"` |
There was a problem hiding this comment.
protocol .....
|
Writing tests now. |
| @@ -69,12 +70,25 @@ func (wsl *WSListener) listenws(address v2net.Address, port v2net.Port) error { | |||
| errchan := make(chan error) | |||
|
|
|||
| listenerfunc := func() error { | |||
| return http.ListenAndServe(address.String()+":"+strconv.Itoa(int(port.Value())), nil) | |||
| ol, err := net.Listen("tcp", address.String()+":"+strconv.Itoa(int(port.Value()))) | |||
There was a problem hiding this comment.
Use ListenTCP here. It removes some unnecessary error checking in NewStoppableListener.
There was a problem hiding this comment.
Resolved by 32e8deb
| s := make(chan int) | ||
| go func() { | ||
| buf := make([]byte, 4) | ||
| conn.Read(buf) |
There was a problem hiding this comment.
Please verify what is read. Same below.
3gZ2jA
pushed a commit
to 3gZ2jA/v2ray-core
that referenced
this pull request
Oct 8, 2020
* remove shadowsosks ota * remove unused buf.Reader
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Websocket transport implements a HTTP(S) compliable, surveillance proof transport method with plausible deniability.
This transport was disscussed at
#224
https://trello.com/c/3uCCeBkC/8-add-websocket-transport