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
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
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
32bb96a5c2
Squash: Fix bugs
2022-02-03 15:16:52 +08:00
winlin
ba0b62fd37
For docker, always use the console for logging. v4.0.235
2022-01-30 22:01:21 +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
93aa0eb5ba
Squash: Fix bugs
2022-01-13 18:26:28 +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
71a4b3c3f7
Add conf/lighthouse.conf for LightHouse. v4.0.222
2022-01-13 11:38:25 +08:00
winlin
4110fb14cb
Squash: Fix bugs. v5.0.20
2022-01-11 08:40:37 +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
7808bd7ca8
Support config in_docker to fix the detect fail. ( #2824 ). v4.0.216
2022-01-03 16:55:52 +08:00
winlin
716e578a19
Squash: Fix bugs
2021-12-26 17:30:51 +08:00
winlin
faf5fb0a83
Refine the config
2021-12-24 10:37:58 +08:00
winlin
f05e67e1a6
Squash: Fix bugs
2021-12-13 09:24:16 +08:00
winlin
027715e4ea
RTC: Update config
2021-12-12 15:53:08 +08:00
winlin
e16830e989
Squash: Merge 4.0.201
2021-12-04 10:43:04 +08:00
winlin
1167f68165
FLV: Add realtime HTTP-FLV config
2021-11-20 09:54:42 +08:00
winlin
66435d583a
Squash: Fix stat bug
2021-11-15 20:39:35 +08:00
winlin
f3380d2ec0
Fix bug for CPU arch info
2021-11-15 20:35:20 +08:00
winlin
e1f65478af
Sqush: Refine config for origin cluster
2021-10-27 17:34:03 +08:00
lvndry
e176401499
Cluster: Origin server shouldn't be it's own coworker. v4.0.186 ( #1963 )
2021-10-27 07:46:24 +08:00
winlin
b874d9c9ba
Squash: Merge SRS 4.0, regression test for RTMP.
2021-10-12 08:36:24 +08:00
winlin
71ed6e5dc5
RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174
2021-10-11 22:14:45 +08:00
winlin
fe9e43b6d4
RTC: Refine config for RTC
2021-10-11 16:36:05 +08:00
winlin
f8b4121497
Test: Add Multiple Sequence test for RTMP
2021-10-11 08:04:12 +08:00
winlin
0f9b9505a8
RTC: Change rtc.aac to discard by default. v4.0.172
2021-10-10 17:17:14 +08:00
winlin
a81aa2edc5
Squash: Merge SRS 4.0
2021-10-10 12:05:26 +08:00
winlin
2fa5a0bee8
Fix #2304 , Remove Push RTSP feature. v4.0.171
2021-10-10 11:50:07 +08:00
winlin
df53c801b2
For #2653 : Update config for HTTP RAW API removed.
2021-10-10 10:28:19 +08:00
winlin
55d8cb4b7b
Default to log to console for docker. v4.0.168
2021-10-08 21:58:33 +08:00
winlin
1acb80b9c8
Enable WebRTC for srs.conf
2021-10-08 21:22:34 +08:00
winlin
a19c0fa121
OpenWRT: Try to create dir for pidfile
2021-10-03 20:51:07 +08:00
winlin
8ea9783de7
OpenWRT: Disable mprotect of ST. 5.0.16
2021-10-03 20:24:57 +08:00
winlin
149ad80b5d
Squash: Merge SRS 4.0
2021-09-25 10:09:25 +08:00
winlin
10fe04ac18
LIVE: Add conf/live.conf for RTMP/FLV/HLS
2021-09-25 09:01:15 +08:00
winlin
28e3a1ca69
Squash: Merge SRS 4.0
2021-09-13 09:57:47 +08:00
winlin
501b3833a1
RTMP: Remove bandwidth test
2021-09-13 09:41:21 +08:00
winlin
19c0a9eb4b
Suqash: Merge 4.0
2021-09-05 14:17:41 +08:00
winlin
90b5ed2202
For #2282 , #2181 , Remove reload for dvr_apply. 4.0.160
2021-09-04 12:29:07 +08:00
winlin
85620a34f5
Squash: Fix rtc to rtmp sync timestamp using sender report. #2470
2021-08-17 07:25:03 +08:00
john
ea8cff6163
RTC: Fix rtc to rtmp sync timestamp using sender report. ( #2470 )
...
* fix annotation spell failed
* RTC to RTMP using SenderReport to sync av timestamp
* update pion/webrtc versio from v3.0.4 -> v3.0.13, auto config sender/receiver report
* Add rtc push flv play regression test
* Add unit test of ntp and av sync time
* Take flag CXX to makefile of utest
* Add annotation about rtc unit test
* Fix compiler error in C++98
* Add FFmpeg log callback funciton.
2021-08-17 06:32:35 +08:00
winlin
24431d35ac
Squash: Merge SRS4
2021-08-13 14:29:32 +08:00
matthew1838
452ca7e88f
add server_id into http_hooks ( #2521 )
...
Co-authored-by: SK <liemlhd@LiemLes-Mac-Pro.local>
2021-08-11 10:38:22 +08:00
winlin
301a8ceadb
Squash: Merge SRS 4.0
2021-07-24 21:10:35 +08:00
Winlin
8c7ba05f9a
For #2371 : Add regression test for SDP nack ( #2487 )
...
* explicitly enable nack, for firefox (#2373 )
* For #2371 : Add regression test for SDP nack
1. Refine API to change defaule decodes.
2. Add test for publish SDP nack.
3. Add test for play SDP nack.
Co-authored-by: Haibo Chen <495810242@qq.com>
2021-07-24 21:03:00 +08:00
winlin
97c627f9d4
Squash: Support CLion
2021-07-17 19:43:22 +08:00
winlin
c209e547a8
[IDE] Support CLion and cmake to build and debug SRS. 4.0.141
...
1. Remove all except JetBrains clion by cmake
2. Add .run/srs.run.xml for debugging for CLion.
3. Auto configure SRS when load CMakeLists.txt
2021-07-16 11:38:12 +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
efdbf37255
Squash: Move GB28181 to feature/gb28181. 5.0.4
2021-06-16 14:03:55 +08:00
winlin
68c48e27f5
Change GB28181 to feature/gb28181. 4.0.127
2021-06-16 08:27:37 +08:00
louis.xia
1c7c74b01a
GB28181: Fix parse rtp tcp failed ( #2382 )
...
* fix parse rtp-tcp failed
* fix parse rtp-tcp failed
* fix gb28181 support tcp stack is setup:passive
* Update push.gb28181.tcp.conf
Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
2021-05-28 21:38:52 +08:00
louis.xia
cc52e5b27c
GB28181: Fix parse rtp tcp failed ( #2382 )
...
* fix parse rtp-tcp failed
* fix parse rtp-tcp failed
* fix gb28181 support tcp stack is setup:passive
* Update push.gb28181.tcp.conf
Co-authored-by: cfw <fangwei.cheng@transwarp.io>
Co-authored-by: Winlin <winlin@vip.126.com>
2021-05-28 21:38:12 +08:00
cfw11
3e7536c493
GB28181: fix parse rtp-tcp failed ( #2378 )
...
* fix parse rtp-tcp failed
* fix parse rtp-tcp failed
Co-authored-by: cfw <fangwei.cheng@transwarp.io>
2021-05-28 21:20:41 +08:00
cfw11
4d6f00e6bf
GB28181: fix parse rtp-tcp failed ( #2378 )
...
* fix parse rtp-tcp failed
* fix parse rtp-tcp failed
Co-authored-by: cfw <fangwei.cheng@transwarp.io>
2021-05-28 21:19:05 +08:00
winlin
34aa11b72a
SquashSRS4: Update doc
2021-05-18 11:47:50 +08:00
winlin
0d14c4b073
System: Fail if use use full.conf
2021-05-18 11:06:14 +08:00
winlin
e3bca883e1
SuqashSRS4: Build SRT native
2021-05-16 16:14:00 +08:00
hondaxiao
90f1b482ab
SRT: Build SRT from source by SRS. 4.0.115
2021-05-16 08:23:26 +08:00
winlin
262f0fc8c8
SRT: Enable HTTP-FLV for SRT
2021-05-15 16:44:43 +08:00
winlin
9b6a1b16e1
RTC: Eliminate unused perf_stat
2021-05-15 12:04:21 +08:00
winlin
6a980683f7
SquashSRS4: Remove object cache and stat api
2021-05-14 18:17:42 +08:00
winlin
f7b32252b0
RTC: Remove Object Cache Pool, no effect. 4.0.110
2021-05-14 16:12:11 +08:00
winlin
276bd2223e
SquashSRS4: Support circuit breaker
2021-05-08 10:04:44 +08:00
winlin
92fc0af8f4
RTC: Support circuit breaker. 4.0.103
2021-05-07 17:43:05 +08:00
winlin
74bb47c13f
SquashSRS4: Support RTC2RTMP.
2021-05-01 22:15:57 +08:00
winlin
f7473c90bc
For #2303 : Add conf for RTC2RTMP
2021-05-01 18:19:17 +08:00
winlin
3d225973ef
Bridger: Support RTC2RTMP bridger and shared FastTimer. 4.0.95
2021-05-01 18:16:51 +08:00
winlin
659e173e15
RTC: Refine for writing doc. 4.0.92
2021-05-01 16:42:09 +08:00
winlin
eba78149ad
SquashSRS4: Change push-RTSP as deprecated feature.
2021-04-24 21:40:09 +08:00
winlin
5516d3751f
Change push-RTSP as deprecated feature.
2021-04-24 21:33:44 +08:00
winlin
35431749c4
Live: Support follow client protocol for edge.
2021-03-17 16:48:18 +08:00
winlin
56b64689bf
SquashSRS4: Docker: Add conf/docker.conf, daemon off, log console, enable RTC
2021-03-04 23:06:08 +08:00
winlin
83c615aa8a
SquashSRS3: Docker: Add conf/docker.conf, daemon off, log console, enable RTC
2021-03-04 22:45:43 +08:00
winlin
3bb1b673c5
Merge SRS4, lots of features
2021-03-04 14:49:03 +08:00
winlin
bb3bd1705e
Refine the regression test tool, add missing files
2021-03-04 14:19:39 +08:00
winlin
5a66d15e85
Support regression test in CI.
2021-03-04 14:18:52 +08:00
winlin
dd8f7ff09a
Enable HTTP-FLV for conf/rtc.conf
2021-03-04 14:16:03 +08:00
winlin
d4b8a57cf7
Enable Object Cache and Zero Copy Nack by default. 4.0.77
2021-03-04 14:12:31 +08:00
winlin
f63441413d
RTC: Support disable the NACK no-copy, enable copy by default
2021-03-02 19:34:56 +08:00
winlin
29b33e6303
RTC: Disable player perf stat, because it should be refined.
2021-03-02 19:33:29 +08:00
winlin
8d7a201742
RTC: Remove unused config
2021-03-02 19:33:12 +08:00
winlin
501104e728
Perf: Limit the size of object cache pool
2021-03-02 19:32:56 +08:00
winlin
3989f2d553
RTC: Refine the stat logs, limit the object cache pool
2021-03-02 19:32:52 +08:00
winlin
4d0863468a
RTC: Cache the large buffer allocation
2021-03-02 19:32:40 +08:00
winlin
86f43d4f72
RTC: Support RTP packet cache manager
2021-03-02 19:32:32 +08:00
winlin
c20d8fb617
RTC: Support disable the NACK no-copy, enable copy by default
2021-02-28 18:51:27 +08:00
winlin
ab601ff386
RTC: Disable player perf stat, because it should be refined.
2021-02-27 12:54:06 +08:00
winlin
427e3e0d84
RTC: Remove unused config
2021-02-27 10:41:48 +08:00
winlin
a29d6cba68
Perf: Limit the size of object cache pool
2021-02-27 08:18:08 +08:00
winlin
7b3b7381e2
RTC: Refine the stat logs, limit the object cache pool
2021-02-27 07:41:51 +08:00
winlin
d5b210abc8
RTC: Cache the large buffer allocation
2021-02-26 19:46:52 +08:00
winlin
1833780655
RTC: Support RTP packet cache manager
2021-02-26 16:21:59 +08:00
xialixin@kanzhun.com
fdaee20b81
For #2200 , Enable RTC and FLV for GB28181
2021-02-19 18:54:12 +08:00
winlin
548fcd627b
Config: Update config files, daemon off, log to console
2021-02-19 18:54:00 +08:00
winlin
d8563398b2
Clock: Update stat. Insert timer to execute first
2021-02-19 18:53:02 +08:00
