Commit Graph

6243 Commits (ec5bdc7dfa2e6ee271caea56094e276e5d3f2f41)

Author SHA1 Message Date
winlin ec5bdc7dfa Refine the signaling dynamic images. 3 years ago
winlin 7e0beb11d8 Conf: Refine comments. 3 years ago
winlin c574ab6465 Live: Refine edge cluster to support FLV. 3 years ago
winlin e8240d64be HTTP: Add configure for nginx proxy. 3 years ago
winlin 2b2379de12 RTC: Refine player sdk, reject with xhr. 3 years ago
winlin b3baa888ee RTC: Refine player sdk, directly use raw HTTP. 3 years ago
winlin 16babd2b64 Merge branch '4.0release' into develop 3 years ago
winlin 1d503c770f Fix proc stat issue. 3 years ago
winlin f87a959480 Support NGINX HLS Cluster. 3 years ago
winlin 4163dce18d Support NGINX HLS Cluster. v5.0.28 3 years ago
winlin 101d1ffbbf Support DigitalOcean Droplet SRS 1-Click. v5.0.27 3 years ago
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
3 years ago
winlin 9385f2b80b Merge branch '4.0release' into develop 3 years ago
winlin 76ed0200b4 SRT: Decouple publish with play url (#2893). v4.0.251 3 years ago
winlin 41e35155f7 SRT: Compatible with previous auth querystring. #2908 3 years ago
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>
3 years ago
winlin c225c3f745 Merge branch '4.0release' into develop 3 years ago
winlin 06cff31b24 Update script. 3 years ago
winlin fd219aa074 Refine utest script. 3 years ago
Winlin 350c05c589
UTest: Upgrade gtest to 1.11 and support clion. (#2970) 3 years ago
winlin c5cc79ee6f SRT: Support debug and run with CLion. v4.0.249 3 years ago
winlin 61f1531aa3 Merge branch '4.0release' into develop 3 years ago
ChenGH ab81696102 Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248
Co-authored-by: Winlin <winlin@vip.126.com>
3 years ago
ChenGH 70aa6b66bb
bugfix: fix rtcp nack blp encode bug (#2966)
Co-authored-by: Winlin <winlin@vip.126.com>
3 years ago
winlin 636066124a SRT: Fix typo in libsrt build options. v5.0.26 3 years ago
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.
3 years ago
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>
3 years ago
winlin 451b01011c Merge SRS 4.0 for bugfix. v5.0.25 3 years ago
winlin 9d3ae5c8ed Merge branch '4.0release' into develop 3 years ago
winlin e26db694ca RTC: Identify the WebRTC publisher in param for hooks. v4.0.247 3 years ago
winlin 107ca2cbb8 SRT: Append vhost to stream, not app. v4.0.246 3 years ago
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>
3 years ago
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
3 years ago
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
3 years ago
winlin 4b838659e9 Merge 4.0release, update AUTHORS 3 years ago
winlin e222f0da1b Add active developers 3 years ago
winlin 88c8a4f6c0 Squash: Bug fixed 3 years ago
winlin d78a4f25a6 Forward: Support dynamic forwarding by backend api. (#2799). v5.0.24 3 years ago
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.
3 years ago
winlin b94ae922d4 Fix warnings for uuid. v4.0.245 3 years ago
winlin 37b6b48882 SRT: Close connection if RTMP failed. (#2917). v4.0.244 3 years ago
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)
3 years ago
winlin 0a848430e9 Refine build script for SRT to avoid warnings. v4.0.243 3 years ago
winlin eeb44ebbe9 Version: Ignore the mgmt version 3 years ago
winlin 957e952b41 Update authors 3 years ago
winlin b839c2ea9c Support include directive for config file. (#2878). v5.0.23 3 years ago
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>
3 years ago
winlin acf0af6b5a Squash: Update 3 years ago
winlin 8d88a5b4cc Release v4.0-b8, 4.0 beta8, v4.0.241, 144445 lines. 3 years ago
winlin c2b07ad943 Squash: Fix bugs 3 years ago