diff --git a/docker-all.sh b/docker-all.sh index 5d8a878..580869b 100755 --- a/docker-all.sh +++ b/docker-all.sh @@ -6,5 +6,5 @@ ROOT=${PWD} echo "Build web" go run gen_web.go -sudo docker run --rm -v "$PWD":/usr/src/torr -w /usr/src/torr golang:1.16 ./build-all.sh +sudo docker run --rm -v "$PWD":/usr/src/torr -v ~/go/pkg/mod:/go/pkg/mod -w /usr/src/torr golang:1.16 ./build-all.sh sudo chmod 0777 ./dist/* \ No newline at end of file diff --git a/server/cmd/preconfig_and.go b/server/cmd/preconfig_and.go new file mode 100644 index 0000000..bdcb357 --- /dev/null +++ b/server/cmd/preconfig_and.go @@ -0,0 +1,6 @@ +// +build android + +package main + +// #cgo LDFLAGS: -static-libstdc++ +import "C" diff --git a/server/settings/btsets.go b/server/settings/btsets.go index f298a26..3529244 100644 --- a/server/settings/btsets.go +++ b/server/settings/btsets.go @@ -28,19 +28,21 @@ type BTSets struct { EnableDebug bool // print logs // BT Config - EnableIPv6 bool - DisableTCP bool - DisableUTP bool - DisableUPNP bool - DisableDHT bool - DisablePEX bool - DisableUpload bool - DownloadRateLimit int // in kb, 0 - inf - UploadRateLimit int // in kb, 0 - inf - ConnectionsLimit int - DhtConnectionLimit int // 0 - inf - PeersListenPort int - Strategy int // 0 - RequestStrategyDuplicateRequestTimeout, 1 - RequestStrategyFuzzing, 2 - RequestStrategyFastest + AcceptPeerCon bool `default:"true"` + AnnTorrentsToDht bool `default:"true"` + EnableIPv6 bool + DisableTCP bool + DisableUTP bool + DisableUPNP bool + DisableDHT bool + DisablePEX bool + DisableUpload bool + DownloadRateLimit int // in kb, 0 - inf + UploadRateLimit int // in kb, 0 - inf + ConnectionsLimit int + //DhtConnectionLimit int // 0 - inf + PeersListenPort int + //Strategy int // 0 - RequestStrategyDuplicateRequestTimeout, 1 - RequestStrategyFuzzing, 2 - RequestStrategyFastest } func (v *BTSets) String() string { diff --git a/server/version/version.go b/server/version/version.go index c5f7114..11a3980 100644 --- a/server/version/version.go +++ b/server/version/version.go @@ -1,3 +1,3 @@ package version -const Version = "MatriX.101" +const Version = "MatriX.102" diff --git a/web/dest/index.html b/web/dest/index.html deleted file mode 100644 index 891be02..0000000 --- a/web/dest/index.html +++ /dev/null @@ -1,30 +0,0 @@ -