Skip to content

Commit

Permalink
bump version to 0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
Ehco1996 committed Jul 7, 2020
1 parent ed718c2 commit 53d120a
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/normal.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
run: go test ./test

- name: Build
run: go build -v -a -installsuffix cgo -o ehco cmd/main.go
run: go build -v -a -installsuffix cgo -o ehco cmd/ehco/main.go

- uses: actions/upload-artifact@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ before:
builds:
- env:
- CGO_ENABLED=0
main: ./cmd/main.go
main: ./cmd/ehco/main.go
archives:
- replacements:
darwin: Darwin
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,39 +64,39 @@ iperf3 -s

# 直接转发
# run relay server listen 1234 to 9001 (raw)
go run cmd/main.go -l 0.0.0.0:1234 -r 0.0.0.0:5201
go run cmd/ehco/main.go -l 0.0.0.0:1234 -r 0.0.0.0:5201

# 直接转发END


# 通过wss隧道转发
# listen 1234 relay over ws to 1236
go run cmd/main.go -l 0.0.0.0:1235 -r wss://0.0.0.0:1236 -tt ws
go run cmd/ehco/main.go -l 0.0.0.0:1235 -r wss://0.0.0.0:1236 -tt ws

# listen 1236 through ws relay to 5201
go run cmd/main.go -l 0.0.0.0:1236 -lt wss -r 0.0.0.0:5201
go run cmd/ehco/main.go -l 0.0.0.0:1236 -lt wss -r 0.0.0.0:5201
# 通过wss隧道转发END


# 通过wss隧道转发
# listen 1234 relay over wss to 1236
go run cmd/main.go -l 0.0.0.0:1235 -r wss://0.0.0.0:1236 -tt wss
go run cmd/ehco/main.go -l 0.0.0.0:1235 -r wss://0.0.0.0:1236 -tt wss

# listen 1236 through wss relay to 5201
go run cmd/main.go -l 0.0.0.0:1236 -lt wss -r 0.0.0.0:5201
go run cmd/ehco/main.go -l 0.0.0.0:1236 -lt wss -r 0.0.0.0:5201
# 通过wss隧道转发END


# 通过mwss隧道转发 和wss相比 速度会慢,但是能减少延迟
# listen 1237 relay over mwss to 1238
go run cmd/main.go -l 0.0.0.0:1237 -r wss://0.0.0.0:1238 -tt mwss
go run cmd/ehco/main.go -l 0.0.0.0:1237 -r wss://0.0.0.0:1238 -tt mwss

# listen 1238 through mwss relay to 5201
go run cmd/main.go -l 0.0.0.0:1238 -lt mwss -r 0.0.0.0:5201
go run cmd/ehco/main.go -l 0.0.0.0:1238 -lt mwss -r 0.0.0.0:5201
# 通过mwss隧道转发END

# run through file
go run cmd/main.go -c config.json
go run cmd/ehco/main.go -c config.json

# benchmark tcp
iperf3 -c 0.0.0.0 -p 1234
Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ RUN go mod download
COPY . .

# Build the Go app
RUN go build -v -a -installsuffix cgo -o ehco cmd/main.go
RUN go build -v -a -installsuffix cgo -o ehco cmd/ehco/main.go

FROM alpine:latest

Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go → cmd/ehco/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ var PprofPort string
func main() {
app := cli.NewApp()
app.Name = "ehco"
app.Version = "0.1.1"
app.Version = "0.1.3"
app.Usage = "ehco is a network relay tool and a typo :)"
app.Flags = []cli.Flag{
&cli.StringFlag{
Expand Down

0 comments on commit 53d120a

Please sign in to comment.