Merge 7141759d78 into 351e8fbd43

Fixed the compilation issue on macOS15 M platform
https://github.com/ZLMediaKit/ZLToolKit/pull/252
2024-11-24 11:40:37 +08:00 · 2024-10-12 23:36:48 +08:00 · 2024-10-11 14:23:05 +08:00 · 2024-09-28 10:11:54 +08:00
2 changed files with 2 additions and 1 deletions
--- a/3rdpart/ZLToolKit
+++ b/3rdpart/ZLToolKit
@ -1 +1 @@
-Subproject commit f8add834ea352bd8c9279486e48ae5070a84d4aa
+Subproject commit 46231014e2a7ec1903d4a37e96222481ecc779d8
--- a/srt/Packet.cpp
+++ b/srt/Packet.cpp
@ -437,6 +437,7 @@ void HandshakePacket::assignPeerIP(struct sockaddr_storage *addr) {
    if (addr->ss_family == AF_INET) {
        struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr;
        // 抓包 奇怪好像是小头端？？？  [AUTO-TRANSLATED:40eb164c]
+        // Packet capture, weird, seems to be from the client side？？？  [AUTO-TRANSLATED:6109d8a0]
        // Packet capture, weird, seems to be from the client side？？？
        storeUint32LE(peer_ip_addr, ipv4->sin_addr.s_addr);
    } else if (addr->ss_family == AF_INET6) {
Author	SHA1	Message	Date
alex	979d368a37	Merge `7141759d78` into `351e8fbd43`	2024-10-12 23:36:48 +08:00
Xiaofeng Wang	351e8fbd43	Fixed the compilation issue on macOS15 M platform Some checks failed Android / build (push) Has been cancelled Details CodeQL / Analyze (cpp) (push) Has been cancelled Details CodeQL / Analyze (javascript) (push) Has been cancelled Details Docker / build (push) Has been cancelled Details Linux / build (push) Has been cancelled Details macOS / build (push) Has been cancelled Details Windows / build (push) Has been cancelled Details https://github.com/ZLMediaKit/ZLToolKit/pull/252	2024-10-11 14:23:05 +08:00
alex	7141759d78	Translate comments in srt/Packet.cpp	2024-09-28 10:11:54 +08:00