Merge pull request #160 from huiminghao/rtsp_udp_fix

Rtsp udp remote address fix; rust 1.83 disable lint warning:non_local_definitions
harlanc · Dec 6, 2024 · 2dc721e · 2dc721e
2 parents 1057281 + 3e31b59
commit 2dc721e
Show file tree

Hide file tree

Showing 32 changed files with 37 additions and 2 deletions.
diff --git a/application/xiu/src/config/errors.rs b/application/xiu/src/config/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     failure::{Backtrace, Fail},
     std::{fmt, io::Error},

diff --git a/library/bytesio/src/bits_errors.rs b/library/bytesio/src/bits_errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use super::bytes_errors::BytesReadError;
 use super::bytes_errors::BytesWriteError;
 use failure::{Backtrace, Fail};

diff --git a/library/bytesio/src/bytes_errors.rs b/library/bytesio/src/bytes_errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use super::bytesio_errors::BytesIOError;
 use std::io;
 // use tokio::time::Elapsed;

diff --git a/library/bytesio/src/bytesio_errors.rs b/library/bytesio/src/bytesio_errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use failure::{Backtrace, Fail};
 use std::fmt;
 use std::io;

diff --git a/library/codec/h264/src/errors.rs b/library/codec/h264/src/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use bytesio::bits_errors::BitError;
 use failure::{Backtrace, Fail};
 use std::fmt;

diff --git a/library/common/src/errors.rs b/library/common/src/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use failure::{Backtrace, Fail};
 use std::fmt;
 

diff --git a/library/container/flv/src/amf0/errors.rs b/library/container/flv/src/amf0/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     bytesio::bytes_errors::{BytesReadError, BytesWriteError},
     failure::{Backtrace, Fail},

diff --git a/library/container/flv/src/errors.rs b/library/container/flv/src/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     bytesio::bits_errors::BitError,
     bytesio::bytes_errors::{BytesReadError, BytesWriteError},

diff --git a/library/container/mpegts/src/errors.rs b/library/container/mpegts/src/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     bytesio::bytes_errors::{BytesReadError, BytesWriteError},
     failure::{Backtrace, Fail},

diff --git a/library/logger/src/errors.rs b/library/logger/src/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use failure::Fail;
 
 pub struct LogError {

diff --git a/library/streamhub/src/errors.rs b/library/streamhub/src/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use bytesio::bytes_errors::BytesReadError;
 use bytesio::bytes_errors::BytesWriteError;
 use failure::Backtrace;

diff --git a/protocol/hls/src/errors.rs b/protocol/hls/src/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     failure::{Backtrace, Fail},
     std::fmt,

diff --git a/protocol/httpflv/src/errors.rs b/protocol/httpflv/src/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use streamhub::errors::StreamHubError;
 
 use {

diff --git a/protocol/rtmp/src/cache/errors.rs b/protocol/rtmp/src/cache/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     crate::chunk::errors::PackError,
     bytesio::bytes_errors::BytesReadError,

diff --git a/protocol/rtmp/src/chunk/errors.rs b/protocol/rtmp/src/chunk/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     failure::{Backtrace, Fail},
     bytesio::bytes_errors::{BytesReadError, BytesWriteError},

diff --git a/protocol/rtmp/src/handshake/errors.rs b/protocol/rtmp/src/handshake/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     bytesio::bytes_errors::{BytesReadError, BytesWriteError},
     failure::{Backtrace, Fail},

diff --git a/protocol/rtmp/src/messages/errors.rs b/protocol/rtmp/src/messages/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     crate::{
         protocol_control_messages::errors::ProtocolControlMessageReaderError,

diff --git a/protocol/rtmp/src/netconnection/errors.rs b/protocol/rtmp/src/netconnection/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     crate::chunk::errors::PackError,
     failure::{Backtrace, Fail},

diff --git a/protocol/rtmp/src/netstream/errors.rs b/protocol/rtmp/src/netstream/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     crate::chunk::errors::PackError,
     failure::{Backtrace, Fail},

diff --git a/protocol/rtmp/src/protocol_control_messages/errors.rs b/protocol/rtmp/src/protocol_control_messages/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     failure::{Backtrace, Fail},
     bytesio::bytes_errors::{BytesReadError, BytesWriteError},

diff --git a/protocol/rtmp/src/relay/errors.rs b/protocol/rtmp/src/relay/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     failure::Fail,
     std::{fmt, io::Error},

diff --git a/protocol/rtmp/src/remuxer/errors.rs b/protocol/rtmp/src/remuxer/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     crate::{cache::errors::MetadataError, session::errors::SessionError},
     bytesio::bytes_errors::{BytesReadError, BytesWriteError},

diff --git a/protocol/rtmp/src/session/errors.rs b/protocol/rtmp/src/session/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     crate::{
         cache::errors::CacheError,

diff --git a/protocol/rtmp/src/user_control_messages/errors.rs b/protocol/rtmp/src/user_control_messages/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     bytesio::bytes_errors::{BytesReadError, BytesWriteError},
     failure::{Backtrace, Fail},

diff --git a/protocol/rtmp/src/utils/errors.rs b/protocol/rtmp/src/utils/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     failure::{Backtrace, Fail},
     std::fmt,

diff --git a/protocol/rtsp/src/relay/errors.rs b/protocol/rtsp/src/relay/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     failure::Fail,
     std::{fmt, io::Error},

diff --git a/protocol/rtsp/src/rtp/errors.rs b/protocol/rtsp/src/rtp/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     failure::{Backtrace, Fail},
     std::fmt,

diff --git a/protocol/rtsp/src/rtp/rtcp/errors.rs b/protocol/rtsp/src/rtp/rtcp/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use bytesio::bytes_errors::BytesReadError;
 use bytesio::bytes_errors::BytesWriteError;
 use failure::Fail;

diff --git a/protocol/rtsp/src/session/errors.rs b/protocol/rtsp/src/session/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     crate::rtp::errors::{PackerError, UnPackerError},
     bytesio::bytes_errors::BytesReadError,

diff --git a/protocol/rtsp/src/session/server_session.rs b/protocol/rtsp/src/session/server_session.rs
@@ -48,6 +48,7 @@ use bytesio::bytesio::TcpIO;
 
 use std::collections::HashMap;
 use std::sync::Arc;
+use std::net::SocketAddr;
 use tokio::sync::mpsc;
 
 use commonlib::auth::Auth;
@@ -81,6 +82,7 @@ pub struct RtspServerSession {
 
     pub stream_identifier: Option<StreamIdentifier>,
     pub is_normal_exit: bool,
+    remote_addr: SocketAddr,
 }
 
 pub struct InterleavedBinaryData {
@@ -125,6 +127,7 @@ impl RtspServerSession {
         //     None
         // };
 
+        let remote_addr = stream.peer_addr().unwrap_or(stream.local_addr().unwrap());
         let net_io: Box<dyn TNetIO + Send + Sync> = Box::new(TcpIO::new(stream));
         let io = Arc::new(Mutex::new(net_io));
 
@@ -141,6 +144,7 @@ impl RtspServerSession {
             auth,
             stream_identifier: None,
             is_normal_exit: false,
+            remote_addr,
         }
     }
 
@@ -159,7 +163,7 @@ impl RtspServerSession {
             if let Ok(data) = InterleavedBinaryData::new(&mut self.reader) {
                 match data {
                     Some(a) => {
-                        if self.reader.len() < a.length as usize {
+                        while self.reader.len() < a.length as usize {
                             let data = self.io.lock().await.read().await?;
                             self.reader.extend_from_slice(&data[..]);
                         }
@@ -428,7 +432,7 @@ impl RtspServerSession {
                                     (0, 0)
                                 };
 
-                            let address = rtsp_request.uri.host.clone();
+                            let address = self.remote_addr.ip().to_string();
                             if let Some(rtp_io) = UdpIO::new(address.clone(), rtp_port, 0).await {
                                 rtp_server_port = rtp_io.get_local_port();
 

diff --git a/protocol/webrtc/src/errors.rs b/protocol/webrtc/src/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use {
     audiopus::error::Error as OpusError,
     failure::{Backtrace, Fail},

diff --git a/protocol/webrtc/src/session/errors.rs b/protocol/webrtc/src/session/errors.rs
@@ -1,3 +1,4 @@
+#![allow(non_local_definitions)]
 use streamhub::errors::StreamHubError;
 use {
     bytesio::bytes_errors::BytesReadError,