external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00
Code Issues Releases Wiki Activity
8041 commits 13 branches 107 tags 375 MiB
Commit graph

8041 commits

This branch
This branch
All branches
Author SHA1 Message Date
mapengfei53
8dc5853f8c
Fix parse_file function did not handle err (#2928) 
* Fix parse file function did not handle err

* Fix parse_file function did not handle err

* Fix error message

* Updated error information
 2022-03-19 13:22:27 +08:00
winlin
9385f2b80b Merge branch '4.0release' into develop 2022-03-19 13:21:58 +08:00
winlin
dbfa761aed Release v4.0-b10, 4.0 beta10, v4.0.251, 144665 lines. 2022-03-19 13:04:06 +08:00
winlin
76ed0200b4 SRT: Decouple publish with play url (#2893). v4.0.251 2022-03-19 12:06:07 +08:00
winlin
41e35155f7 SRT: Compatible with previous auth querystring. #2908 2022-03-19 09:04:51 +08:00
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
90bc56b36f Update PR template. 2022-03-17 11:53:31 +08:00
winlin
c5cc79ee6f SRT: Support debug and run with CLion. v4.0.249 2022-03-17 08:42:44 +08:00
winlin
3998a88cc9 Update README for mermaid. 2022-03-15 14:25:09 +08:00
winlin
0008927d76 Update README for FOSSA. 2022-03-15 14:19:41 +08:00
winlin
b0463c2a4d Update README for FOSSA. 2022-03-15 13:51:27 +08:00
winlin
8703957595 Update README for FOSSA LICNESE scan. 2022-03-15 13:48:41 +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
winlin
75cf9b3d19 Add single node architecture 2022-03-03 09:40:50 +08:00
winlin
95bbb5a0c3 Update README 2022-02-28 20:26:55 +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
4b737f010f Merge branch 'merge/develop' into develop 2022-02-18 12:43:58 +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
f4966f992c Update 2022-02-16 11:22:10 +08:00
winlin
9dc4b78592 Update 2022-02-16 11:18:26 +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
cd0599baeb Release v4.0-b9, 4.0 beta9, v4.0.245, 144474 lines. 2022-02-15 19:34:01 +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
9379ebbc2c Update the contribute guide 2022-02-14 15:45:53 +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
5e78c1fe88 Update README 2022-02-14 09:41:58 +08:00