sr-dev April 2025

sr-dev@lists.kamailio.org

14 participants
201 discussions

[kamailio/kamailio] pua_json : add support for as-feature-event (PR #4195)
by ThomasSevestre 04 Apr '25

04 Apr '25

#### Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description This PR allow usage of the new presence_dfks module with pua_json You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4195 -- Commit Summary -- * pua_json: add support for as-feature-event -- File Changes -- M src/modules/pua_json/defs.h (16) M src/modules/pua_json/pua_json_publish.c (55) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4195.patch https://github.com/kamailio/kamailio/pull/4195.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4195 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4195(a)github.com>

2 9

git:master:c858cecb: pua_json: add support for as-feature-event
by Henning Westerholt 04 Apr '25

04 Apr '25

Module: kamailio Branch: master Commit: c858cecb4d6589bc53c474b0520a5d060bd3c55b URL: https://github.com/kamailio/kamailio/commit/c858cecb4d6589bc53c474b0520a5d0… Author: Thomas <1258170+ThomasSevestre(a)users.noreply.github.com> Committer: Henning Westerholt <hw(a)gilawa.com> Date: 2025-04-04T18:04:27+02:00 pua_json: add support for as-feature-event --- Modified: src/modules/pua_json/defs.h Modified: src/modules/pua_json/pua_json_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/c858cecb4d6589bc53c474b0520a5d0… Patch: https://github.com/kamailio/kamailio/commit/c858cecb4d6589bc53c474b0520a5d0… --- diff --git a/src/modules/pua_json/defs.h b/src/modules/pua_json/defs.h index ebf0ba4a0b9..ad5a8eb1eb0 100644 --- a/src/modules/pua_json/defs.h +++ b/src/modules/pua_json/defs.h @@ -68,12 +68,20 @@ #define MWI_JSON_FROM "From" #define MWI_JSON_TO "To" +#define AS_FEATURE_JSON_CALLID "Call-ID" +#define AS_FEATURE_JSON_FROM "From" +#define AS_FEATURE_JSON_FROM_USER "From-User" +#define AS_FEATURE_JSON_FROM_REALM "From-Realm" +#define AS_FEATURE_JSON_DND_STATUS "DND-Status" +#define AS_FEATURE_JSON_EXPIRES "Expires" + #define TO_TAG_BUFFER_SIZE 128 #define FROM_TAG_BUFFER_SIZE 128 #define SENDER_BUFFER_SIZE 1024 #define DIALOGINFO_BODY_BUFFER_SIZE 8192 #define MWI_BODY_BUFFER_SIZE 2048 #define PRESENCE_BODY_BUFFER_SIZE 4096 +#define AS_FEATURE_BODY_BUFFER_SIZE 4096 #define MWI_BODY_VOICE_MESSAGE \ "Messages-Waiting: %.*s\r\nMessage-Account: %.*s\r\nVoice-Message: " \ @@ -139,4 +147,12 @@ </dialog>\ </dialog-info>" +#define AS_FEATURE_BODY \ + "<?xml version=\"1.0\" encoding=\"ISO-8859-1\"?>\ +<DoNotDisturbEvent xmlns=\"http://www.ecma-international.org/standards/ecma-323/csta/ed3\">\ +<device>%.*s</device>\ +<doNotDisturbOn>%.*s</doNotDisturbOn>\ +</DoNotDisturbEvent>\ +" + #endif /* _PUA_JSON_DEFS_H_ */ diff --git a/src/modules/pua_json/pua_json_publish.c b/src/modules/pua_json/pua_json_publish.c index 359c5071858..3444210f39f 100644 --- a/src/modules/pua_json/pua_json_publish.c +++ b/src/modules/pua_json/pua_json_publish.c @@ -38,6 +38,7 @@ extern int pua_include_entity; str str_event_message_summary = str_init("message-summary"); str str_event_dialog = str_init("dialog"); str str_event_presence = str_init("presence"); +str str_event_as_feature_event = str_init("as-feature-event"); str str_username_col = str_init("username"); str str_domain_col = str_init("domain"); @@ -359,6 +360,62 @@ int pua_json_publish_dialoginfo_to_presentity(struct json_object *json_obj) return ret; } +int pua_json_publish_as_feature_to_presentity(struct json_object *json_obj) +{ + int ret = 1; + int len; + str event = str_init("as-feature-event"); + str from = {0, 0}; + str from_user = {0, 0}; + str from_realm = {0, 0}; + str callid = {0, 0}; + str dnd_status = {0, 0}; + int expires = 0; + str as_feature_body = {0, 0}; + + char *body = (char *)pkg_malloc(AS_FEATURE_BODY_BUFFER_SIZE); + + if(body == NULL) { + LM_ERR("Error allocating buffer for publish\n"); + ret = -1; + goto error; + } + + json_api.extract_field(json_obj, AS_FEATURE_JSON_CALLID, &callid); + + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM, &from); + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM_USER, &from_user); + json_api.extract_field(json_obj, AS_FEATURE_JSON_FROM_REALM, &from_realm); + + json_api.extract_field(json_obj, AS_FEATURE_JSON_DND_STATUS, &dnd_status); + + struct json_object *ExpiresObj = + json_api.get_object(json_obj, AS_FEATURE_JSON_EXPIRES); + if(ExpiresObj != NULL) { + expires = json_object_get_int(ExpiresObj); + } + + if(!from_user.len || !dnd_status.len) { + LM_ERR("missing one of From-User / DND-Status\n"); + goto error; + } + + len = snprintf(body, AS_FEATURE_BODY_BUFFER_SIZE, AS_FEATURE_BODY, + from_user.len, from_user.s, dnd_status.len, dnd_status.s); + + as_feature_body.s = body; + as_feature_body.len = len; + + pua_json_update_presentity(&event, &from_realm, &from_user, &callid, &from, + &as_feature_body, expires, 1, 1); + +error: + + if(body) + pkg_free(body); + + return ret; +} int pua_json_publish(struct sip_msg *msg, char *json) { @@ -391,6 +448,11 @@ int pua_json_publish(struct sip_msg *msg, char *json) event_package.len) == 0) { ret = pua_json_publish_presence_to_presentity(json_obj); + } else if(event_package.len == str_event_as_feature_event.len + && strncmp(event_package.s, str_event_as_feature_event.s, + event_package.len) + == 0) { + ret = pua_json_publish_as_feature_to_presentity(json_obj); } }

1 0

git:master:330543f4: github: pull_request, always use scripts from master [skip ci]
by Victor Seva 03 Apr '25

03 Apr '25

Module: kamailio Branch: master Commit: 330543f46cbb6bf815ebf77c98378314091197ce URL: https://github.com/kamailio/kamailio/commit/330543f46cbb6bf815ebf77c9837831… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-04-03T14:37:14+02:00 github: pull_request, always use scripts from master [skip ci] --- Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/330543f46cbb6bf815ebf77c9837831… Patch: https://github.com/kamailio/kamailio/commit/330543f46cbb6bf815ebf77c9837831… --- diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index cdfd9f3a3fd..35dda521756 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -23,15 +23,25 @@ jobs: permissions: contents: read # to fetch code (actions/checkout) steps: + - name: Check out scripts folder to the runner + uses: actions/checkout@v4 + with: + ref: master + path: actions + sparse-checkout: | + .github/scripts/check-cmake-format.sh + sparse-checkout-cone-mode: false - name: Check out the repository to the runner uses: actions/checkout@v4 with: + path: source ref: ${{ github.event.pull_request.head.sha }} - uses: awalsh128/cache-apt-pkgs-action(a)v1.5.0 with: packages: cmake-format - name: Run scripts/check-cmake-format.sh - run: ./.github/scripts/check-cmake-format.sh + run: ${{ github.workspace }}/actions/.github/scripts/check-cmake-format.sh + working-directory: ${{ github.workspace }}/source env: ref: ${{ github.event.pull_request.head.sha }} FETCH_DEPTH: 50 @@ -40,12 +50,22 @@ jobs: permissions: contents: read # to fetch code (actions/checkout) steps: + - name: Check out scripts folder to the runner + uses: actions/checkout@v4 + with: + ref: master + path: actions + sparse-checkout: | + .github/scripts/check-commit.sh + sparse-checkout-cone-mode: false - name: Check out the repository to the runner uses: actions/checkout@v4 with: + path: source ref: ${{ github.event.pull_request.head.sha }} - name: Run scripts/check-commit.sh - run: ./.github/scripts/check-commit.sh + run: ${{ github.workspace }}/actions/.github/scripts/check-commit.sh + working-directory: ${{ github.workspace }}/source env: ref: ${{ github.event.pull_request.head.sha }} FETCH_DEPTH: 50

1 0

git:master:3e1b0c02: github: fix scripts/check-* [skip ci]
by Victor Seva 03 Apr '25

03 Apr '25

Module: kamailio Branch: master Commit: 3e1b0c026b37be2d7240dae32177c20bf692860f URL: https://github.com/kamailio/kamailio/commit/3e1b0c026b37be2d7240dae32177c20… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-04-03T13:37:30+02:00 github: fix scripts/check-* [skip ci] * fetch ref previous commit too * add FETCH_DEPTH value so is more visible --- Modified: .github/scripts/check-cmake-format.sh Modified: .github/scripts/check-commit.sh Modified: .github/workflows/pull_request.yml --- Diff: https://github.com/kamailio/kamailio/commit/3e1b0c026b37be2d7240dae32177c20… Patch: https://github.com/kamailio/kamailio/commit/3e1b0c026b37be2d7240dae32177c20… --- diff --git a/.github/scripts/check-cmake-format.sh b/.github/scripts/check-cmake-format.sh index 6c51c415831..582e0324714 100755 --- a/.github/scripts/check-cmake-format.sh +++ b/.github/scripts/check-cmake-format.sh @@ -39,6 +39,8 @@ else fi ref=${ref:-HEAD} +# Ensure that the ref revision has some history +git fetch -q "--depth=${FETCH_DEPTH:-50}" origin "+${ref}" src_sha=$(git rev-parse -q --verify "${ref}") || die "fatal: couldn't find ref ${ref}" echo "Checking $(git rev-list --count "${src_sha}" "^${target_sha}") commits since revision ${target_sha}" for commit in $(git rev-list --reverse "${src_sha}" "^${target_sha}"); do diff --git a/.github/scripts/check-commit.sh b/.github/scripts/check-commit.sh index 144d6a4395e..87aa17be598 100755 --- a/.github/scripts/check-commit.sh +++ b/.github/scripts/check-commit.sh @@ -72,6 +72,8 @@ else fi ref=${ref:-HEAD} +# Ensure that the ref revision has some history +git fetch -q "--depth=${FETCH_DEPTH:-50}" origin "+${ref}" src_sha=$(git rev-parse -q --verify "${ref}") || die "fatal: couldn't find ref ${ref}" echo "Checking $(git rev-list --count "${src_sha}" "^${target_sha}") commits since revision ${target_sha}" for commit in $(git rev-list --reverse "${src_sha}" "^${target_sha}"); do diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 96f3ac6b864..cdfd9f3a3fd 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -34,6 +34,7 @@ jobs: run: ./.github/scripts/check-cmake-format.sh env: ref: ${{ github.event.pull_request.head.sha }} + FETCH_DEPTH: 50 check-commit: runs-on: ubuntu-latest permissions: @@ -47,6 +48,7 @@ jobs: run: ./.github/scripts/check-commit.sh env: ref: ${{ github.event.pull_request.head.sha }} + FETCH_DEPTH: 50 build: runs-on: ubuntu-latest permissions:

1 0

Re: [kamailio/kamailio] test issue for github actions (Issue #4200)
by github-actions[bot] 03 Apr '25

03 Apr '25

github-actions[bot] left a comment (kamailio/kamailio#4200) This tracker is for reporting issues in the C code, for questions about kamailio use sr-users(a)lists.kamailio.org mailing list. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4200#issuecomment-2775212517 You are receiving this because you authored the thread. Message ID: <kamailio/kamailio/issues/4200/2775212517(a)github.com>

1 0

Re: [kamailio/kamailio] test issue for github actions (Issue #4200)
by github-actions[bot] 03 Apr '25

03 Apr '25

Closed #4200 as completed. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4200#event-17110423595 You are receiving this because you authored the thread. Message ID: <kamailio/kamailio/issue/4200/issue_event/17110423595(a)github.com>

1 0

git:master:ae17d26d: github: issue_labeled fix closing issue step [skip ci]
by Victor Seva 03 Apr '25

03 Apr '25

Module: kamailio Branch: master Commit: ae17d26d1fc422e25a2146082bab6773dc6f76ff URL: https://github.com/kamailio/kamailio/commit/ae17d26d1fc422e25a2146082bab677… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-04-03T12:15:06+02:00 github: issue_labeled fix closing issue step [skip ci] --- Modified: .github/workflows/issue_labeled.yml --- Diff: https://github.com/kamailio/kamailio/commit/ae17d26d1fc422e25a2146082bab677… Patch: https://github.com/kamailio/kamailio/commit/ae17d26d1fc422e25a2146082bab677… --- diff --git a/.github/workflows/issue_labeled.yml b/.github/workflows/issue_labeled.yml index a3451852528..63f5e885ec6 100644 --- a/.github/workflows/issue_labeled.yml +++ b/.github/workflows/issue_labeled.yml @@ -22,5 +22,5 @@ jobs: owner: context.repo.owner, repo: context.repo.repo, issue_number: context.issue.number, - state: "close", + state: "closed", });

1 0

git:master:13cc11b8: github: fix issue_labeled workflow [skip ci]
by Victor Seva 03 Apr '25

03 Apr '25

Module: kamailio Branch: master Commit: 13cc11b8506f695dacacc99d6eb1341c99c87cc7 URL: https://github.com/kamailio/kamailio/commit/13cc11b8506f695dacacc99d6eb1341… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-04-03T12:04:36+02:00 github: fix issue_labeled workflow [skip ci] --- Modified: .github/workflows/issue_labeled.yml --- Diff: https://github.com/kamailio/kamailio/commit/13cc11b8506f695dacacc99d6eb1341… Patch: https://github.com/kamailio/kamailio/commit/13cc11b8506f695dacacc99d6eb1341… --- diff --git a/.github/workflows/issue_labeled.yml b/.github/workflows/issue_labeled.yml index 31d546c733f..a3451852528 100644 --- a/.github/workflows/issue_labeled.yml +++ b/.github/workflows/issue_labeled.yml @@ -13,8 +13,14 @@ jobs: with: script: | github.rest.issues.createComment({ - issue_number: context.issue.number, owner: context.repo.owner, repo: context.repo.repo, + issue_number: context.issue.number, body: 'This tracker is for reporting issues in the C code, for questions about kamailio use sr-users(a)lists.kamailio.org mailing list.' - }) + }); + github.rest.issues.update({ + owner: context.repo.owner, + repo: context.repo.repo, + issue_number: context.issue.number, + state: "close", + });

1 0

Re: [kamailio/kamailio] test issue for github actions (Issue #4200)
by github-actions[bot] 03 Apr '25

03 Apr '25

github-actions[bot] left a comment (kamailio/kamailio#4200) This tracker is for reporting issues in the C code, for questions about kamailio use sr-users(a)lists.kamailio.org mailing list. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/4200#issuecomment-2775169027 You are receiving this because you authored the thread. Message ID: <kamailio/kamailio/issues/4200/2775169027(a)github.com>

1 0

[kamailio/kamailio] Run failed: manage labels from comments - master (408b48c)
by kamailio-sync 03 Apr '25

03 Apr '25

[kamailio/kamailio] manage labels from comments workflow run Repository: kamailio/kamailio Workflow: manage labels from comments Duration: 7.0 seconds Finished: 2025-04-03 09:48:00 UTC View results: https://github.com/kamailio/kamailio/actions/runs/14240022482 Jobs: * manage failed (1 annotation) -- You are receiving this because you are subscribed to this thread. Manage your GitHub Actions notifications: https://github.com/settings/notifications

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2025