amass/ZLMediaKit
1
0
Fork 0
mirror of https://github.com/ZLMediaKit/ZLMediaKit.git synced 2024-11-26 12:37:09 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix clang format change include order result in windows build error

Browse Source
This commit is contained in:
xiongguangjie 2022-06-09 22:54:24 +08:00
parent f58211fb08
commit 49a0183df0
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
srt/Common.hpp
View File

@ -1,9 +1,10 @@
#ifndef ZLMEDIAKIT_SRT_COMMON_H #ifndef ZLMEDIAKIT_SRT_COMMON_H
#define ZLMEDIAKIT_SRT_COMMON_H #define ZLMEDIAKIT_SRT_COMMON_H
#if defined(_WIN32) #if defined(_WIN32)
#include <Iphlpapi.h>
#include <winsock2.h> #include <winsock2.h>
#include <ws2tcpip.h> #include <ws2tcpip.h>
#include <Iphlpapi.h>
#pragma comment(lib, "Ws2_32.lib") #pragma comment(lib, "Ws2_32.lib")
#pragma comment(lib, "Iphlpapi.lib") #pragma comment(lib, "Iphlpapi.lib")
#else #else

10
srt/Packet.cpp
View File

@ -294,8 +294,12 @@ bool HandshakePacket::loadExtMessage(uint8_t *buf, size_t len) {
length = loadUint16(ptr + 2); length = loadUint16(ptr + 2);
switch (type) { switch (type) {
case HSExt::SRT_CMD_HSREQ: case HSExt::SRT_CMD_HSREQ:
case HSExt::SRT_CMD_HSRSP: ext = std::make_shared<HSExtMessage>(); break; case HSExt::SRT_CMD_HSRSP:
case HSExt::SRT_CMD_SID: ext = std::make_shared<HSExtStreamID>(); break; ext = std::make_shared<HSExtMessage>();
break;
case HSExt::SRT_CMD_SID:
ext = std::make_shared<HSExtStreamID>();
break;
default: default:
WarnL << "not support ext " << type; WarnL << "not support ext " << type;
break; break;
@ -410,7 +414,7 @@ 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) * sizeof(peer_ip_addr[0]));
if (addr->ss_family == AF_INET) { if (addr->ss_family == AF_INET) {
struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr; struct sockaddr_in *ipv4 = (struct sockaddr_in *)addr;
//抓包 奇怪好像是小头端？？？ // 抓包 奇怪好像是小头端？？？
storeUint32LE(peer_ip_addr, ipv4->sin_addr.s_addr); storeUint32LE(peer_ip_addr, ipv4->sin_addr.s_addr);
} else if (addr->ss_family == AF_INET6) { } else if (addr->ss_family == AF_INET6) {
if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)addr)->sin6_addr)) { if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)addr)->sin6_addr)) {

10
srt/SrtTransport.cpp
View File

@ -127,6 +127,8 @@ void SrtTransport::handleHandshakeInduction(HandshakePacket &pkt, struct sockadd
_max_window_size = pkt.max_flow_window_size; _max_window_size = pkt.max_flow_window_size;
_mtu = pkt.mtu; _mtu = pkt.mtu;
_last_pkt_seq = _init_seq_number - 1;
_peer_socket_id = pkt.srt_socket_id; _peer_socket_id = pkt.srt_socket_id;
HandshakePacket::Ptr res = std::make_shared<HandshakePacket>(); HandshakePacket::Ptr res = std::make_shared<HandshakePacket>();
res->dst_socket_id = _peer_socket_id; res->dst_socket_id = _peer_socket_id;
@ -318,6 +320,10 @@ void SrtTransport::handleDropReq(uint8_t *buf, int len, struct sockaddr_storage
uint32_t max_seq = 0; uint32_t max_seq = 0;
for (auto data : list) { for (auto data : list) {
max_seq = data->packet_seq_number; max_seq = data->packet_seq_number;
if (_last_pkt_seq + 1 != data->packet_seq_number) {
TraceL << "pkt lost " << _last_pkt_seq + 1 << "->" << data->packet_seq_number;
}
_last_pkt_seq = data->packet_seq_number;
onSRTData(std::move(data)); onSRTData(std::move(data));
} }
_recv_nack.drop(max_seq); _recv_nack.drop(max_seq);
@ -454,6 +460,10 @@ void SrtTransport::handleDataPacket(uint8_t *buf, int len, struct sockaddr_stora
uint32_t last_seq; uint32_t last_seq;
for (auto data : list) { for (auto data : list) {
last_seq = data->packet_seq_number; last_seq = data->packet_seq_number;
if (_last_pkt_seq + 1 != data->packet_seq_number) {
TraceL << "pkt lost " << _last_pkt_seq + 1 << "->" << data->packet_seq_number;
}
_last_pkt_seq = data->packet_seq_number;
onSRTData(std::move(data)); onSRTData(std::move(data));
} }
_recv_nack.drop(last_seq); _recv_nack.drop(last_seq);

2
srt/SrtTransport.hpp
View File

@ -125,6 +125,8 @@ private:
uint32_t _light_ack_pkt_count = 0; uint32_t _light_ack_pkt_count = 0;
uint32_t _ack_number_count = 0; uint32_t _ack_number_count = 0;
uint32_t _last_ack_pkt_seq_num = 0; uint32_t _last_ack_pkt_seq_num = 0;
uint32_t _last_pkt_seq = 0;
UTicker _ack_ticker; UTicker _ack_ticker;
std::map<uint32_t, TimePoint> _ack_send_timestamp; std::map<uint32_t, TimePoint> _ack_send_timestamp;