fix

Author: Fangliding

infra/conf/transport_internet.go

@@ -494,11 +494,8 @@ func (c *TLSConfig) Build() (proto.Message, error) {
 		}
 		config.EchServerKeys = EchPrivateKey
 	}
-	if c.ECHForceQuery == "" {
-		c.ECHForceQuery = "none"
-	}
 	switch c.ECHForceQuery {
-	case "none", "half", "full":
+	case "none", "half", "full", "":
 		config.EchForceQuery = c.ECHForceQuery
 	default:
 		return nil, errors.New(`invalid "echForceQuery": `, c.ECHForceQuery)

transport/internet/tls/ech.go

@@ -53,17 +53,18 @@ func ApplyECH(c *Config, config *tls.Config) error {
 
 	// for client
 	if len(c.EchConfigList) != 0 {
-		switch c.EchForceQuery {
+		ECHForceQuery := c.EchForceQuery
+		switch ECHForceQuery {
 		case "none", "half", "full":
 		case "":
-			c.EchForceQuery = "none" // default to none
+			ECHForceQuery = "none" // default to none
 		default:
 			panic("Invalid ECHForceQuery: " + c.EchForceQuery)
 		}
 		defer func() {
 			// if failed to get ECHConfig, use an invalid one to make connection fail
 			if err != nil {
-				if c.EchForceQuery == "full" {
+				if ECHForceQuery == "full" {
 					ECHConfig = []byte{1, 1, 4, 5, 1, 4}
 				}
 			}
@@ -144,7 +145,7 @@ func (c *ECHConfigCache) Update(domain string, server string, isLockedUpdate boo
 	echConfig, ttl, err := dnsQuery(server, domain, sockopt)
 	if err != nil {
 		// only cache err if forceQuery is "none"
-		if forceQuery == "none" || forceQuery == "" {
+		if forceQuery != "none" {
 			return nil, err
 		}
 	}