Merge branch 'update_iptproxy' into 'main'

Update iptproxy

See merge request !4

IPtProxy @ c8124260

-Subproject commit ca6e707555224ba17adfedc7c5aa65eeb987286c
+Subproject commit c812426041708a156be221b7edd3a88c723a14b9

build_core.sh

@@ -71,7 +71,9 @@ export GOPATH=`pwd`
 export GO_LANG=`pwd`/go/bin
 export GO_COMPILED=`pwd`/bin
 export PATH="${GO_LANG}:${GO_COMPILED}:${PATH}"
-# go env
+# the next line can be removed if we use golang v1.18+
+go env -w GOFLAGS=-mod=mod
+go env
 cd ..
 
 # -------- init gomobile ---------------
@@ -85,7 +87,7 @@ showtitle "initiating gomobile"
 # -------- prepare snowflake ---------------
 showtitle "Checking out snowflake repository"
 cd ./IPtProxy/snowflake
-git checkout --force --quiet ead5a960 || quit "Failed to checkout snowflake at commit ead5a960"
+git checkout --force --quiet c983c13a || quit "Failed to checkout snowflake at commit ead5a960"
 git submodule update --init --recursive || quit "Failed to update snowflake submodules"
 cd ..
 
@@ -94,7 +96,7 @@ patch --directory=snowflake --strip=1 < snowflake.patch || quit
 cd ..
 
 showtitle "Applying patch to IPtProxy"
-patch --directory=IPtProxy --strip=1 < IPtProxy.patch || quit
+patch --directory=IPtProxy --strip=1 < iptproxy.patch || quit
 
 # -------- preparing obfsvpn ---------------
 showtitle "Applying patch to obfsvpn"

go.mod

@@ -10,7 +10,7 @@ replace (
 
 require (
 	git.torproject.org/pluggable-transports/goptlib.git v1.1.0
-	git.torproject.org/pluggable-transports/snowflake.git/v2 v2.0.1
+	git.torproject.org/pluggable-transports/snowflake.git/v2 v2.3.0
 	github.com/kalikaneko/socks5 v1.0.1
 	github.com/xtaci/kcp-go v5.4.20+incompatible
 	// Do not update obfs4 past e330d1b7024b, a backwards incompatible change was
@@ -19,9 +19,48 @@ require (
 )
 
 require (
+	0xacab.org/leap/obfsvpn v0.0.0-20220802171959-991a3abcd851
+	golang.org/x/crypto v0.0.0-20220516162934-403b01795ae8
+	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
+)
+
+require (
+	github.com/dchest/siphash v1.2.1 // indirect
+	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/websocket v1.4.1 // indirect
+	github.com/klauspost/cpuid v1.3.1 // indirect
+	github.com/klauspost/cpuid/v2 v2.0.6 // indirect
+	github.com/klauspost/reedsolomon v1.9.16 // indirect
+	github.com/pion/datachannel v1.5.2 // indirect
+	github.com/pion/dtls/v2 v2.1.5 // indirect
+	github.com/pion/ice/v2 v2.2.6 // indirect
+	github.com/pion/interceptor v0.1.11 // indirect
+	github.com/pion/logging v0.2.2 // indirect
+	github.com/pion/mdns v0.0.5 // indirect
+	github.com/pion/randutil v0.1.0 // indirect
+	github.com/pion/rtcp v1.2.9 // indirect
+	github.com/pion/rtp v1.7.13 // indirect
+	github.com/pion/sctp v1.8.2 // indirect
+	github.com/pion/sdp/v3 v3.0.5 // indirect
+	github.com/pion/srtp/v2 v2.0.9 // indirect
+	github.com/pion/stun v0.3.5 // indirect
+	github.com/pion/transport v0.13.0 // indirect
+	github.com/pion/turn/v2 v2.0.8 // indirect
+	github.com/pion/udp v0.1.1 // indirect
+	github.com/pion/webrtc/v3 v3.1.41 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/refraction-networking/utls v1.0.0 // indirect
+	github.com/templexxx/cpu v0.0.7 // indirect
+	github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
+	github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
+	github.com/templexxx/xorsimd v0.4.1 // indirect
+	github.com/tjfoc/gmsm v1.4.1 // indirect
+	github.com/xtaci/kcp-go/v5 v5.6.1 // indirect
+	github.com/xtaci/smux v1.5.15 // indirect
 	golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd // indirect
 	golang.org/x/mod v0.4.2 // indirect
-	golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e // indirect
+	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/text v0.3.7 // indirect
 	golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098 // indirect
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 )