From 87277ac91ab58272e2ff143a14e845167c785692 Mon Sep 17 00:00:00 2001
From: xiongguangjie <xiong_panda@163.com>
Date: Sat, 28 Sep 2024 10:11:39 +0800
Subject: [PATCH] Optimaztion code for srt (#3934)

---
 srt/Packet.cpp       | 12 ++++++------
 srt/SrtTransport.cpp |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/srt/Packet.cpp b/srt/Packet.cpp
index a1abb742..a675f58a 100644
--- a/srt/Packet.cpp
+++ b/srt/Packet.cpp
@@ -292,8 +292,8 @@ bool HandshakePacket::loadFromData(uint8_t *buf, size_t len) {
     syn_cookie = loadUint32(ptr);
     ptr += 4;
 
-    memcpy(peer_ip_addr, ptr, sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]));
-    ptr += sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]);
+    memcpy(peer_ip_addr, ptr, sizeof(peer_ip_addr));
+    ptr += sizeof(peer_ip_addr);
 
     if (encryption_field != NO_ENCRYPTION) {
         ErrorL << "not support encryption " << encryption_field;
@@ -400,8 +400,8 @@ bool HandshakePacket::storeToData() {
     storeUint32(ptr, syn_cookie);
     ptr += 4;
 
-    memcpy(ptr, peer_ip_addr, sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]));
-    ptr += sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]);
+    memcpy(ptr, peer_ip_addr, sizeof(peer_ip_addr));
+    ptr += sizeof(peer_ip_addr);
 
     if (encryption_field != NO_ENCRYPTION) {
         ErrorL << "not support encryption " << encryption_field;
@@ -433,7 +433,7 @@ uint32_t HandshakePacket::getSynCookie(uint8_t *buf, size_t len) {
 }
 
 void HandshakePacket::assignPeerIP(struct sockaddr_storage *addr) {
-    memset(peer_ip_addr, 0, sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]));
+    memset(peer_ip_addr, 0, sizeof(peer_ip_addr));
     if (addr->ss_family == AF_INET) {
         struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr;
         // 抓包 奇怪好像是小头端？？？  [AUTO-TRANSLATED:40eb164c]
@@ -446,7 +446,7 @@ void HandshakePacket::assignPeerIP(struct sockaddr_storage *addr) {
             storeUint32LE(peer_ip_addr, addr4.s_addr);
         } else {
             const sockaddr_in6 *ipv6 = (struct sockaddr_in6 *)addr;
-            memcpy(peer_ip_addr, ipv6->sin6_addr.s6_addr, sizeof(peer_ip_addr) * sizeof(peer_ip_addr[0]));
+            memcpy(peer_ip_addr, ipv6->sin6_addr.s6_addr, sizeof(peer_ip_addr));
         }
     }
 }
diff --git a/srt/SrtTransport.cpp b/srt/SrtTransport.cpp
index d02eb516..e3db949f 100644
--- a/srt/SrtTransport.cpp
+++ b/srt/SrtTransport.cpp
@@ -206,7 +206,7 @@ void SrtTransport::handleHandshakeInduction(HandshakePacket &pkt, struct sockadd
     res->srt_socket_id = _peer_socket_id;
     res->syn_cookie = HandshakePacket::generateSynCookie(addr, _start_timestamp);
     _sync_cookie = res->syn_cookie;
-    memcpy(res->peer_ip_addr, pkt.peer_ip_addr, sizeof(pkt.peer_ip_addr) * sizeof(pkt.peer_ip_addr[0]));
+    memcpy(res->peer_ip_addr, pkt.peer_ip_addr, sizeof(pkt.peer_ip_addr));
     _handleshake_res = res;
     res->storeToData();