From ba8b0cba804a3fe444a58a31b2528d2c1a017d0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20R=C3=A4s=C3=A4nen?= Date: Tue, 1 Jun 2021 10:54:23 +0300 Subject: [PATCH] common: Reverse the order of the header includes I tried to make the headers be included in local to global order. This way any potential missing includes are detected making it easier to make changes to header location and includes. --- include/clock.hh | 8 ++++++++ include/crypto.hh | 4 +++- include/dispatch.hh | 8 ++++---- include/formats/h264.hh | 6 +++--- include/formats/h265.hh | 8 ++++---- include/formats/h266.hh | 3 ++- include/formats/media.hh | 10 +++++----- include/frame.hh | 3 ++- include/holepuncher.hh | 4 ++-- include/lib.hh | 2 +- include/media_stream.hh | 8 +++++--- include/mingw_inet.hh | 4 ++++ include/pkt_dispatch.hh | 6 +++--- include/poll.hh | 4 ++-- include/queue.hh | 10 +++++----- include/rtcp.hh | 10 +++++----- include/rtp.hh | 5 +---- include/runner.hh | 4 ++-- include/session.hh | 6 +++--- include/socket.hh | 3 ++- include/srtp/base.hh | 12 +++++++----- include/zrtp.hh | 12 +++++++----- include/zrtp/commit.hh | 5 +++-- include/zrtp/confack.hh | 6 ++++-- include/zrtp/confirm.hh | 7 +++++-- include/zrtp/dh_kxchng.hh | 6 ++++-- include/zrtp/error.hh | 6 ++++-- include/zrtp/hello.hh | 6 +++--- include/zrtp/hello_ack.hh | 5 +++-- include/zrtp/zrtp_receiver.hh | 2 ++ src/clock.cc | 8 +------- src/crypto.cc | 5 ++++- src/dispatch.cc | 4 +++- src/formats/h264.cc | 14 +++++++------- src/formats/h264_pkt_handler.cc | 10 +++++----- src/formats/h265.cc | 15 +++++++-------- src/formats/h265_pkt_handler.cc | 10 +++++----- src/formats/h266.cc | 14 +++++++------- src/formats/h266_pkt_handler.cc | 10 +++++----- src/formats/h26x.cc | 15 ++++++++------- src/formats/media.cc | 5 +---- src/frame.cc | 8 +++++--- src/holepuncher.cc | 4 +++- src/hostname.cc | 7 ++++--- src/lib.cc | 9 +++++---- src/media_stream.cc | 10 +++++----- src/mingw_inet.cc | 4 ++-- src/pkt_dispatch.cc | 11 ++++++----- src/poll.cc | 10 +++++++--- src/queue.cc | 16 +++++++++------- src/random.cc | 10 ++++++---- src/rtcp.cc | 15 ++++++++------- src/rtcp/app.cc | 4 ---- src/rtcp/bye.cc | 4 ---- src/rtcp/receiver.cc | 4 ---- src/rtcp/rtcp_runner.cc | 4 ---- src/rtcp/sdes.cc | 4 ---- src/rtcp/sender.cc | 4 ---- src/rtp.cc | 11 +++++++---- src/session.cc | 3 ++- src/socket.cc | 8 +++++--- src/srtp/base.cc | 7 ++++--- src/srtp/srtcp.cc | 6 ++++-- src/srtp/srtp.cc | 7 ++++--- src/zrtp.cc | 23 ++++++++++++----------- src/zrtp/commit.cc | 10 +++++----- src/zrtp/confack.cc | 6 +++--- src/zrtp/confirm.cc | 5 ++--- src/zrtp/dh_kxchng.cc | 9 +++++---- src/zrtp/error.cc | 11 +++++++---- src/zrtp/hello.cc | 9 +++++---- src/zrtp/hello_ack.cc | 7 ++++--- src/zrtp/zrtp_receiver.cc | 27 +++++++++++++++------------ 73 files changed, 305 insertions(+), 265 deletions(-) diff --git a/include/clock.hh b/include/clock.hh index d2767b7..1d67adc 100644 --- a/include/clock.hh +++ b/include/clock.hh @@ -1,5 +1,13 @@ #pragma once +#ifdef _WIN32 +#include +#include +#else +#include +#endif + + #include namespace uvgrtp { diff --git a/include/crypto.hh b/include/crypto.hh index 43252f6..de2c464 100644 --- a/include/crypto.hh +++ b/include/crypto.hh @@ -25,7 +25,7 @@ #include #endif -#else // __cplusplus +#else // __cplusplus < 201703L #ifndef __RTP_NO_CRYPTO__ #define __RTP_CRYPTO__ @@ -42,6 +42,8 @@ #endif #endif // __cplusplus +#include + namespace uvgrtp { namespace crypto { diff --git a/include/dispatch.hh b/include/dispatch.hh index 16e303e..605276b 100644 --- a/include/dispatch.hh +++ b/include/dispatch.hh @@ -1,14 +1,14 @@ #pragma once -#include -#include -#include - #include "queue.hh" #include "socket.hh" #include "runner.hh" #include "util.hh" +#include +#include +#include + namespace uvgrtp { /* System call dispatcher is an optimization technique which aims to minimize diff --git a/include/formats/h264.hh b/include/formats/h264.hh index d66ea0a..9da3462 100644 --- a/include/formats/h264.hh +++ b/include/formats/h264.hh @@ -1,10 +1,10 @@ #pragma once -#include - +#include "formats/h26x.hh" #include "frame.hh" #include "queue.hh" -#include "formats/h26x.hh" + +#include namespace uvgrtp { diff --git a/include/formats/h265.hh b/include/formats/h265.hh index 7cc0afd..5956803 100644 --- a/include/formats/h265.hh +++ b/include/formats/h265.hh @@ -1,14 +1,14 @@ #pragma once +#include "formats/h26x.hh" +#include "frame.hh" +#include "queue.hh" + #include #include #include #include -#include "frame.hh" -#include "queue.hh" -#include "formats/h26x.hh" - namespace uvgrtp { namespace formats { diff --git a/include/formats/h266.hh b/include/formats/h266.hh index 7ead455..8d2fc44 100644 --- a/include/formats/h266.hh +++ b/include/formats/h266.hh @@ -1,8 +1,9 @@ #pragma once +#include "formats/h26x.hh" #include "frame.hh" #include "queue.hh" -#include "formats/h26x.hh" + namespace uvgrtp { diff --git a/include/formats/media.hh b/include/formats/media.hh index 43c1862..1fef683 100644 --- a/include/formats/media.hh +++ b/include/formats/media.hh @@ -1,15 +1,15 @@ #pragma once -#include -#include -#include -#include - #include "../rtp.hh" #include "../socket.hh" #include "../queue.hh" #include "../util.hh" +#include +#include +#include +#include + namespace uvgrtp { namespace formats { diff --git a/include/frame.hh b/include/frame.hh index d18fb96..c6a55e7 100644 --- a/include/frame.hh +++ b/include/frame.hh @@ -1,5 +1,7 @@ #pragma once +#include "util.hh" + #ifdef _WIN32 #include #include @@ -11,7 +13,6 @@ #include #include -#include "util.hh" #define RTP_HEADER_LENGTH 12 #define RTCP_HEADER_LENGTH 12 diff --git a/include/holepuncher.hh b/include/holepuncher.hh index 0d300ca..c8e538d 100644 --- a/include/holepuncher.hh +++ b/include/holepuncher.hh @@ -1,11 +1,11 @@ #pragma once -#include - #include "runner.hh" #include "socket.hh" #include "util.hh" +#include + namespace uvgrtp { class holepuncher : public runner { diff --git a/include/lib.hh b/include/lib.hh index b9695ab..5a11180 100644 --- a/include/lib.hh +++ b/include/lib.hh @@ -1,7 +1,7 @@ #pragma once -#include #include "session.hh" +#include namespace uvgrtp { diff --git a/include/media_stream.hh b/include/media_stream.hh index 7d7a6c1..722ebc9 100644 --- a/include/media_stream.hh +++ b/include/media_stream.hh @@ -1,8 +1,5 @@ #pragma once -#include -#include - #include "holepuncher.hh" #include "pkt_dispatch.hh" #include "rtcp.hh" @@ -13,6 +10,11 @@ #include "formats/media.hh" +#include +#include + + + namespace uvgrtp { class media_stream { diff --git a/include/mingw_inet.hh b/include/mingw_inet.hh index b793354..a3e6e9c 100644 --- a/include/mingw_inet.hh +++ b/include/mingw_inet.hh @@ -1,5 +1,9 @@ #pragma once +#ifdef _WIN32 +#include +#endif + namespace uvgrtp { namespace mingw { int inet_pton(int af, const char *src, struct in_addr *dst); diff --git a/include/pkt_dispatch.hh b/include/pkt_dispatch.hh index 4be6f4a..4209cb7 100644 --- a/include/pkt_dispatch.hh +++ b/include/pkt_dispatch.hh @@ -1,13 +1,13 @@ #pragma once -#include -#include - #include "frame.hh" #include "runner.hh" #include "socket.hh" #include "util.hh" +#include +#include + namespace uvgrtp { typedef rtp_error_t (*packet_handler)(ssize_t, void *, int, uvgrtp::frame::rtp_frame **); diff --git a/include/poll.hh b/include/poll.hh index 9e3cb20..b91f049 100644 --- a/include/poll.hh +++ b/include/poll.hh @@ -1,9 +1,9 @@ #pragma once -#include - #include "socket.hh" +#include + namespace uvgrtp { namespace poll { /* Cross-platform poll implementation for listening to a socket for a period of time diff --git a/include/queue.hh b/include/queue.hh index 46e8c3d..3c4b159 100644 --- a/include/queue.hh +++ b/include/queue.hh @@ -1,10 +1,5 @@ #pragma once -#include -#include -#include -#include - #include "dispatch.hh" #include "frame.hh" #include "rtp.hh" @@ -12,6 +7,11 @@ #include "srtp/base.hh" #include "util.hh" +#include +#include +#include +#include + #if defined(_MSC_VER) typedef SSIZE_T ssize_t; #endif diff --git a/include/rtcp.hh b/include/rtcp.hh index 5f97614..74ff03e 100644 --- a/include/rtcp.hh +++ b/include/rtcp.hh @@ -1,10 +1,5 @@ #pragma once -#include -#include -#include -#include - #include "clock.hh" #include "frame.hh" #include "runner.hh" @@ -12,6 +7,11 @@ #include "srtp/srtcp.hh" #include "util.hh" +#include +#include +#include +#include + namespace uvgrtp { /// \cond DO_NOT_DOCUMENT diff --git a/include/rtp.hh b/include/rtp.hh index a800619..3221800 100644 --- a/include/rtp.hh +++ b/include/rtp.hh @@ -1,5 +1,4 @@ -#ifndef __RTP_HH_ -#define __RTP_HH_ +#pragma once #include "clock.hh" #include "frame.hh" @@ -68,5 +67,3 @@ namespace uvgrtp { }; namespace uvg_rtp = uvgrtp; - -#endif /* __RTP_HH_ */ diff --git a/include/runner.hh b/include/runner.hh index 721de4c..706b772 100644 --- a/include/runner.hh +++ b/include/runner.hh @@ -1,9 +1,9 @@ #pragma once -#include - #include "util.hh" +#include + namespace uvgrtp { class runner { public: diff --git a/include/session.hh b/include/session.hh index 4b4aeb6..f018656 100644 --- a/include/session.hh +++ b/include/session.hh @@ -1,12 +1,12 @@ #pragma once +#include "media_stream.hh" +#include "zrtp.hh" + #include #include #include -#include "media_stream.hh" -#include "zrtp.hh" - namespace uvgrtp { class session { diff --git a/include/socket.hh b/include/socket.hh index 63a2721..b902cd2 100644 --- a/include/socket.hh +++ b/include/socket.hh @@ -1,5 +1,7 @@ #pragma once +#include "util.hh" + #ifdef _WIN32 #include #include @@ -13,7 +15,6 @@ #include #include -#include "util.hh" namespace uvgrtp { diff --git a/include/srtp/base.hh b/include/srtp/base.hh index 21163eb..d0ca885 100644 --- a/include/srtp/base.hh +++ b/include/srtp/base.hh @@ -1,5 +1,11 @@ #pragma once +#include "../debug.hh" +#include "../frame.hh" +#include "../rtp.hh" +#include "../util.hh" +#include "../zrtp.hh" + #ifdef _WIN32 #include #include @@ -13,11 +19,7 @@ #include #include -#include "../debug.hh" -#include "../frame.hh" -#include "../rtp.hh" -#include "../util.hh" -#include "../zrtp.hh" + enum { AES128_KEY_SIZE = 16, diff --git a/include/zrtp.hh b/include/zrtp.hh index 422ddc4..2ff1ad2 100644 --- a/include/zrtp.hh +++ b/include/zrtp.hh @@ -1,5 +1,11 @@ #pragma once +#include "crypto.hh" +#include "frame.hh" +#include "socket.hh" +#include "zrtp/defines.hh" +#include "zrtp/zrtp_receiver.hh" + #ifdef _WIN32 #include #include @@ -12,11 +18,7 @@ #include #include -#include "crypto.hh" -#include "frame.hh" -#include "socket.hh" -#include "zrtp/defines.hh" -#include "zrtp/zrtp_receiver.hh" + namespace uvgrtp { diff --git a/include/zrtp/commit.hh b/include/zrtp/commit.hh index 3ce2d51..0c1dc45 100644 --- a/include/zrtp/commit.hh +++ b/include/zrtp/commit.hh @@ -1,11 +1,12 @@ #pragma once +#include "zrtp/defines.hh" +#include "zrtp/zrtp_receiver.hh" + #include "frame.hh" #include "socket.hh" #include "util.hh" -#include "zrtp/defines.hh" -#include "zrtp/zrtp_receiver.hh" namespace uvgrtp { diff --git a/include/zrtp/confack.hh b/include/zrtp/confack.hh index 16706c7..d96cc0f 100644 --- a/include/zrtp/confack.hh +++ b/include/zrtp/confack.hh @@ -1,11 +1,13 @@ #pragma once +#include "zrtp/defines.hh" +#include "zrtp/zrtp_receiver.hh" +#include "zrtp.hh" + #include "frame.hh" #include "socket.hh" #include "util.hh" -#include "zrtp/defines.hh" -#include "zrtp/zrtp_receiver.hh" namespace uvgrtp { diff --git a/include/zrtp/confirm.hh b/include/zrtp/confirm.hh index f4f0b37..435c18d 100644 --- a/include/zrtp/confirm.hh +++ b/include/zrtp/confirm.hh @@ -1,11 +1,14 @@ #pragma once + +#include "zrtp/zrtp_receiver.hh" +#include "zrtp.hh" +#include "zrtp/defines.hh" + #include "frame.hh" #include "socket.hh" #include "util.hh" -#include "zrtp/defines.hh" -#include "zrtp/zrtp_receiver.hh" namespace uvgrtp { diff --git a/include/zrtp/dh_kxchng.hh b/include/zrtp/dh_kxchng.hh index c17d7ef..9d88ba9 100644 --- a/include/zrtp/dh_kxchng.hh +++ b/include/zrtp/dh_kxchng.hh @@ -1,11 +1,13 @@ #pragma once +#include "zrtp/defines.hh" +#include "zrtp/zrtp_receiver.hh" + #include "frame.hh" #include "socket.hh" #include "util.hh" -#include "zrtp/defines.hh" -#include "zrtp/zrtp_receiver.hh" + namespace uvgrtp { diff --git a/include/zrtp/error.hh b/include/zrtp/error.hh index 84a852b..5ce9a86 100644 --- a/include/zrtp/error.hh +++ b/include/zrtp/error.hh @@ -1,10 +1,12 @@ #pragma once +#include "zrtp/defines.hh" +#include "zrtp/zrtp_receiver.hh" + #include "frame.hh" #include "socket.hh" #include "util.hh" -#include "zrtp/defines.hh" -#include "zrtp/zrtp_receiver.hh" + namespace uvgrtp { diff --git a/include/zrtp/hello.hh b/include/zrtp/hello.hh index 0a3fa83..e806ca0 100644 --- a/include/zrtp/hello.hh +++ b/include/zrtp/hello.hh @@ -1,12 +1,12 @@ #pragma once +#include "zrtp/defines.hh" +#include "zrtp/zrtp_receiver.hh" + #include "frame.hh" #include "socket.hh" #include "util.hh" -#include "zrtp/defines.hh" -#include "zrtp/zrtp_receiver.hh" - namespace uvgrtp { typedef struct capabilities zrtp_capab_t; diff --git a/include/zrtp/hello_ack.hh b/include/zrtp/hello_ack.hh index 680c613..fafc3f5 100644 --- a/include/zrtp/hello_ack.hh +++ b/include/zrtp/hello_ack.hh @@ -1,10 +1,11 @@ #pragma once +#include "zrtp/defines.hh" +#include "zrtp/zrtp_receiver.hh" + #include "frame.hh" #include "socket.hh" #include "util.hh" -#include "zrtp/defines.hh" -#include "zrtp/zrtp_receiver.hh" namespace uvgrtp { diff --git a/include/zrtp/zrtp_receiver.hh b/include/zrtp/zrtp_receiver.hh index ed2d58d..1c9667d 100644 --- a/include/zrtp/zrtp_receiver.hh +++ b/include/zrtp/zrtp_receiver.hh @@ -1,5 +1,7 @@ #pragma once +#include "socket.hh" + namespace uvgrtp { namespace zrtp_msg { diff --git a/src/clock.cc b/src/clock.cc index ae8de8d..9bc5f11 100644 --- a/src/clock.cc +++ b/src/clock.cc @@ -1,11 +1,5 @@ -#ifdef _WIN32 -#include -#include -#else -#include -#endif - #include "clock.hh" + #include static const uint64_t EPOCH = 2208988800ULL; diff --git a/src/crypto.cc b/src/crypto.cc index 8cbb7ac..bacd7b5 100644 --- a/src/crypto.cc +++ b/src/crypto.cc @@ -1,7 +1,10 @@ -#include #include "crypto.hh" + #include "debug.hh" + + + /* ***************** hmac-sha1 ***************** */ uvgrtp::crypto::hmac::sha1::sha1(uint8_t *key, size_t key_size) diff --git a/src/dispatch.cc b/src/dispatch.cc index 99a1ea7..c56eab0 100644 --- a/src/dispatch.cc +++ b/src/dispatch.cc @@ -1,6 +1,8 @@ -#include "debug.hh" #include "dispatch.hh" + #include "socket.hh" +#include "debug.hh" + #ifndef _WIN32 uvgrtp::dispatcher::dispatcher(uvgrtp::socket *socket): diff --git a/src/formats/h264.cc b/src/formats/h264.cc index 9eac1f2..c1b415e 100644 --- a/src/formats/h264.cc +++ b/src/formats/h264.cc @@ -1,7 +1,7 @@ -#ifdef _WIN32 -#else -#include -#endif +#include "formats/h264.hh" + +#include "queue.hh" +#include "debug.hh" #include #include @@ -9,10 +9,10 @@ #include #include -#include "debug.hh" -#include "queue.hh" +#ifndef _WIN32 +#include +#endif -#include "formats/h264.hh" void uvgrtp::formats::h264::clear_aggregation_info() { diff --git a/src/formats/h264_pkt_handler.cc b/src/formats/h264_pkt_handler.cc index eb25cb3..0304708 100644 --- a/src/formats/h264_pkt_handler.cc +++ b/src/formats/h264_pkt_handler.cc @@ -1,14 +1,14 @@ +#include "formats/h264.hh" + +#include "queue.hh" +#include "debug.hh" + #include #include #include #include #include -#include "debug.hh" -#include "queue.hh" - -#include "formats/h264.hh" - #define RTP_FRAME_MAX_DELAY 100 #define INVALID_SEQ 0x13371338 #define INVALID_TS 0xffffffff diff --git a/src/formats/h265.cc b/src/formats/h265.cc index f378779..857c05c 100644 --- a/src/formats/h265.cc +++ b/src/formats/h265.cc @@ -1,7 +1,7 @@ -#ifdef _WIN32 -#else -#include -#endif +#include "formats/h265.hh" + +#include "debug.hh" +#include "queue.hh" #include #include @@ -9,10 +9,9 @@ #include #include -#include "debug.hh" -#include "queue.hh" - -#include "formats/h265.hh" +#ifndef _WIN32 +#include +#endif void uvgrtp::formats::h265::clear_aggregation_info() { diff --git a/src/formats/h265_pkt_handler.cc b/src/formats/h265_pkt_handler.cc index 8c6049b..0bdc045 100644 --- a/src/formats/h265_pkt_handler.cc +++ b/src/formats/h265_pkt_handler.cc @@ -1,14 +1,14 @@ +#include "formats/h265.hh" + +#include "debug.hh" +#include "queue.hh" + #include #include #include #include #include -#include "debug.hh" -#include "queue.hh" - -#include "formats/h265.hh" - #define INVALID_SEQ 0x13371338 #define INVALID_TS 0xffffffff diff --git a/src/formats/h266.cc b/src/formats/h266.cc index e033fa6..7d589a7 100644 --- a/src/formats/h266.cc +++ b/src/formats/h266.cc @@ -1,7 +1,7 @@ -#ifdef _WIN32 -#else -#include -#endif +#include "formats/h266.hh" + +#include "queue.hh" +#include "debug.hh" #include #include @@ -9,10 +9,10 @@ #include #include -#include "debug.hh" -#include "queue.hh" -#include "formats/h266.hh" +#ifndef _WIN32 +#include +#endif rtp_error_t uvgrtp::formats::h266::push_nal_unit(uint8_t *data, size_t data_len, bool more) { diff --git a/src/formats/h266_pkt_handler.cc b/src/formats/h266_pkt_handler.cc index d62d0f0..3fffca5 100644 --- a/src/formats/h266_pkt_handler.cc +++ b/src/formats/h266_pkt_handler.cc @@ -1,14 +1,14 @@ +#include "formats/h266.hh" + +#include "debug.hh" +#include "queue.hh" + #include #include #include #include #include -#include "debug.hh" -#include "queue.hh" - -#include "formats/h266.hh" - #define INVALID_SEQ 0x13371338 #define INVALID_TS 0xffffffff diff --git a/src/formats/h26x.cc b/src/formats/h26x.cc index eb36710..28517d6 100644 --- a/src/formats/h26x.cc +++ b/src/formats/h26x.cc @@ -1,7 +1,7 @@ -#ifdef _WIN32 -#else -#include -#endif +#include "formats/h26x.hh" + +#include "queue.hh" +#include "debug.hh" #include #include @@ -9,10 +9,11 @@ #include #include -#include "debug.hh" -#include "queue.hh" -#include "formats/h26x.hh" +#ifndef _WIN32 +#include +#endif + #define PTR_DIFF(a, b) ((ptrdiff_t)((char *)(a) - (char *)(b))) diff --git a/src/formats/media.cc b/src/formats/media.cc index 3ea13db..ff3e4fd 100644 --- a/src/formats/media.cc +++ b/src/formats/media.cc @@ -1,12 +1,9 @@ -#ifdef __linux__ -#else -#endif +#include "formats/media.hh" #include #include #include "debug.hh" -#include "formats/media.hh" #define INVALID_SEQ 0xffffffff diff --git a/src/frame.cc b/src/frame.cc index 9eb6b3b..f7b5f53 100644 --- a/src/frame.cc +++ b/src/frame.cc @@ -1,8 +1,10 @@ +#include "frame.hh" + +#include "util.hh" +#include "debug.hh" + #include -#include "debug.hh" -#include "frame.hh" -#include "util.hh" uvgrtp::frame::rtp_frame *uvgrtp::frame::alloc_rtp_frame() { diff --git a/src/holepuncher.cc b/src/holepuncher.cc index 2e24420..1b599a9 100644 --- a/src/holepuncher.cc +++ b/src/holepuncher.cc @@ -1,6 +1,8 @@ +#include "holepuncher.hh" + #include "clock.hh" #include "debug.hh" -#include "holepuncher.hh" + #define THRESHOLD 2000 diff --git a/src/hostname.cc b/src/hostname.cc index d7a9b14..9691b29 100644 --- a/src/hostname.cc +++ b/src/hostname.cc @@ -1,3 +1,7 @@ +#include "hostname.hh" + +#include "debug.hh" + #ifdef _WIN32 //#include //#include @@ -8,9 +12,6 @@ #include #endif -#include "debug.hh" -#include "hostname.hh" - #define NAME_MAXLEN 512 std::string uvgrtp::hostname::get_hostname() diff --git a/src/lib.cc b/src/lib.cc index 9cabacc..7ca0131 100644 --- a/src/lib.cc +++ b/src/lib.cc @@ -1,12 +1,13 @@ -#include -#include -#include +#include "lib.hh" #include "debug.hh" #include "hostname.hh" -#include "lib.hh" #include "random.hh" +#include +#include +#include + thread_local rtp_error_t rtp_errno; uvgrtp::context::context() diff --git a/src/media_stream.cc b/src/media_stream.cc index ec13fe8..79ce49b 100644 --- a/src/media_stream.cc +++ b/src/media_stream.cc @@ -1,13 +1,13 @@ -#include -#include - -#include "debug.hh" #include "media_stream.hh" -#include "random.hh" #include "formats/h264.hh" #include "formats/h265.hh" #include "formats/h266.hh" +#include "debug.hh" +#include "random.hh" + +#include +#include #define INVALID_TS UINT64_MAX diff --git a/src/mingw_inet.cc b/src/mingw_inet.cc index d52d986..85feaf5 100644 --- a/src/mingw_inet.cc +++ b/src/mingw_inet.cc @@ -1,8 +1,8 @@ #if defined(__MINGW32__) || defined(__MINGW64__) -#include -#include #include "mingw_inet.hh" +#include + #define NS_INADDRSZ 4 #define NS_IN6ADDRSZ 16 #define NS_INT16SZ 2 diff --git a/src/pkt_dispatch.cc b/src/pkt_dispatch.cc index b7073ee..d3aeed3 100644 --- a/src/pkt_dispatch.cc +++ b/src/pkt_dispatch.cc @@ -1,3 +1,9 @@ +#include "pkt_dispatch.hh" + +#include "debug.hh" +#include "random.hh" +#include "util.hh" + #ifdef __linux__ #include #else @@ -6,11 +12,6 @@ #include -#include "debug.hh" -#include "pkt_dispatch.hh" -#include "random.hh" -#include "util.hh" - uvgrtp::pkt_dispatcher::pkt_dispatcher(): recv_hook_arg_(nullptr), recv_hook_(nullptr) diff --git a/src/poll.cc b/src/poll.cc index f0180a4..71c3a7e 100644 --- a/src/poll.cc +++ b/src/poll.cc @@ -1,3 +1,8 @@ +#include "poll.hh" + +#include "multicast.hh" +#include "debug.hh" + #ifdef _WIN32 #include #else @@ -7,9 +12,8 @@ #include -#include "debug.hh" -#include "multicast.hh" -#include "poll.hh" + + rtp_error_t uvgrtp::poll::blocked_recv(uvgrtp::socket *socket, uint8_t *buf, size_t buf_len, int timeout, int *bytes_read) { diff --git a/src/queue.cc b/src/queue.cc index bfd5f56..d78f151 100644 --- a/src/queue.cc +++ b/src/queue.cc @@ -1,3 +1,12 @@ +#include "queue.hh" + +#include "formats/h264.hh" +#include "formats/h265.hh" +#include "formats/h266.hh" + +#include "debug.hh" +#include "random.hh" + #ifdef _WIN32 #include #include @@ -8,13 +17,6 @@ #include #endif -#include "debug.hh" -#include "queue.hh" -#include "random.hh" - -#include "formats/h264.hh" -#include "formats/h265.hh" -#include "formats/h266.hh" uvgrtp::frame_queue::frame_queue(uvgrtp::socket *socket, uvgrtp::rtp *rtp, int flags): rtp_(rtp), socket_(socket), flags_(flags) diff --git a/src/random.cc b/src/random.cc index ab160bd..4193d28 100644 --- a/src/random.cc +++ b/src/random.cc @@ -1,8 +1,12 @@ +#include "random.hh" + +#include "debug.hh" + #ifdef _WIN32 #include #include #include -#else // _WIN32 +#else // non _WIN32 #ifdef HAVE_GETRANDOM #include #else // HAVE_GETRANDOM @@ -11,12 +15,10 @@ #endif // HAVE_GETRANDOM #endif // _WIN32 + #include #include -#include "debug.hh" -#include "random.hh" - rtp_error_t uvgrtp::random::init() { #ifdef _WIN32 diff --git a/src/rtcp.cc b/src/rtcp.cc index 91baa42..0d865e3 100644 --- a/src/rtcp.cc +++ b/src/rtcp.cc @@ -1,5 +1,11 @@ -#ifdef _WIN32 -#else +#include "rtcp.hh" + +#include "hostname.hh" +#include "poll.hh" +#include "debug.hh" +#include "util.hh" + +#ifndef _WIN32 #include #endif @@ -8,11 +14,6 @@ #include #include -#include "debug.hh" -#include "hostname.hh" -#include "poll.hh" -#include "rtcp.hh" -#include "util.hh" uvgrtp::rtcp::rtcp(uvgrtp::rtp *rtp, int flags): rtp_(rtp), flags_(flags), our_role_(RECEIVER), diff --git a/src/rtcp/app.cc b/src/rtcp/app.cc index b8e614b..a5f872b 100644 --- a/src/rtcp/app.cc +++ b/src/rtcp/app.cc @@ -1,7 +1,3 @@ -#ifdef _WIN32 -#else -#endif - #include "rtcp.hh" uvgrtp::frame::rtcp_app_packet *uvgrtp::rtcp::get_app_packet(uint32_t ssrc) diff --git a/src/rtcp/bye.cc b/src/rtcp/bye.cc index 51863a3..4dd30b9 100644 --- a/src/rtcp/bye.cc +++ b/src/rtcp/bye.cc @@ -1,7 +1,3 @@ -#ifdef _WIN32 -#else -#endif - #include "rtcp.hh" rtp_error_t uvgrtp::rtcp::handle_bye_packet(uint8_t *packet, size_t size) diff --git a/src/rtcp/receiver.cc b/src/rtcp/receiver.cc index 95e9b09..3a716f8 100644 --- a/src/rtcp/receiver.cc +++ b/src/rtcp/receiver.cc @@ -1,7 +1,3 @@ -#ifdef _WIN32 -#else -#endif - #include "rtcp.hh" uvgrtp::frame::rtcp_receiver_report *uvgrtp::rtcp::get_receiver_packet(uint32_t ssrc) diff --git a/src/rtcp/rtcp_runner.cc b/src/rtcp/rtcp_runner.cc index f0849cd..c0d57ed 100644 --- a/src/rtcp/rtcp_runner.cc +++ b/src/rtcp/rtcp_runner.cc @@ -1,7 +1,3 @@ -#ifdef _WIN32 -#else -#endif - #include "rtcp.hh" #include "poll.hh" diff --git a/src/rtcp/sdes.cc b/src/rtcp/sdes.cc index 09f510c..386f224 100644 --- a/src/rtcp/sdes.cc +++ b/src/rtcp/sdes.cc @@ -1,7 +1,3 @@ -#ifdef _WIN32 -#else -#endif - #include "rtcp.hh" uvgrtp::frame::rtcp_sdes_packet *uvgrtp::rtcp::get_sdes_packet(uint32_t ssrc) diff --git a/src/rtcp/sender.cc b/src/rtcp/sender.cc index c2711e1..ca9a964 100644 --- a/src/rtcp/sender.cc +++ b/src/rtcp/sender.cc @@ -1,7 +1,3 @@ -#ifdef _WIN32 -#else -#endif - #include "rtcp.hh" uvgrtp::frame::rtcp_sender_report *uvgrtp::rtcp::get_sender_packet(uint32_t ssrc) diff --git a/src/rtp.cc b/src/rtp.cc index 7d5f948..717194a 100644 --- a/src/rtp.cc +++ b/src/rtp.cc @@ -1,3 +1,9 @@ +#include "rtp.hh" + +#include "clock.hh" +#include "debug.hh" +#include "random.hh" + #ifdef __linux__ #include #include @@ -5,10 +11,7 @@ #include -#include "clock.hh" -#include "debug.hh" -#include "random.hh" -#include "rtp.hh" + #define INVALID_TS UINT64_MAX diff --git a/src/session.cc b/src/session.cc index bec83c8..4ffea16 100644 --- a/src/session.cc +++ b/src/session.cc @@ -1,5 +1,6 @@ -#include "debug.hh" #include "session.hh" +#include "debug.hh" + uvgrtp::session::session(std::string addr): #ifdef __RTP_CRYPTO__ diff --git a/src/socket.cc b/src/socket.cc index d229d37..3c9a980 100644 --- a/src/socket.cc +++ b/src/socket.cc @@ -1,3 +1,8 @@ +#include "socket.hh" + +#include "debug.hh" +#include "util.hh" + #ifdef _WIN32 #include #include @@ -17,9 +22,6 @@ using namespace mingw; #include #include -#include "debug.hh" -#include "socket.hh" -#include "util.hh" #define WSABUF_SIZE 32 diff --git a/src/srtp/base.cc b/src/srtp/base.cc index b379c57..e1bcff5 100644 --- a/src/srtp/base.cc +++ b/src/srtp/base.cc @@ -1,8 +1,9 @@ -#include -#include +#include "srtp/base.hh" #include "crypto.hh" -#include "srtp/base.hh" + +#include +#include uvgrtp::base_srtp::base_srtp(): srtp_ctx_(new uvgrtp::srtp_ctx_t), diff --git a/src/srtp/srtcp.cc b/src/srtp/srtcp.cc index 0749cef..21be91b 100644 --- a/src/srtp/srtcp.cc +++ b/src/srtp/srtcp.cc @@ -1,8 +1,10 @@ +#include "srtp/srtcp.hh" + +#include "crypto.hh" + #include #include -#include "crypto.hh" -#include "srtp/srtcp.hh" uvgrtp::srtcp::srtcp() { diff --git a/src/srtp/srtp.cc b/src/srtp/srtp.cc index b450303..1720fa0 100644 --- a/src/srtp/srtp.cc +++ b/src/srtp/srtp.cc @@ -1,9 +1,10 @@ +#include "srtp/srtp.hh" +#include "srtp/base.hh" +#include "crypto.hh" + #include #include -#include "crypto.hh" -#include "srtp/base.hh" -#include "srtp/srtp.hh" #define MAX_OFF 10000 diff --git a/src/zrtp.cc b/src/zrtp.cc index e91ea9c..4fbcd8f 100644 --- a/src/zrtp.cc +++ b/src/zrtp.cc @@ -1,14 +1,3 @@ -#ifdef _WIN32 -#define MSG_DONTWAIT 0 -#else -#endif - -#include -#include - -#include "debug.hh" -#include "crypto.hh" -#include "random.hh" #include "zrtp.hh" #include "zrtp/commit.hh" @@ -19,8 +8,20 @@ #include "zrtp/hello_ack.hh" #include "zrtp/zrtp_receiver.hh" +#include "debug.hh" +#include "crypto.hh" +#include "random.hh" + +#include +#include + using namespace uvgrtp::zrtp_msg; +#ifdef _WIN32 +#define MSG_DONTWAIT 0 +#endif + + #define ZRTP_VERSION 110 uvgrtp::zrtp::zrtp(): diff --git a/src/zrtp/commit.cc b/src/zrtp/commit.cc index 09e4fd4..897f956 100644 --- a/src/zrtp/commit.cc +++ b/src/zrtp/commit.cc @@ -1,11 +1,11 @@ +#include "zrtp/commit.hh" + +#include "zrtp.hh" +#include "debug.hh" + #include #include -#include "debug.hh" -#include "zrtp.hh" - -#include "zrtp/commit.hh" - #define ZRTP_COMMIT "Commit " uvgrtp::zrtp_msg::commit::commit(zrtp_session_t& session) diff --git a/src/zrtp/confack.cc b/src/zrtp/confack.cc index 825aeeb..f18ff42 100644 --- a/src/zrtp/confack.cc +++ b/src/zrtp/confack.cc @@ -1,9 +1,9 @@ -#include +#include "zrtp/confack.hh" #include "debug.hh" -#include "zrtp.hh" -#include "zrtp/confack.hh" +#include + #define ZRTP_CONFACK "Conf2ACK" diff --git a/src/zrtp/confirm.cc b/src/zrtp/confirm.cc index ce80315..fcaa2eb 100644 --- a/src/zrtp/confirm.cc +++ b/src/zrtp/confirm.cc @@ -1,9 +1,8 @@ -#include +#include "zrtp/confirm.hh" #include "debug.hh" -#include "zrtp.hh" -#include "zrtp/confirm.hh" +#include #define ZRTP_CONFRIM1 "Confirm1" #define ZRTP_CONFRIM2 "Confirm2" diff --git a/src/zrtp/dh_kxchng.cc b/src/zrtp/dh_kxchng.cc index 4bf5a60..f3413df 100644 --- a/src/zrtp/dh_kxchng.cc +++ b/src/zrtp/dh_kxchng.cc @@ -1,9 +1,10 @@ -#include - -#include "debug.hh" -#include "zrtp.hh" #include "zrtp/dh_kxchng.hh" + +#include "zrtp.hh" #include "zrtp/defines.hh" +#include "debug.hh" + +#include #define ZRTP_DH_PART1 "DHPart1 " #define ZRTP_DH_PART2 "DHPart2 " diff --git a/src/zrtp/error.cc b/src/zrtp/error.cc index a8e9e8e..dfc36b7 100644 --- a/src/zrtp/error.cc +++ b/src/zrtp/error.cc @@ -1,9 +1,12 @@ -#include +#include "zrtp/error.hh" + +#include "zrtp/defines.hh" +#include "zrtp.hh" #include "debug.hh" -#include "zrtp.hh" -#include "zrtp/defines.hh" -#include "zrtp/error.hh" + + +#include #define ZRTP_ERROR "Error " diff --git a/src/zrtp/hello.cc b/src/zrtp/hello.cc index 17e3be1..e31909e 100644 --- a/src/zrtp/hello.cc +++ b/src/zrtp/hello.cc @@ -1,9 +1,10 @@ -#include - -#include "debug.hh" -#include "zrtp.hh" #include "zrtp/hello.hh" + #include "zrtp/defines.hh" +#include "zrtp.hh" +#include "debug.hh" + +#include #define ZRTP_VERSION "1.10" #define ZRTP_HELLO "Hello " diff --git a/src/zrtp/hello_ack.cc b/src/zrtp/hello_ack.cc index 5569a81..1078bc7 100644 --- a/src/zrtp/hello_ack.cc +++ b/src/zrtp/hello_ack.cc @@ -1,9 +1,10 @@ -#include +#include "zrtp/hello_ack.hh" -#include "debug.hh" #include "zrtp.hh" #include "zrtp/defines.hh" -#include "zrtp/hello_ack.hh" +#include "debug.hh" + +#include #define ZRTP_HELLO_ACK "HelloACK" diff --git a/src/zrtp/zrtp_receiver.cc b/src/zrtp/zrtp_receiver.cc index 8d30b40..7663b38 100644 --- a/src/zrtp/zrtp_receiver.cc +++ b/src/zrtp/zrtp_receiver.cc @@ -1,3 +1,18 @@ +#include "zrtp/zrtp_receiver.hh" + +#include "zrtp/defines.hh" +#include "zrtp/dh_kxchng.hh" +#include "zrtp/commit.hh" +#include "zrtp/confack.hh" +#include "zrtp/confirm.hh" +#include "zrtp/hello.hh" +#include "zrtp/hello_ack.hh" + +#include "crypto.hh" +#include "poll.hh" +#include "debug.hh" +#include "util.hh" + #ifdef _WIN32 #include #include @@ -10,18 +25,6 @@ #include -#include "debug.hh" -#include "util.hh" -#include "crypto.hh" -#include "poll.hh" -#include "zrtp/defines.hh" -#include "zrtp/dh_kxchng.hh" -#include "zrtp/commit.hh" -#include "zrtp/confack.hh" -#include "zrtp/confirm.hh" -#include "zrtp/hello.hh" -#include "zrtp/hello_ack.hh" -#include "zrtp/zrtp_receiver.hh" using namespace uvgrtp::zrtp_msg;