1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 11:51:57 +00:00
Commit graph

6278 commits

Author SHA1 Message Date
loveforever
210cdf04be
SRT: url supports multiple QueryStrings (#2908)
* SRT:  parse srt url to supports multiple QueryStrings.(#2893)

* SRT:  url supports multiple QueryStrings by  comma-separated key-value pairs with no nesting  (#2893)

* SRT:  url supports multiple QueryStrings by comma-separated key-value pairs with no nesting  (#2893)

* SRT: Add comments for url.

* Add utest for SRT URL parsing.

* Update README.

Co-authored-by: winlin <winlin@vip.126.com>
2022-03-19 08:24:06 +08:00
winlin
c225c3f745 Merge branch '4.0release' into develop 2022-03-18 12:03:52 +08:00
winlin
06cff31b24 Update script. 2022-03-18 12:02:49 +08:00
winlin
fd219aa074 Refine utest script. 2022-03-18 12:01:11 +08:00
Winlin
350c05c589
UTest: Upgrade gtest to 1.11 and support clion. (#2970) 2022-03-17 16:56:52 +08:00
winlin
c5cc79ee6f SRT: Support debug and run with CLion. v4.0.249 2022-03-17 08:42:44 +08:00
winlin
61f1531aa3 Merge branch '4.0release' into develop 2022-03-15 08:48:26 +08:00
ChenGH
ab81696102 Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248
Co-authored-by: Winlin <winlin@vip.126.com>
2022-03-15 08:43:03 +08:00
ChenGH
70aa6b66bb
bugfix: fix rtcp nack blp encode bug (#2966)
Co-authored-by: Winlin <winlin@vip.126.com>
2022-03-15 08:40:06 +08:00
winlin
636066124a SRT: Fix typo in libsrt build options. v5.0.26 2022-03-12 18:37:41 +08:00
everything411
d6ead6c0c5
SRT: Fix typo in libsrt build options (#2943)
the cmake option is ENABLE_APPS, so we should use --disable-apps or --enable-apps=0. this commit fixes the typo.
2022-03-12 18:34:30 +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
winlin
451b01011c Merge SRS 4.0 for bugfix. v5.0.25 2022-03-09 08:09:27 +08:00
winlin
9d3ae5c8ed Merge branch '4.0release' into develop 2022-03-09 08:06:56 +08:00
winlin
e26db694ca RTC: Identify the WebRTC publisher in param for hooks. v4.0.247 2022-03-07 16:34:51 +08:00
winlin
107ca2cbb8 SRT: Append vhost to stream, not app. v4.0.246 2022-03-07 15:53:55 +08:00
CommanderRoot
8a75e8a165
Replace deprecated String.prototype.substr() (#2948)
String.prototype.substr() is deprecated (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr) so we replace it with slice() or substring() which work similarily but aren't deprecated.
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
2022-03-07 08:02:27 +08:00
mapengfei53
84951cbc74
Update the demo config file for include directive (#2927)
* Update the demo config file for include directive

* update config file

* update config file
2022-03-05 17:43:20 +08:00
Matthew
526cd62075
Fix FD leak when exceed max connections limit. (#2925)
* fix fd leak

when tcp connection exceed max_connection, that connection will leak because of not closing the fd

* fix leak, code refine
2022-02-26 07:50:09 +08:00
winlin
4b838659e9 Merge 4.0release, update AUTHORS 2022-02-18 12:45:22 +08:00
winlin
e222f0da1b Add active developers 2022-02-16 13:16:18 +08:00
winlin
88c8a4f6c0 Squash: Bug fixed 2022-02-16 11:34:05 +08:00
winlin
d78a4f25a6 Forward: Support dynamic forwarding by backend api. (#2799). v5.0.24 2022-02-16 11:14:25 +08:00
chundonglinlin
03cf93fc2b
Forward: support config full rtmp url forward to other server (#2799)
* Forward: add backend config and demo server for dynamic create forwarder to other server.(#1342)

* Forward: if call forward backend failed, then return directly.

* Forward: add API description and change return value format.

* Forward: add backend conf file and wrapper function for backend service.

* Forward: add backend comment in full.conf and update forward.backend.conf.

* Forward: rename backend param and add comment tips.
2022-02-16 10:49:16 +08:00
winlin
b94ae922d4 Fix warnings for uuid. v4.0.245 2022-02-15 19:07:37 +08:00
winlin
37b6b48882 SRT: Close connection if RTMP failed. (#2917). v4.0.244 2022-02-15 18:51:28 +08:00
loveforever
e8fca60ece
SRT: Close connection if RTMP failed. (#2917)
* SRT: using global variables  to pass errors (#2897)

* SRT: using global variables  to pass errors (#2897)
2022-02-15 18:49:17 +08:00
winlin
0a848430e9 Refine build script for SRT to avoid warnings. v4.0.243 2022-02-15 18:35:25 +08:00
winlin
eeb44ebbe9 Version: Ignore the mgmt version 2022-02-14 18:17:02 +08:00
winlin
957e952b41 Update authors 2022-02-14 15:30:02 +08:00
winlin
b839c2ea9c Support include directive for config file. (#2878). v5.0.23 2022-02-14 15:20:48 +08:00
mapengfei53
fde44885d9
Support include directive for config file (#2878)
* Support include import configuration

* Remove support for regular rules

* Remove support for regular rules

* Fix configuration file parsing bug

* Added utest tests for include functionality

* Added utest tests for include functionality

* Modify the UTest function

* optimized code

* Config: Refine parse error with state

* Config: Reorder functions

* Config: Rename parsing type to context

* Config: Refine args for include

* Config: Add utests for include

* Config: Refine code, parsing recursively.

* Config: Change the mock from file to buffer

* Config: Mock buffer in config

* Config: Refine code

* Add utests for include

* Added utest for include

Co-authored-by: pengfei.ma <pengfei.ma@ngaa.com.cn>
Co-authored-by: winlin <winlin@vip.126.com>
2022-02-14 15:08:51 +08:00
winlin
acf0af6b5a Squash: Update 2022-02-13 08:31:10 +08:00
winlin
8d88a5b4cc Release v4.0-b8, 4.0 beta8, v4.0.241, 144445 lines. 2022-02-11 16:38:11 +08:00
winlin
c2b07ad943 Squash: Fix bugs 2022-02-11 08:44:31 +08:00
winlin
ff93bdd14f Mirror docker images in TCR Singapore. v4.0.240 2022-02-09 11:42:02 +08:00
winlin
e27b658ef9 Refine the error for WebRTC H5 publisher. v4.0.239 2022-02-08 11:54:04 +08:00
winlin
5c1556ac74 Squash: Refine release 2022-02-04 09:57:05 +08:00
winlin
d1534c099b Push docker to docker, acr and tcr. v4.0.238 2022-02-04 09:01:12 +08:00
winlin
32bb96a5c2 Squash: Fix bugs 2022-02-03 15:16:52 +08:00
winlin
dcf565bba1 Fix bug when the value of http header is empty. (#2888). v4.0.237 2022-02-03 15:07:37 +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
1d4fac0dbc Refine docker console, preview by players at the same server. v4.0.236 2022-01-30 22:36:01 +08:00
winlin
ba0b62fd37 For docker, always use the console for logging. v4.0.235 2022-01-30 22:01:21 +08:00
winlin
bdf6540c89 SRT: Reduce the SRT bug by limit the max times for retry. (#2896). v4.0.234 2022-01-29 15:08:56 +08:00
Alex.CR
0c036e0435
SRT: Reduce the SRT bug by limit the max times for retry. 2022-01-29 15:07:01 +08:00
winlin
6b7fc6fdb5 Squash: Fix bugs for 4.0 2022-01-23 08:12:19 +08:00
winlin
339d942e7b Fix bug when free addrinfo. (#2886). v4.0.233 2022-01-23 08:09:37 +08:00
winlin
8f2d23ff73 Fix memory leak in SrsMetaCache. (#2887). v4.0.232 2022-01-23 08:09:20 +08:00
winlin
6c6c0f0f0f Support docker image for lighthouse. v4.0.231 2022-01-23 08:06:48 +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
stone
92434cfeba
bugfix:SrsMetaCache memleak (#2887)
Co-authored-by: wanglei <wanglei@unicloud.com>
2022-01-22 18:50:10 +08:00
winlin
7c9f88be0b Eliminate unused *.as files for Adobe Flash. v5.0.22 2022-01-18 12:04:15 +08:00
winlin
12ffddd363 Release v5.0.21 2022-01-17 21:43:47 +08:00
winlin
dc43a11aed Enable rtmp2rtc and rtc2rtmp for docker.conf 2022-01-17 21:37:57 +08:00
winlin
5d8b950a06 Update CHANGELOG 2022-01-17 14:30:01 +08:00
winlin
b9bfe18829 CICD: Refine release for droplet 2022-01-17 14:13:42 +08:00
winlin
27e5d77302 Squash: Update README 2022-01-17 09:47:27 +08:00
winlin
16f17848bb Update README for **Cloud Virtual Machine** 2022-01-16 21:59:46 +08:00
winlin
55ea0a62d3 Build: Disable c++11 and c++14 for CentOS 6.0 2022-01-15 09:02:14 +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
93aa0eb5ba Squash: Fix bugs 2022-01-13 18:26:28 +08:00
winlin
0dd6246c2f Release v4.0-b3, 4.0 beta3, v4.0.229, 144393 lines. 2022-01-13 18:04:21 +08:00
winlin
7796083e9a RTC: fix play rtc judge for config rtc2rtmp on. (#2872). v4.0.229 2022-01-13 17:07:10 +08:00
chundonglinlin
584889754c
RTC: fix play rtc judge for config rtc2rtmp on.(#2863) (#2872) 2022-01-13 17:03:03 +08:00
winlin
99ff853de9 Refine package variables. v4.0.228 2022-01-13 17:01:57 +08:00
winlin
8830d267f2 Refine conf for vm.conf 2022-01-13 16:20:03 +08:00
winlin
6a5bc27f9b Support configure with --config as default config file. v4.0.227 2022-01-13 15:16:54 +08:00
winlin
3881c4c77e Add SrsAutoFreeH to release ptr with hooks. (#2880). v4.0.226 2022-01-13 14:05:00 +08:00
winlin
73d0ce1cee Support api to specify the WebRTC API port. v4.0.225 2022-01-13 13:34:06 +08:00
winlin
c6c2e97189 Support api_port to specify the WebRTC API port. v4.0.225 2022-01-13 12:16:45 +08:00
winlin
db3ceb445b Support api_port to specify the WebRTC API port. v4.0.224 2022-01-13 12:07:34 +08:00
winlin
e6ab5db113 LiveSource: Refine fetch for external exposed interface. (#2873). v4.0.223 2022-01-13 11:47:14 +08:00
chundonglinlin
7580341a1e
LiveSource/RtcSource: Refine fetch for external exposed interface. (#2873) 2022-01-13 11:43:32 +08:00
winlin
71a4b3c3f7 Add conf/lighthouse.conf for LightHouse. v4.0.222 2022-01-13 11:38:25 +08:00
winlin
d47dd81f46 Refine the running homepage. v4.0.221 2022-01-13 11:10:11 +08:00
winlin
fb93631407 Refine the running homepage. v4.0.221 2022-01-13 11:00:11 +08:00
winlin
574afb4320 Refine the running homepage. v4.0.221 2022-01-13 10:44:10 +08:00
winlin
7e25d0d7f4 Refine the running homepage. v4.0.221 2022-01-12 22:03:46 +08:00
chundonglinlin
c30aa479a7
RTC: Fix both rtmp and rtc streams can be published at the same time. (#2875) 2022-01-12 09:12:29 +08:00
winlin
4110fb14cb Squash: Fix bugs. v5.0.20 2022-01-11 08:40:37 +08:00
chundonglinlin
750c58beff
RTC: fix play rtc judge for rtmp inactive.(#2863) (#2867) 2022-01-11 08:18:06 +08:00
winlin
2bc5e9a8b4 RTC: fix play crash or no stream for rtmp2rtc tips.(#2863). v4.0.220 2022-01-10 19:16:01 +08:00
chundonglinlin
c85daeb12d
RTC: fix play crash or no stream for rtmp2rtc tips.(#2728) (#2863) 2022-01-10 19:14:11 +08:00
winlin
2f6d6a0ac0 Change warn to trace for release query 2022-01-07 16:41:02 +08:00
liuxiaoliang
4434bb1a25
SRT: use const string to sprint rtmp url. (#2847) 2022-01-06 12:02:31 +08:00
winlin
51ca3fd80a Only discover api server ip as candidate. 2022-01-06 11:31:06 +08:00
winlin
6919011e86 Update sync script, ignore gb28181 2022-01-05 14:36:42 +08:00
winlin
4d09b8caae When reopening segment, never update the duration. (#2717). v4.0.219 2022-01-05 08:29:20 +08:00
winlin
fbb6d9464c Discover api server and ip as candidates. v4.0.218 2022-01-04 22:31:27 +08:00
winlin
013fa8ac6c Install test-on self-sign certificate. v4.0.217 2022-01-04 16:47:38 +08:00
winlin
c0a7790c91 Update README 2022-01-04 12:05:28 +08:00
winlin
7808bd7ca8 Support config in_docker to fix the detect fail. (#2824). v4.0.216 2022-01-03 16:55:52 +08:00
winlin
8bc2759c7e Refine error log for rtmp2rtc. (#2728). v4.0.215 2021-12-31 11:42:49 +08:00
along
cf010064eb
Update srs_core.hpp (#2832)
modify a word.
2021-12-30 18:06:23 +08:00
winlin
56a9e4d140 Change images from gitee to ossrs.net 2021-12-30 11:28:10 +08:00
winlin
5aba212f3d Bugs fixed. (#2770)(#2820). v4.0.214 2021-12-29 11:57:15 +08:00
john
a9397598e8
Fix typo(HTTP-Server -> HTTPS-Server) (#2822) 2021-12-29 11:53:16 +08:00
chundonglinlin
a16590b3a6
SRT: Eliminate duplicate header file.(#2786) (#2827) 2021-12-29 11:52:02 +08:00