mirror of
https://github.com/ossrs/srs.git
synced 2025-03-09 15:49:59 +00:00
Compare commits
31 commits
v3.0-r5
...
3.0release
Author | SHA1 | Date | |
---|---|---|---|
|
e801174ab2 | ||
|
b4220ee7c1 | ||
|
21be9daba4 | ||
|
9eadebdde7 | ||
|
2431e0b140 | ||
|
b3516b88dc | ||
|
1d79ef87a5 | ||
|
8d44b982ee | ||
|
b02c814251 | ||
|
c2b133bd07 | ||
|
b8177ff2fb | ||
|
34117027fd | ||
|
d21dadb285 | ||
|
6543aa8635 | ||
|
d81cba4d16 | ||
|
5c97da28c6 | ||
|
5c6bb63bf2 | ||
|
ea064166b7 | ||
|
d4c1bdf9d0 | ||
|
d72d05294d | ||
|
e7435a6237 | ||
|
2be8589a8a | ||
|
cf34ebc32f | ||
|
e7e05c434e | ||
|
9f9bc6a17f | ||
|
a1f5382240 | ||
|
e076300cd8 | ||
|
71dda68f62 | ||
|
b7af726ffc | ||
|
61a5e22af8 | ||
|
a3fddbe8b0 |
31 changed files with 1987 additions and 79 deletions
75
.github/workflows/release.yml
vendored
Normal file
75
.github/workflows/release.yml
vendored
Normal file
|
@ -0,0 +1,75 @@
|
|||
name: "Release"
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- v3*
|
||||
|
||||
jobs:
|
||||
k8s:
|
||||
name: actions-release-k8s
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
# The github.ref is, for example, refs/tags/v3.0.145 or refs/tags/v3.0-r8
|
||||
# Generate variables like:
|
||||
# SRS_TAG=v3.0.145
|
||||
# SRS_TAG=v3.0-r8
|
||||
# SRS_MAJOR=3
|
||||
# @see https://docs.github.com/en/actions/reference/workflow-commands-for-github-actions#setting-an-environment-variable
|
||||
- name: Generate varaiables
|
||||
shell: bash
|
||||
run: |
|
||||
SRS_TAG=$(echo ${{ github.ref }}| awk -F '/' '{print $3}')
|
||||
echo "SRS_TAG=$SRS_TAG" >> $GITHUB_ENV
|
||||
SRS_MAJOR=$(echo $SRS_TAG| cut -c 2)
|
||||
echo "SRS_MAJOR=$SRS_MAJOR" >> $GITHUB_ENV
|
||||
|
||||
- name: Build SRS
|
||||
shell: bash
|
||||
run: |
|
||||
echo "Release ossrs/srs:$SRS_TAG"
|
||||
docker build --tag ossrs/srs:$SRS_TAG -f trunk/Dockerfile .
|
||||
|
||||
- name: Login docker hub
|
||||
uses: docker/login-action@v1
|
||||
with:
|
||||
username: "${{ secrets.DOCKER_USERNAME }}"
|
||||
password: "${{ secrets.DOCKER_PASSWORD }}"
|
||||
- name: Push to docker hub
|
||||
shell: bash
|
||||
run: |
|
||||
docker push ossrs/srs:$SRS_TAG
|
||||
docker tag ossrs/srs:$SRS_TAG ossrs/srs:$SRS_MAJOR
|
||||
docker push ossrs/srs:$SRS_MAJOR
|
||||
|
||||
- name: Login Aliyun docker hub
|
||||
uses: aliyun/acr-login@v1
|
||||
with:
|
||||
login-server: https://registry.cn-hangzhou.aliyuncs.com
|
||||
username: "${{ secrets.ACR_USERNAME }}"
|
||||
password: "${{ secrets.ACR_PASSWORD }}"
|
||||
- name: Push to Aliyun docker hub
|
||||
shell: bash
|
||||
run: |
|
||||
docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
|
||||
docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
|
||||
docker tag ossrs/srs:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_MAJOR
|
||||
docker push registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_MAJOR
|
||||
|
||||
- name: Setup KUBCONFIG for Aliyun ACK
|
||||
shell: bash
|
||||
run: |-
|
||||
KUBECONFIG=$RUNNER_TEMP/kubeconfig_$(date +%s)
|
||||
echo "${{ secrets.KUBCONFIG }}" > $KUBECONFIG
|
||||
echo "KUBECONFIG=$KUBECONFIG" >> $GITHUB_ENV
|
||||
|
||||
- name: Release SRS 3.0 to Aliyun ACK
|
||||
shell: bash
|
||||
if: ${{ startsWith(github.ref, 'refs/tags/v3') }}
|
||||
run: |-
|
||||
kubectl set image deploy/srs3-deploy srs=registry.cn-hangzhou.aliyuncs.com/ossrs/srs:$SRS_TAG
|
||||
kubectl describe deploy/srs3-deploy
|
47
.github/workflows/test.yml
vendored
Normal file
47
.github/workflows/test.yml
vendored
Normal file
|
@ -0,0 +1,47 @@
|
|||
name: "Test"
|
||||
|
||||
on: [push, pull_request]
|
||||
|
||||
jobs:
|
||||
utest:
|
||||
name: actions-test-utest
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
################################################################
|
||||
# Tests
|
||||
- name: Build test image
|
||||
run: docker build --tag srs:test -f trunk/Dockerfile.test .
|
||||
# For utest
|
||||
- name: Run SRS utest
|
||||
run: docker run --rm srs:test bash -c 'make && ./objs/srs_utest'
|
||||
coverage:
|
||||
name: actions-test-coverage
|
||||
runs-on: ubuntu-20.04
|
||||
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v2
|
||||
|
||||
################################################################
|
||||
# Tests
|
||||
- name: Build coverage image
|
||||
run: docker build --tag srs:cov -f trunk/Dockerfile.cov .
|
||||
# For coverage
|
||||
- name: Run SRS covergae
|
||||
if: ${{ startsWith(github.ref, 'refs/heads/') || startsWith(github.ref, 'refs/pull/') }}
|
||||
run: |
|
||||
# The hash of commit.
|
||||
SRS_SHA=${{ github.sha }}
|
||||
# Note that the root of SRS, must contains .git, for report fixing.
|
||||
SRS_PROJECT=/srs
|
||||
# The github.ref is, for example, refs/heads/3.0release
|
||||
SRS_BRANCH=$(echo ${{ github.ref }}| awk -F 'refs/heads/' '{print $2}'| awk -F '/' '{print $1}')
|
||||
# The github.ref is, for example, refs/pull/2536/merge
|
||||
SRS_PR=$(echo ${{ github.ref }}| awk -F 'refs/pull/' '{print $2}'| awk -F '/' '{print $1}')
|
||||
echo "For ref=${{ github.ref }}, sha=${{ github.sha }}, SRS_BRANCH=$SRS_BRANCH, SRS_PR=$SRS_PR, SRS_SHA=$SRS_SHA, SRS_PROJECT=$SRS_PROJECT"
|
||||
docker run --rm --env SRS_BRANCH=$SRS_BRANCH --env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
|
||||
srs:cov bash -c 'make && ./objs/srs_utest && bash auto/coverage.sh'
|
73
README.md
73
README.md
|
@ -1,31 +1,32 @@
|
|||
# SRS(Simple Realtime Server)
|
||||
|
||||

|
||||
[](https://circleci.com/gh/ossrs/srs/tree/3.0release)
|
||||
[](https://github.com/ossrs/srs/actions?query=workflow%3ATest+branch%3A3.0release)
|
||||
[](https://github.com/ossrs/srs/actions?query=workflow%3ARelease)
|
||||
[](https://codecov.io/gh/ossrs/srs/branch/3.0release)
|
||||
[](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
|
||||
|
||||
SRS/3.0,[OuXuli][release3],是一个简单高效的实时视频服务器,支持RTMP/WebRTC/HLS/HTTP-FLV/SRT/GB28181。
|
||||
SRS/3.0,[OuXuli][release3],是一个简单高效的实时视频服务器,支持RTMP/HLS/HTTP-FLV。
|
||||
|
||||
SRS is a simple, high efficiency and realtime video server, supports RTMP/WebRTC/HLS/HTTP-FLV/SRT/GB28181.
|
||||
SRS is a simple, high efficiency and realtime video server, supports RTMP/HLS/HTTP-FLV.
|
||||
|
||||
> Remark: Although SRS is licenced under [MIT][LICENSE], but there are some depended libraries which are distributed using their own licenses, please read [License Mixing][LicenseMixing].
|
||||
|
||||
<a name="product"></a>
|
||||
## Usage
|
||||
|
||||
Recommend running SRS by [docker][docker-srs3], images is [here](https://hub.docker.com/r/ossrs/srs/tags) or [there](https://cr.console.aliyun.com/repository/cn-hangzhou/ossrs/srs/images):
|
||||
Build SRS from source, please read **Wiki: Gettting Started( [EN](https://github.com/ossrs/srs/wiki/v3_EN_Home#getting-started) / [CN](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started) )**:
|
||||
|
||||
```bash
|
||||
docker run --rm -p 1935:1935 -p 1985:1985 -p 8080:8080 ossrs/srs:3
|
||||
```
|
||||
git clone -b 3.0release https://gitee.com/ossrs/srs.git &&
|
||||
cd srs/trunk && ./configure && make && ./objs/srs -c conf/srs.conf
|
||||
```
|
||||
|
||||
Open [http://localhost:8080/](http://localhost:8080/) to check it, then publish
|
||||
[stream](https://github.com/ossrs/srs/blob/3.0release/trunk/doc/source.200kbps.768x320.flv) by:
|
||||
by [FFmpeg](https://ffmpeg.org/download.html) or [OBS](https://obsproject.com/download) as:
|
||||
|
||||
```bash
|
||||
docker run --rm --network=host ossrs/srs:encoder ffmpeg -re -i ./doc/source.200kbps.768x320.flv \
|
||||
-c copy -f flv -y rtmp://localhost/live/livestream
|
||||
ffmpeg -re -i ./doc/source.flv -c copy -f flv -y rtmp://localhost/live/livestream
|
||||
```
|
||||
|
||||
Play the following streams by [players](https://ossrs.net):
|
||||
|
@ -34,29 +35,17 @@ Play the following streams by [players](https://ossrs.net):
|
|||
* H5(HTTP-FLV): [http://localhost:8080/live/livestream.flv](http://localhost:8080/players/srs_player.html?autostart=true&stream=livestream.flv&port=8080&schema=http)
|
||||
* H5(HLS): [http://localhost:8080/live/livestream.m3u8](http://localhost:8080/players/srs_player.html?autostart=true&stream=livestream.m3u8&port=8080&schema=http)
|
||||
|
||||
It's also very easy to build from source:
|
||||
|
||||
```
|
||||
git clone -b 3.0release https://gitee.com/winlinvip/srs.oschina.git srs &&
|
||||
cd srs/trunk && git remote set-url origin https://github.com/ossrs/srs.git &&
|
||||
./configure && make && ./objs/srs -c conf/srs.conf
|
||||
```
|
||||
|
||||
> Note: We use [mirrors(gitee)](#mirrors) here, but it's also ok to `git clone https://github.com/ossrs/srs.git`
|
||||
|
||||
> Remark: Recommend to use Centos7 64bits, please read wiki([CN][v3_CN_Build],[EN][v3_EN_Build]), or use [docker][docker-dev].
|
||||
|
||||
<a name="srs-30-wiki"></a>
|
||||
<a name="wiki"></a>
|
||||
|
||||
From here, please read wikis:
|
||||
|
||||
* [SRS 3.0 English Wiki][v3_EN_Home], please read Wiki first.
|
||||
* [SRS 3.0 中文Wiki][v3_CN_Home],不读Wiki一定扑街,不读文档请不要提Issue,不读文档请不要提问题,任何文档中明确说过的疑问都不会解答。
|
||||
* [Getting Started](https://github.com/ossrs/srs/wiki/v3_EN_Home#getting-started), please read Wiki first.
|
||||
* [中文文档:起步](https://github.com/ossrs/srs/wiki/v3_CN_Home#getting-started),不读Wiki一定扑街,不读文档请不要提Issue,不读文档请不要提问题,任何文档中明确说过的疑问都不会解答。
|
||||
|
||||
Fast index for Wikis:
|
||||
|
||||
* Overview? ([CN][v3_EN_Home], [EN][v3_CN_Home])
|
||||
* Overview? ([CN][v3_CN_Home], [EN][v3_EN_Home])
|
||||
* How to deliver RTMP streaming?([CN][v1_CN_SampleRTMP], [EN][v1_EN_SampleRTMP])
|
||||
* How to build RTMP Edge-Cluster?([CN][v3_CN_SampleRTMPCluster], [EN][v3_EN_SampleRTMPCluster])
|
||||
* How to build RTMP Origin-Cluster?([CN][v3_CN_SampleOriginCluster], [EN][v3_EN_SampleOriginCluster])
|
||||
|
@ -141,6 +130,13 @@ Other important wiki:
|
|||
|
||||
## V3 changes
|
||||
|
||||
* v3.0, 2021-10-08, Fix [#2606](https://github.com/ossrs/srs/issues/2606): Memory leak for RTMP client, pick from 4.0. v3.0.170
|
||||
* <strong>v3.0, 2021-08-14, [3.0 release8(3.0.168)](https://github.com/ossrs/srs/releases/tag/v3.0-r8) released. 124469 lines.</strong>
|
||||
* <strong>v3.0, 2021-07-04, [3.0 release7(3.0.164)](https://github.com/ossrs/srs/releases/tag/v3.0-r7) released. 123463 lines.</strong>
|
||||
* v3.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 3.0.164
|
||||
* <strong>v3.0, 2021-06-26, [3.0 release6(3.0.163)](https://github.com/ossrs/srs/releases/tag/v3.0-r6) released. 123011 lines.</strong>
|
||||
* v3.0, 2021-06-26, For [#2424](https://github.com/ossrs/srs/issues/2424), query the latest available version. 3.0.163
|
||||
* v3.0, 2021-05-12, Fix [#2311][bug #2311], Copy the request for stat client. 3.0.162
|
||||
* <strong>v3.0, 2021-04-28, [3.0 release5(3.0.161)][r3.0r5] released. 122750 lines.</strong>
|
||||
* v3.0, 2021-04-28, Upgrade players. 3.0.161
|
||||
* <strong>v3.0, 2021-04-24, [3.0 release4(3.0.160)][r3.0r4] released. 122750 lines.</strong>
|
||||
|
@ -343,6 +339,11 @@ Other important wiki:
|
|||
|
||||
## V2 changes
|
||||
|
||||
* <strong>v2.0, 2021-08-14, [2.0 release11(2.0.276)](https://github.com/ossrs/srs/releases/tag/v2.0-r11) released. 89013 lines.</strong>
|
||||
* <strong>v2.0, 2021-07-04, [2.0 release10(2.0.274)](https://github.com/ossrs/srs/releases/tag/v2.0-r10) released. 87575 lines.</strong>
|
||||
* v2.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 2.0.274
|
||||
* <strong>v2.0, 2021-06-26, [2.0 release9(2.0.273)](https://github.com/ossrs/srs/releases/tag/v2.0-r9) released. 87552 lines.</strong>
|
||||
* v2.0, 2021-06-25, For [#2424](https://github.com/ossrs/srs/issues/2424), query the latest available version. 2.0.273
|
||||
* <strong>v2.0, 2020-01-25, [2.0 release8(2.0.272)][r2.0r8] released. 87292 lines.</strong>
|
||||
* v2.0, 2020-01-08, Merge [#1554][bug #1554], support logrotate copytruncate. 2.0.272
|
||||
* v2.0, 2020-01-05, Merge [#1551][bug #1551], fix memory leak in RTSP stack. 2.0.270
|
||||
|
@ -781,6 +782,9 @@ Other important wiki:
|
|||
|
||||
## Releases
|
||||
|
||||
* 2021-08-14, [Release v3.0-r8](https://github.com/ossrs/srs/releases/tag/v3.0-r8), 3.0 release8, 3.0.168, 124469 lines.
|
||||
* 2021-07-04, [Release v3.0-r7](https://github.com/ossrs/srs/releases/tag/v3.0-r7), 3.0 release7, 3.0.167, 123463 lines.
|
||||
* 2021-06-26, [Release v3.0-r6](https://github.com/ossrs/srs/releases/tag/v3.0-r6), 3.0 release6, 3.0.163, 123011 lines.
|
||||
* 2021-04-28, [Release v3.0-r5][r3.0r5], 3.0 release5, 3.0.161, 122750 lines.
|
||||
* 2021-04-24, [Release v3.0-r4][r3.0r4], 3.0 release4, 3.0.160, 122750 lines.
|
||||
* 2021-01-02, [Release v3.0-r3][r3.0r3], 3.0 release3, 3.0.156, 122736 lines.
|
||||
|
@ -1153,10 +1157,10 @@ A big THANK YOU goes to:
|
|||
|
||||
## Mirrors
|
||||
|
||||
OSChina: [https://gitee.com/winlinvip/srs.oschina][oschina], the GIT usage([CN][v1_CN_Git], [EN][v1_EN_Git])
|
||||
Gitee: [https://gitee.com/ossrs/srs][gitee], the GIT usage([CN][v1_CN_Git], [EN][v1_EN_Git])
|
||||
|
||||
```
|
||||
git clone https://gitee.com/winlinvip/srs.oschina.git srs &&
|
||||
git clone https://gitee.com/ossrs/srs.git &&
|
||||
cd srs && git remote set-url origin https://github.com/ossrs/srs.git && git pull
|
||||
```
|
||||
|
||||
|
@ -1177,12 +1181,12 @@ git clone https://github.com/ossrs/srs.git
|
|||
|
||||
| Branch | Cost | Size | CMD |
|
||||
| --- | --- | --- | --- |
|
||||
| 3.0release | 2m19.931s | 262MB | git clone -b 3.0release https://gitee.com/winlinvip/srs.oschina.git |
|
||||
| 3.0release | 0m56.515s | 95MB | git clone -b 3.0release --depth=1 https://gitee.com/winlinvip/srs.oschina.git |
|
||||
| develop | 2m22.430s | 234MB | git clone -b develop https://gitee.com/winlinvip/srs.oschina.git |
|
||||
| develop | 0m46.421s | 42MB | git clone -b develop --depth=1 https://gitee.com/winlinvip/srs.oschina.git |
|
||||
| min | 2m22.865s | 217MB | git clone -b min https://gitee.com/winlinvip/srs.oschina.git |
|
||||
| min | 0m36.472s | 11MB | git clone -b min --depth=1 https://gitee.com/winlinvip/srs.oschina.git |
|
||||
| 3.0release | 2m19.931s | 262MB | git clone -b 3.0release https://gitee.com/ossrs/srs.git |
|
||||
| 3.0release | 0m56.515s | 95MB | git clone -b 3.0release --depth=1 https://gitee.com/ossrs/srs.git |
|
||||
| develop | 2m22.430s | 234MB | git clone -b develop https://gitee.com/ossrs/srs.git |
|
||||
| develop | 0m46.421s | 42MB | git clone -b develop --depth=1 https://gitee.com/ossrs/srs.git |
|
||||
| min | 2m22.865s | 217MB | git clone -b min https://gitee.com/ossrs/srs.git |
|
||||
| min | 0m36.472s | 11MB | git clone -b min --depth=1 https://gitee.com/ossrs/srs.git |
|
||||
|
||||
## System Requirements
|
||||
|
||||
|
@ -1233,7 +1237,7 @@ Winlin
|
|||
[libx264]: http://www.videolan.org/
|
||||
[srs]: https://github.com/ossrs/srs
|
||||
[csdn]: https://code.csdn.net/winlinvip/srs-csdn
|
||||
[oschina]: https://gitee.com/winlinvip/srs.oschina
|
||||
[gitee]: https://gitee.com/ossrs/srs
|
||||
[srs-dolphin]: https://github.com/ossrs/srs-dolphin
|
||||
[oryx]: https://github.com/ossrs/go-oryx
|
||||
[srs-bench]: https://github.com/ossrs/srs-bench
|
||||
|
@ -1719,6 +1723,7 @@ Winlin
|
|||
[bug #1987]: https://github.com/ossrs/srs/issues/1987
|
||||
[bug #1548]: https://github.com/ossrs/srs/issues/1548
|
||||
[bug #1694]: https://github.com/ossrs/srs/issues/1694
|
||||
[bug #2311]: https://github.com/ossrs/srs/issues/2311
|
||||
[bug #yyyyyyyyyyyyy]: https://github.com/ossrs/srs/issues/yyyyyyyyyyyyy
|
||||
|
||||
[exo #828]: https://github.com/google/ExoPlayer/pull/828
|
||||
|
@ -1792,7 +1797,7 @@ Winlin
|
|||
[more0]: http://winlinvip.github.io/srs.release/releases/
|
||||
[more1]: http://ossrs.net/srs.release/releases/
|
||||
|
||||
[LICENSE]: https://github.com/ossrs/srs/blob/develop/LICENSE
|
||||
[LICENSE]: https://github.com/ossrs/srs/blob/3.0release/LICENSE
|
||||
[LicenseMixing]: https://github.com/ossrs/srs/wiki/LicenseMixing
|
||||
|
||||
[srs_CN]: https://github.com/ossrs/srs/wiki/v3_CN_Home
|
||||
|
|
1
trunk/.gitignore
vendored
1
trunk/.gitignore
vendored
|
@ -13,6 +13,7 @@
|
|||
/ide/srs_xcode/srs_xcode.xcodeproj/xcuserdata/
|
||||
/research/aac/
|
||||
/research/api-server/static-dir/mse
|
||||
/research/api-server/static-dir/crossdomain.xml
|
||||
/research/bat/
|
||||
/research/big/
|
||||
/research/bitch/
|
||||
|
|
36
trunk/Dockerfile
Normal file
36
trunk/Dockerfile
Normal file
|
@ -0,0 +1,36 @@
|
|||
FROM ossrs/srs:dev AS build
|
||||
|
||||
# Install depends tools.
|
||||
RUN yum install -y gcc make gcc-c++ patch unzip perl git
|
||||
|
||||
# Build and install SRS.
|
||||
COPY . /srs
|
||||
WORKDIR /srs/trunk
|
||||
RUN ./configure --jobs=2 && make -j2 && make install
|
||||
|
||||
# All config files for SRS.
|
||||
RUN cp -R conf /usr/local/srs/conf
|
||||
# The default index.html and srs-console.
|
||||
RUN cp research/api-server/static-dir/index.html /usr/local/srs/objs/nginx/html/
|
||||
RUN cp research/api-server/static-dir/favicon.ico /usr/local/srs/objs/nginx/html/
|
||||
RUN cp research/players/crossdomain.xml /usr/local/srs/objs/nginx/html/
|
||||
RUN cp -R research/console /usr/local/srs/objs/nginx/html/
|
||||
RUN cp -R research/players /usr/local/srs/objs/nginx/html/
|
||||
#RUN cp -R 3rdparty/signaling/www/demos /usr/local/srs/objs/nginx/html/
|
||||
|
||||
############################################################
|
||||
# dist
|
||||
############################################################
|
||||
FROM centos:7 AS dist
|
||||
|
||||
# Expose ports for live streaming
|
||||
EXPOSE 1935 1985 8080
|
||||
|
||||
# FFMPEG 4.1
|
||||
COPY --from=build /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg
|
||||
# SRS binary, config files and srs-console.
|
||||
COPY --from=build /usr/local/srs /usr/local/srs
|
||||
|
||||
# Default workdir and command.
|
||||
WORKDIR /usr/local/srs
|
||||
CMD ["./objs/srs", "-c", "conf/srs.conf"]
|
9
trunk/Dockerfile.cov
Normal file
9
trunk/Dockerfile.cov
Normal file
|
@ -0,0 +1,9 @@
|
|||
FROM ossrs/srs:dev
|
||||
|
||||
# Install depends tools.
|
||||
RUN yum install -y gcc make gcc-c++ patch unzip perl git
|
||||
|
||||
# Build and install SRS.
|
||||
COPY . /srs
|
||||
WORKDIR /srs/trunk
|
||||
RUN ./configure --with-utest --gcov --jobs=2 && make -j2
|
9
trunk/Dockerfile.test
Normal file
9
trunk/Dockerfile.test
Normal file
|
@ -0,0 +1,9 @@
|
|||
FROM ossrs/srs:dev
|
||||
|
||||
# Install depends tools.
|
||||
RUN yum install -y gcc make gcc-c++ patch unzip perl git
|
||||
|
||||
# Build and install SRS.
|
||||
COPY . /srs
|
||||
WORKDIR /srs/trunk
|
||||
RUN ./configure --with-utest --jobs=2 && make -j2
|
|
@ -11,6 +11,7 @@ echo "#ifndef SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
|
|||
echo "#define SRS_AUTO_HEADER_HPP" >> $SRS_AUTO_HEADERS_H
|
||||
echo "" >> $SRS_AUTO_HEADERS_H
|
||||
|
||||
echo "#define SRS_AUTO_PACKAGER \"${SRS_AUTO_PACKAGER}\"" >> $SRS_AUTO_HEADERS_H
|
||||
echo "#define SRS_AUTO_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H
|
||||
echo "#define SRS_AUTO_BUILD_DATE \"`date \"+%Y-%m-%d %H:%M:%S\"`\"" >> $SRS_AUTO_HEADERS_H
|
||||
echo "#define SRS_AUTO_UNAME \"`uname -a`\"" >> $SRS_AUTO_HEADERS_H
|
||||
|
|
|
@ -1,36 +1,35 @@
|
|||
#!/bin/bash
|
||||
|
||||
# In .circleci/config.yml, generate *.gcno with
|
||||
# ./configure --gcov --without-research --without-librtmp && make
|
||||
# ./configure --gcov --with-utest --without-research --without-librtmp && make
|
||||
# and generate *.gcda by
|
||||
# ./objs/srs_utest
|
||||
|
||||
# Workdir is objs/cover.
|
||||
workdir=`pwd`/objs/cover
|
||||
|
||||
# Tool git is required to map the right path.
|
||||
git --version >/dev/null 2>&1
|
||||
ret=$?; if [[ $ret -ne 0 ]]; then echo "Tool git is required, ret=$ret"; exit $ret; fi
|
||||
|
||||
# Create trunk under workdir.
|
||||
mkdir -p $workdir && cd $workdir
|
||||
ret=$?; if [[ $ret -ne 0 ]]; then echo "Enter workdir failed, ret=$ret"; exit $ret; fi
|
||||
|
||||
# Collect all *.gcno and *.gcda to objs/cover.
|
||||
cd $workdir && (rm -rf src && cp -R ../../src . && cp -R ../src/* src/)
|
||||
ret=$?; if [[ $ret -ne 0 ]]; then echo "Collect *.gcno and *.gcda failed, ret=$ret"; exit $ret; fi
|
||||
|
||||
# Generate *.gcov for coverage.
|
||||
cd $workdir &&
|
||||
for file in `find src -name "*.cpp"|grep -v utest`; do
|
||||
gcov $file -o `dirname $file`
|
||||
ret=$?; if [[ $ret -ne 0 ]]; then echo "Collect $file failed, ret=$ret"; exit $ret; fi
|
||||
done
|
||||
|
||||
# Cook the gcov files.
|
||||
cd $workdir &&
|
||||
find . -name "*.gcov"|grep -v srs|xargs rm -f
|
||||
ret=$?; if [[ $ret -ne 0 ]]; then echo "Cook gcov files failed, ret=$ret"; exit $ret; fi
|
||||
CODECOV_ARGS=""
|
||||
if [[ $SRS_PROJECT != '' ]]; then
|
||||
# -R root dir Used when not in git/hg project to identify project root directory
|
||||
# -p dir Project root directory. Also used when preparing gcov
|
||||
CODECOV_ARGS="$CODECOV_ARGS -R $SRS_PROJECT -p $SRS_PROJECT"
|
||||
fi
|
||||
if [[ $SRS_BRANCH != '' ]]; then
|
||||
# -B branch Specify the branch name
|
||||
CODECOV_ARGS="$CODECOV_ARGS -B $SRS_BRANCH"
|
||||
fi
|
||||
if [[ $SRS_SHA != '' ]]; then
|
||||
# -C sha Specify the commit sha
|
||||
CODECOV_ARGS="$CODECOV_ARGS -C $SRS_SHA"
|
||||
fi
|
||||
if [[ $SRS_PR != '' ]]; then
|
||||
# -P pr Specify the pull request number
|
||||
CODECOV_ARGS="$CODECOV_ARGS -P $SRS_PR"
|
||||
fi
|
||||
|
||||
# Upload report with *.gcov
|
||||
# Remark: The file codecov.yml is not neccessary. It literally depends on git.
|
||||
|
@ -41,5 +40,6 @@ ret=$?; if [[ $ret -ne 0 ]]; then echo "Cook gcov files failed, ret=$ret"; exit
|
|||
# https://circleci.com/gh/ossrs/srs/tree/3.0release
|
||||
cd $workdir &&
|
||||
export CODECOV_TOKEN="493bba46-c468-4e73-8b45-8cdd8ff62d96" &&
|
||||
bash <(curl -s https://codecov.io/bash) &&
|
||||
bash <(curl -s https://codecov.io/bash) $CODECOV_ARGS &&
|
||||
echo "Done" && exit 0
|
||||
|
||||
|
|
|
@ -105,6 +105,11 @@ inotify_auto_reload off;
|
|||
# default: on
|
||||
auto_reload_for_docker on;
|
||||
|
||||
# Query the latest available version of SRS, write a log to notice user to upgrade.
|
||||
# @see https://github.com/ossrs/srs/issues/2424
|
||||
# Default: on
|
||||
query_latest_version on;
|
||||
|
||||
#############################################################################################
|
||||
# heartbeat/stats sections
|
||||
#############################################################################################
|
||||
|
|
2
trunk/configure
vendored
2
trunk/configure
vendored
|
@ -228,7 +228,7 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then
|
|||
"srs_app_heartbeat" "srs_app_empty" "srs_app_http_client" "srs_app_http_static"
|
||||
"srs_app_recv_thread" "srs_app_security" "srs_app_statistic" "srs_app_hds"
|
||||
"srs_app_mpegts_udp" "srs_app_rtsp" "srs_app_listener" "srs_app_async_call"
|
||||
"srs_app_caster_flv" "srs_app_process" "srs_app_ng_exec"
|
||||
"srs_app_caster_flv" "srs_app_latest_version" "srs_app_uuid" "srs_app_process" "srs_app_ng_exec"
|
||||
"srs_app_hourglass" "srs_app_dash" "srs_app_fragment" "srs_app_dvr"
|
||||
"srs_app_coworkers")
|
||||
DEFINES=""
|
||||
|
|
1
trunk/doc/source.flv
Symbolic link
1
trunk/doc/source.flv
Symbolic link
|
@ -0,0 +1 @@
|
|||
source.200kbps.768x320.flv
|
|
@ -1,3 +0,0 @@
|
|||
<cross-domain-policy>
|
||||
<allow-access-from domain="*"/>
|
||||
</cross-domain-policy>
|
|
@ -4056,6 +4056,18 @@ bool SrsConfig::get_asprocess()
|
|||
return SRS_CONF_PERFER_FALSE(conf->arg0());
|
||||
}
|
||||
|
||||
bool SrsConfig::whether_query_latest_version()
|
||||
{
|
||||
static bool DEFAULT = true;
|
||||
|
||||
SrsConfDirective* conf = root->get("query_latest_version");
|
||||
if (!conf) {
|
||||
return DEFAULT;
|
||||
}
|
||||
|
||||
return SRS_CONF_PERFER_TRUE(conf->arg0());
|
||||
}
|
||||
|
||||
bool SrsConfig::empty_ip_ok()
|
||||
{
|
||||
static bool DEFAULT = true;
|
||||
|
|
|
@ -468,6 +468,8 @@ public:
|
|||
virtual std::string get_work_dir();
|
||||
// Whether use asprocess mode.
|
||||
virtual bool get_asprocess();
|
||||
// Whether query the latest available version of SRS.
|
||||
virtual bool whether_query_latest_version();
|
||||
// Whether empty client IP is ok.
|
||||
virtual bool empty_ip_ok();
|
||||
// Get the start wait in ms for gracefully quit.
|
||||
|
|
|
@ -75,7 +75,7 @@ SrsBufferCache::~SrsBufferCache()
|
|||
srs_freep(req);
|
||||
}
|
||||
|
||||
srs_error_t SrsBufferCache::update(SrsSource* s, SrsRequest* r)
|
||||
srs_error_t SrsBufferCache::update_auth(SrsSource* s, SrsRequest* r)
|
||||
{
|
||||
srs_freep(req);
|
||||
req = r->copy();
|
||||
|
@ -523,7 +523,7 @@ SrsLiveStream::~SrsLiveStream()
|
|||
srs_freep(req);
|
||||
}
|
||||
|
||||
srs_error_t SrsLiveStream::update(SrsSource* s, SrsRequest* r)
|
||||
srs_error_t SrsLiveStream::update_auth(SrsSource* s, SrsRequest* r)
|
||||
{
|
||||
source = s;
|
||||
|
||||
|
@ -938,9 +938,10 @@ srs_error_t SrsHttpStreamServer::http_mount(SrsSource* s, SrsRequest* r)
|
|||
}
|
||||
srs_trace("http: mount flv stream for sid=%s, mount=%s", sid.c_str(), mount.c_str());
|
||||
} else {
|
||||
// The entry exists, we reuse it and update the request of stream and cache.
|
||||
entry = sflvs[sid];
|
||||
entry->stream->update(s, r);
|
||||
entry->cache->update(s, r);
|
||||
entry->stream->update_auth(s, r);
|
||||
entry->cache->update_auth(s, r);
|
||||
}
|
||||
|
||||
if (entry->stream) {
|
||||
|
|
|
@ -46,7 +46,7 @@ private:
|
|||
public:
|
||||
SrsBufferCache(SrsSource* s, SrsRequest* r);
|
||||
virtual ~SrsBufferCache();
|
||||
virtual srs_error_t update(SrsSource* s, SrsRequest* r);
|
||||
virtual srs_error_t update_auth(SrsSource* s, SrsRequest* r);
|
||||
public:
|
||||
virtual srs_error_t start();
|
||||
virtual srs_error_t dump_cache(SrsConsumer* consumer, SrsRtmpJitterAlgorithm jitter);
|
||||
|
@ -188,7 +188,7 @@ private:
|
|||
public:
|
||||
SrsLiveStream(SrsSource* s, SrsRequest* r, SrsBufferCache* c);
|
||||
virtual ~SrsLiveStream();
|
||||
virtual srs_error_t update(SrsSource* s, SrsRequest* r);
|
||||
virtual srs_error_t update_auth(SrsSource* s, SrsRequest* r);
|
||||
public:
|
||||
virtual srs_error_t serve_http(ISrsHttpResponseWriter* w, ISrsHttpMessage* r);
|
||||
private:
|
||||
|
|
|
@ -484,7 +484,7 @@ void SrsIngester::show_ingest_log_message()
|
|||
}
|
||||
|
||||
// random choose one ingester to report.
|
||||
int index = rand() % (int)ingesters.size();
|
||||
int index = srs_random() % (int)ingesters.size();
|
||||
SrsIngesterFFMPEG* ingester = ingesters.at(index);
|
||||
|
||||
// reportable
|
||||
|
|
187
trunk/src/app/srs_app_latest_version.cpp
Normal file
187
trunk/src/app/srs_app_latest_version.cpp
Normal file
|
@ -0,0 +1,187 @@
|
|||
/*
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2013-2015 SRS(ossrs)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <srs_app_latest_version.hpp>
|
||||
|
||||
#include <srs_core_autofree.hpp>
|
||||
#include <srs_kernel_error.hpp>
|
||||
#include <srs_kernel_log.hpp>
|
||||
#include <srs_kernel_utility.hpp>
|
||||
#include <srs_protocol_json.hpp>
|
||||
#include <srs_protocol_utility.hpp>
|
||||
#include <srs_app_config.hpp>
|
||||
#include <srs_app_http_conn.hpp>
|
||||
#include <srs_app_http_client.hpp>
|
||||
#include <srs_app_utility.hpp>
|
||||
#include <srs_app_uuid.hpp>
|
||||
|
||||
#include <unistd.h>
|
||||
#include <sstream>
|
||||
using namespace std;
|
||||
|
||||
// Whether we are in docker, defined in main module.
|
||||
extern bool _srs_in_docker;
|
||||
|
||||
void srs_build_features(stringstream& ss)
|
||||
{
|
||||
ss << "&os=linux";
|
||||
|
||||
ss << "&docker=" << _srs_in_docker
|
||||
<< "&packager=" << SRS_AUTO_PACKAGER;
|
||||
}
|
||||
|
||||
SrsLatestVersion::SrsLatestVersion()
|
||||
{
|
||||
trd_ = new SrsSTCoroutine("signal", this);
|
||||
}
|
||||
|
||||
SrsLatestVersion::~SrsLatestVersion()
|
||||
{
|
||||
srs_freep(trd_);
|
||||
}
|
||||
|
||||
srs_error_t SrsLatestVersion::start()
|
||||
{
|
||||
if (!_srs_config->whether_query_latest_version()) {
|
||||
return srs_success;
|
||||
}
|
||||
|
||||
if (true) {
|
||||
uuid_t uuid;
|
||||
uuid_generate_time(uuid);
|
||||
|
||||
char buf[32];
|
||||
for (int i = 0; i < 16; i++) {
|
||||
snprintf(buf + i * 2, sizeof(buf), "%02x", uuid[i]);
|
||||
}
|
||||
server_id_ = string(buf, sizeof(buf));
|
||||
}
|
||||
|
||||
return trd_->start();
|
||||
}
|
||||
|
||||
srs_error_t SrsLatestVersion::cycle()
|
||||
{
|
||||
srs_error_t err = srs_success;
|
||||
|
||||
srs_utime_t first_random_wait = 0;
|
||||
srs_random_generate((char*)&first_random_wait, 8);
|
||||
first_random_wait = srs_utime_t(uint64_t((first_random_wait + srs_update_system_time() + getpid())) % (5 * 60)) * SRS_UTIME_SECONDS; // in s.
|
||||
|
||||
// Only report after 5+ minutes.
|
||||
first_random_wait += 5 * 60 * SRS_UTIME_SECONDS;
|
||||
|
||||
srs_trace("Startup query id=%s, eip=%s, wait=%ds", server_id_.c_str(), srs_get_public_internet_address().c_str(), srsu2msi(first_random_wait)/1000);
|
||||
srs_usleep(first_random_wait);
|
||||
|
||||
while (true) {
|
||||
srs_utime_t starttime = srs_update_system_time();
|
||||
if ((err = query_latest_version()) != srs_success) {
|
||||
srs_warn("query err %s", srs_error_desc(err).c_str());
|
||||
srs_freep(err); // Ignore any error.
|
||||
}
|
||||
|
||||
srs_trace("Finish query id=%s, eip=%s, match=%s, stable=%s, cost=%dms", server_id_.c_str(), srs_get_public_internet_address().c_str(), match_version_.c_str(), stable_version_.c_str(), srsu2msi(srs_update_system_time() - starttime));
|
||||
srs_usleep(3600 * SRS_UTIME_SECONDS); // Every an hour.
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
srs_error_t SrsLatestVersion::query_latest_version()
|
||||
{
|
||||
srs_error_t err = srs_success;
|
||||
|
||||
// Generate uri and parse to object.
|
||||
stringstream ss;
|
||||
ss << "http://api.ossrs.net/service/v1/releases?"
|
||||
<< "version=v" << VERSION_MAJOR << "." << VERSION_MINOR << "." << VERSION_REVISION
|
||||
<< "&id=" << server_id_ << "&role=srs"
|
||||
<< "&eip=" << srs_get_public_internet_address()
|
||||
<< "&ts=" << srs_get_system_time()
|
||||
<< "&alive=" << srsu2ms(srs_get_system_time() - srs_get_system_startup_time()) / 1000;
|
||||
srs_build_features(ss);
|
||||
|
||||
string url = ss.str();
|
||||
|
||||
SrsHttpUri uri;
|
||||
if ((err = uri.initialize(url)) != srs_success) {
|
||||
return srs_error_wrap(err, "http: post failed. url=%s", url.c_str());
|
||||
}
|
||||
|
||||
// Start HTTP request and read response.
|
||||
SrsHttpClient http;
|
||||
if ((err = http.initialize(uri.get_host(), uri.get_port())) != srs_success) {
|
||||
return err;
|
||||
}
|
||||
|
||||
// Path with query.
|
||||
string path = uri.get_path();
|
||||
path += "?";
|
||||
path += uri.get_query();
|
||||
|
||||
ISrsHttpMessage* msg = NULL;
|
||||
if ((err = http.get(path, "", &msg)) != srs_success) {
|
||||
return err;
|
||||
}
|
||||
SrsAutoFree(ISrsHttpMessage, msg);
|
||||
|
||||
string res;
|
||||
int code = msg->status_code();
|
||||
if ((err = msg->body_read_all(res)) != srs_success) {
|
||||
return err;
|
||||
}
|
||||
|
||||
// Check the response code and content.
|
||||
if (code != SRS_CONSTS_HTTP_OK) {
|
||||
return srs_error_new(ERROR_HTTP_STATUS_INVALID, "invalid response status=%d", code);
|
||||
}
|
||||
|
||||
if (res.empty()) {
|
||||
return srs_error_new(ERROR_HTTP_DATA_INVALID, "invalid empty response");
|
||||
}
|
||||
|
||||
// Response in json object.
|
||||
SrsJsonAny* jres = SrsJsonAny::loads((char*)res.c_str());
|
||||
if (!jres || !jres->is_object()) {
|
||||
return srs_error_new(ERROR_HTTP_DATA_INVALID, "invalid response %s", res.c_str());
|
||||
}
|
||||
SrsAutoFree(SrsJsonAny, jres);
|
||||
|
||||
SrsJsonObject* obj = jres->to_object();
|
||||
SrsJsonAny* prop = NULL;
|
||||
|
||||
// Parse fields of response.
|
||||
if ((prop = obj->ensure_property_string("match_version")) == NULL) {
|
||||
return srs_error_new(ERROR_RESPONSE_CODE, "no match_version");
|
||||
}
|
||||
match_version_ = prop->to_str();
|
||||
|
||||
if ((prop = obj->ensure_property_string("stable_version")) == NULL) {
|
||||
return srs_error_new(ERROR_RESPONSE_CODE, "no stable_version");
|
||||
}
|
||||
stable_version_ = prop->to_str();
|
||||
|
||||
return err;
|
||||
}
|
||||
|
58
trunk/src/app/srs_app_latest_version.hpp
Normal file
58
trunk/src/app/srs_app_latest_version.hpp
Normal file
|
@ -0,0 +1,58 @@
|
|||
/*
|
||||
The MIT License (MIT)
|
||||
|
||||
Copyright (c) 2013-2015 SRS(ossrs)
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
*/
|
||||
|
||||
#ifndef SRS_APP_LATEST_VERSION_HPP
|
||||
#define SRS_APP_LATEST_VERSION_HPP
|
||||
|
||||
/*
|
||||
#include <srs_app_latest_version.hpp>
|
||||
*/
|
||||
|
||||
#include <srs_core.hpp>
|
||||
|
||||
#include <srs_app_thread.hpp>
|
||||
|
||||
#include <string>
|
||||
|
||||
class SrsLatestVersion : public ISrsCoroutineHandler
|
||||
{
|
||||
private:
|
||||
SrsCoroutine* trd_;
|
||||
std::string server_id_;
|
||||
private:
|
||||
std::string match_version_;
|
||||
std::string stable_version_;
|
||||
public:
|
||||
SrsLatestVersion();
|
||||
virtual ~SrsLatestVersion();
|
||||
public:
|
||||
virtual srs_error_t start();
|
||||
// interface ISrsEndlessThreadHandler.
|
||||
public:
|
||||
virtual srs_error_t cycle();
|
||||
private:
|
||||
srs_error_t query_latest_version();
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
@ -54,6 +54,7 @@ using namespace std;
|
|||
#include <srs_kernel_consts.hpp>
|
||||
#include <srs_app_thread.hpp>
|
||||
#include <srs_app_coworkers.hpp>
|
||||
#include <srs_app_latest_version.hpp>
|
||||
|
||||
// system interval in srs_utime_t,
|
||||
// all resolution times should be times togother,
|
||||
|
@ -623,6 +624,7 @@ SrsServer::SrsServer()
|
|||
pid_fd = -1;
|
||||
|
||||
signal_manager = new SrsSignalManager(this);
|
||||
latest_version_ = new SrsLatestVersion();
|
||||
conn_manager = new SrsCoroutineManager();
|
||||
|
||||
handler = NULL;
|
||||
|
@ -659,6 +661,7 @@ void SrsServer::destroy()
|
|||
}
|
||||
|
||||
srs_freep(signal_manager);
|
||||
srs_freep(latest_version_);
|
||||
srs_freep(conn_manager);
|
||||
}
|
||||
|
||||
|
@ -787,7 +790,18 @@ srs_error_t SrsServer::initialize_st()
|
|||
|
||||
srs_error_t SrsServer::initialize_signal()
|
||||
{
|
||||
return signal_manager->initialize();
|
||||
srs_error_t err = srs_success;
|
||||
|
||||
if ((err = signal_manager->initialize()) != srs_success) {
|
||||
return srs_error_wrap(err, "init signal manager");
|
||||
}
|
||||
|
||||
// Start the version query coroutine.
|
||||
if ((err = latest_version_->start()) != srs_success) {
|
||||
return srs_error_wrap(err, "start version query");
|
||||
}
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
srs_error_t SrsServer::acquire_pid_file()
|
||||
|
|
|
@ -51,6 +51,7 @@ class SrsUdpListener;
|
|||
class SrsTcpListener;
|
||||
class SrsAppCasterFlv;
|
||||
class SrsCoroutineManager;
|
||||
class SrsLatestVersion;
|
||||
|
||||
// The listener type for server to identify the connection,
|
||||
// that is, use different type to process the connection.
|
||||
|
@ -239,6 +240,8 @@ private:
|
|||
std::vector<SrsListener*> listeners;
|
||||
// Signal manager which convert gignal to io message.
|
||||
SrsSignalManager* signal_manager;
|
||||
// To query the latest available version of SRS.
|
||||
SrsLatestVersion* latest_version_;
|
||||
// Handle in server cycle.
|
||||
ISrsServerCycle* handler;
|
||||
// User send the signal, convert to variable.
|
||||
|
|
|
@ -215,6 +215,7 @@ SrsStatisticClient::SrsStatisticClient()
|
|||
|
||||
SrsStatisticClient::~SrsStatisticClient()
|
||||
{
|
||||
srs_freep(req);
|
||||
}
|
||||
|
||||
srs_error_t SrsStatisticClient::dumps(SrsJsonObject* obj)
|
||||
|
@ -425,10 +426,14 @@ srs_error_t SrsStatistic::on_client(std::string id, SrsRequest* req, SrsConnecti
|
|||
|
||||
// got client.
|
||||
client->conn = conn;
|
||||
client->req = req;
|
||||
client->type = type;
|
||||
stream->nb_clients++;
|
||||
vhost->nb_clients++;
|
||||
|
||||
// The req might be freed, in such as SrsLiveStream::update, so we must copy it.
|
||||
// @see https://github.com/ossrs/srs/issues/2311
|
||||
srs_freep(client->req);
|
||||
client->req = req->copy();
|
||||
|
||||
return err;
|
||||
}
|
||||
|
|
1320
trunk/src/app/srs_app_uuid.cpp
Normal file
1320
trunk/src/app/srs_app_uuid.cpp
Normal file
File diff suppressed because it is too large
Load diff
112
trunk/src/app/srs_app_uuid.hpp
Normal file
112
trunk/src/app/srs_app_uuid.hpp
Normal file
|
@ -0,0 +1,112 @@
|
|||
//
|
||||
// libuuid BSD License @see https://sourceforge.net/projects/libuuid/
|
||||
//
|
||||
// SPDX-License-Identifier: BSD-3-Clause
|
||||
//
|
||||
#include <srs_core.hpp>
|
||||
|
||||
/*
|
||||
* Public include file for the UUID library
|
||||
*
|
||||
* Copyright (C) 1996, 1997, 1998 Theodore Ts'o.
|
||||
*
|
||||
* %Begin-Header%
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
* modification, are permitted provided that the following conditions
|
||||
* are met:
|
||||
* 1. Redistributions of source code must retain the above copyright
|
||||
* notice, and the entire permission notice in its entirety,
|
||||
* including the disclaimer of warranties.
|
||||
* 2. Redistributions in binary form must reproduce the above copyright
|
||||
* notice, this list of conditions and the following disclaimer in the
|
||||
* documentation and/or other materials provided with the distribution.
|
||||
* 3. The name of the author may not be used to endorse or promote
|
||||
* products derived from this software without specific prior
|
||||
* written permission.
|
||||
*
|
||||
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
||||
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
|
||||
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, ALL OF
|
||||
* WHICH ARE HEREBY DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
|
||||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
|
||||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT
|
||||
* OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
|
||||
* BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
|
||||
* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
||||
* USE OF THIS SOFTWARE, EVEN IF NOT ADVISED OF THE POSSIBILITY OF SUCH
|
||||
* DAMAGE.
|
||||
* %End-Header%
|
||||
*/
|
||||
|
||||
#ifndef _UUID_UUID_H
|
||||
#define _UUID_UUID_H
|
||||
|
||||
#include <sys/types.h>
|
||||
#ifndef _WIN32
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
#include <time.h>
|
||||
|
||||
typedef unsigned char uuid_t[16];
|
||||
|
||||
/* UUID Variant definitions */
|
||||
#define UUID_VARIANT_NCS 0
|
||||
#define UUID_VARIANT_DCE 1
|
||||
#define UUID_VARIANT_MICROSOFT 2
|
||||
#define UUID_VARIANT_OTHER 3
|
||||
|
||||
/* UUID Type definitions */
|
||||
#define UUID_TYPE_DCE_TIME 1
|
||||
#define UUID_TYPE_DCE_RANDOM 4
|
||||
|
||||
/* Allow UUID constants to be defined */
|
||||
#ifdef __GNUC__
|
||||
#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
|
||||
static const uuid_t name __attribute__ ((unused)) = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
|
||||
#else
|
||||
#define UUID_DEFINE(name,u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15) \
|
||||
static const uuid_t name = {u0,u1,u2,u3,u4,u5,u6,u7,u8,u9,u10,u11,u12,u13,u14,u15}
|
||||
#endif
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/* clear.c */
|
||||
void uuid_clear(uuid_t uu);
|
||||
|
||||
/* compare.c */
|
||||
int uuid_compare(const uuid_t uu1, const uuid_t uu2);
|
||||
|
||||
/* copy.c */
|
||||
void uuid_copy(uuid_t dst, const uuid_t src);
|
||||
|
||||
/* gen_uuid.c */
|
||||
void uuid_generate(uuid_t out);
|
||||
void uuid_generate_random(uuid_t out);
|
||||
void uuid_generate_time(uuid_t out);
|
||||
int uuid_generate_time_safe(uuid_t out);
|
||||
|
||||
/* isnull.c */
|
||||
int uuid_is_null(const uuid_t uu);
|
||||
|
||||
/* parse.c */
|
||||
int uuid_parse(const char *in, uuid_t uu);
|
||||
|
||||
/* unparse.c */
|
||||
void uuid_unparse(const uuid_t uu, char *out);
|
||||
void uuid_unparse_lower(const uuid_t uu, char *out);
|
||||
void uuid_unparse_upper(const uuid_t uu, char *out);
|
||||
|
||||
/* uuid_time.c */
|
||||
time_t uuid_time(const uuid_t uu, struct timeval *ret_tv);
|
||||
int uuid_type(const uuid_t uu);
|
||||
int uuid_variant(const uuid_t uu);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
|
||||
#endif /* _UUID_UUID_H */
|
||||
|
|
@ -24,6 +24,6 @@
|
|||
#ifndef SRS_CORE_VERSION3_HPP
|
||||
#define SRS_CORE_VERSION3_HPP
|
||||
|
||||
#define SRS_VERSION3_REVISION 161
|
||||
#define SRS_VERSION3_REVISION 170
|
||||
|
||||
#endif
|
||||
|
|
|
@ -119,7 +119,7 @@ srs_utime_t srs_get_system_startup_time()
|
|||
if (_srs_system_time_startup_time <= 0) {
|
||||
srs_update_system_time();
|
||||
}
|
||||
|
||||
|
||||
return _srs_system_time_startup_time;
|
||||
}
|
||||
|
||||
|
|
|
@ -150,18 +150,23 @@ void srs_parse_query_string(string q, map<string,string>& query)
|
|||
|
||||
void srs_random_generate(char* bytes, int size)
|
||||
{
|
||||
static bool _random_initialized = false;
|
||||
if (!_random_initialized) {
|
||||
srand(0);
|
||||
_random_initialized = true;
|
||||
}
|
||||
|
||||
for (int i = 0; i < size; i++) {
|
||||
// the common value in [0x0f, 0xf0]
|
||||
bytes[i] = 0x0f + (rand() % (256 - 0x0f - 0x0f));
|
||||
bytes[i] = 0x0f + (srs_random() % (256 - 0x0f - 0x0f));
|
||||
}
|
||||
}
|
||||
|
||||
long srs_random()
|
||||
{
|
||||
static bool _random_initialized = false;
|
||||
if (!_random_initialized) {
|
||||
_random_initialized = true;
|
||||
srandom((unsigned int)srs_get_system_startup_time());
|
||||
}
|
||||
|
||||
return random();
|
||||
}
|
||||
|
||||
string srs_generate_tc_url(string host, string vhost, string app, int port)
|
||||
{
|
||||
string tcUrl = "rtmp://";
|
||||
|
|
|
@ -69,6 +69,8 @@ extern void srs_parse_query_string(std::string q, std::map<std::string, std::str
|
|||
* generate ramdom data for handshake.
|
||||
*/
|
||||
extern void srs_random_generate(char* bytes, int size);
|
||||
// Generate random value, use srandom(now_us) to init seed if not initialized.
|
||||
extern long srs_random();
|
||||
|
||||
/**
|
||||
* generate the tcUrl without param.
|
||||
|
|
|
@ -357,7 +357,7 @@ namespace srs_internal
|
|||
|
||||
key_block::key_block()
|
||||
{
|
||||
offset = (int32_t)rand();
|
||||
offset = (int32_t)srs_random();
|
||||
random0 = NULL;
|
||||
random1 = NULL;
|
||||
|
||||
|
@ -439,7 +439,7 @@ namespace srs_internal
|
|||
|
||||
digest_block::digest_block()
|
||||
{
|
||||
offset = (int32_t)rand();
|
||||
offset = (int32_t)srs_random();
|
||||
random0 = NULL;
|
||||
random1 = NULL;
|
||||
|
||||
|
|
|
@ -57,6 +57,7 @@ SrsBasicRtmpClient::~SrsBasicRtmpClient()
|
|||
close();
|
||||
srs_freep(kbps);
|
||||
srs_freep(clk);
|
||||
srs_freep(req);
|
||||
}
|
||||
|
||||
srs_error_t SrsBasicRtmpClient::connect()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue