Skip to content

Commit 7de1e94

Browse files
author
seanchann
committed
1.update upstream. 2. replace shadowsocks-go name with shadowss
1 parent 8d9240c commit 7de1e94

File tree

10,922 files changed

+170
-3783606
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

10,922 files changed

+170
-3783606
lines changed

‎.travis.yml

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# shadowsocks-go
1+
# shadowss
22

3-
[![Build Status](https://travis-ci.org/bjjyd/shadowsocks-go.svg?branch=master)](https://travis-ci.org/bjjyd/shadowsocks-go/)
3+
[![Build Status](https://travis-ci.org/bjjyd/shadowss.svg?branch=master)](https://travis-ci.org/bjjyd/shadowss/)
44

5-
shadowsocks-go is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).
5+
shadowss is a lightweight tunnel proxy which can help you get through firewalls. It is a port of [shadowsocks](https://github.com/clowwindy/shadowsocks).
66

77
The protocol is compatible with the origin shadowsocks (if both have been upgraded to the latest version).
88

@@ -11,13 +11,13 @@ The protocol is compatible with the origin shadowsocks (if both have been upgrad
1111
You can also install from source (assume you have go installed):
1212

1313
```
14-
git clone https://github.com/bjjyd/shadowsocks-go
15-
cd shadowsocks-go/cmd/shadowss/server/
14+
git clone https://github.com/bjjyd/shadowss
15+
cd shadowss/cmd/shadowss/server/
1616
go build -a -o shadowss
1717
./shadowss --alsologtostderr=true --config-file="/etc/server-multi-port.json" &
1818
```
1919

20-
It's recommended to disable cgo when compiling shadowsocks-go. This will prevent the go runtime from creating too many threads for dns lookup.
20+
It's recommended to disable cgo when compiling shadowss. This will prevent the go runtime from creating too many threads for dns lookup.
2121

2222
# Usage
2323

@@ -50,7 +50,7 @@ Configuration file is in json format like this:
5050

5151
## About encryption methods
5252

53-
AES is recommended for shadowsocks-go. [Intel AES Instruction Set](http://en.wikipedia.org/wiki/AES_instruction_set) will be used if available and can make encryption/decryption very fast. To be more specific, **`aes-128-cfb` is recommended as it is faster and [secure enough](https://www.schneier.com/blog/archives/2009/07/another_new_aes.html)**.
53+
AES is recommended for shadowss. [Intel AES Instruction Set](http://en.wikipedia.org/wiki/AES_instruction_set) will be used if available and can make encryption/decryption very fast. To be more specific, **`aes-128-cfb` is recommended as it is faster and [secure enough](https://www.schneier.com/blog/archives/2009/07/another_new_aes.html)**.
5454

5555
**rc4 and table encryption methods are deprecated because they are not secure.**
5656

‎build/build-image/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ MAINTAINER seanchann <[email protected]>
55
RUN set -ex \
66
&& apk add --no-cache --virtual bash
77

8-
COPY . /go/src/shadowsocks-go/
8+
COPY . /go/src/shadowss/
99
COPY /build/build-image/files/entrypoint.sh /entrypoint.sh
1010
COPY /build/build-image/files/config.json //conf/config.json
1111

12-
RUN cd /go/src/shadowsocks-go/ \
12+
RUN cd /go/src/shadowss/ \
1313
&& cp vendor/* /go/src/ -rf \
1414
&& cd cmd/shadowss/ \
1515
&& go build -v -o /go/bin/shadowss \

‎cmd/shadowss/app/app.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package app
33
import (
44
"runtime"
55

6-
"shadowsocks-go/cmd/shadowss/app/options"
7-
"shadowsocks-go/pkg/multiuser"
8-
"shadowsocks-go/pkg/proxyserver"
6+
"shadowss/cmd/shadowss/app/options"
7+
"shadowss/pkg/multiuser"
8+
"shadowss/pkg/proxyserver"
99

1010
"github.com/golang/glog"
1111
)

‎cmd/shadowss/app/options/server_option.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package options
22

33
import (
4-
"shadowsocks-go/pkg/config"
4+
"shadowss/pkg/config"
55

66
storageoptions "gofreezer/pkg/genericstoragecodec/options"
77

‎cmd/shadowss/shadowss.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"runtime/debug"
1010
"syscall"
1111

12-
"shadowsocks-go/cmd/shadowss/app"
13-
"shadowsocks-go/cmd/shadowss/app/options"
12+
"shadowss/cmd/shadowss/app"
13+
"shadowss/cmd/shadowss/app/options"
1414

1515
"github.com/spf13/pflag"
1616
)

‎cmd/shadowssctl/app/apiserver.go

Lines changed: 0 additions & 55 deletions
This file was deleted.

‎cmd/shadowssctl/app/options/options.go

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎cmd/shadowssctl/shadowssctl.go

Lines changed: 0 additions & 32 deletions
This file was deleted.

0 commit comments

Comments
 (0)