Compare commits

...

10 Commits

Author SHA1 Message Date
dependabot[bot]
15cecc97a2
Upgrade actions/download-artifact from 6 to 7 version (#1785)
Some checks failed
MinGW / build (OFF, Release, windows) (push) Has been cancelled
MSVC / code analysis (windows-vc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_TYPE }}-${{ matrix.BUILD_SHARED_LIBS }}) (OFF, Release, x64, v143) (push) Has been cancelled
MSVC / compile (${{ matrix.os }}-vc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_TYPE }}-${{ matrix.BUILD_SHARED_LIBS }}) (OFF, Debug, Win32, v142, windows, x86-windows) (push) Has been cancelled
MSVC / compile (${{ matrix.os }}-vc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_TYPE }}-${{ matrix.BUILD_SHARED_LIBS }}) (OFF, Debug, x64, v143, windows, x64-windows) (push) Has been cancelled
MSVC / compile (${{ matrix.os }}-vc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_TYPE }}-${{ matrix.BUILD_SHARED_LIBS }}) (OFF, Release, Win32, v142, windows, x86-windows) (push) Has been cancelled
MSVC / compile (${{ matrix.os }}-vc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_TYPE }}-${{ matrix.BUILD_SHARED_LIBS }}) (OFF, Release, x64, v143, windows, x64-windows) (push) Has been cancelled
MSVC / compile (${{ matrix.os }}-vc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_TYPE }}-${{ matrix.BUILD_SHARED_LIBS }}) (ON, Debug, Win32, v142, windows, x86-windows) (push) Has been cancelled
MSVC / compile (${{ matrix.os }}-vc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_TYPE }}-${{ matrix.BUILD_SHARED_LIBS }}) (ON, Debug, x64, v143, windows, x64-windows) (push) Has been cancelled
MSVC / compile (${{ matrix.os }}-vc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_TYPE }}-${{ matrix.BUILD_SHARED_LIBS }}) (ON, Release, Win32, v142, windows, x86-windows) (push) Has been cancelled
MSVC / compile (${{ matrix.os }}-vc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_TYPE }}-${{ matrix.BUILD_SHARED_LIBS }}) (ON, Release, x64, v143, windows, x64-windows) (push) Has been cancelled
Docker / test (amd64, alpine) (push) Has been cancelled
Docker / test (amd64, debian) (push) Has been cancelled
Docker / test (arm32v6, alpine) (push) Has been cancelled
Docker / test (arm32v6, debian) (push) Has been cancelled
Docker / test (arm32v7, alpine) (push) Has been cancelled
Docker / test (arm32v7, debian) (push) Has been cancelled
Docker / test (arm64v8, alpine) (push) Has been cancelled
Docker / test (arm64v8, debian) (push) Has been cancelled
Docker / test (i386, alpine) (push) Has been cancelled
Docker / test (i386, debian) (push) Has been cancelled
Docker / test (ppc64le, alpine) (push) Has been cancelled
Docker / test (ppc64le, debian) (push) Has been cancelled
Docker / test (s390x, debian) (push) Has been cancelled
Docker / push (alpine, docker.io) (push) Has been cancelled
Docker / push (alpine, ghcr.io) (push) Has been cancelled
Docker / push (alpine, quay.io) (push) Has been cancelled
Docker / push (debian, docker.io) (push) Has been cancelled
Docker / push (debian, ghcr.io) (push) Has been cancelled
Docker / push (debian, quay.io) (push) Has been cancelled
Docker / release (GitHub) (push) Has been cancelled
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-13 01:44:37 +01:00
dependabot[bot]
60ed2e246e
Upgrade actions/upload-artifact from 5 to 6 version (#1784)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-13 01:43:51 +01:00
dependabot[bot]
b7dfa236c1
Upgrade actions/cache from 4 to 5 version (#1783)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-12 12:03:36 +01:00
tyranron
5a6c9f3ce4
Update Debian "trixie" to 20251208 snapshot in Docker image 2025-12-09 12:33:53 +01:00
Pavel Punsky
265d1029e6
Use bool to enable prometheus (#1779)
`turn_params.prometheus` is bool but used as int throughout the code
`turn_params,prometheus_username_labels` is bool but in one place is set
with 1

This PR changes 0 and 1 to false and true accordingly
2025-12-08 08:43:36 -08:00
tyranron
a668d4b4cc
Upgrade Alpine to 3.23 version in Docker image 2025-12-04 15:34:15 +01:00
dependabot[bot]
9298847097
Upgrade actions/checkout from 5 to 6 version (#1776)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-11-21 13:37:27 +01:00
tyranron
60b6e2d816
Update Debian "trixie" to 20251117 snapshot in Docker image 2025-11-18 13:57:46 +01:00
tyranron
e1d3ba8a69
Update Debian "trixie" to 20251103 snapshot in Docker image 2025-11-05 12:04:30 +02:00
dependabot[bot]
5c14404c71
Upgrade actions/upload-artifact from 4 to 5 version (#1771)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-10-25 10:03:37 +02:00
16 changed files with 53 additions and 38 deletions

View File

@ -20,7 +20,7 @@ jobs:
matrix:
sanitizer: ["address", "memory", "undefined"]
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: build fuzzers (${{ matrix.sanitizer }})
id: build
@ -40,7 +40,7 @@ jobs:
output-sarif: true
- name: upload crash
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: ${{ matrix.sanitizer }}_artifacts
path: ./out/artifacts

View File

@ -15,7 +15,7 @@ jobs:
format:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Install dependencies
uses: ./.github/workflows/actions/ubuntu-build-deps
@ -49,7 +49,7 @@ jobs:
CC: clang
ASAN_OPTIONS: strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:detect_leaks=0:detect_invalid_pointer_pairs=1:halt_on_error=0
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Install dependencies
uses: ./.github/workflows/actions/ubuntu-build-deps
@ -74,7 +74,7 @@ jobs:
matrix:
config: ["Release"]
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Install dependencies
uses: ./.github/workflows/actions/ubuntu-build-deps

View File

@ -25,7 +25,7 @@ jobs:
container: ${{ matrix.os }}
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Install dependencies
env:

View File

@ -22,7 +22,7 @@ jobs:
permissions:
security-events: write
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Install dependencies
uses: ./.github/workflows/actions/ubuntu-build-deps

View File

@ -34,7 +34,7 @@ jobs:
- s390x
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
with:
fetch-depth: 0 # for correct image labeling via `git describe --tags`
# TODO: Try remove once `moby/buildkit` image upgrades its default QEMU version.
@ -70,7 +70,7 @@ jobs:
- run: make docker.tar to-file=.cache/image.tar
tags=build-${{ github.run_number }}-${{ matrix.dist }}-${{ matrix.arch }}
working-directory: docker/coturn/
- uses: actions/upload-artifact@v4
- uses: actions/upload-artifact@v6
with:
name: ${{ matrix.dist }}-${{ matrix.arch }}-${{ github.run_number }}
path: docker/coturn/.cache/image.tar
@ -89,7 +89,7 @@ jobs:
|| github.ref == 'refs/heads/master') }}
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
if: ${{ startsWith(github.ref, 'refs/tags/') }}
- name: Parse semver versions from Git tag
@ -134,7 +134,7 @@ jobs:
arch: s390x
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- uses: docker/setup-qemu-action@v3
- run: make npm.install
working-directory: docker/coturn/
@ -151,7 +151,7 @@ jobs:
}
return out;
- uses: actions/download-artifact@v6
- uses: actions/download-artifact@v7
with:
name: ${{ matrix.dist }}-${{ matrix.arch }}-${{ github.run_number }}
path: docker/coturn/.cache/
@ -186,7 +186,7 @@ jobs:
dist: ["alpine", "debian"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Parse Docker image name from Git repository name
id: image
@ -208,7 +208,7 @@ jobs:
|| 'edge' }}-${{ matrix.dist }}"
>> $GITHUB_OUTPUT
- uses: actions/download-artifact@v6
- uses: actions/download-artifact@v7
with:
path: docker/coturn/.cache/
@ -296,7 +296,7 @@ jobs:
needs: ["push"]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Parse semver versions from Git tag
id: semver

View File

@ -47,7 +47,7 @@ jobs:
working-directory: /tmp/
if: ${{ contains('amazonlinux:2 ubuntu:16.04 ubuntu:18.04', matrix.os) }}
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Install `apt` dependencies
# Set env variable or otherwise `tzdata` package requires interaction.

View File

@ -20,7 +20,7 @@ jobs:
ver: ["14", "15", "26"]
runs-on: macos-${{ matrix.ver }}
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Relink `python` package in `brew`
# Unlink and re-link to prevent errors when GitHub `macos` runner images
@ -57,7 +57,7 @@ jobs:
ver: ["15", "26"]
runs-on: macos-${{ matrix.ver }}
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Relink `python` package in `brew`
# Unlink and re-link to prevent errors when GitHub `macos` runner images

View File

@ -31,7 +31,7 @@ jobs:
TOOSL_DIR: ${{ github.workspace }}\.cache\tools
INSTALL_DIR: ${{ github.workspace }}\.cache\install_mingw_2022_02_15
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Install dependencies
run: |
@ -58,7 +58,7 @@ jobs:
cmake -E make_directory ${{ env.INSTALL_DIR }}
- name: Cache installed
uses: actions/cache@v4
uses: actions/cache@v5
id: cache-installed
with:
path: ${{ env.INSTALL_DIR }}
@ -113,7 +113,7 @@ jobs:
if: ${{ matrix.BUILD_TYPE == 'Release' }}
- name: Update artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: coturn_mingw_${{ matrix.os }}
path: |

View File

@ -38,7 +38,7 @@ jobs:
permissions:
security-events: write # required for all CodeQL to report detected outcomes
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Create directories
run: |
@ -112,7 +112,7 @@ jobs:
run:
shell: cmd
steps:
- uses: actions/checkout@v5
- uses: actions/checkout@v6
- name: Install NSIS for packaging
uses: repolevedavaj/install-nsis@v1.1.0
@ -157,7 +157,7 @@ jobs:
if: ${{ matrix.BUILD_TYPE == 'Release' }}
- name: Update artifacts
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v6
with:
name: coturn_msvc-${{ matrix.VCPKG_PLATFORM_TOOLSET }}-${{ matrix.CMAKE_GENERATOR_PLATFORM }}-${{ matrix.BUILD_SHARED_LIBS }}
path: |

1
.gitignore vendored
View File

@ -83,3 +83,4 @@ Thumbs.db
# --------
*.dll
*.exe
.cache/*

View File

@ -9,7 +9,21 @@ Coturn TURN server Docker image changelog
### Security updated
- [Debian Linux] "trixie" 20251020 (13.1): <https://github.com/docker-library/official-images/commit/7d7121f027cea92f35edf151aef7d1175b9e1464>
- [Debian Linux] "trixie" 20251208 (13.2): <https://github.com/docker-library/official-images/commit/11670f6c414419f5eb6febb8a94978354073a016>
## [4.7.0-r3] · 2025-12-04
[4.7.0-r3]: /../../tree/docker/4.7.0-r3
### Upgraded
- [Alpine Linux] 3.23: <https://www.alpinelinux.org/posts/Alpine-3.23.0-released.html>
### Security updated
- [Debian Linux] "trixie" 20251117 (13.2): <https://github.com/docker-library/official-images/commit/215fa7075010e3f2da20008b1a3a223b788beb0d>

View File

@ -34,7 +34,7 @@ ALPINE_VER := alpine$(strip $(shell grep -m1 'alpine_ver=' alpine/Dockerfile \
DEBIAN_VER := $(strip $(shell grep -m1 'debian_ver=' debian/Dockerfile \
| cut -d '=' -f2))
BUILD_REV ?= 2
BUILD_REV ?= 3
NAME := coturn
OWNER := $(or $(GITHUB_REPOSITORY_OWNER),coturn)

View File

@ -15,8 +15,8 @@ Coturn TURN server Docker image
## Supported tags and respective `Dockerfile` links
- [`4.7.0-r2`, `4.7.0-r2-debian`, `4.7.0`, `4.7.0-debian`, `4.7.0-trixie`, `4.7`, `4.7-debian`, `4.7-trixie`, `4`, `4-debian`, `4-trixie`, `debian`, `trixie`, `latest`][d1]
- [`4.7.0-r2-alpine`, `4.7.0-alpine`, `4.7.0-alpine3.22`, `4.7-alpine`, `4.7-alpine3.22`, `4-alpine`, `4-alpine3.22`, `alpine`, `alpine3.22`][d2]
- [`4.7.0-r3`, `4.7.0-r3-debian`, `4.7.0`, `4.7.0-debian`, `4.7.0-trixie`, `4.7`, `4.7-debian`, `4.7-trixie`, `4`, `4-debian`, `4-trixie`, `debian`, `trixie`, `latest`][d1]
- [`4.7.0-r3-alpine`, `4.7.0-alpine`, `4.7.0-alpine3.23`, `4.7-alpine`, `4.7-alpine3.23`, `4-alpine`, `4-alpine3.23`, `alpine`, `alpine3.23`][d2]

View File

@ -2,7 +2,7 @@
# Dockerfile of coturn/coturn:alpine Docker image.
#
ARG alpine_ver=3.22
ARG alpine_ver=3.23

View File

@ -2214,7 +2214,7 @@ static void set_option(int c, char *value) {
break;
#endif
case PROMETHEUS_OPT:
turn_params.prometheus = 1;
turn_params.prometheus = true;
break;
case PROMETHEUS_PORT_OPT:
turn_params.prometheus_port = atoi(value);
@ -2226,7 +2226,7 @@ static void set_option(int c, char *value) {
STRCPY(turn_params.prometheus_path, value);
break;
case PROMETHEUS_ENABLE_USERNAMES_OPT:
turn_params.prometheus_username_labels = 1;
turn_params.prometheus_username_labels = true;
break;
case AUTH_SECRET_OPT:
turn_params.use_auth_secret_with_timestamp = 1;

View File

@ -112,7 +112,7 @@ MHD_RESULT promhttp_handler(void *cls, struct MHD_Connection *connection, const
}
void start_prometheus_server(void) {
if (turn_params.prometheus == 0) {
if (!turn_params.prometheus) {
TURN_LOG_FUNC(TURN_LOG_LEVEL_INFO, "prometheus collector disabled, not started\n");
return;
}
@ -238,7 +238,7 @@ void start_prometheus_server(void) {
void prom_set_finished_traffic(const char *realm, const char *user, unsigned long rsvp, unsigned long rsvb,
unsigned long sentp, unsigned long sentb, bool peer) {
if (turn_params.prometheus == 1) {
if (turn_params.prometheus) {
const char *label[] = {realm, NULL};
if (turn_params.prometheus_username_labels) {
@ -270,33 +270,33 @@ void prom_set_finished_traffic(const char *realm, const char *user, unsigned lon
}
void prom_inc_allocation(SOCKET_TYPE type) {
if (turn_params.prometheus == 1) {
if (turn_params.prometheus) {
const char *label[] = {socket_type_name(type)};
prom_gauge_inc(turn_total_allocations, label);
}
}
void prom_dec_allocation(SOCKET_TYPE type) {
if (turn_params.prometheus == 1) {
if (turn_params.prometheus) {
const char *label[] = {socket_type_name(type)};
prom_gauge_dec(turn_total_allocations, label);
}
}
void prom_inc_stun_binding_request(void) {
if (turn_params.prometheus == 1) {
if (turn_params.prometheus) {
prom_counter_add(stun_binding_request, 1, NULL);
}
}
void prom_inc_stun_binding_response(void) {
if (turn_params.prometheus == 1) {
if (turn_params.prometheus) {
prom_counter_add(stun_binding_response, 1, NULL);
}
}
void prom_inc_stun_binding_error(void) {
if (turn_params.prometheus == 1) {
if (turn_params.prometheus) {
prom_counter_add(stun_binding_error, 1, NULL);
}
}