update vendor

This commit is contained in:
rui.zheng 2017-01-19 15:35:33 +08:00
parent 2dd7ace3ce
commit 37c2f2a1ca
5 changed files with 16 additions and 18 deletions

View File

@ -38,25 +38,25 @@ scheme分为两部分: protocol+transport
protocol: 代理协议类型(http, socks5, shadowsocks), transport: 数据传输方式(ws, wss, tls, http2, quic, kcp), 二者可以任意组合,或单独使用: protocol: 代理协议类型(http, socks5, shadowsocks), transport: 数据传输方式(ws, wss, tls, http2, quic, kcp), 二者可以任意组合,或单独使用:
> http - 作为HTTP代理: http://:8080 > http - HTTP代理: http://:8080
> http+tls - 作为HTTPS代理(可能需要提供受信任的证书): http+tls://:443 > http+tls - HTTPS代理(可能需要提供受信任的证书): http+tls://:443或https://:443
> http2 - 作为HTTP2代理并向下兼容HTTPS代理: http2://:443 > http2 - HTTP2代理并向下兼容HTTPS代理: http2://:443
> socks - 作为标准SOCKS5代理(支持tls协商加密): socks://:1080 > socks - 标准SOCKS5代理(支持tls协商加密): socks://:1080
> socks+wss - 作为SOCKS5代理使用websocket传输数据: socks+wss://:1080 > socks+wss - SOCKS5代理使用websocket传输数据: socks+wss://:1080
> tls - 作为HTTPS/SOCKS5代理使用tls传输数据: tls://:443 > tls - HTTPS/SOCKS5代理使用tls传输数据: tls://:443
> ss - 作为Shadowsocks服务ss://aes-256-cfb:123456@:8338 > ss - Shadowsocks代理ss://aes-256-cfb:123456@:8338
> quic - 作为QUIC代理quic://:6121 > quic - QUIC代理quic://:6121
> kcp - 作为KCP代理kcp://:8388或kcp://aes:123456@:8388 > kcp - KCP代理kcp://:8388或kcp://aes:123456@:8388
> redirect - 作为透明代理redirect://:12345 > redirect - 透明代理redirect://:12345
#### 端口转发 #### 端口转发
@ -251,7 +251,6 @@ gost -L=kcp://:8388?c=/path/to/conf/file
``` ```
**注:** 客户端若要开启KCP转发当且仅当代理链不为空且首个代理节点(第一个-F参数)为kcp类型。 **注:** 客户端若要开启KCP转发当且仅当代理链不为空且首个代理节点(第一个-F参数)为kcp类型。
当KCP转发开启代理链中的其他代理节点将被忽略。
#### 透明代理 #### 透明代理
基于iptables的透明代理。 基于iptables的透明代理。

View File

@ -40,7 +40,7 @@ transport: data transmission mode (ws, wss, tls, http2, quic, kcp), may be used
> http - standard HTTP proxy: http://:8080 > http - standard HTTP proxy: http://:8080
> http+tls - standard HTTPS proxy (may need to provide a trusted certificate): http+tls://:443 > http+tls - standard HTTPS proxy (may need to provide a trusted certificate): http+tls://:443 or https://:443
> http2 - HTTP2 proxy and backwards-compatible with HTTPS proxy: http2://:443 > http2 - HTTP2 proxy and backwards-compatible with HTTPS proxy: http2://:443
@ -253,7 +253,6 @@ gost -L=kcp://:8388?c=/path/to/conf/file
``` ```
**NOTE:** KCP will be enabled if and only if the proxy chain is not empty and the first proxy node (the first -F parameter) is of type KCP. **NOTE:** KCP will be enabled if and only if the proxy chain is not empty and the first proxy node (the first -F parameter) is of type KCP.
When KCP is enabled, other proxy nodes are ignored.
#### Transparent proxy #### Transparent proxy
Iptables-based transparent proxy Iptables-based transparent proxy

View File

@ -69,7 +69,7 @@ func (c *ProxyChain) SetNode(index int, node ProxyNode) {
} }
// Init initialize the proxy chain. // Init initialize the proxy chain.
// KCP will be enabled if the first proxy node is KCP proxy (transport == kcp), the remaining nodes are ignored. // KCP will be enabled if the first proxy node is KCP proxy (transport == kcp).
// HTTP2 will be enabled when at least one HTTP2 proxy node (scheme == http2) is present. // HTTP2 will be enabled when at least one HTTP2 proxy node (scheme == http2) is present.
// //
// NOTE: Should be called immediately when proxy nodes are ready. // NOTE: Should be called immediately when proxy nodes are ready.

View File

@ -11,7 +11,7 @@ import (
) )
const ( const (
Version = "2.3-rc2" Version = "2.3-rc3"
) )
// Log level for glog // Log level for glog

View File

@ -15,10 +15,10 @@
"revisionTime": "2017-01-19T05:34:58Z" "revisionTime": "2017-01-19T05:34:58Z"
}, },
{ {
"checksumSHA1": "oZV/w2ONwoM0nMDddIJQYDAZOPg=", "checksumSHA1": "PyPkZsdjGNe18KDQQeyyhGkyAA8=",
"path": "github.com/ginuerzh/gost", "path": "github.com/ginuerzh/gost",
"revision": "c1d79272573ada276e5a4234774ea4c2e2b4e9ef", "revision": "2dd7ace3ce9839c5bbba7a068cea3bf17133ba5e",
"revisionTime": "2017-01-19T05:42:02Z" "revisionTime": "2017-01-19T07:34:22Z"
}, },
{ {
"checksumSHA1": "URsJa4y/sUUw/STmbeYx9EKqaYE=", "checksumSHA1": "URsJa4y/sUUw/STmbeYx9EKqaYE=",