Skip to content

G
gost
Commit 7b8ca674 authored by nanahira's avatar nanahira
Browse files
Options

merge problems

parent f8ae2583
Pipeline #11784 passed with stages
        in 2 minutes and 20 seconds
        Show whitespace changes
        Inline Side-by-side
        Showing with 0 additions and 4 deletions
        chain.go
        View file @ 7b8ca674
        ...@@ -136,10 +136,6 @@ func (c *Chain) DialContext(ctx context.Context, network, address string, opts . ...@@ -136,10 +136,6 @@ func (c *Chain) DialContext(ctx context.Context, network, address string, opts .
        return return
        } }
        func setSocketMark(fd int, value int) (e error) {
        return syscall.SetsockoptInt(fd, syscall.SOL_SOCKET, syscall.SO_MARK, value)
        }
        func (c *Chain) dialWithOptions(ctx context.Context, network, address string, options *ChainOptions) (net.Conn, error) { func (c *Chain) dialWithOptions(ctx context.Context, network, address string, options *ChainOptions) (net.Conn, error) {
        if options == nil { if options == nil {
        options = &ChainOptions{} options = &ChainOptions{}
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment