Version 1.2.1

Added work mode(blacklist/whitelist) for ipchecker. Now a few countries can be given for ip check

Author: DroidProger

shadowsocks.go

@@ -81,7 +81,8 @@ func createSsServerConfig(str string) (errstr string) {
 		} else {
 			conf.Address = spstr[:index]
 			//check ip
-			if !isIpValid(config.IpCheckServer, conf.Address, config.IpCheckKey, config.IpCheckValue) {
+			if !isIpValid(config.IpCheckServer, conf.Address, config.IpCheckKey,
+				config.IpCheckValue, config.IpCheckBlackList) {
 				return "Ip is invalid"
 			}
 			//

trojan.go

@@ -54,7 +54,8 @@ func createTrojanServerConfig(ser_passw string, params string) (errstr string) {
 		portInd := strings.IndexByte(ser, ':')
 		conf.Address = ser[:portInd]
 		//check ip
-		if !isIpValid(config.IpCheckServer, conf.Address, config.IpCheckKey, config.IpCheckValue) {
+		if !isIpValid(config.IpCheckServer, conf.Address, config.IpCheckKey,
+			config.IpCheckValue, config.IpCheckBlackList) {
 			return "Ip is invalid"
 		}
 		//

vless.go

@@ -61,7 +61,8 @@ func createVlessServerConfig(uid_ser string, params string) (errstr string) {
 		portInd := strings.IndexByte(ser, ':')
 		conf.Address = ser[:portInd]
 		//check ip
-		if !isIpValid(config.IpCheckServer, conf.Address, config.IpCheckKey, config.IpCheckValue) {
+		if !isIpValid(config.IpCheckServer, conf.Address, config.IpCheckKey,
+			config.IpCheckValue, config.IpCheckBlackList) {
 			return "Ip is invalid"
 		}
 		//

vmess.go

@@ -50,7 +50,8 @@ func createVmessServerConfig(str string) (errstr string) {
 		conf := new(VmessServerConfig)
 		conf.Address = params["add"].(string)
 		//check ip
-		if !isIpValid(config.IpCheckServer, conf.Address, config.IpCheckKey, config.IpCheckValue) {
+		if !isIpValid(config.IpCheckServer, conf.Address, config.IpCheckKey,
+			config.IpCheckValue, config.IpCheckBlackList) {
 			return "Ip is invalid"
 		}
 		//

xrkeyparser.go

@@ -45,24 +45,12 @@ type Config struct {
 	ConfigSectionPath []string
 	ServersEditPos    int
 	Tag               string
-	//SsConfigSectionPath []string
-	//SsServersEditPos    int
-	//SsModeDefault       string
-	//SsTimeOutDefault    int32
-	//SsTag string
-	//SsMultipleOutbounds    bool
-	//VlessConfigSectionPath []string
-	//VlessServersEditPos    int
-	//VlessMultipleOutbounds bool
-	//VlessTag               string
-	//VmessConfigSectionPath []string
-	//VmessServersEditPos    int
-	//VmessTag               string
-	OutputFile    string
-	Links         []Link
-	IpCheckServer string
-	IpCheckKey    string
-	IpCheckValue  string
+	OutputFile        string
+	Links             []Link
+	IpCheckServer     string
+	IpCheckKey        string
+	IpCheckBlackList  bool
+	IpCheckValue      []string
 }
 
 type ParseResult struct {