Rename service to protocol files.

ossrs · Jun 9, 2022 · 665ad56 · 665ad56
1 parent f1840b8
commit 665ad56
Show file tree

Hide file tree

Showing 46 changed files with 506 additions and 526 deletions.
diff --git a/trunk/configure b/trunk/configure
@@ -226,8 +226,8 @@ ModuleLibIncs=(${SRS_OBJS_DIR} ${LibSTRoot} ${LibSSLRoot})
 MODULE_FILES=("srs_protocol_amf0" "srs_protocol_io" "srs_rtmp_stack"
         "srs_rtmp_handshake" "srs_protocol_utility" "srs_rtmp_msg_array" "srs_protocol_stream"
         "srs_raw_avc" "srs_rtsp_stack" "srs_http_stack" "srs_protocol_kbps" "srs_protocol_json"
-        "srs_protocol_format" "srs_service_log" "srs_service_st" "srs_service_http_client" "srs_service_http_conn"
-        "srs_service_rtmp_conn" "srs_service_utility" "srs_service_conn")
+        "srs_protocol_format" "srs_protocol_log" "srs_protocol_st" "srs_protocol_http_client"
+        "srs_protocol_http_conn" "srs_protocol_rtmp_conn" "srs_protocol_conn")
 if [[ $SRS_RTC == YES ]]; then
     MODULE_FILES+=("srs_rtc_stun_stack")
     ModuleLibIncs+=(${LibSrtpRoot})

diff --git a/trunk/src/app/srs_app_conn.cpp b/trunk/src/app/srs_app_conn.cpp
@@ -14,7 +14,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_app_utility.hpp>
 #include <srs_kernel_utility.hpp>
-#include <srs_service_log.hpp>
+#include <srs_protocol_log.hpp>
 #include <srs_app_log.hpp>
 #include <srs_app_config.hpp>
 #include <srs_core_autofree.hpp>

diff --git a/trunk/src/app/srs_app_conn.hpp b/trunk/src/app/srs_app_conn.hpp
@@ -18,7 +18,7 @@
 #include <srs_app_st.hpp>
 #include <srs_protocol_kbps.hpp>
 #include <srs_app_reload.hpp>
-#include <srs_service_conn.hpp>
+#include <srs_protocol_conn.hpp>
 
 class SrsWallClock;
 

diff --git a/trunk/src/app/srs_app_coworkers.cpp b/trunk/src/app/srs_app_coworkers.cpp
@@ -14,7 +14,7 @@ using namespace std;
 #include <srs_rtmp_stack.hpp>
 #include <srs_app_config.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_service_utility.hpp>
+#include <srs_protocol_utility.hpp>
 #include <srs_kernel_utility.hpp>
 
 SrsCoWorkers* SrsCoWorkers::_instance = NULL;

diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp
@@ -29,7 +29,7 @@ using namespace std;
 #include <srs_kernel_utility.hpp>
 #include <srs_kernel_balance.hpp>
 #include <srs_app_rtmp_conn.hpp>
-#include <srs_service_http_client.hpp>
+#include <srs_protocol_http_client.hpp>
 #include <srs_app_caster_flv.hpp>
 #include <srs_kernel_flv.hpp>
 #include <srs_kernel_buffer.hpp>

diff --git a/trunk/src/app/srs_app_http_client.hpp b/trunk/src/app/srs_app_http_client.hpp
@@ -9,7 +9,7 @@
 
 #include <srs_core.hpp>
 
-#include <srs_service_http_client.hpp>
+#include <srs_protocol_http_client.hpp>
 
 #endif
 
diff --git a/trunk/src/app/srs_app_http_conn.hpp b/trunk/src/app/srs_app_http_conn.hpp
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include <srs_service_http_conn.hpp>
+#include <srs_protocol_http_conn.hpp>
 #include <srs_app_reload.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_app_st.hpp>

diff --git a/trunk/src/app/srs_app_http_static.cpp b/trunk/src/app/srs_app_http_static.cpp
@@ -33,11 +33,11 @@ using namespace std;
 #include <srs_app_pithy_print.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_server.hpp>
-#include <srs_service_utility.hpp>
+#include <srs_protocol_utility.hpp>
 #include <srs_app_http_hooks.hpp>
 #include <srs_app_statistic.hpp>
 #include <srs_app_hybrid.hpp>
-#include <srs_service_log.hpp>
+#include <srs_protocol_log.hpp>
 
 #define SRS_CONTEXT_IN_HLS "hls_ctx"
 

diff --git a/trunk/src/app/srs_app_hybrid.cpp b/trunk/src/app/srs_app_hybrid.cpp
@@ -9,7 +9,7 @@
 #include <srs_app_server.hpp>
 #include <srs_app_config.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_app_utility.hpp>
 
 using namespace std;

diff --git a/trunk/src/app/srs_app_log.hpp b/trunk/src/app/srs_app_log.hpp
@@ -13,7 +13,7 @@
 #include <string>
 
 #include <srs_app_reload.hpp>
-#include <srs_service_log.hpp>
+#include <srs_protocol_log.hpp>
 
 // For log TAGs.
 #define TAG_MAIN "MAIN"

diff --git a/trunk/src/app/srs_app_rtc_conn.cpp b/trunk/src/app/srs_app_rtc_conn.cpp
@@ -32,17 +32,17 @@ using namespace std;
 #include <srs_app_rtc_queue.hpp>
 #include <srs_app_source.hpp>
 #include <srs_app_server.hpp>
-#include <srs_service_utility.hpp>
+#include <srs_protocol_utility.hpp>
 #include <srs_http_stack.hpp>
 #include <srs_app_http_api.hpp>
 #include <srs_app_statistic.hpp>
 #include <srs_app_pithy_print.hpp>
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_app_rtc_server.hpp>
 #include <srs_app_rtc_source.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_app_threads.hpp>
-#include <srs_service_log.hpp>
+#include <srs_protocol_log.hpp>
 #include <srs_app_log.hpp>
 #include <srs_app_http_hooks.hpp>
 #include <srs_protocol_kbps.hpp>

diff --git a/trunk/src/app/srs_app_rtc_conn.hpp b/trunk/src/app/srs_app_rtc_conn.hpp
@@ -9,7 +9,7 @@
 
 #include <srs_core.hpp>
 #include <srs_app_listener.hpp>
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_app_hybrid.hpp>
@@ -21,7 +21,7 @@
 #include <srs_app_rtc_queue.hpp>
 #include <srs_app_rtc_source.hpp>
 #include <srs_app_rtc_dtls.hpp>
-#include <srs_service_conn.hpp>
+#include <srs_protocol_conn.hpp>
 #include <srs_app_conn.hpp>
 #include <srs_app_async_call.hpp>
 

diff --git a/trunk/src/app/srs_app_rtc_server.cpp b/trunk/src/app/srs_app_rtc_server.cpp
@@ -23,12 +23,12 @@ using namespace std;
 #include <srs_app_server.hpp>
 #include <srs_app_http_api.hpp>
 #include <srs_app_rtc_dtls.hpp>
-#include <srs_service_utility.hpp>
+#include <srs_protocol_utility.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_app_rtc_source.hpp>
 #include <srs_app_rtc_api.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_service_log.hpp>
+#include <srs_protocol_log.hpp>
 
 extern SrsPps* _srs_pps_rpkts;
 SrsPps* _srs_pps_rstuns = NULL;

diff --git a/trunk/src/app/srs_app_rtc_source.hpp b/trunk/src/app/srs_app_rtc_source.hpp
@@ -17,7 +17,7 @@
 #include <map>
 
 #include <srs_app_rtc_sdp.hpp>
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_app_source.hpp>
 #include <srs_kernel_rtc_rtp.hpp>
 

diff --git a/trunk/src/app/srs_app_rtmp_conn.hpp b/trunk/src/app/srs_app_rtmp_conn.hpp
@@ -15,7 +15,7 @@
 #include <srs_app_conn.hpp>
 #include <srs_app_reload.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_service_rtmp_conn.hpp>
+#include <srs_protocol_rtmp_conn.hpp>
 
 class SrsServer;
 class SrsRtmpServer;

diff --git a/trunk/src/app/srs_app_server.cpp b/trunk/src/app/srs_app_server.cpp
@@ -34,7 +34,7 @@ using namespace std;
 #include <srs_app_caster_flv.hpp>
 #include <srs_kernel_consts.hpp>
 #include <srs_app_coworkers.hpp>
-#include <srs_service_log.hpp>
+#include <srs_protocol_log.hpp>
 #include <srs_app_latest_version.hpp>
 
 std::string srs_listener_type2string(SrsListenerType type)

diff --git a/trunk/src/app/srs_app_server.hpp b/trunk/src/app/srs_app_server.hpp
@@ -18,7 +18,7 @@
 #include <srs_app_hls.hpp>
 #include <srs_app_listener.hpp>
 #include <srs_app_conn.hpp>
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_app_hourglass.hpp>
 #include <srs_app_hybrid.hpp>
 

diff --git a/trunk/src/app/srs_app_source.hpp b/trunk/src/app/srs_app_source.hpp
@@ -16,7 +16,7 @@
 #include <srs_app_st.hpp>
 #include <srs_app_reload.hpp>
 #include <srs_core_performance.hpp>
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_app_hourglass.hpp>
 
 class SrsFormat;

diff --git a/trunk/src/app/srs_app_st.hpp b/trunk/src/app/srs_app_st.hpp
@@ -13,7 +13,7 @@
 
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_protocol_io.hpp>
 
 class SrsFastCoroutine;

diff --git a/trunk/src/app/srs_app_utility.hpp b/trunk/src/app/srs_app_utility.hpp
@@ -19,7 +19,7 @@
 
 #include <srs_app_st.hpp>
 #include <srs_kernel_log.hpp>
-#include <srs_service_utility.hpp>
+#include <srs_protocol_utility.hpp>
 
 class SrsKbps;
 class SrsBuffer;

diff --git a/trunk/src/main/srs_main_ingest_hls.cpp b/trunk/src/main/srs_main_ingest_hls.cpp
@@ -23,12 +23,12 @@ using namespace std;
 #include <srs_raw_avc.hpp>
 #include <srs_rtmp_stack.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_service_http_client.hpp>
-#include <srs_service_log.hpp>
-#include <srs_service_st.hpp>
-#include <srs_service_http_conn.hpp>
-#include <srs_service_rtmp_conn.hpp>
-#include <srs_service_utility.hpp>
+#include <srs_protocol_http_client.hpp>
+#include <srs_protocol_log.hpp>
+#include <srs_protocol_st.hpp>
+#include <srs_protocol_http_conn.hpp>
+#include <srs_protocol_rtmp_conn.hpp>
+#include <srs_protocol_utility.hpp>
 #include <srs_app_config.hpp>
 
 // pre-declare

diff --git a/trunk/src/main/srs_main_mp4_parser.cpp b/trunk/src/main/srs_main_mp4_parser.cpp
@@ -7,7 +7,7 @@
 #include <srs_core.hpp>
 
 #include <srs_kernel_error.hpp>
-#include <srs_service_log.hpp>
+#include <srs_protocol_log.hpp>
 #include <srs_kernel_mp4.hpp>
 #include <srs_kernel_file.hpp>
 #include <srs_kernel_stream.hpp>

diff --git a/trunk/src/protocol/srs_service_conn.cpp → trunk/src/protocol/srs_protocol_conn.cpp b/trunk/src/protocol/srs_service_conn.cpp → trunk/src/protocol/srs_protocol_conn.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_service_conn.hpp>
+#include <srs_protocol_conn.hpp>
 
 ISrsResource::ISrsResource()
 {

diff --git a/trunk/src/protocol/srs_service_conn.hpp → trunk/src/protocol/srs_protocol_conn.hpp b/trunk/src/protocol/srs_service_conn.hpp → trunk/src/protocol/srs_protocol_conn.hpp
@@ -4,8 +4,8 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#ifndef SRS_SERVICE_CONN_HPP
-#define SRS_SERVICE_CONN_HPP
+#ifndef SRS_PROTOCOL_CONN_HPP
+#define SRS_PROTOCOL_CONN_HPP
 
 #include <srs_core.hpp>
 

diff --git a/.../src/protocol/srs_service_http_client.cpp → ...src/protocol/srs_protocol_http_client.cpp b/.../src/protocol/srs_service_http_client.cpp → ...src/protocol/srs_protocol_http_client.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_service_http_client.hpp>
+#include <srs_protocol_http_client.hpp>
 
 #include <arpa/inet.h>
 #include <sstream>
@@ -16,7 +16,7 @@ using namespace std;
 #include <srs_kernel_error.hpp>
 #include <srs_kernel_log.hpp>
 #include <srs_core_autofree.hpp>
-#include <srs_service_http_conn.hpp>
+#include <srs_protocol_http_conn.hpp>
 
 // The return value of verify_callback controls the strategy of the further verification process. If verify_callback
 // returns 0, the verification process is immediately stopped with "verification failed" state. If SSL_VERIFY_PEER is

diff --git a/.../src/protocol/srs_service_http_client.hpp → ...src/protocol/srs_protocol_http_client.hpp b/.../src/protocol/srs_service_http_client.hpp → ...src/protocol/srs_protocol_http_client.hpp
@@ -4,8 +4,8 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#ifndef SRS_SERVICE_HTTP_CLIENT_HPP
-#define SRS_SERVICE_HTTP_CLIENT_HPP
+#ifndef SRS_PROTOCOL_HTTP_CLIENT_HPP
+#define SRS_PROTOCOL_HTTP_CLIENT_HPP
 
 #include <srs_core.hpp>
 
@@ -14,7 +14,7 @@
 
 #include <openssl/ssl.h>
 
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_http_stack.hpp>
 
 class SrsHttpUri;

diff --git a/trunk/src/protocol/srs_service_http_conn.cpp → ...k/src/protocol/srs_protocol_http_conn.cpp b/trunk/src/protocol/srs_service_http_conn.cpp → ...k/src/protocol/srs_protocol_http_conn.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_service_http_conn.hpp>
+#include <srs_protocol_http_conn.hpp>
 
 #include <stdlib.h>
 #include <sstream>
@@ -13,12 +13,12 @@ using namespace std;
 #include <srs_kernel_log.hpp>
 #include <srs_kernel_error.hpp>
 #include <srs_protocol_stream.hpp>
-#include <srs_service_utility.hpp>
+#include <srs_protocol_utility.hpp>
 #include <srs_kernel_utility.hpp>
 #include <srs_protocol_utility.hpp>
 #include <srs_core_autofree.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_service_conn.hpp>
+#include <srs_protocol_conn.hpp>
 
 SrsHttpParser::SrsHttpParser()
 {

diff --git a/trunk/src/protocol/srs_service_http_conn.hpp → ...k/src/protocol/srs_protocol_http_conn.hpp b/trunk/src/protocol/srs_service_http_conn.hpp → ...k/src/protocol/srs_protocol_http_conn.hpp
@@ -4,8 +4,8 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#ifndef SRS_SERVICE_HTTP_CONN_HPP
-#define SRS_SERVICE_HTTP_CONN_HPP
+#ifndef SRS_PROTOCOL_HTTP_CONN_HPP
+#define SRS_PROTOCOL_HTTP_CONN_HPP
 
 #include <srs_core.hpp>
 

diff --git a/trunk/src/protocol/srs_service_log.cpp → trunk/src/protocol/srs_protocol_log.cpp b/trunk/src/protocol/srs_service_log.cpp → trunk/src/protocol/srs_protocol_log.cpp
@@ -4,7 +4,7 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_service_log.hpp>
+#include <srs_protocol_log.hpp>
 
 #include <stdarg.h>
 #include <sys/time.h>

diff --git a/trunk/src/protocol/srs_service_log.hpp → trunk/src/protocol/srs_protocol_log.hpp b/trunk/src/protocol/srs_service_log.hpp → trunk/src/protocol/srs_protocol_log.hpp
@@ -4,15 +4,15 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#ifndef SRS_SERVICE_LOG_HPP
-#define SRS_SERVICE_LOG_HPP
+#ifndef SRS_PROTOCOL_LOG_HPP
+#define SRS_PROTOCOL_LOG_HPP
 
 #include <srs_core.hpp>
 
 #include <map>
 #include <string>
 
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_kernel_log.hpp>
 
 // The st thread context, get_id will get the st-thread id,

diff --git a/trunk/src/protocol/srs_service_rtmp_conn.cpp → ...k/src/protocol/srs_protocol_rtmp_conn.cpp b/trunk/src/protocol/srs_service_rtmp_conn.cpp → ...k/src/protocol/srs_protocol_rtmp_conn.cpp
@@ -4,17 +4,17 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#include <srs_service_rtmp_conn.hpp>
+#include <srs_protocol_rtmp_conn.hpp>
 
 #include <unistd.h>
 using namespace std;
 
 #include <srs_protocol_kbps.hpp>
 #include <srs_rtmp_stack.hpp>
-#include <srs_service_st.hpp>
+#include <srs_protocol_st.hpp>
 #include <srs_protocol_amf0.hpp>
 #include <srs_protocol_utility.hpp>
-#include <srs_service_utility.hpp>
+#include <srs_protocol_utility.hpp>
 
 SrsBasicRtmpClient::SrsBasicRtmpClient(string r, srs_utime_t ctm, srs_utime_t stm)
 {

diff --git a/trunk/src/protocol/srs_service_rtmp_conn.hpp → ...k/src/protocol/srs_protocol_rtmp_conn.hpp b/trunk/src/protocol/srs_service_rtmp_conn.hpp → ...k/src/protocol/srs_protocol_rtmp_conn.hpp
@@ -4,8 +4,8 @@
 // SPDX-License-Identifier: MIT or MulanPSL-2.0
 //
 
-#ifndef SRS_SERVICE_RTMP_CONN_HPP
-#define SRS_SERVICE_RTMP_CONN_HPP
+#ifndef SRS_PROTOCOL_RTMP_CONN_HPP
+#define SRS_PROTOCOL_RTMP_CONN_HPP
 
 #include <srs_core.hpp>