bughz/glider
1
0
Fork 0
mirror of https://github.com/nadoo/glider.git synced 2025-02-23 01:15:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

vsock: update dependency to fix building error on riscv64 (#295)

Browse Source
This commit is contained in:
nadoo 2022-04-06 18:47:04 +08:00
parent 730e9c765e
commit a153c34e37
6 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
README.md
View File

@ -64,6 +64,7 @@ we can set up local listeners as proxy servers, and forward requests to internet
|TLS |√| |√| |transport client & server |TLS |√| |√| |transport client & server
|KCP | |√|√| |transport client & server |KCP | |√|√| |transport client & server
|Unix |√|√|√|√|transport client & server |Unix |√|√|√|√|transport client & server
|VSOCK |√| |√| |transport client & server
|Smux |√| |√| |transport client & server |Smux |√| |√| |transport client & server
|Websocket(WS) |√| |√| |transport client & server |Websocket(WS) |√| |√| |transport client & server
|WS Secure |√| |√| |websocket secure (wss) |WS Secure |√| |√| |websocket secure (wss)
@ -351,7 +352,9 @@ TLS and Websocket with a specified proxy protocol:
-- --
VM socket scheme: VM socket scheme:
vsock://[contextID]:port vsock://[CID]:port
if you want to listen on any address, just set CID to 4294967295.
``` ```
</details> </details>

3
config/glider.conf.example
View File

@ -63,6 +63,9 @@ listen=socks5://:1080
# socks5 over unix domain socket # socks5 over unix domain socket
# listen=unix:///dev/shm/socket,socks5:// # listen=unix:///dev/shm/socket,socks5://
# socks5 over vm socket
# listen=vsock://:1234,socks5://
# socks5 over kcp # socks5 over kcp
# listen=kcp://aes:key@127.0.0.1:8444?dataShards=10&parityShards=3&mode=fast,socks5:// # listen=kcp://aes:key@127.0.0.1:8444?dataShards=10&parityShards=3&mode=fast,socks5://

2
go.mod
View File

@ -12,7 +12,7 @@ require (
github.com/nadoo/ipset v0.5.0 github.com/nadoo/ipset v0.5.0
github.com/xtaci/kcp-go/v5 v5.6.1 github.com/xtaci/kcp-go/v5 v5.6.1
golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29 golang.org/x/crypto v0.0.0-20220331220935-ae2d96664a29
golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 golang.org/x/sys v0.0.0-20220405210540-1e041c57c461
) )
require ( require (

4
go.sum
View File

@ -164,8 +164,8 @@ golang.org/x/sys v0.0.0-20201101102859-da207088b7d1/go.mod h1:h1NjWce9XRLGQEsW7w
golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210525143221-35b2ab0089ea/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64 h1:D1v9ucDTYBtbz5vNuBbAhIMAGhQhJ6Ym5ah3maMVNX4= golang.org/x/sys v0.0.0-20220405210540-1e041c57c461 h1:kHVeDEnfKn3T238CvrUcz6KeEsFHVaKh4kMTt6Wsysg=
golang.org/x/sys v0.0.0-20220405052023-b1e9470b6e64/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

4
proxy/vsock/socket.go
View File

@ -1,8 +1,8 @@
package vsock
// Source code from: // Source code from:
// https://github.com/linuxkit/virtsock/tree/master/pkg/vsock // https://github.com/linuxkit/virtsock/tree/master/pkg/vsock
package vsock
import ( import (
"fmt" "fmt"
"net" "net"

4
proxy/vsock/vsock.go
View File

@ -58,6 +58,8 @@ func (s *vsock) Addr() string {
func init() { func init() {
proxy.AddUsage("vsock", ` proxy.AddUsage("vsock", `
VM socket scheme: VM socket scheme:
vsock://[contextID]:port vsock://[CID]:port
if you want to listen on any address, just set CID to 4294967295.
`) `)
} }