{FEC} Packet filter framework and API (#854)

* Introduced a capability flag for packet filter. Added standard capability set definition. Recorded SRT HS flags in the fields.
Haivision · Sep 9, 2019 · f94a4c1 · f94a4c1
1 parent 9b01aac
commit f94a4c1
Show file tree

Hide file tree

Showing 14 changed files with 1,391 additions and 211 deletions.
diff --git a/srtcore/api.cpp b/srtcore/api.cpp
@@ -205,6 +205,8 @@ int CUDTUnited::startup()
          throw CUDTException(MJ_SETUP, MN_NONE,  WSAGetLastError());
    #endif
 
+   PacketFilter::globalInit();
+
    //init CTimer::EventLock
 
    if (m_bGCStatus)

diff --git a/srtcore/buffer.cpp b/srtcore/buffer.cpp
@@ -1656,7 +1656,7 @@ int CRcvBuffer::readMsg(char* data, int len, ref_t<SRT_MSGCTRL> r_msgctl)
                         << FormatTime(srctime) << " in " << (timediff/1000.0)
                         << "ms - TIME-PREVIOUS: PKT: " << (srctimediff/1000.0)
                         << " LOCAL: " << (nowdiff/1000.0)
-                        << " !" << BufferStamp(pkt.m_pcData, pkt.getLength()));
+                        << " !" << BufferStamp(pkt.data(), pkt.size()));
 
                 prev_now = nowtime;
                 prev_srctime = srctime;

diff --git a/srtcore/channel.cpp b/srtcore/channel.cpp
@@ -422,7 +422,7 @@ int CChannel::sendto(const sockaddr* addr, CPacket& packet) const
     {
         spec << " CONTROL size=" << packet.getLength()
              << " cmd=" << MessageTypeStr(packet.getType(), packet.getExtendedType())
-             << " arg=" << packet.getHeader()[CPacket::PH_MSGNO];
+             << " arg=" << packet.header(SRT_PH_MSGNO);
     }
     else
     {
@@ -738,7 +738,7 @@ EReadStatus CChannel::recvfrom(sockaddr* addr, CPacket& packet) const
     //   packet.m_nHeader[i] = ntohl(packet.m_nHeader[i]);
     {
         uint32_t* p = packet.m_nHeader;
-        for (size_t i = 0; i < CPacket::PH_SIZE; ++ i)
+        for (size_t i = 0; i < SRT_PH__SIZE; ++ i)
         {
             *p = ntohl(*p);
             ++ p;