winlin
6c94e91792
SRT: Refine get_srt_poller to poller.
2022-06-14 20:02:24 +08:00
winlin
21899c5998
SRT: Initialize SRT eventloop in adapter.
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
winlin
b507a080b2
SRT: Refine parse SRT listen ip and port.
2022-06-14 20:02:24 +08:00
hondaxiao
e13d16439e
SRT: support rtmp to srt
2022-06-14 20:02:22 +08:00
hondaxiao
94fa0ff7bd
Refine SRT code, with StateThread adpater
2022-06-14 19:58:42 +08:00
winlin
3ed4aed824
Fix build failed.
2022-06-09 20:46:20 +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
winlin
f1840b87e5
Fix typo, change bridger to bridge.
2022-06-09 19:35:07 +08:00
winlin
16babd2b64
Merge branch '4.0release' into develop
2022-04-07 13:48:59 +08:00
winlin
1d503c770f
Fix proc stat issue.
2022-04-07 13:48:19 +08:00
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
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
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
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
88c8a4f6c0
Squash: Bug fixed
2022-02-16 11:34:05 +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
eeb44ebbe9
Version: Ignore the mgmt version
2022-02-14 18:17:02 +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
6b7fc6fdb5
Squash: Fix bugs for 4.0
2022-01-23 08:12:19 +08:00
stone
92434cfeba
bugfix:SrsMetaCache memleak ( #2887 )
...
Co-authored-by: wanglei <wanglei@unicloud.com>
2022-01-22 18:50:10 +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
chundonglinlin
584889754c
RTC: fix play rtc judge for config rtc2rtmp on.( #2863 ) ( #2872 )
2022-01-13 17:03:03 +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
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
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
winlin
51ca3fd80a
Only discover api server ip as candidate.
2022-01-06 11:31:06 +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
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
john
a9397598e8
Fix typo(HTTP-Server -> HTTPS-Server) ( #2822 )
2021-12-29 11:53:16 +08:00
mapengfei53
3f8b1a2922
Fix the error of pps statistics ( #2820 )
2021-12-29 11:25:30 +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
winlin
63da0dca92
Cleanup server for GMC, by WaitGroup to destroy. ( #2247 ). v4.0.206
2021-12-26 11:37:59 +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
2f52d0aefa
Fix bug for HLS log printing. ( #2807 ). v4.0.209
2021-12-23 18:38:18 +08:00
winlin
d32195993d
Refine the default config file. ( #2711 ). v4.0.208
2021-12-23 18:34:40 +08:00
chundonglinlin
3188c772b1
RTC: Eliminate duplicate assignment for video packet frame type ( #2803 )
...
Co-authored-by: zhangjunqin1 <zhangjunqin@jd.com>
2021-12-21 08:32:17 +08:00
