Freedom outbound: Change legacy variable name of UDP noise

XTLS · Jan 2, 2025 · 7a4eff9 · 7a4eff9
1 parent e80ca67
commit 7a4eff9
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 47 deletions.
diff --git a/infra/conf/freedom.go b/infra/conf/freedom.go
@@ -167,11 +167,11 @@ func ParseNoise(noise *Noise) (*freedom.Noise, error) {
 
 	case "str":
 		//user input string
-		NConfig.StrNoise = []byte(strings.TrimSpace(noise.Packet))
+		NConfig.Noise = []byte(strings.TrimSpace(noise.Packet))
 
 	case "base64":
 		//user input base64
-		NConfig.StrNoise, err = base64.StdEncoding.DecodeString(strings.TrimSpace(noise.Packet))
+		NConfig.Noise, err = base64.StdEncoding.DecodeString(strings.TrimSpace(noise.Packet))
 		if err != nil {
 			return nil, errors.New("Invalid base64 string")
 		}

diff --git a/proxy/freedom/config.pb.go b/proxy/freedom/config.pb.go
diff --git a/proxy/freedom/config.proto b/proxy/freedom/config.proto
@@ -25,7 +25,11 @@ message Noise {
   uint64 length_max = 2;
   uint64 delay_min = 3;
   uint64 delay_max = 4;
+
+  // Deprecated: noises now support binary data, str will be converted in infra/conf
   bytes str_noise = 5;
+
+  bytes noise = 6;
 }
 
 message Config {

diff --git a/proxy/freedom/freedom.go b/proxy/freedom/freedom.go
@@ -407,8 +407,8 @@ func (w *NoisePacketWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
 		var err error
 		for _, n := range w.noises {
 			//User input string or base64 encoded string
-			if n.StrNoise != nil {
-				noise = n.StrNoise
+			if n.Noise != nil {
+				noise = n.Noise
 			} else {
 				//Random noise
 				noise, err = GenerateRandomBytes(randBetween(int64(n.LengthMin),