Commit Graph

415 Commits (9c81a0e1bdc367e9556a70310d077f77103a2283)

Author SHA1 Message Date
mapengfei53 eb04f92176
Config: Support overwrote by environment variables. (#3197)
* Support overwrite by environment virable.

* modify duplicated code

* Config: Add stat for envrionment config.

* Config: Fix utest fail.

Co-authored-by: pengfei.ma <pengfei.ma@ctechm.com>
Co-authored-by: winlin <winlin@vip.126.com>
2 years ago
chundonglinlin 9525511032
Exporter: Listen at port 9972 for Prometheus exporter. (#3195) 2 years ago
winlin 173c683566 GB28181: Refine SRS listeners without wrapper. 2 years ago
winlin 5f8da02ee7 API: Refine stat and config for prometheus exporter. 2 years ago
chundonglinlin 981cab40d3
API: support metrics for prometheus.(#2899) (#3189)
* API: support metrics for prometheus.

* Metrics: optimize metrics statistics info.

* Refine: remove redundant code.

* Refine: fix metrics srs_streams param.

* Metrics: add major param.

* Metrics: refine params and metric comments.

* For #2899: API: Support exporter for Prometheus. v5.0.67

Co-authored-by: winlin <winlin@vip.126.com>
2 years ago
winlin d4898bec3c APM: Check endpoint port and team. 2 years ago
winlin 3e2f8622f8 APM: Support distributed tracing by Tencent Cloud APM. v5.0.63 2 years ago
winlin 625069af7f WebRTC: Extract SrsRtcNetwork layer for UDP/TCP. 3 years ago
winlin 770d959148 WebRTC: Support config, listener and SDP for TCP transport. 3 years ago
winlin 38c3d9f1a7 Config: Refine config file, nothing changed. 3 years ago
winlin 84c96076a9 Merge branch '4.0release' into develop 3 years ago
winlin 4a225c5640 For #307: WebRTC: Support use domain name as CANDIDATE. v4.0.259 3 years ago
winlin 783aea7ac3 Fix #1405: Support guessing IBMF first. v5.0.58 3 years ago
winlin e027d28c4d HLS: Support disable hls_ts_ctx. 3 years ago
winlin 7d47017a00 Ingest: Still use -re for stream to ingest HLS better. 3 years ago
winlin 6a108fab6d Fix #2837: Callback: Support stream_url and stream_id. v5.0.55 3 years ago
winlin 457738f6eb Fix #2881: HTTP: Support merging api to server. v5.0.47 3 years ago
winlin d39995cc31 HLS: Enable hls_ctx by default. 3 years ago
ChenHaibo 2c569f568c HLS: Support config hls_ctx to disable HLS streaming. 3 years ago
winlin 5757950860 Merge 4.0release 3 years ago
winlin cdccdf70b8 Hooks: Remove on_connect and on_close from doc. 3 years ago
winlin 18d25eacfb Merge 4.0release 3 years ago
winlin 95cd0e84eb Log: Support write log to tencentcloud CLS. v5.0.44 3 years ago
winlin 3da0b57121 Merge 4.0release. 3 years ago
winlin 9923c749d4 STAT: Support config server_id and generate one if empty. v4.0.257 3 years ago
winlin f7280399d4 Merge 4.0release, migrate to new website. 3 years ago
winlin d57e9c758e Docs: Migrate to ossrs.net and ossrs.io 3 years ago
winlin b2e083b00d Support multiple threads by thread pool. v5.0.32 3 years ago
winlin e05535267b Disable reload for log config. 3 years ago
hondaxiao fbc6eebe18 SRT: remove rtmp_to_srt 3 years ago
hondaxiao 59d9cdbe61 SRT: add option peer_idle_timeout in full.conf 3 years ago
hondaxiao a929f79d2c SRT: Add SRT option annotation in full.conf 3 years ago
winlin 3616c9976a SRT: Add srt vhost section to full.conf. 3 years ago
winlin ef553b571c SRT: Update full.conf for review. 3 years ago
winlin bda0268a37 SRT: Update full.conf for new configs. 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
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
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 4110fb14cb Squash: Fix bugs. v5.0.20 3 years ago
winlin fbb6d9464c Discover api server and ip as candidates. v4.0.218 3 years ago
winlin 7808bd7ca8 Support config in_docker to fix the detect fail. (#2824). v4.0.216 3 years ago
winlin 716e578a19 Squash: Fix bugs 3 years ago
winlin faf5fb0a83 Refine the config 3 years ago
winlin 66435d583a Squash: Fix stat bug 3 years ago
winlin f3380d2ec0 Fix bug for CPU arch info 3 years ago
winlin b874d9c9ba Squash: Merge SRS 4.0, regression test for RTMP. 3 years ago
winlin 71ed6e5dc5 RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174 3 years ago
winlin fe9e43b6d4 RTC: Refine config for RTC 3 years ago
winlin f8b4121497 Test: Add Multiple Sequence test for RTMP 3 years ago
winlin 0f9b9505a8 RTC: Change rtc.aac to discard by default. v4.0.172 3 years ago