Merge branch 'XTLS:main' into add_hex_to_udp_noise

XTLS · Jan 2, 2025 · a00cdac · a00cdac
2 parents 8d08d66 + 33186ca
commit a00cdac
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 51 deletions.
diff --git a/infra/conf/freedom.go b/infra/conf/freedom.go
@@ -168,7 +168,7 @@ func ParseNoise(noise *Noise) (*freedom.Noise, error) {
 
 	case "str":
 		//user input string
-		NConfig.StrNoise = []byte(strings.TrimSpace(noise.Packet))
+		NConfig.Packet = []byte(strings.TrimSpace(noise.Packet))
 
 	case "hex":
 		// user input hex - Decode hex string into byte slice
@@ -179,7 +179,7 @@ func ParseNoise(noise *Noise) (*freedom.Noise, error) {
 
 	case "base64":
 		//user input base64
-		NConfig.StrNoise, err = base64.StdEncoding.DecodeString(strings.TrimSpace(noise.Packet))
+		NConfig.Packet, 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,7 @@ message Noise {
   uint64 length_max = 2;
   uint64 delay_min = 3;
   uint64 delay_max = 4;
-  bytes str_noise = 5;
+  bytes packet = 5;
 }
 
 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.Packet != nil {
+				noise = n.Packet
 			} else {
 				//Random noise
 				noise, err = GenerateRandomBytes(randBetween(int64(n.LengthMin),