Improve rtsp ip resolution

src/lib/network/utils.rs

@@ -1,15 +1,33 @@
+use std::sync::RwLock;
+
 use pnet;
 use tracing::*;
 
 use crate::cli::manager::vehicle_ddns;
 
+static OBSERVED_ADDRESS: RwLock<Option<String>> = RwLock::new(None);
+
+/// Store a known-reachable IP learned from an incoming HTTP request.
+pub fn set_observed_address(address: String) {
+    if let Ok(mut guard) = OBSERVED_ADDRESS.write() {
+        *guard = Some(address);
+    }
+}
+
+/// Priority: (1) CLI `--vehicle-ddns`, (2) IP observed from an HTTP
+/// client request, (3) pnet interface detection (legacy fallback).
 pub fn get_visible_qgc_address() -> String {
     match vehicle_ddns() {
         Some(ddns) => ddns.to_string(),
-        None => get_ipv4_addresses()
-            .last()
-            .unwrap_or(&std::net::Ipv4Addr::UNSPECIFIED)
-            .to_string(),
+        None => {
+            if let Some(addr) = OBSERVED_ADDRESS.read().ok().and_then(|g| g.clone()) {
+                return addr;
+            }
+            get_ipv4_addresses()
+                .last()
+                .unwrap_or(&std::net::Ipv4Addr::UNSPECIFIED)
+                .to_string()
+        }
     }
 }
 

src/lib/server/pages.rs

@@ -433,7 +433,16 @@ pub fn camera_reset_controls(json: web::Json<ResetCameraControls>) -> Result<Htt
 
 #[api_v2_operation]
 /// Provides a xml description file that contains information for a specific device, based on: https://mavlink.io/en/services/camera_def.html
-pub fn xml(xml_file_request: web::Query<XmlFileRequest>) -> Result<HttpResponse> {
+pub fn xml(req: HttpRequest, xml_file_request: web::Query<XmlFileRequest>) -> Result<HttpResponse> {
+    let host = req.connection_info().host().to_string();
+    if let Some(ip_str) = host.split(':').next() {
+        if let Ok(ip) = ip_str.parse::<std::net::IpAddr>() {
+            if !ip.is_unspecified() && !ip.is_loopback() {
+                crate::network::utils::set_observed_address(ip_str.to_string());
+            }
+        }
+    }
+
     debug!("{xml_file_request:#?}");
     let cameras = video_source::cameras_available().await;
     let camera = cameras