sr-dev

sr-dev@lists.kamailio.org

16 participants
45394 discussions

git:master:cf8cdb99: cmake: Warning if no modules/group were selected
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: cf8cdb99355e19a30460229633eaf087717ee44d URL: https://github.com/kamailio/kamailio/commit/cf8cdb99355e19a30460229633eaf08… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T08:15:11Z cmake: Warning if no modules/group were selected --- Modified: src/modules/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/cf8cdb99355e19a30460229633eaf08… Patch: https://github.com/kamailio/kamailio/commit/cf8cdb99355e19a30460229633eaf08… --- diff --git a/src/modules/CMakeLists.txt b/src/modules/CMakeLists.txt index cc303f0bb88..0decc1865ab 100644 --- a/src/modules/CMakeLists.txt +++ b/src/modules/CMakeLists.txt @@ -149,8 +149,14 @@ message(STATUS "Modules to be built: ${ADDED_MODULES_LIST}") # TODO: Comment is not showing. probably a bug in CMAKE # https://gitlab.kitware.com/cmake/cmake/-/issues/26571 add_custom_target(modules COMMENT "Building modules") -add_dependencies(modules ${ADDED_MODULES_LIST}) - +if(NOT ADDED_MODULES_LIST) + message( + WARNING + "No modules to build. Did you forget to add a module group or include module?" + ) +else() + add_dependencies(modules ${ADDED_MODULES_LIST}) +endif() get_property(ALL_MODULE_DOC_TARGETS GLOBAL PROPERTY ALL_MODULE_DOC_TARGETS) # message(STATUS "ALL_MODULE_DOC_TARGETS: ${ALL_MODULE_DOC_TARGETS}")

1 0

git:master:0afea1fd: cmake: Forbid in-source builds
by Xenofon Karamanos 19 May '25

19 May '25

Module: kamailio Branch: master Commit: 0afea1fd170a79d3f260c18a293bac1ce8fd8527 URL: https://github.com/kamailio/kamailio/commit/0afea1fd170a79d3f260c18a293bac1… Author: Xenofon Karamanos <xk(a)gilawa.com> Committer: Xenofon Karamanos <xk(a)gilawa.com> Date: 2025-05-19T08:14:54Z cmake: Forbid in-source builds --- Modified: CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/0afea1fd170a79d3f260c18a293bac1… Patch: https://github.com/kamailio/kamailio/commit/0afea1fd170a79d3f260c18a293bac1… --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 6d68b5da980..22ee9a8e3a2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,6 +10,17 @@ project( HOMEPAGE_URL "https://www.kamailio.org" ) +# ---- Include guards ---- + +if(PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR) + message( + FATAL_ERROR + "In-source builds not allowed. Please make a new directory (called a build directory) \ +and run CMake again accordingly.") +endif() + +# ---- Project settings ---- + # Set the version number set(EXTRAVERSION "-dev1") set(RELEASE "${PROJECT_VERSION}${EXTRAVERSION}")

1 0

[kamailio/kamailio] generate rpm packages using github actions (PR #4194)
by sergey-safarov 17 May '25

17 May '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 - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist: - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description I have refactored the rpm packaging and am now using the GitHub actions. Now `tar.gz` archive with rpm packages, source rpm and deps rpm files attached to the release message like. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4194 -- Commit Summary -- * generate rpm packages using github actions -- File Changes -- A .github/workflows/rpm.yml (57) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4194.patch https://github.com/kamailio/kamailio/pull/4194.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4194 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4194(a)github.com>

2 5

git:master:afa2d017: github: generate rpm packages
by Victor Seva 17 May '25

17 May '25

Module: kamailio Branch: master Commit: afa2d017e3b5a1f5a776935767e485c1158be461 URL: https://github.com/kamailio/kamailio/commit/afa2d017e3b5a1f5a776935767e485c… Author: Sergey Safarov <s.safarov(a)anycast-lb.net> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-05-17T20:41:05+02:00 github: generate rpm packages --- Added: .github/workflows/rpm.yml --- Diff: https://github.com/kamailio/kamailio/commit/afa2d017e3b5a1f5a776935767e485c… Patch: https://github.com/kamailio/kamailio/commit/afa2d017e3b5a1f5a776935767e485c… --- diff --git a/.github/workflows/rpm.yml b/.github/workflows/rpm.yml new file mode 100644 index 00000000000..0d890b63a8c --- /dev/null +++ b/.github/workflows/rpm.yml @@ -0,0 +1,89 @@ +--- +name: build_rpm +'on': + schedule: + - cron: '41 6 * * 0' + push: + tags: + - '[0-9]+.[0-9]+.[0-9]+' +jobs: + # is required nightly build? + # More info at https://stackoverflow.com/questions/63014786/how-to-schedule-a-github-actio… + # looking commit_id of the last successful daily build + check: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + - uses: octokit/request-action(a)v2.x + id: check_last_run + with: + route: GET /repos/{owner}/{repo}/actions/workflows/rpm.yml/runs?per_page=1&status=success + owner: ${{ github.repository_owner }} + repo: kamailio + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + - name: Show last execution info + run: | + echo "Last daily build: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }}" + + outputs: + last_sha: ${{ fromJson(steps.check_last_run.outputs.data).workflow_runs[0].head_sha }} + + native: + needs: [check] + if: needs.check.outputs.last_sha != github.sha + strategy: + matrix: + os: + - centos-10 + - rhel-10 + - centos-9 + - rhel-9 + - centos-8 + - rhel-8 + runner: + - ubuntu-latest + - ubuntu-24.04-arm + runs-on: ${{ matrix.runner }} + permissions: + contents: write + steps: + - name: checkout sources + uses: actions/checkout@v4 + + - name: print commit info and init hosttype var + id: init + run: | + echo ${{ github.sha }} + echo "hosttype=${HOSTTYPE}" >> $GITHUB_OUTPUT + + - name: build rpm files + uses: addnab/docker-run-action@v3 + with: + image: safarov/kamailio-builder:${{ matrix.os }} + options: -v ${{ github.workspace }}:/usr/src/kamailio + run: | + cd /usr/src/kamailio + make cfg + make -C pkg/kamailio src.rpm + rpmbuild -ra /usr/src/kamailio/kamailio*.src.rpm + cp -R /deps ~/rpmbuild/RPMS + mv ~/rpmbuild/SRPMS/* ~/rpmbuild/RPMS + mv ~/rpmbuild/RPMS . + tar czf kamailio-${{ github.ref_name }}-${{ matrix.os }}-${{ steps.init.outputs.hosttype }}.rpm.tar.gz RPMS + + - name: Push artifacts + uses: actions/upload-artifact@v4 + if: "! startsWith(github.ref, 'refs/tags/')" + with: + name: kamailio-${{ github.ref_name }}-${{ matrix.os }}-${{ steps.init.outputs.hosttype }}.rpm + path: | + RPMS/* + + - name: Release + uses: softprops/action-gh-release@v2 + if: "startsWith(github.ref, 'refs/tags/')" + with: + files: | + kamailio-${{ github.ref_name }}-${{ matrix.os }}-${{ steps.init.outputs.hosttype }}.rpm.tar.gz

1 0

[kamailio/kamailio] ims_auth: replaced t_continue_skip_timer with t_continue in cxdx_mar.c (PR #4206)
by Amin Nazari 17 May '25

17 May '25

- fixed log message in MAR Async CDP callback - fixed executing cfg_action after sending MAR Diameter request - cfg_action is the callback parameter of the ims_www_challenge function   #### 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #4205 (replace XXXX with an open issue number) #### Description Based on the description in issue #4205, this PR will fix a bug in ims_auth module related to MAR Diameter request callbacks, by replacing the call to t_continue function with t_continue_skip_timer, after the MAR request is sent, the control will successfully move to the cfg action in Kamailio scripts. Just like what we already have in ims_registrar_scscf module, using t_continue_skip_timer instead of t_continue cause the transaction to be found and resumed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4206 -- Commit Summary -- * ims_auth: replaced t_continue_skip_timer with t_continue in cxdx_mar.c -- File Changes -- M src/modules/ims_auth/cxdx_mar.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4206.patch https://github.com/kamailio/kamailio/pull/4206.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4206 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4206(a)github.com>

2 1

git:master:74709677: ims_auth: replaced t_continue_skip_timer with t_continue in cxdx_mar.c
by Victor Seva 17 May '25

17 May '25

Module: kamailio Branch: master Commit: 7470967790a78ba67ef7acb7c87d94482fbea0cb URL: https://github.com/kamailio/kamailio/commit/7470967790a78ba67ef7acb7c87d944… Author: amnapa <marvelousvip(a)live.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-05-17T20:34:43+02:00 ims_auth: replaced t_continue_skip_timer with t_continue in cxdx_mar.c - fixed log message in MAR Async CDP callback - fixed executing cfg_action after sending MAR Diameter request - cfg_action is the callback parameter of the ims_www_challenge function --- Modified: src/modules/ims_auth/cxdx_mar.c --- Diff: https://github.com/kamailio/kamailio/commit/7470967790a78ba67ef7acb7c87d944… Patch: https://github.com/kamailio/kamailio/commit/7470967790a78ba67ef7acb7c87d944… --- diff --git a/src/modules/ims_auth/cxdx_mar.c b/src/modules/ims_auth/cxdx_mar.c index 51e05ce7a27..3868dee4f60 100644 --- a/src/modules/ims_auth/cxdx_mar.c +++ b/src/modules/ims_auth/cxdx_mar.c @@ -479,7 +479,7 @@ void async_cdp_callback( adi_list = 0; } - LM_DBG("DBG:UAR Async CDP callback: ... Done resuming transaction\n"); + LM_DBG("DBG:MAR Async CDP callback: ... Done resuming transaction\n"); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_URI, &t->uri_avps_from); set_avp_list(AVP_TRACK_TO | AVP_CLASS_URI, &t->uri_avps_to); set_avp_list(AVP_TRACK_FROM | AVP_CLASS_USER, &t->user_avps_from); @@ -493,7 +493,7 @@ void async_cdp_callback( //del_nonshm_lump_rpl(&req->reply_lump); tmb.unref_cell(t); } - tmb.t_continue(data->tindex, data->tlabel, data->act); + tmb.t_continue_skip_timer(data->tindex, data->tlabel, data->act); free_saved_transaction_data(data); return; @@ -504,7 +504,7 @@ void async_cdp_callback( //del_nonshm_lump_rpl(&t->uas.request->reply_lump); tmb.unref_cell(t); } - tmb.t_continue(data->tindex, data->tlabel, data->act); + tmb.t_continue_skip_timer(data->tindex, data->tlabel, data->act); error1: free_saved_transaction_data(data);

1 0

git:master:b51c78ba: usrloc: use the internal wrappers for time value
by Daniel-Constantin Mierla 16 May '25

16 May '25

Module: kamailio Branch: master Commit: b51c78ba27ca552893ba88cefe2d941246322a69 URL: https://github.com/kamailio/kamailio/commit/b51c78ba27ca552893ba88cefe2d941… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-16T11:05:47+02:00 usrloc: use the internal wrappers for time value --- Modified: src/modules/usrloc/ul_keepalive.c --- Diff: https://github.com/kamailio/kamailio/commit/b51c78ba27ca552893ba88cefe2d941… Patch: https://github.com/kamailio/kamailio/commit/b51c78ba27ca552893ba88cefe2d941… --- diff --git a/src/modules/usrloc/ul_keepalive.c b/src/modules/usrloc/ul_keepalive.c index 5ea58f25a9f..a0704da2a69 100644 --- a/src/modules/usrloc/ul_keepalive.c +++ b/src/modules/usrloc/ul_keepalive.c @@ -156,9 +156,10 @@ int ul_ka_urecord(urecord_t *ur) /* set contact as expired in 10s */ LM_DBG("set expired contact on keepalive (%u + %u < %u)" " - aor: %.*s c: %.*s\n", - (unsigned int)uc->last_keepalive, - (unsigned int)ul_keepalive_timeout, (unsigned int)tnow, - ur->aor.len, ur->aor.s, uc->c.len, uc->c.s); + ksr_time_uint(&uc->last_keepalive, NULL), + (unsigned int)ul_keepalive_timeout, + ksr_time_sint(&tnow, NULL), ur->aor.len, ur->aor.s, + uc->c.len, uc->c.s); if(uc->expires > tnow + 10) { uc->expires = tnow + 10; continue;

1 0

git:master:73dc08af: tls: removed unnecessary code
by Daniel-Constantin Mierla 16 May '25

16 May '25

Module: kamailio Branch: master Commit: 73dc08affb9d0a7a3f9ab83c24e01bada8958b2d URL: https://github.com/kamailio/kamailio/commit/73dc08affb9d0a7a3f9ab83c24e01ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-16T10:49:09+02:00 tls: removed unnecessary code --- Modified: src/modules/tls/tls_select.c --- Diff: https://github.com/kamailio/kamailio/commit/73dc08affb9d0a7a3f9ab83c24e01ba… Patch: https://github.com/kamailio/kamailio/commit/73dc08affb9d0a7a3f9ab83c24e01ba… --- diff --git a/src/modules/tls/tls_select.c b/src/modules/tls/tls_select.c index 6a2711bd36a..18abcc7dd03 100644 --- a/src/modules/tls/tls_select.c +++ b/src/modules/tls/tls_select.c @@ -1415,8 +1415,6 @@ static int get_alt_count(long *res, int local, int type, sip_msg_t *msg) tcpconn_put(c); return 0; err: - if(names) - sk_GENERAL_NAME_pop_free(names, GENERAL_NAME_free); if(!local) X509_free(cert); tcpconn_put(c);

1 0

git:master:87cfa9f3: pv_headers: compare the pvh_set_xavi() result with NULL
by Daniel-Constantin Mierla 16 May '25

16 May '25

Module: kamailio Branch: master Commit: 87cfa9f3c5ae337dceb78654beb6fe4b00587993 URL: https://github.com/kamailio/kamailio/commit/87cfa9f3c5ae337dceb78654beb6fe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-16T10:39:33+02:00 pv_headers: compare the pvh_set_xavi() result with NULL --- Modified: src/modules/pv_headers/pvh_func.c --- Diff: https://github.com/kamailio/kamailio/commit/87cfa9f3c5ae337dceb78654beb6fe4… Patch: https://github.com/kamailio/kamailio/commit/87cfa9f3c5ae337dceb78654beb6fe4… --- diff --git a/src/modules/pv_headers/pvh_func.c b/src/modules/pv_headers/pvh_func.c index 1fe3d58f07c..5cbeb143113 100644 --- a/src/modules/pv_headers/pvh_func.c +++ b/src/modules/pv_headers/pvh_func.c @@ -113,20 +113,20 @@ int pvh_collect_headers(struct sip_msg *msg) val_part.len = strlen(hvals[idx]); if(pvh_set_xavi(msg, &_pvh_params.xavi_name, &name, &val_part, SR_XTYPE_STR, 0, 1) - < 0) + == NULL) return -1; } continue; } if(pvh_set_xavi( msg, &_pvh_params.xavi_name, &name, &val, SR_XTYPE_STR, 0, 1) - < 0) + == NULL) return -1; } if(pvh_set_xavi(msg, &_pvh_params.xavi_helper_xname, &xavi_helper_name, &_pvh_params.xavi_name, SR_XTYPE_STR, 0, 0) - < 0) + == NULL) return -1; pvh_hdrs_set_collected(msg);

1 0

git:master:cf53743b: presence: use internal wrapper to get int time values
by Daniel-Constantin Mierla 16 May '25

16 May '25

Module: kamailio Branch: master Commit: cf53743ba79b60724150738eb482473043925ffc URL: https://github.com/kamailio/kamailio/commit/cf53743ba79b60724150738eb482473… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-05-16T10:33:21+02:00 presence: use internal wrapper to get int time values --- Modified: src/modules/presence/notify.c --- Diff: https://github.com/kamailio/kamailio/commit/cf53743ba79b60724150738eb482473… Patch: https://github.com/kamailio/kamailio/commit/cf53743ba79b60724150738eb482473… --- diff --git a/src/modules/presence/notify.c b/src/modules/presence/notify.c index 191cac0d04b..6c86a5237e7 100644 --- a/src/modules/presence/notify.c +++ b/src/modules/presence/notify.c @@ -297,7 +297,7 @@ int get_wi_subs_db(subs_t *subs, watcher_t *watchers) query_vals[n_query_cols].type = DB1_INT; query_vals[n_query_cols].nul = 0; query_vals[n_query_cols].val.int_val = - (int)time(NULL) + pres_expires_offset; + ksr_time_sint(NULL, NULL) + pres_expires_offset; n_query_cols++; result_cols[status_col = n_result_cols++] = &str_status_col; @@ -367,7 +367,7 @@ str *get_wi_notify_body(subs_t *subs, subs_t *watcher_subs) unsigned int hash_code; subs_t *s = NULL; int state = FULL_STATE_FLAG; - unsigned int now = (int)time(NULL); + unsigned int now = ksr_time_uint(NULL, NULL); hash_code = 0; version_str = int2str(subs->version, &len); @@ -655,7 +655,7 @@ str *ps_db_get_p_notify_body( query_cols[n_query_cols] = &str_expires_col; query_vals[n_query_cols].type = DB1_INT; query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.int_val = (int)time(NULL); + query_vals[n_query_cols].val.int_val = ksr_time_sint(NULL, NULL); query_ops[n_query_cols] = OP_GT; n_query_cols++; } @@ -891,7 +891,7 @@ str *ps_cache_get_p_notify_body( ptm.domain = uri.host; ptm.event = event->name; if(pres_startup_mode == 1) { - ptm.expires = (int)time(NULL); + ptm.expires = ksr_time_sint(NULL, NULL); } ptlist = ps_ptable_search(&ptm, 1, pres_retrieve_order); @@ -1343,10 +1343,11 @@ int get_subs_db( s.event = event; s.local_cseq = row_vals[cseq_col].val.int_val + 1; if(row_vals[expires_col].val.int_val - < (int)time(NULL) + pres_expires_offset) + < ksr_time_sint(NULL, NULL) + pres_expires_offset) s.expires = 0; else - s.expires = row_vals[expires_col].val.int_val - (int)time(NULL); + s.expires = row_vals[expires_col].val.int_val + - ksr_time_sint(NULL, NULL); s.version = row_vals[version_col].val.int_val + 1; s.flags = row_vals[flags_col].val.int_val; s.user_agent.s = (char *)row_vals[user_agent_col].val.string_val; @@ -1401,7 +1402,7 @@ subs_t *get_subs_dialog(str *pres_uri, pres_ev_t *event, str *sender) printf_subs(s); - if(s->expires < (int)time(NULL)) { + if(s->expires < ksr_time_sint(NULL, NULL)) { LM_DBG("expired subs\n"); continue; } @@ -1420,7 +1421,7 @@ subs_t *get_subs_dialog(str *pres_uri, pres_ev_t *event, str *sender) lock_release(&subs_htable[hash_code].lock); goto error; } - s_new->expires -= (int)time(NULL); + s_new->expires -= ksr_time_sint(NULL, NULL); s_new->next = s_array; s_array = s_new; } @@ -2883,7 +2884,7 @@ int process_dialogs(int round, int presence_winfo) int end_transaction = 0; subs_t sub; str ev_sname, winfo = str_init("presence.winfo"); - int now = (int)time(NULL); + int now = ksr_time_sint(NULL, NULL); int updated = 0; int no_active_watchers = 0; db_query_f query_fn = pa_dbf.query_lock ? pa_dbf.query_lock : pa_dbf.query; @@ -3228,7 +3229,7 @@ void ps_active_watchers_db_timer_clean(unsigned int ticks, void *param) db_ops[0] = OP_LT; db_vals[0].type = DB1_INT; db_vals[0].nul = 0; - db_vals[0].val.int_val = (int)time(NULL); + db_vals[0].val.int_val = ksr_time_sint(NULL, NULL); db_keys[1] = &str_expires_col; db_ops[1] = OP_GT;

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