Freedom config: Fix noises delay (#4233)

Co-authored-by: RPRX <[email protected]>
XTLS · Jan 1, 2025 · 3dec711 · 3dec711
1 parent 480eac7
commit 3dec711
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 11 deletions.
diff --git a/infra/conf/freedom.go b/infra/conf/freedom.go
@@ -180,20 +180,15 @@ func ParseNoise(noise *Noise) (*freedom.Noise, error) {
 		}
 
 	default:
-		return nil, errors.New("Invalid packet,only rand,str,base64 are supported")
+		return nil, errors.New("Invalid packet, only rand/str/base64 are supported")
 	}
 
 	if noise.Delay != nil {
-		if noise.Delay.From != 0 && noise.Delay.To != 0 {
-			NConfig.DelayMin = uint64(noise.Delay.From)
-			NConfig.DelayMax = uint64(noise.Delay.To)
-			if NConfig.DelayMin > NConfig.LengthMax {
-				NConfig.DelayMin, NConfig.DelayMax = NConfig.LengthMax, NConfig.DelayMin
-			}
-		} else {
-			return nil, errors.New("DelayMin or DelayMax cannot be zero")
+		NConfig.DelayMin = uint64(noise.Delay.From)
+		NConfig.DelayMax = uint64(noise.Delay.To)
+		if NConfig.DelayMin > NConfig.DelayMax {
+			NConfig.DelayMin, NConfig.DelayMax = NConfig.DelayMax, NConfig.DelayMin
 		}
-
 	} else {
 		NConfig.DelayMin = 0
 		NConfig.DelayMax = 0

diff --git a/proxy/freedom/freedom.go b/proxy/freedom/freedom.go
@@ -419,7 +419,7 @@ func (w *NoisePacketWriter) WriteMultiBuffer(mb buf.MultiBuffer) error {
 			}
 			w.Writer.WriteMultiBuffer(buf.MultiBuffer{buf.FromBytes(noise)})
 
-			if n.DelayMin != 0 {
+			if n.DelayMin != 0 || n.DelayMax != 0 {
 				time.Sleep(time.Duration(randBetween(int64(n.DelayMin), int64(n.DelayMax))) * time.Millisecond)
 			}
 		}