Merge pull request #60 from esrrhs/esrrhs-patch-1

Update go.yml

.github/workflows/go.yml

@@ -19,7 +19,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Build
         run: |

README.md

@@ -20,6 +20,7 @@ Pingtunnel is a tool that send TCP/UDP traffic over ICMP.
 
 -   First prepare a server with a public IP, such as EC2 on AWS, assuming the domain name or public IP is www.yourserver.com
 -   Download the corresponding installation package from [releases](https://github.com/esrrhs/pingtunnel/releases), such as pingtunnel_linux64.zip, then decompress and execute with **root** privileges
+-   “-key” parameter is **int** type, only supports numbers between 0-2147483647
 
 ```
 sudo wget (link of latest release)
@@ -38,23 +39,25 @@ echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_all
 -   Download the corresponding installation package from [releases](https://github.com/esrrhs/pingtunnel/releases), such as pingtunnel_windows64.zip, and decompress it
 -   Then run with **administrator** privileges. The commands corresponding to different forwarding functions are as follows.
 -   If you see a log of ping pong, the connection is normal
+-   “-key” parameter is **int** type, only supports numbers between 0-2147483647
+
 
 #### Forward sock5
 
 ```
-pingtunnel.exe -type client -l: 4455 -s www.yourserver.com -sock5 1
+pingtunnel.exe -type client -l :4455 -s www.yourserver.com -sock5 1
 ```
 
 #### Forward tcp
 
 ```
-pingtunnel.exe -type client -l: 4455 -s www.yourserver.com -t www.yourserver.com:4455 -tcp 1
+pingtunnel.exe -type client -l :4455 -s www.yourserver.com -t www.yourserver.com:4455 -tcp 1
 ```
 
 #### Forward udp
 
 ```
-pingtunnel.exe -type client -l: 4455 -s www.yourserver.com -t www.yourserver.com:4455
+pingtunnel.exe -type client -l :4455 -s www.yourserver.com -t www.yourserver.com:4455
 ```
 
 ### Use Docker
@@ -65,7 +68,7 @@ docker run --name pingtunnel-server -d --privileged --network host --restart=alw
 ```
 -   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
+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
 ```
 
 ## Thanks for free JetBrains Open Source license

client.go

@@ -1,4 +1,4 @@
-package main
+package pingtunnel
 
 import (
 	"github.com/esrrhs/gohome/common"

cmd/main.go

@@ -4,7 +4,9 @@ import (
 	"flag"
 	"fmt"
 	"github.com/esrrhs/gohome/common"
+	"github.com/esrrhs/gohome/geoip"
 	"github.com/esrrhs/gohome/loggo"
+	"github.com/esrrhs/pingtunnel"
 	"net"
 	"net/http"
 	_ "net/http/pprof"
@@ -35,7 +37,7 @@ Usage:
 
 服务器参数server param:
 
-    -key      设置的密码，默认0
+    -key      设置的纯数字密码，默认0, 参数为int类型，范围从0-2147483647，不可夹杂字母特殊符号
               Set password, default 0
 
     -nolog    不写日志文件，只打印标准输出，默认0
@@ -166,8 +168,8 @@ func main() {
 			*tcpmode = 1
 		}
 	}
-	if *tcpmode_maxwin*10 > FRAME_MAX_ID {
-		fmt.Println("set tcp win to big, max = " + strconv.Itoa(FRAME_MAX_ID/10))
+	if *tcpmode_maxwin*10 > pingtunnel.FRAME_MAX_ID {
+		fmt.Println("set tcp win to big, max = " + strconv.Itoa(pingtunnel.FRAME_MAX_ID/10))
 		return
 	}
 
@@ -186,7 +188,7 @@ func main() {
 	loggo.Info("key %d", *key)
 
 	if *t == "server" {
-		s, err := NewServer(*key, *maxconn, *max_process_thread, *max_process_buffer, *conntt)
+		s, err := pingtunnel.NewServer(*key, *maxconn, *max_process_thread, *max_process_buffer, *conntt)
 		if err != nil {
 			loggo.Error("ERROR: %s", err.Error())
 			return
@@ -213,7 +215,7 @@ func main() {
 		}
 
 		if len(*s5filter) > 0 {
-			err := LoadGeoDB(*s5ftfile)
+			err := geoip.Load(*s5ftfile)
 			if err != nil {
 				loggo.Error("Load Sock5 ip file ERROR: %s", err.Error())
 				return
@@ -229,7 +231,7 @@ func main() {
 				return false
 			}
 
-			ret, err := GetCountryIsoCode(taddr.IP.String())
+			ret, err := geoip.GetCountryIsoCode(taddr.IP.String())
 			if err != nil {
 				return false
 			}
@@ -239,7 +241,7 @@ func main() {
 			return ret != *s5filter
 		}
 
-		c, err := NewClient(*listen, *server, *target, *timeout, *key,
+		c, err := pingtunnel.NewClient(*listen, *server, *target, *timeout, *key,
 			*tcpmode, *tcpmode_buffersize, *tcpmode_maxwin, *tcpmode_resend_timems, *tcpmode_compress,
 			*tcpmode_stat, *open_sock5, *maxconn, &filter)
 		if err != nil {

country.go

@@ -1,52 +0,0 @@
-package main
-
-import (
-	"errors"
-	"github.com/esrrhs/gohome/common"
-	"github.com/oschwald/geoip2-golang"
-	"net"
-)
-
-var gdb *geoip2.Reader
-
-func LoadGeoDB(file string) error {
-
-	if len(file) <= 0 {
-		file = common.GetDataDir() + "/geoip/" + "GeoLite2-Country.mmdb"
-	}
-
-	db, err := geoip2.Open(file)
-	if err != nil {
-		return err
-	}
-	gdb = db
-	return nil
-}
-
-func GetCountryIsoCode(ipaddr string) (string, error) {
-
-	ip := net.ParseIP(ipaddr)
-	if ip == nil {
-		return "", errors.New("ip " + ipaddr + " ParseIP nil")
-	}
-	record, err := gdb.City(ip)
-	if err != nil {
-		return "", err
-	}
-
-	return record.Country.IsoCode, nil
-}
-
-func GetCountryName(ipaddr string) (string, error) {
-
-	ip := net.ParseIP(ipaddr)
-	if ip == nil {
-		return "", errors.New("ip " + ipaddr + "ParseIP nil")
-	}
-	record, err := gdb.City(ip)
-	if err != nil {
-		return "", err
-	}
-
-	return record.Country.Names["en"], nil
-}

country_test.go

@@ -1,16 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestNew(t *testing.T) {
-	LoadGeoDB("./GeoLite2-Country.mmdb")
-
-	fmt.Println(GetCountryIsoCode("39.106.101.133"))
-	fmt.Println(GetCountryIsoCode(""))
-	fmt.Println(GetCountryIsoCode("aa"))
-	fmt.Println(GetCountryIsoCode("39.106.101.133:14234"))
-	fmt.Println(GetCountryIsoCode("192.168.1.121"))
-}

go.mod

@@ -1,18 +1,18 @@
-module github.com/esrrhs/pingtunnul
+module github.com/esrrhs/pingtunnel
 
 go 1.18
 
 require (
-	github.com/esrrhs/gohome v0.0.0-20230222132228-8bb1d3e2ecc4
-	github.com/golang/protobuf v1.5.2
-	github.com/oschwald/geoip2-golang v1.8.0
-	golang.org/x/net v0.7.0
+	github.com/esrrhs/gohome v0.0.0-20231102120537-c519efbde976
+	github.com/golang/protobuf v1.5.3
+	golang.org/x/net v0.17.0
 )
 
 require (
 	github.com/OneOfOne/xxhash v1.2.8 // indirect
-	github.com/google/uuid v1.3.0 // indirect
-	github.com/oschwald/maxminddb-golang v1.10.0 // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	google.golang.org/protobuf v1.28.1 // indirect
+	github.com/google/uuid v1.4.0 // indirect
+	github.com/oschwald/geoip2-golang v1.9.0 // indirect
+	github.com/oschwald/maxminddb-golang v1.12.0 // indirect
+	golang.org/x/sys v0.13.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
 )

go.sum

@@ -1,29 +1,29 @@
 github.com/OneOfOne/xxhash v1.2.8 h1:31czK/TI9sNkxIKfaUfGlU47BAxQ0ztGgd9vPyqimf8=
 github.com/OneOfOne/xxhash v1.2.8/go.mod h1:eZbhyaAYD41SGSSsnmcpxVoRiQ/MPUTjUdIIOT9Um7Q=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
-github.com/esrrhs/gohome v0.0.0-20230222132228-8bb1d3e2ecc4 h1:ACKEtu7Lgqzu79p4ceZuNSCkm2Fi0GqzKmYyZBCHEXE=
-github.com/esrrhs/gohome v0.0.0-20230222132228-8bb1d3e2ecc4/go.mod h1:34iMM/+BQzOgisvR1ukn1tuEwYxVvdG4UOlBPNlyNUQ=
+github.com/esrrhs/gohome v0.0.0-20231102120537-c519efbde976 h1:av0d/lRou1Z5cxdSQFwtVcqJjokFI5pJyyr63iAuYis=
+github.com/esrrhs/gohome v0.0.0-20231102120537-c519efbde976/go.mod h1:S5fYcOFy4nUPnkYg7D9hIp+SwBR9kCBiOYmWVW42Yhs=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
-github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw=
-github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
+github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
+github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
-github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/oschwald/geoip2-golang v1.8.0 h1:KfjYB8ojCEn/QLqsDU0AzrJ3R5Qa9vFlx3z6SLNcKTs=
-github.com/oschwald/geoip2-golang v1.8.0/go.mod h1:R7bRvYjOeaoenAp9sKRS8GX5bJWcZ0laWO5+DauEktw=
-github.com/oschwald/maxminddb-golang v1.10.0 h1:Xp1u0ZhqkSuopaKmk1WwHtjF0H9Hd9181uj2MQ5Vndg=
-github.com/oschwald/maxminddb-golang v1.10.0/go.mod h1:Y2ELenReaLAZ0b400URyGwvYxHV1dLIxBuyOsyYjHK0=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/oschwald/geoip2-golang v1.9.0 h1:uvD3O6fXAXs+usU+UGExshpdP13GAqp4GBrzN7IgKZc=
+github.com/oschwald/geoip2-golang v1.9.0/go.mod h1:BHK6TvDyATVQhKNbQBdrj9eAvuwOMi2zSFXizL3K81Y=
+github.com/oschwald/maxminddb-golang v1.12.0 h1:9FnTOD0YOhP7DGxGsq4glzpGy5+w7pq50AS6wALUMYs=
+github.com/oschwald/maxminddb-golang v1.12.0/go.mod h1:q0Nob5lTCqyQ8WT6FYgS1L7PXKVVbgiymefNwIjPzgY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
-golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
-golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
-golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
+golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM=
+golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE=
+golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE=
+golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
-google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=
-google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
+google.golang.org/protobuf v1.31.0 h1:g0LDEJHgrBl9N9r17Ru3sqWhkIx2NB67okBHPwC7hs8=
+google.golang.org/protobuf v1.31.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

msg.pb.go

@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // source: msg.proto
 
-package main
+package pingtunnel
 
 import (
 	fmt "fmt"

msg.proto

@@ -1,5 +1,5 @@
 syntax = "proto3";
-option go_package = "main";
+option go_package = "pingtunnel";
 
 message MyMsg {
   enum TYPE {

pingtunnel.go

@@ -1,4 +1,4 @@
-package main
+package pingtunnel
 
 import (
 	"encoding/binary"

pingtunnel_test.go

@@ -1,4 +1,4 @@
-package main
+package pingtunnel
 
 import (
 	"fmt"

server.go

@@ -1,4 +1,4 @@
-package main
+package pingtunnel
 
 import (
 	"github.com/esrrhs/gohome/common"