This repository has been archived by the owner on Apr 9, 2020. It is now read-only.
Porting ss-redir to go
#473
Open
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
arthurkiller
reviewed
May 3, 2019
| @@ -18,7 +18,7 @@ import ( | |||
| "syscall" | |||
| "time" | |||
|
|
|||
| ss "github.com/shadowsocks/shadowsocks-go/shadowsocks" | |||
| ss "github.com/bonafideyan/shadowsocks-go/shadowsocks" | |||
There was a problem hiding this comment.
pls fix the dependency
arthurkiller
reviewed
May 3, 2019
cmd/shadowsocks-local/guess.go
Outdated
| @@ -0,0 +1,138 @@ | |||
| package main | |||
There was a problem hiding this comment.
this file should be in shadowsocks package but not the client main package
arthurkiller
reviewed
May 3, 2019
cmd/shadowsocks-httpget/httpget.go
Outdated
| @@ -76,9 +81,94 @@ func get(connid int, uri, serverAddr string, rawAddr []byte, cipher *ss.Cipher, | |||
| } | |||
| } | |||
|
|
|||
| func dialSocks5(targetAddr, proxy string) (conn net.Conn, err error) { | |||
There was a problem hiding this comment.
this should be added into shadowsocks package
arthurkiller
suggested changes
May 3, 2019
|
Add command line parameter
and set iptables rules, refererence here. |
arthurkiller
reviewed
May 4, 2019
| @@ -14,6 +13,8 @@ import ( | |||
| "strconv" | |||
| "strings" | |||
| "time" | |||
|
|
|||
| ss "github.com/bonafideyan/shadowsocks-go/shadowsocks" | |||
There was a problem hiding this comment.
your can add your branch as a reference for git
There was a problem hiding this comment.
Sorry, I don't know how to do it, could you please give me some steps in detail?
arthurkiller
suggested changes
May 10, 2019
| @@ -77,8 +82,9 @@ func get(connid int, uri, serverAddr string, rawAddr []byte, cipher *ss.Cipher, | |||
| } | |||
|
|
|||
| func main() { | |||
| flag.StringVar(&config.server, "s", "127.0.0.1", "server:port") | |||
| flag.IntVar(&config.port, "p", 0, "server:port") | |||
| server := flag.String("s", "127.0.0.1", "server:port") | |||
| @@ -89,8 +95,17 @@ func main() { | |||
|
|
|||
| flag.Parse() | |||
|
|
|||
| if config.server == "" || config.port == 0 || config.passwd == "" || len(flag.Args()) != 1 { | |||
| fmt.Printf("Usage: %s -s <server> -p <port> -k <password> <url>\n", os.Args[0]) | |||
| config.server = "127.0.0.1" | |||
There was a problem hiding this comment.
default config can be set with flag
| @@ -280,7 +281,7 @@ func createServerConn(rawaddr []byte, addr string) (remote *ss.Conn, err error) | |||
| return nil, err | |||
| } | |||
|
|
|||
| func handleConnection(conn net.Conn) { | |||
| func handleConnection(conn net.Conn, redir bool) { | |||
There was a problem hiding this comment.
need a new function called redirectConnection
|
|
||
| flag.BoolVar(&printVer, "version", false, "print version") | ||
| flag.BoolVar(&redirect, "redirect", false, "Redirect normal request to socks server.") |
| @@ -78,6 +80,91 @@ func Dial(addr, server string, cipher *Cipher) (c *Conn, err error) { | |||
| return DialWithRawAddr(ra, server, cipher) | |||
| } | |||
|
|
|||
| // DialAsClient dials in client's position. | |||
| func DialAsClient(server, proxy string) (conn net.Conn, err error) { | |||
There was a problem hiding this comment.
add unit test for this function
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Only socks proxy is a bit inconvenient, so ...