kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code styles

This commit is contained in:
Andy Wang 2020-04-05 00:56:43 +01:00
parent dc262f7ca5
commit 8d84ebd145
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/client/chrome.go
View File

@ -16,7 +16,7 @@ func makeGREASE() []byte {
var one [1]byte var one [1]byte
util.CryptoRandRead(one[:]) util.CryptoRandRead(one[:])
sixteenth := one[0] % 16 sixteenth := one[0] % 16
monoGREASE := byte(sixteenth*16 + 0xA) monoGREASE := sixteenth*16 + 0xA
doubleGREASE := []byte{monoGREASE, monoGREASE} doubleGREASE := []byte{monoGREASE, monoGREASE}
return doubleGREASE return doubleGREASE
} }

6
internal/multiplex/session_test.go
View File

@ -212,7 +212,7 @@ func TestRecvDataFromRemote_Closing_InOrder(t *testing.T) {
if err != nil { if err != nil {
t.Fatalf("receiving stream closing frame for stream 1: %v", err) t.Fatalf("receiving stream closing frame for stream 1: %v", err)
} }
s1I, _ = sesh.streams.Load(f1.StreamID) s1I, _ := sesh.streams.Load(f1.StreamID)
if s1I != nil { if s1I != nil {
t.Fatal("stream 1 still exist after receiving stream close") t.Fatal("stream 1 still exist after receiving stream close")
} }
@ -349,7 +349,7 @@ func TestParallel(t *testing.T) {
numStreams := 10 numStreams := 10
seqs := make([]*uint64, numStreams) seqs := make([]*uint64, numStreams)
for i, _ := range seqs { for i := range seqs {
seqs[i] = new(uint64) seqs[i] = new(uint64)
} }
randFrame := func() *Frame { randFrame := func() *Frame {
@ -367,7 +367,7 @@ func TestParallel(t *testing.T) {
name string name string
frame *Frame frame *Frame
}, numOfTests) }, numOfTests)
for i, _ := range tests { for i := range tests {
tests[i].name = strconv.Itoa(i) tests[i].name = strconv.Itoa(i)
tests[i].frame = randFrame() tests[i].frame = randFrame()
} }

2
internal/multiplex/streamBuffer_test.go
View File

@ -45,7 +45,7 @@ func TestRecvNewFrame(t *testing.T) {
copy(targetSorted, set) copy(targetSorted, set)
sort.Slice(targetSorted, func(i, j int) bool { return targetSorted[i] < targetSorted[j] }) sort.Slice(targetSorted, func(i, j int) bool { return targetSorted[i] < targetSorted[j] })
for i, _ := range targetSorted { for i := range targetSorted {
if sortedResult[i] != targetSorted[i] { if sortedResult[i] != targetSorted[i] {
goto fail goto fail
} }

2
internal/server/usermanager/localmanager_api.go
View File

@ -59,7 +59,7 @@ func (manager *localManager) getUserInfoHlr(w http.ResponseWriter, r *http.Reque
var uinfo UserInfo var uinfo UserInfo
err = manager.db.View(func(tx *bolt.Tx) error { err = manager.db.View(func(tx *bolt.Tx) error {
bucket := tx.Bucket([]byte(UID)) bucket := tx.Bucket(UID)
if bucket == nil { if bucket == nil {
return ErrUserNotFound return ErrUserNotFound
} }

10
release.sh
View File

@ -2,7 +2,7 @@ go get github.com/mitchellh/gox
mkdir -p release mkdir -p release
read -p "Cleaning $PWD/release directory. Proceed? [y/n]" res read -rp "Cleaning $PWD/release directory. Proceed? [y/n]" res
if [ ! "$res" == "y" ]; then if [ ! "$res" == "y" ]; then
echo "Abort" echo "Abort"
exit 1 exit 1
@ -23,14 +23,14 @@ echo "Compiling:"
os="windows linux darwin" os="windows linux darwin"
arch="amd64 386 arm arm64 mips mips64 mipsle mips64le" arch="amd64 386 arm arm64 mips mips64 mipsle mips64le"
pushd cmd/ck-client pushd cmd/ck-client || exit 1
gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output" gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output"
GOOS="linux" GOARCH="mips" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mips_softfloat-${v} GOOS="linux" GOARCH="mips" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mips_softfloat-"${v}"
GOOS="linux" GOARCH="mipsle" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mipsle_softfloat-${v} GOOS="linux" GOARCH="mipsle" GOMIPS="softfloat" go build -ldflags "-X main.version=${v}" -o ck-client-linux-mipsle_softfloat-"${v}"
mv ck-client-* ../../release mv ck-client-* ../../release
os="linux" os="linux"
arch="amd64 386 arm arm64" arch="amd64 386 arm arm64"
pushd ../ck-server pushd ../ck-server || exit 1
gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output" gox -ldflags "-X main.version=${v}" -os="$os" -arch="$arch" -osarch="$osarch" -output="$output"
mv ck-server-* ../../release mv ck-server-* ../../release