Merge branch 'master' into old-good-engine

server/cmd/preconfig_and.go

@@ -0,0 +1,6 @@
+// +build android
+
+package main
+
+// #cgo LDFLAGS: -static-libstdc++
+import "C"

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 {

server/version/version.go

@@ -1,3 +1,3 @@
 package version
 
-const Version = "MatriX.101"
+const Version = "MatriX.102"