fixed #1621

shogo4405 · Nov 14, 2024 · 1a27187 · 1a27187
1 parent 20d8eb4
commit 1a27187
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/SRTHaishinKit/Sources/SRTConnection.swift b/SRTHaishinKit/Sources/SRTConnection.swift
@@ -114,7 +114,12 @@ public actor SRTConnection: NetworkConnection {
     }
 
     func send(_ data: Data) async {
-        await socket?.send(data)
+        switch mode {
+        case .caller:
+            await socket?.send(data)
+        case .listener:
+            await clients.first?.send(data)
+        }
     }
 
     func recv() {

diff --git a/SRTHaishinKit/Sources/SRTSocket.swift b/SRTHaishinKit/Sources/SRTSocket.swift
@@ -58,17 +58,8 @@ final actor SRTSocket {
             case SRTS_CONNECTING:
                 logger.trace("SRT Socket Connecting")
             case SRTS_CONNECTED:
-                connected = true
-                let (stream, continuation) = AsyncStream<Data>.makeStream()
-                outputs = continuation
-                Task {
-                    for await data in stream where connected {
-                        _ = sendmsg2(data)
-                        totalBytesOut += data.count
-                        queueBytesOut -= data.count
-                    }
-                }
                 logger.info("SRT Socket Connected")
+                didConnected()
             case SRTS_BROKEN:
                 logger.warn("SRT Socket Broken")
                 close()
@@ -106,7 +97,7 @@ final actor SRTSocket {
         status = srt_getsockstate(socket)
         switch status {
         case SRTS_CONNECTED:
-            connected = true
+            didConnected()
         default:
             break
         }
@@ -185,6 +176,19 @@ final actor SRTSocket {
         return srt_bstats(socket, &perf, 1)
     }
 
+    private func didConnected() {
+        connected = true
+        let (stream, continuation) = AsyncStream<Data>.makeStream()
+        outputs = continuation
+        Task {
+            for await data in stream where connected {
+                _ = sendmsg2(data)
+                totalBytesOut += data.count
+                queueBytesOut -= data.count
+            }
+        }
+    }
+
     private func makeSocketError() -> SRTError {
         let error_message = String(cString: srt_getlasterror_str())
         logger.error(error_message)