1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Commit graph

613 commits

Author SHA1 Message Date
winlin
927dd473eb Kernel: Support lazy sweeping simple GC. v5.0.69 2022-09-30 18:33:29 +08:00
winlin
4b7d9587f4 HTTP: Support HTTP header in creating order. v5.0.68 2022-09-30 18:22:25 +08:00
winlin
d65c699829 Micro changes and refines. 2022-09-30 18:11:59 +08:00
winlin
378bffa34f Micro changes and refines. 2022-09-30 17:57:48 +08:00
winlin
b452144fb7 GB28181: Remove unused RTSP protocol stack. 2022-09-30 12:35:10 +08:00
hondaxiao
4acb246c57 Fix #3181: SRT & WebRTC: Use SrsRawH264Stream to mux SPS/PPS. 2022-09-22 14:55:55 +08:00
winlin
3e2f8622f8 APM: Support distributed tracing by Tencent Cloud APM. v5.0.63 2022-09-16 18:54:28 +08:00
Li Peng
efa0851476 WebRTC: Refine code and destroy session when tcp close. 2022-09-04 22:57:47 +08:00
winlin
625069af7f WebRTC: Extract SrsRtcNetwork layer for UDP/TCP. 2022-09-04 20:14:09 +08:00
winlin
424713a31d Merge branch '4.0release' into develop 2022-09-03 22:12:46 +08:00
winlin
e0c8c199d5 Fix HTTP url parsing bug. v4.0.261 2022-09-03 22:11:00 +08:00
winlin
dd37a041b9 Fix URL parsing bug for __defaultVhost__. v5.0.55 2022-08-31 11:46:09 +08:00
winlin
9c6774b644 STAT: Refine tcUrl for SRT/RTC. v5.0.54 2022-08-30 21:28:06 +08:00
winlin
2c259bd95b Refactor: Extract SrsNetworkKbps from SrsKbps. v5.0.53 2022-08-30 13:41:27 +08:00
winlin
937605b18c Remove bandwidth check because falsh is disabled. v5.0.52 2022-08-30 10:45:40 +08:00
winlin
1630918b0f Refactor: Use compositor for ISrsKbpsDelta. v5.0.51 2022-08-30 09:26:51 +08:00
winlin
db91102e67 STAT: Extract an ephemeral delta object. 2022-08-29 13:44:10 +08:00
winlin
d7c2d5ab01 HLS: Stat the HLS streaming clients bandwidth. v5.0.49 2022-08-29 12:09:26 +08:00
winlin
c1df280211 HLS: Rebuild m3u8 to make ts with id, for stat. 2022-08-29 09:08:46 +08:00
winlin
28154e820c URL: Use SrsHttpUri to parse URL and query. 2022-08-28 20:24:07 +08:00
winlin
9bd3c51818 RTMP: Refine code for gussing stream by app. 2022-08-28 17:03:34 +08:00
winlin
457738f6eb Fix #2881: HTTP: Support merging api to server. v5.0.47 2022-08-28 13:11:31 +08:00
winlin
4e3ea99ccd STAT: Refine stat for global server. 2022-08-27 20:40:34 +08:00
winlin
101e4fa3b9 STAT: Add hls-play, flv-play, srt-play and srt-publish. 2022-08-27 20:40:33 +08:00
winlin
8bc7342c3c Protobuf: Extract protobuf encoder. 2022-08-26 18:46:26 +08:00
winlin
4edf33326d Merge branch '4.0release' into develop 2022-08-17 11:10:30 +08:00
winlin
f9941a325b RTMP URL supports domain in stream parameters. v4.0.255 2022-08-17 11:08:32 +08:00
winlin
0227e44ef0 Fix warning for comparing int with sizeof. 2022-08-10 19:34:23 +08:00
winlin
a71eddd56a Fix the snprintf size issue. 2022-08-10 08:32:02 +08:00
winlin
0a025fc4b6 Remove unneccessary depends headers. 2022-08-09 18:32:01 +08:00
winlin
5ae495ab95 For #1229: Check the return value of vsnprintf. 2022-08-08 08:31:57 +08:00
winlin
d117145b95 Update date from 2021 to 2022. 2022-06-20 19:22:25 +08:00
winlin
93fed3874b SRT: Rebase develop. 2022-06-14 20:17:00 +08:00
hondaxiao
910b5945af SRT: add srt log handle, srs log supoort multithread 2022-06-14 20:05:11 +08:00
winlin
6009395c10 SRT: Hide srt implements from API. 2022-06-14 20:02:25 +08:00
winlin
d39ec3cf45 SRT: Extract ISrsSrtPoller to hide SRT_EPOLL_EVENT 2022-06-14 20:02:25 +08:00
winlin
94cc50d146 SRT: Wrap SRT stat object. 2022-06-14 20:02:25 +08:00
winlin
78b778fb93 SRT: Rename srs_service_st_srt to srs_protocol_srt 2022-06-14 20:02:25 +08:00
winlin
492e3a888c SRT: Refine the SRT socket code. 2022-06-14 20:02:24 +08:00
winlin
4899be9c34 SRT: Refine the schedule resolution to 10ms if idle. 2022-06-14 20:02:24 +08:00
hondaxiao
e13d16439e SRT: support rtmp to srt 2022-06-14 20:02:22 +08:00
hondaxiao
7da792f19d SRT: check srt_connect return value 2022-06-14 19:59:13 +08:00
hondaxiao
94fa0ff7bd Refine SRT code, with StateThread adpater 2022-06-14 19:58:42 +08:00
winlin
fa78cf3354 Prefix with srs_protocol in protocol directory. 2022-06-09 20:26:58 +08:00
winlin
665ad564fb Rename service to protocol files. 2022-06-09 19:59:51 +08:00
Haibo Chen
67ccd589c1
Security: Enable CIDR for allow/deny play/publish (#2914)
* protocol/utility: add srs_ipv4_to_num

* protocol/utility: add srs_ipv4_within_mask

* protocol/utility: add srs_get_cidr_mask and CIDR_VALUES static struct

* protocol/utility: add srs_get_cidr_ipv4

* app/security: support cidr ip ranges in allow/deny rules

* conf: update security example with cidr ranges

* Security: Enable CIDR for allow/deny play/publish

* Security: Enable CIDR for allow/deny play/publish

* Security: Enable CIDR for allow/deny play/publish

* fix compile error on centos6

Co-authored-by: Matheus Macabu <macabu.matheus@gmail.com>
2022-03-11 12:24:35 +08:00
Haibo Chen
290c3b95a5 Fix bug when the value of http header is empty (#2888)
* Fix bug when the value of http header is empty

* add utest
2022-02-03 15:06:06 +08:00
Haibo Chen
b94ce1485a
Fix bug when the value of http header is empty (#2888)
* Fix bug when the value of http header is empty

* add utest
2022-02-03 15:05:09 +08:00
winlin
6b7fc6fdb5 Squash: Fix bugs for 4.0 2022-01-23 08:12:19 +08:00
stone
386ac44558
bugfix: SrsAutoFree addrinfo (#2886)
* bugfix: SrsAutoFree addrinfo

* bugfix: SrsAutoFreeH(addrinfo, r, freeaddrinfo)

Co-authored-by: wanglei <wanglei@unicloud.com>
2022-01-23 07:18:16 +08:00
winlin
d5c86dc5fa Switch LICENSE from MIT to **MIT or MulanPSL-2.0**. v5.0.21 2022-01-13 18:40:22 +08:00
winlin
716e578a19 Squash: Fix bugs 2021-12-26 17:30:51 +08:00
winlin
44e9dc83e9 Upgrade gperftools to 2.9 for GCP/GMC/GMP/GMD. (#2247) 2021-12-26 15:19:08 +08:00
chundonglinlin
e73d00250b
HTTP: Fix mp4/flv file size exceed 2GB download error (#2780) (#2809) 2021-12-25 08:18:47 +08:00
winlin
523b055c06 Squash: Support RPM. Fix bugs. 2021-11-04 07:37:17 +08:00
winlin
ab5079909d For #2369, #1708, #1941: Check errno when close fd or stop thread 2021-10-31 19:33:27 +08:00
winlin
665b5f48f7 Squash: JSON: Support escape special chars. (#1758) 2021-10-20 09:16:18 +08:00
xmedia-systems
34b968aabf JSON: Support escape special chars. (#1758) v4.0.182 2021-10-20 08:57:40 +08:00
winlin
a81aa2edc5 Squash: Merge SRS 4.0 2021-10-10 12:05:26 +08:00
winlin
19e857ada4 Remove dead link for issues 2021-10-10 09:31:06 +08:00
Haibo Chen
36b813b971 Enhance HLS: support http callback on_play/stop, support statistic (#2578)
* Enhance HLS: support http callback on_play/stop, support statistic

* make code readable

* make code readable

* rename secret
2021-09-23 13:32:15 +08:00
Haibo Chen
f901831362
Enhance HLS: support http callback on_play/stop, support statistic (#2578)
* Enhance HLS: support http callback on_play/stop, support statistic

* make code readable

* make code readable

* rename secret
2021-09-23 13:31:45 +08:00
Justin Kromlinger
a583d7efb4 Set empty HTTP paths to '/' to avoid malformed requests (#2329)
This resolves #1610.
2021-09-07 08:17:53 +08:00
Justin Kromlinger
8aee0169ce
Set empty HTTP paths to '/' to avoid malformed requests (#2329)
This resolves #1610.
2021-09-07 08:15:27 +08:00
Haibo Chen
86c67f7d95 RTC: Support statistic for HTTP-API, HTTP-Callback and Security (#2483) v4.0.144
* commit message for your changes. Lines starting

* Update srs_app_rtc_api.cpp

* add SrsRtcConnPlay and SrsRtcConnPublish, in enum SrsRtmpConnType

* Update srs_rtmp_stack.cpp

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_api.cpp

* update utest

* Update srs_utest_app.cpp
2021-07-24 08:08:35 +08:00
Haibo Chen
0efd7b1bbc
RTC: Support statistic for HTTP-API, HTTP-Callback and Security (#2483)
* commit message for your changes. Lines starting

* Update srs_app_rtc_api.cpp

* add SrsRtcConnPlay and SrsRtcConnPublish, in enum SrsRtmpConnType

* Update srs_rtmp_stack.cpp

* Update srs_app_rtc_conn.cpp

* Update srs_app_rtc_api.cpp

* update utest

* Update srs_utest_app.cpp
2021-07-24 08:05:10 +08:00
winlin
97c627f9d4 Squash: Support CLion 2021-07-17 19:43:22 +08:00
winlin
afa32910c9 Fix bugs and enhance code. 4.0.142 2021-07-17 19:16:26 +08:00
Winlin
c8a1e0f3da
Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8 (#2464)
* Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8

* Update README.md

* Update README.md

* Refine format for AUTHORS.md
2021-07-08 14:30:47 +08:00
winlin
13d015b8fd Squash: Fix random bug 2021-07-04 16:04:51 +08:00
winlin
642359a50e For #2424, use srandom/random to generate. 4.0.139 2021-07-04 15:50:29 +08:00
winlin
5ee20613ca Squash: Support query lastest available version. 5.0.6 2021-06-28 07:33:24 +08:00
winlin
da763e43d5 Squash for #2424, query the latest available version. 4.0.132 2021-06-27 08:56:41 +08:00
winlin
9e2c6d458e Fix build fail for SPDX 2021-05-31 13:46:19 +08:00
winlin
67272f0721 Fix build fail for SPDX 2021-05-31 13:45:23 +08:00
winlin
15901cacee SquashSRS4: Use SPDX-License-Identifier: MIT. 5.0.3 2021-05-31 13:42:20 +08:00
winlin
3cd22b6e6e Use SPDX-License-Identifier: MIT. 4.0.124 2021-05-31 12:59:21 +08:00
winlin
6dc8d9dd6f SquashSRS4: Remove srs-librtmp 2021-05-20 20:07:13 +08:00
winlin
af04285baa Tools: Remove srs-librtmp 2021-05-20 18:52:21 +08:00
winlin
a1d7fe46c1 SquashSRS4: Rename SrsRtpPacket2 to SrsRtpPacket. 2021-05-15 08:53:54 +08:00
winlin
ddd7a378b1 Rename SrsRtpPacket2 to SrsRtpPacket. 4.0.111 2021-05-15 08:47:09 +08:00
winlin
6a980683f7 SquashSRS4: Remove object cache and stat api 2021-05-14 18:17:42 +08:00
winlin
717e811002 Change virtual public to public. 4.0.109 2021-05-14 09:13:15 +08:00
winlin
cd45750c9d RTC: Eliminate unused stat API 2021-05-14 08:56:41 +08:00
winlin
3939844301 SquashSRS4: Fix bugs 2021-05-11 19:12:15 +08:00
winlin
8c5a435714 Fix print bug in retrieve_local_ips. 4.0.107 2021-05-11 19:04:43 +08:00
winlin
eb339432c4 SquashSRS4: Update benchmark data. 2021-05-10 18:09:59 +08:00
winlin
6dc93fe0a8 RTC: Update benchmark data 2021-05-10 14:30:08 +08:00
winlin
3256c7c2fa SquashSRS4: Refine the init of global objects 2021-05-08 11:51:54 +08:00
winlin
b1e85664a1 Refine init of global SrsPps 2021-05-08 11:11:13 +08:00
winlin
aa07f45545 SquashSRS4: Happy 2021 2021-04-20 19:03:02 +08:00
winlin
cec0191b16 Happy 2021 2021-04-20 19:00:14 +08:00
winlin
8b74c7cb89 SquashSRS4: Happy 2021 2021-04-16 09:29:43 +08:00
winlin
d01e603b25 Happy 2021 2021-04-16 09:25:55 +08:00
winlin
4f1d213c91 Live: Support follow HTTP/302 for HTTP/HTTPS FLV edge. 2021-03-17 16:53:39 +08:00
winlin
35431749c4 Live: Support follow client protocol for edge. 2021-03-17 16:48:18 +08:00
winlin
cec588e08a For #2188: Remove sendmmsg from ST. 2021-03-02 19:31:33 +08:00
winlin
6dac180627 Kernel: Never depends on another globals for global variables 2021-03-02 19:30:56 +08:00
winlin
d8ba72fdc5 Kernel: Extract SrsPps to kernel 2021-03-02 19:30:52 +08:00
winlin
34dae0fe0d For #2188: Remove sendmmsg from ST. 2021-02-26 09:13:21 +08:00