Merge remote-tracking branch 'origin/master'

.github/workflows/go.yml

@@ -0,0 +1,30 @@
+name: Go
+on: [push]
+jobs:
+
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Set up Go 1.13
+      uses: actions/setup-go@v1
+      with:
+        go-version: 1.13
+      id: go
+
+    - name: Check out code into the Go module directory
+      uses: actions/checkout@v1
+
+    - name: Get dependencies
+      run: |
+        go get -v -t -d ./...
+        if [ -f Gopkg.toml ]; then
+            curl https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
+            dep ensure
+        fi
+
+    - name: Build
+      run: |
+        go build -v .
+        ./pingtunnel

Dockerfile

@@ -0,0 +1,9 @@
+FROM golang AS build-env
+
+RUN go get -u github.com/esrrhs/pingtunnel
+RUN go get -u github.com/esrrhs/pingtunnel/...
+RUN go install github.com/esrrhs/pingtunnel
+
+FROM debian
+COPY --from=build-env /go/bin/pingtunnel .
+WORKDIR ./

README.md

@@ -1,5 +1,7 @@
 # Pingtunnel
 pingtunnel是把tcp/udp/sock5流量伪装成icmp流量进行转发的工具。用于突破网络封锁，或是绕过WIFI网络的登陆验证，或是在某些网络加快网络传输速度。
+
+**注意：本工具只是用作学习研究，请勿用于非法用途！**
 <br />Pingtunnel is a tool that advertises tcp/udp/sock5 traffic as icmp traffic for forwarding. Used to break through the network blockade, or to bypass the WIFI network login verification, or speed up network transmission speed on some networks. 
 
 ![image](network.jpg)
@@ -37,8 +39,23 @@ pingtunnel.exe -type client -l :4455 -s www.yourserver.com -sock5 1
 # Download
 cmd: https://github.com/esrrhs/pingtunnel/releases
 
-qt: https://github.com/esrrhs/pingtunnel-qt
+QT GUI: https://github.com/esrrhs/pingtunnel-qt
 
+# Docker
+server:
+```
+docker run --name pingtunnel-server -d --privileged --network host --restart=always esrrhs/pingtunnel ./pingtunnel -type server -key 123456
+```
+client:
+```
+docker run --name pingtunnel-client -d --restart=always -p 1080:1080 esrrhs/pingtunnel ./pingtunnel -type client -l :1080 -s www.yourserver.com -sock5 1 -key 123456
+```
+
+
+# Stargazers over time
+
+[![Stargazers over time](https://starchart.cc/esrrhs/pingtunnel.svg)](https://starchart.cc/esrrhs/pingtunnel)
+      
 # Usage
     通过伪造ping，把tcp/udp/sock5流量通过远程服务器转发到目的服务器上。用于突破某些运营商封锁TCP/UDP流量。
     By forging ping, the tcp/udp/sock5 traffic is forwarded to the destination server through the remote server. Used to break certain operators to block TCP/UDP traffic.
@@ -124,4 +141,4 @@ qt: https://github.com/esrrhs/pingtunnel-qt
               Set the forwarding filter in the sock5 mode. The default is full forwarding. For example, setting the CN indicates that the Chinese address is not forwarded.
 
     -s5ftfile sock5模式转发过滤的数据文件，默认读取当前目录的GeoLite2-Country.mmdb
-              The data file in sock5 filter mode, the default reading of the current directory GeoLite2-Country.mmdb
+              The data file in sock5 filter mode, the default reading of the current directory GeoLite2-Country.mmdb

_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-hacker

main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/esrrhs/go-engine/src/common"
 	"github.com/esrrhs/go-engine/src/geoip"
 	"github.com/esrrhs/go-engine/src/loggo"
 	"github.com/esrrhs/go-engine/src/pingtunnel"
@@ -103,6 +104,8 @@ Usage:
 
 func main() {
 
+	defer common.CrashLog()
+
 	t := flag.String("type", "", "client or server")
 	listen := flag.String("l", "", "listen addr")
 	target := flag.String("t", "", "target addr")