diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 574217ba5..00418403a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -7,7 +7,7 @@ on:
jobs:
k8s:
- name: actions-release-k8s
+ name: release-k8s
runs-on: ubuntu-20.04
steps:
@@ -32,7 +32,7 @@ jobs:
shell: bash
run: |
echo "Release ossrs/srs:$SRS_TAG"
- docker build --tag ossrs/srs:$SRS_TAG -f trunk/Dockerfile .
+ docker build --tag ossrs/srs:$SRS_TAG trunk
- name: Login docker hub
uses: docker/login-action@v1
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 291ee14f4..000000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,47 +0,0 @@
-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'
\ No newline at end of file
diff --git a/README.md b/README.md
index 39d262cf4..7d9ec939f 100755
--- a/README.md
+++ b/README.md
@@ -1,8 +1,7 @@
# SRS(Simple Realtime Server)
-[](https://github.com/ossrs/srs/actions?query=workflow%3ATest+branch%3A3.0release)
-[](https://github.com/ossrs/srs/actions?query=workflow%3ARelease)
+[](https://circleci.com/gh/ossrs/srs/tree/3.0release)
[](https://codecov.io/gh/ossrs/srs/branch/3.0release)
[](https://github.com/ossrs/srs/wiki/v1_CN_Contact#wechat)
@@ -130,7 +129,6 @@ 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
* v3.0, 2021-08-14, [3.0 release8(3.0.168)](https://github.com/ossrs/srs/releases/tag/v3.0-r8) released. 124469 lines.
* v3.0, 2021-07-04, [3.0 release7(3.0.164)](https://github.com/ossrs/srs/releases/tag/v3.0-r7) released. 123463 lines.
* v3.0, 2021-07-04, For [#2424](https://github.com/ossrs/srs/issues/2424), use srandom/random to generate. 3.0.164
diff --git a/trunk/Dockerfile b/trunk/Dockerfile
index 7a3e32d34..a48b22e79 100644
--- a/trunk/Dockerfile
+++ b/trunk/Dockerfile
@@ -4,8 +4,8 @@ FROM ossrs/srs:dev AS build
RUN yum install -y gcc make gcc-c++ patch unzip perl git
# Build and install SRS.
-COPY . /srs
-WORKDIR /srs/trunk
+COPY . /trunk
+WORKDIR /trunk
RUN ./configure --jobs=2 && make -j2 && make install
# All config files for SRS.
@@ -23,8 +23,8 @@ RUN cp -R research/players /usr/local/srs/objs/nginx/html/
############################################################
FROM centos:7 AS dist
-# Expose ports for live streaming
-EXPOSE 1935 1985 8080
+# Expose ports for streaming @see https://github.com/ossrs/srs#ports
+EXPOSE 1935 1985 8080 8000/udp 10080/udp
# FFMPEG 4.1
COPY --from=build /usr/local/bin/ffmpeg /usr/local/srs/objs/ffmpeg/bin/ffmpeg
diff --git a/trunk/Dockerfile.cov b/trunk/Dockerfile.cov
deleted file mode 100644
index a898cb969..000000000
--- a/trunk/Dockerfile.cov
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/trunk/Dockerfile.test b/trunk/Dockerfile.test
deleted file mode 100644
index de1eb633e..000000000
--- a/trunk/Dockerfile.test
+++ /dev/null
@@ -1,9 +0,0 @@
-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
diff --git a/trunk/auto/coverage.sh b/trunk/auto/coverage.sh
index 25f7041d5..55cb7ce46 100644
--- a/trunk/auto/coverage.sh
+++ b/trunk/auto/coverage.sh
@@ -1,35 +1,36 @@
#!/bin/bash
# In .circleci/config.yml, generate *.gcno with
-# ./configure --gcov --with-utest --without-research --without-librtmp && make
+# ./configure --gcov --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
-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
+# 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
# Upload report with *.gcov
# Remark: The file codecov.yml is not neccessary. It literally depends on git.
@@ -40,6 +41,5 @@ fi
# 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) $CODECOV_ARGS &&
+bash <(curl -s https://codecov.io/bash) &&
echo "Done" && exit 0
-
diff --git a/trunk/src/app/srs_app_latest_version.cpp b/trunk/src/app/srs_app_latest_version.cpp
index 66ac01561..d67f40af4 100644
--- a/trunk/src/app/srs_app_latest_version.cpp
+++ b/trunk/src/app/srs_app_latest_version.cpp
@@ -44,8 +44,6 @@ extern bool _srs_in_docker;
void srs_build_features(stringstream& ss)
{
- ss << "&os=linux";
-
ss << "&docker=" << _srs_in_docker
<< "&packager=" << SRS_AUTO_PACKAGER;
}
diff --git a/trunk/src/core/srs_core_version3.hpp b/trunk/src/core/srs_core_version3.hpp
index d4156cec3..838281207 100644
--- a/trunk/src/core/srs_core_version3.hpp
+++ b/trunk/src/core/srs_core_version3.hpp
@@ -24,6 +24,6 @@
#ifndef SRS_CORE_VERSION3_HPP
#define SRS_CORE_VERSION3_HPP
-#define SRS_VERSION3_REVISION 170
+#define SRS_VERSION3_REVISION 168
#endif
diff --git a/trunk/src/service/srs_service_rtmp_conn.cpp b/trunk/src/service/srs_service_rtmp_conn.cpp
index 2f856d824..2a7c7c8bb 100644
--- a/trunk/src/service/srs_service_rtmp_conn.cpp
+++ b/trunk/src/service/srs_service_rtmp_conn.cpp
@@ -57,7 +57,6 @@ SrsBasicRtmpClient::~SrsBasicRtmpClient()
close();
srs_freep(kbps);
srs_freep(clk);
- srs_freep(req);
}
srs_error_t SrsBasicRtmpClient::connect()