Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2025-02-23 11:36:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve: add rc4-md5 and chacha20 supported with the fork

Browse Source
This commit is contained in:
Dreamacro 2018-09-21 15:27:51 +08:00
parent eb778ad6e2
commit 3e68faecb2
10 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
Gopkg.lock generated
View File

@ -1,6 +1,19 @@
# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. # This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
[[projects]]
digest = "1:d21e998147c1c8cd727bd34148f373d3faa46fd8669c389b53c4eaabbe4eb2b3"
name = "github.com/Dreamacro/go-shadowsocks2"
packages = [
"core",
"shadowaead",
"shadowstream",
"socks",
]
pruneopts = "UT"
revision = "1c1fd6c192eb76261ea3ccd80e3b141b25f20db4"
version = "v0.1.1"
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:8fa55a6e302771a90a86ceae1ca3c0df4ef15d21092198e8313f61dde9eea963" digest = "1:8fa55a6e302771a90a86ceae1ca3c0df4ef15d21092198e8313f61dde9eea963"
@ -65,19 +78,6 @@
revision = "c5bec84d1963260297932a1b7a1753c8420717a7" revision = "c5bec84d1963260297932a1b7a1753c8420717a7"
version = "v1.3.0" version = "v1.3.0"
[[projects]]
digest = "1:2bfa1a73654feb90893014b04779ce5205f3e19e843c0e32a89ea051d31f12d5"
name = "github.com/riobard/go-shadowsocks2"
packages = [
"core",
"shadowaead",
"shadowstream",
"socks",
]
pruneopts = "UT"
revision = "8346403248229fc7e10d7a259de8e9352a9d8830"
version = "v0.1.0"
[[projects]] [[projects]]
digest = "1:d867dfa6751c8d7a435821ad3b736310c2ed68945d05b50fb9d23aee0540c8cc" digest = "1:d867dfa6751c8d7a435821ad3b736310c2ed68945d05b50fb9d23aee0540c8cc"
name = "github.com/sirupsen/logrus" name = "github.com/sirupsen/logrus"
@ -99,11 +99,11 @@
"ssh/terminal", "ssh/terminal",
] ]
pruneopts = "UT" pruneopts = "UT"
revision = "0709b304e793a5edb4a2c0145f281ecdc20838a4" revision = "0e37d006457bf46f9e6692014ba72ef82c33022c"
[[projects]] [[projects]]
branch = "master" branch = "master"
digest = "1:576f8d82185dc836ec6d10c0e5568dc4ff94e4d9f101d33ed5d6bae0cbba65b2" digest = "1:ddbafa32d1899456edbf7a64aec7afe5aa287b840e6a12b996f8a8425c1d9a6a"
name = "golang.org/x/sys" name = "golang.org/x/sys"
packages = [ packages = [
"cpu", "cpu",
@ -111,7 +111,7 @@
"windows", "windows",
] ]
pruneopts = "UT" pruneopts = "UT"
revision = "ebe1bf3edb3325c393447059974de898d5133eb8" revision = "d641721ec2dead6fe5ca284096fe4b1fcd49e427"
[[projects]] [[projects]]
digest = "1:975a4480c40f2d0b95e1f83d3ec1aa29a2774e80179e08a9a4ba2aab86721b23" digest = "1:975a4480c40f2d0b95e1f83d3ec1aa29a2774e80179e08a9a4ba2aab86721b23"
@ -133,13 +133,13 @@
analyzer-name = "dep" analyzer-name = "dep"
analyzer-version = 1 analyzer-version = 1
input-imports = [ input-imports = [
"github.com/Dreamacro/go-shadowsocks2/core",
"github.com/Dreamacro/go-shadowsocks2/socks",
"github.com/go-chi/chi", "github.com/go-chi/chi",
"github.com/go-chi/cors", "github.com/go-chi/cors",
"github.com/go-chi/render", "github.com/go-chi/render",
"github.com/gofrs/uuid", "github.com/gofrs/uuid",
"github.com/oschwald/geoip2-golang", "github.com/oschwald/geoip2-golang",
"github.com/riobard/go-shadowsocks2/core",
"github.com/riobard/go-shadowsocks2/socks",
"github.com/sirupsen/logrus", "github.com/sirupsen/logrus",
"golang.org/x/crypto/chacha20poly1305", "golang.org/x/crypto/chacha20poly1305",
"gopkg.in/eapache/channels.v1", "gopkg.in/eapache/channels.v1",

8
Gopkg.toml
View File

@ -25,6 +25,10 @@
# unused-packages = true # unused-packages = true
[[constraint]]
name = "github.com/Dreamacro/go-shadowsocks2"
version = "0.1.1"
[[constraint]] [[constraint]]
name = "github.com/go-chi/chi" name = "github.com/go-chi/chi"
version = "3.3.3" version = "3.3.3"
@ -45,10 +49,6 @@
name = "github.com/oschwald/geoip2-golang" name = "github.com/oschwald/geoip2-golang"
version = "1.2.1" version = "1.2.1"
[[constraint]]
name = "github.com/riobard/go-shadowsocks2"
version = "0.1.0"
[[constraint]] [[constraint]]
name = "github.com/sirupsen/logrus" name = "github.com/sirupsen/logrus"
version = "1.0.6" version = "1.0.6"

2
adapters/local/socket.go
View File

@ -4,7 +4,7 @@ import (
"net" "net"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/riobard/go-shadowsocks2/socks" "github.com/Dreamacro/go-shadowsocks2/socks"
) )
// SocketAdapter is a adapter for socks and redir connection // SocketAdapter is a adapter for socks and redir connection

2
adapters/local/util.go
View File

@ -6,7 +6,7 @@ import (
"strconv" "strconv"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/riobard/go-shadowsocks2/socks" "github.com/Dreamacro/go-shadowsocks2/socks"
) )
func parseSocksAddr(target socks.Addr) *C.Addr { func parseSocksAddr(target socks.Addr) *C.Addr {

4
adapters/remote/shadowsocks.go
View File

@ -10,8 +10,8 @@ import (
"github.com/Dreamacro/clash/common/simple-obfs" "github.com/Dreamacro/clash/common/simple-obfs"
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/riobard/go-shadowsocks2/core" "github.com/Dreamacro/go-shadowsocks2/core"
"github.com/riobard/go-shadowsocks2/socks" "github.com/Dreamacro/go-shadowsocks2/socks"
) )
// ShadowsocksAdapter is a shadowsocks adapter // ShadowsocksAdapter is a shadowsocks adapter

2
adapters/remote/socks5.go
View File

@ -9,7 +9,7 @@ import (
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/riobard/go-shadowsocks2/socks" "github.com/Dreamacro/go-shadowsocks2/socks"
) )
// Socks5Adapter is a shadowsocks adapter // Socks5Adapter is a shadowsocks adapter

2
proxy/redir/tcp_darwin.go
View File

@ -5,7 +5,7 @@ import (
"syscall" "syscall"
"unsafe" "unsafe"
"github.com/riobard/go-shadowsocks2/socks" "github.com/Dreamacro/go-shadowsocks2/socks"
) )
func parserPacket(c net.Conn) (socks.Addr, error) { func parserPacket(c net.Conn) (socks.Addr, error) {

2
proxy/redir/tcp_linux.go
View File

@ -6,7 +6,7 @@ import (
"syscall" "syscall"
"unsafe" "unsafe"
"github.com/riobard/go-shadowsocks2/socks" "github.com/Dreamacro/go-shadowsocks2/socks"
) )
const ( const (

2
proxy/redir/tcp_windows.go
View File

@ -4,7 +4,7 @@ import (
"errors" "errors"
"net" "net"
"github.com/riobard/go-shadowsocks2/socks" "github.com/Dreamacro/go-shadowsocks2/socks"
) )
func parserPacket(conn net.Conn) (socks.Addr, error) { func parserPacket(conn net.Conn) (socks.Addr, error) {

2
proxy/socks/tcp.go
View File

@ -7,7 +7,7 @@ import (
C "github.com/Dreamacro/clash/constant" C "github.com/Dreamacro/clash/constant"
"github.com/Dreamacro/clash/tunnel" "github.com/Dreamacro/clash/tunnel"
"github.com/riobard/go-shadowsocks2/socks" "github.com/Dreamacro/go-shadowsocks2/socks"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )