From 8edd093d68c050ab4f2e01404ee948f057c8c6a8 Mon Sep 17 00:00:00 2001
From: ziyue <1213642868@qq.com>
Date: Tue, 6 Apr 2021 17:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0bom=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webrtc/DtlsTransport.cpp   | 2 +-
 webrtc/DtlsTransport.hpp   | 2 +-
 webrtc/IceServer.cpp       | 2 +-
 webrtc/IceServer.hpp       | 7 +++++--
 webrtc/Sdp.cpp             | 2 +-
 webrtc/Sdp.h               | 2 +-
 webrtc/SrtpSession.cpp     | 2 +-
 webrtc/SrtpSession.hpp     | 2 +-
 webrtc/StunPacket.cpp      | 2 +-
 webrtc/StunPacket.hpp      | 2 +-
 webrtc/Utils.hpp           | 2 +-
 webrtc/WebRtcTransport.cpp | 2 +-
 webrtc/WebRtcTransport.h   | 2 +-
 webrtc/logger.h            | 2 +-
 14 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/webrtc/DtlsTransport.cpp b/webrtc/DtlsTransport.cpp
index f627fd29..0dd9492c 100644
--- a/webrtc/DtlsTransport.cpp
+++ b/webrtc/DtlsTransport.cpp
@@ -1,4 +1,4 @@
-#define MS_CLASS "RTC::DtlsTransport"
+#define MS_CLASS "RTC::DtlsTransport"
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "DtlsTransport.hpp"
diff --git a/webrtc/DtlsTransport.hpp b/webrtc/DtlsTransport.hpp
index 41fa4c09..2d324441 100644
--- a/webrtc/DtlsTransport.hpp
+++ b/webrtc/DtlsTransport.hpp
@@ -1,4 +1,4 @@
-#ifndef MS_RTC_DTLS_TRANSPORT_HPP
+#ifndef MS_RTC_DTLS_TRANSPORT_HPP
 #define MS_RTC_DTLS_TRANSPORT_HPP
 
 #include "SrtpSession.hpp"
diff --git a/webrtc/IceServer.cpp b/webrtc/IceServer.cpp
index d80ef0f0..15aeb0bd 100644
--- a/webrtc/IceServer.cpp
+++ b/webrtc/IceServer.cpp
@@ -1,4 +1,4 @@
-#define MS_CLASS "RTC::IceServer"
+#define MS_CLASS "RTC::IceServer"
 // #define MS_LOG_DEV_LEVEL 3
 
 #include <utility>
diff --git a/webrtc/IceServer.hpp b/webrtc/IceServer.hpp
index 103727f0..49045f43 100644
--- a/webrtc/IceServer.hpp
+++ b/webrtc/IceServer.hpp
@@ -1,16 +1,19 @@
-#ifndef MS_RTC_ICE_SERVER_HPP
+#ifndef MS_RTC_ICE_SERVER_HPP
 #define MS_RTC_ICE_SERVER_HPP
 
 #include "StunPacket.hpp"
 #include "logger.h"
+#include "Utils.hpp"
 #include <list>
 #include <string>
 #include <functional>
 #include <memory>
 
+using _TransportTuple = struct sockaddr;
+
 namespace RTC
 {
-    using TransportTuple = struct sockaddr;
+    using TransportTuple = _TransportTuple;
 	class IceServer
 	{
 	public:
diff --git a/webrtc/Sdp.cpp b/webrtc/Sdp.cpp
index 6c55c9a1..b25eabb4 100644
--- a/webrtc/Sdp.cpp
+++ b/webrtc/Sdp.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Created by xzl on 2021/3/27.
 //
 
diff --git a/webrtc/Sdp.h b/webrtc/Sdp.h
index e7ba518e..b8328577 100644
--- a/webrtc/Sdp.h
+++ b/webrtc/Sdp.h
@@ -1,4 +1,4 @@
-//
+//
 // Created by xzl on 2021/3/27.
 //
 
diff --git a/webrtc/SrtpSession.cpp b/webrtc/SrtpSession.cpp
index 64c1bca0..a73c5aaa 100644
--- a/webrtc/SrtpSession.cpp
+++ b/webrtc/SrtpSession.cpp
@@ -1,4 +1,4 @@
-#define MS_CLASS "RTC::SrtpSession"
+#define MS_CLASS "RTC::SrtpSession"
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "SrtpSession.hpp"
diff --git a/webrtc/SrtpSession.hpp b/webrtc/SrtpSession.hpp
index 5b3edefd..988d730b 100644
--- a/webrtc/SrtpSession.hpp
+++ b/webrtc/SrtpSession.hpp
@@ -1,4 +1,4 @@
-#ifndef MS_RTC_SRTP_SESSION_HPP
+#ifndef MS_RTC_SRTP_SESSION_HPP
 #define MS_RTC_SRTP_SESSION_HPP
 
 #include "Utils.hpp"
diff --git a/webrtc/StunPacket.cpp b/webrtc/StunPacket.cpp
index 019fadd9..223d3f57 100644
--- a/webrtc/StunPacket.cpp
+++ b/webrtc/StunPacket.cpp
@@ -1,4 +1,4 @@
-#define MS_CLASS "RTC::StunPacket"
+#define MS_CLASS "RTC::StunPacket"
 // #define MS_LOG_DEV_LEVEL 3
 
 #include "StunPacket.hpp"
diff --git a/webrtc/StunPacket.hpp b/webrtc/StunPacket.hpp
index 8f65aab6..ebd1b1d0 100644
--- a/webrtc/StunPacket.hpp
+++ b/webrtc/StunPacket.hpp
@@ -1,4 +1,4 @@
-#ifndef MS_RTC_STUN_PACKET_HPP
+#ifndef MS_RTC_STUN_PACKET_HPP
 #define MS_RTC_STUN_PACKET_HPP
 
 
diff --git a/webrtc/Utils.hpp b/webrtc/Utils.hpp
index 6b33b9f5..0b1b66ad 100644
--- a/webrtc/Utils.hpp
+++ b/webrtc/Utils.hpp
@@ -1,4 +1,4 @@
-#ifndef MS_UTILS_HPP
+#ifndef MS_UTILS_HPP
 #define MS_UTILS_HPP
 
 #if defined(_WIN32)
diff --git a/webrtc/WebRtcTransport.cpp b/webrtc/WebRtcTransport.cpp
index ee0558f9..bad1648e 100644
--- a/webrtc/WebRtcTransport.cpp
+++ b/webrtc/WebRtcTransport.cpp
@@ -1,4 +1,4 @@
-#include "WebRtcTransport.h"
+#include "WebRtcTransport.h"
 #include <iostream>
 #include "Rtcp/Rtcp.h"
 #include "Rtsp/RtpReceiver.h"
diff --git a/webrtc/WebRtcTransport.h b/webrtc/WebRtcTransport.h
index 125771d8..db84b186 100644
--- a/webrtc/WebRtcTransport.h
+++ b/webrtc/WebRtcTransport.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 
 #include <memory>
 #include <string>
diff --git a/webrtc/logger.h b/webrtc/logger.h
index 6b345e98..67da6219 100644
--- a/webrtc/logger.h
+++ b/webrtc/logger.h
@@ -1,4 +1,4 @@
-#pragma once
+#pragma once
 #include <stdio.h>
 #include <assert.h>