🗽 Sync 2026-10-23 00:46:23

luci-app-fwlive/root/usr/libexec/fwlive-adaptive-cap.sh

@@ -316,15 +316,18 @@ fwlive_adaptive_compute_limit() {
 	_limit=$_max
 	_probe=0
 
-	# Hot/warm: hold the previous limit while samples stay hot, and probe
-	# upward on the first healthy sample. Record may retain that step above
-	# the lines just served (same as a full-sized cold probe).
+	# Hot/warm: hold the previous limit while samples stay hot or warm, and
+	# probe upward on the first healthy sample. A hot sample never holds a
+	# limit above the hot floor. Record may retain a healthy step above the
+	# lines just served (same as a full-sized cold probe).
 	case "$_prev_b" in
 		hot|warm)
 			if [ "$_prev_c" -gt 0 ]; then
 				if [ "$_ms" -gt "$FWLIVE_ADAPTIVE_HOT_EXIT_MS" ] || \
 					[ "$_bucket" = hot ]; then
 					_limit=$_prev_l
+					[ "$_bucket" = hot ] && [ "$_limit" -gt "$FWLIVE_ADAPTIVE_HOT_FLOOR" ] && \
+						_limit=$FWLIVE_ADAPTIVE_HOT_FLOOR
 					fwlive_adaptive_clamp "$_req" "$_max"
 					printf '%s\n' "$_limit"
 					return 0

luci-app-fwlive/root/usr/libexec/fwlive-logging.sh

@@ -945,11 +945,10 @@ restore_wan_zone_log() {
 		logger -t fwlive "WAN log rollback skipped: commit generation unavailable" 2>/dev/null || true
 		return 1
 	}
-	# Capture the committed value before staging our rollback. If another
-	# writer stages a firewall delta after this point, the post-stage guard
-	# may revert our option only when its staged log delta is still uniquely
-	# identifiable; otherwise it preserves the ambiguous same-option change.
-	committed=$(wan_zone_log_value "$zone")
+	# If another writer stages a firewall delta after this point, the
+	# post-stage guard may revert our option only when its staged log
+	# delta is still uniquely identifiable; otherwise it preserves the
+	# ambiguous same-option change.
 	# Fail closed if set/delete never staged. Swallowed rc plus an empty
 	# changes list would make `uci commit` succeed as a no-op.
 	if [ -z "$previous" ]; then

luci-app-fwlive/root/usr/libexec/rpcd/fwlive

@@ -319,7 +319,8 @@ map_uci_rule_targets() {
 	done <<EOF
 $_uci_names
 EOF
-	[ -z "$_targets_overflow" ] || _map_overflow=1
+	# Target overflow omits remaining suffixes only. Do not set
+	# _map_overflow: truncated means rule labels were capped.
 }
 
 # One awk pass; output encoding depends on mode (default: raw). Raw mode emits