From 3d4f5108bb945f1d9328ccda2b874840f0049ea3 Mon Sep 17 00:00:00 2001
From: euzu <euzu@proton.me>
Date: Tue, 28 Oct 2025 20:55:49 +0100
Subject: [PATCH] Some refactorings - HdHomerun - WebUI GeoIP - Playlist
 Updates ...

---
 backend/src/api/hdhomerun_proprietary.rs | 35 ++++++++++++++++++++----
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/backend/src/api/hdhomerun_proprietary.rs b/backend/src/api/hdhomerun_proprietary.rs
index 3495191fc..f6c39fa4b 100644
--- a/backend/src/api/hdhomerun_proprietary.rs
+++ b/backend/src/api/hdhomerun_proprietary.rs
@@ -141,12 +141,31 @@ fn parse_tlv(cursor: &mut Cursor<&[u8]>) -> HashMap<u8, Vec<u8>> {
         }
         let tag = tag_buf[0];
 
-        // 2-Byte length (big-endian)
-        let mut len_buf = [0u8; 2];
-        if std::io::Read::read_exact(cursor, &mut len_buf).is_err() {
-            break;
-        }
-        let len = u16::from_be_bytes(len_buf) as usize;
+        // // 2-Byte length (big-endian)
+        // let mut len_buf = [0u8; 2];
+        // if std::io::Read::read_exact(cursor, &mut len_buf).is_err() {
+        //     break;
+        // }
+        // let len = u16::from_be_bytes(len_buf) as usize;
+
+         // Variable-length TLV decoding
+         let mut first_len_byte = [0u8; 1];
+         if std::io::Read::read_exact(cursor, &mut first_len_byte).is_err() {
+              break;
+         }
+         let len = if first_len_byte[0] & 0x80 == 0 {
+             // Single-byte length (≤127)
+             first_len_byte[0] as usize
+         } else {
+             // Two-byte length (≥128)
+             let mut second_len_byte = [0u8; 1];
+             if std::io::Read::read_exact(cursor, &mut second_len_byte).is_err() {
+                 break;
+             }
+             let low_bits = (first_len_byte[0] & 0x7F) as usize;
+             let high_bits = (second_len_byte[0] as usize) << 7;
+             low_bits | high_bits
+         };
 
         // Check for incomplete TLV
         let remaining = cursor.get_ref().len() as u64 - cursor.position();
@@ -227,6 +246,10 @@ async fn proprietary_discover_loop(
                             };
                             if should_reply {
                                 let response = build_discover_response(device, &server_host);
+                                if response.is_empty() {
+                                   error!("Failed to build discovery response for device '{}'", device.name);
+                                   continue;
+                                }
                                 if let Err(e) = socket.send_to(&response, remote_addr).await {
                                     error!("Failed to send proprietary discovery response to {remote_addr}: {e}");
                                 } else {