sr-dev January 2025

sr-dev@lists.kamailio.org

21 participants
295 discussions

git:master:833bb437: dialog: use internal function to get 4-byte time value
by Daniel-Constantin Mierla 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 833bb437750ee3c9403f91eb13a607ceede0be5d URL: https://github.com/kamailio/kamailio/commit/833bb437750ee3c9403f91eb13a607c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-31T20:23:11+01:00 dialog: use internal function to get 4-byte time value --- Modified: src/modules/dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/833bb437750ee3c9403f91eb13a607c… Patch: https://github.com/kamailio/kamailio/commit/833bb437750ee3c9403f91eb13a607c… --- diff --git a/src/modules/dialog/dlg_handlers.c b/src/modules/dialog/dlg_handlers.c index c05da0378fb..822175eb829 100644 --- a/src/modules/dialog/dlg_handlers.c +++ b/src/modules/dialog/dlg_handlers.c @@ -494,7 +494,7 @@ static void dlg_onreply(struct cell *t, int type, struct tmcb_params *param) next_state_dlg(dlg, event, &old_state, &new_state, &unref); if(new_state == DLG_STATE_DELETED && old_state != DLG_STATE_DELETED) { /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); + dlg->end_ts = ksr_time_uint(NULL, NULL); } if(dlg_run_event_route( dlg, (rpl == FAKED_REPLY) ? NULL : rpl, old_state, new_state) @@ -540,7 +540,7 @@ static void dlg_onreply(struct cell *t, int type, struct tmcb_params *param) } /* set start time */ - dlg->start_ts = (unsigned int)(time(0)); + dlg->start_ts = ksr_time_uint(NULL, NULL); /* save the settings to the database, * if realtime saving mode configured- save dialog now @@ -1431,7 +1431,7 @@ void dlg_onroute(struct sip_msg *req, str *route_params, void *param) next_state_dlg(dlg, event, &old_state, &new_state, &unref); CURR_DLG_ID = req->id; - CURR_DLG_LIFETIME = (unsigned int)(time(0)) - dlg->start_ts; + CURR_DLG_LIFETIME = ksr_time_uint(NULL, NULL) - dlg->start_ts; CURR_DLG_STATUS = new_state; if(dlg_run_event_route(dlg, req, old_state, new_state) < 0) { @@ -1443,7 +1443,7 @@ void dlg_onroute(struct sip_msg *req, str *route_params, void *param) * to absorb in-air messages */ if(new_state == DLG_STATE_DELETED && old_state != DLG_STATE_DELETED) { /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); + dlg->end_ts = ksr_time_uint(NULL, NULL); iuid = dlg_get_iuid_shm_clone(dlg); if(iuid != NULL) { if(d_tmb.register_tmcb(req, NULL, TMCB_DESTROY, unref_dlg_from_cb, @@ -1681,7 +1681,7 @@ void dlg_ontimeout(struct dlg_tl *tl) dlg->tag[DLG_CALLEE_LEG].s, old_state); /* set end time */ - dlg->end_ts = (unsigned int)(time(0)); + dlg->end_ts = ksr_time_uint(NULL, NULL); /* dialog timeout */ run_dlg_callbacks( @@ -1923,8 +1923,8 @@ int dlg_set_state(sip_msg_t *msg, int istate) /* updates for terminated dialogs */ if(ostate == DLG_STATE_CONFIRMED && istate == DLG_STATE_DELETED) { /* updating timestamps, flags, dialog stats */ - dlg->init_ts = (unsigned int)(time(0)); - dlg->end_ts = (unsigned int)(time(0)); + dlg->init_ts = ksr_time_uint(NULL, NULL); + dlg->end_ts = ksr_time_uint(NULL, NULL); } dlg->dflags |= DLG_FLAG_CHANGED; dlg_release(dlg);

1 0

git:master:5283bf62: core: ut.h - function to split time_t in lower and upper 4 bytes
by Daniel-Constantin Mierla 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 5283bf6288a6b86bdc405883d6995f03cc373256 URL: https://github.com/kamailio/kamailio/commit/5283bf6288a6b86bdc405883d6995f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-31T20:23:11+01:00 core: ut.h - function to split time_t in lower and upper 4 bytes - lower 4 bytes are returned, upper 4 bytes can be stored in output parameter - if pointer to time value is not give, time(0) is used --- Modified: src/core/ut.h --- Diff: https://github.com/kamailio/kamailio/commit/5283bf6288a6b86bdc405883d6995f0… Patch: https://github.com/kamailio/kamailio/commit/5283bf6288a6b86bdc405883d6995f0… --- diff --git a/src/core/ut.h b/src/core/ut.h index 31b45fe5b4d..29faca83fc2 100644 --- a/src/core/ut.h +++ b/src/core/ut.h @@ -1155,6 +1155,27 @@ static inline int strno2int(str *val, unsigned int *mask) } } +static inline unsigned int ksr_time_uint(time_t *tv, unsigned int *tu) +{ + unsigned int tl; /* lower 4 bytes */ + unsigned long long v64; + time_t t; + + if(tv != NULL) { + t = *tv; + } else { + t = time(NULL); + } + v64 = (unsigned long long)t; + tl = (unsigned int)(v64 & 0xFFFFFFFFULL); + if(tu != NULL) { + /* upper 4 bytes */ + *tu = (unsigned int)((v64 >> 32) & 0xFFFFFFFFULL); + } + + return tl; +} + /* converts a username into uid:gid, * returns -1 on error & 0 on success */ int user2uid(int *uid, int *gid, char *user);

1 0

git:master:478310c5: pv: small reworking of pointer conditions
by Daniel-Constantin Mierla 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 478310c56f0eb060c5f31b2ee8febbb6204d37e7 URL: https://github.com/kamailio/kamailio/commit/478310c56f0eb060c5f31b2ee8febbb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-31T20:23:11+01:00 pv: small reworking of pointer conditions --- Modified: src/modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/478310c56f0eb060c5f31b2ee8febbb… Patch: https://github.com/kamailio/kamailio/commit/478310c56f0eb060c5f31b2ee8febbb… --- diff --git a/src/modules/pv/pv_core.c b/src/modules/pv/pv_core.c index 3963ead97f9..38d46c01dba 100644 --- a/src/modules/pv/pv_core.c +++ b/src/modules/pv/pv_core.c @@ -3654,7 +3654,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, } buf.s = pkg_malloc(val->rs.len); - if(buf.s == 0) { + if(buf.s == NULL) { LM_ERR("no more pkg mem\n"); goto error; } @@ -3681,7 +3681,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } buf.s = pkg_malloc(val->rs.len + 1); - if(buf.s == 0) { + if(buf.s == NULL) { LM_ERR("no more pkg mem\n"); goto error; } @@ -3708,7 +3708,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } buf.s = pkg_malloc(val->rs.len); - if(buf.s == 0) { + if(buf.s == NULL) { PKG_MEM_ERROR; goto error; } @@ -3735,7 +3735,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return -1; } buf.s = pkg_malloc(val->rs.len + 1); - if(buf.s == 0) { + if(buf.s == NULL) { LM_ERR("no more pkg mem\n"); goto error; } @@ -3790,7 +3790,7 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, goto error; } } else { - if(buf.s != 0) { + if(buf.s != NULL) { pkg_free(buf.s); buf.s = NULL; } @@ -3817,8 +3817,9 @@ int pv_set_xto_attr(struct sip_msg *msg, pv_param_t *param, int op, return 0; error: - if(buf.s != 0) + if(buf.s != NULL) { pkg_free(buf.s); + } return -1; }

1 0

[kamailio/kamailio] pkg/kamailio/alpine: Add new modules (PR #4132)
by Ben Kaufman 31 Jan '25

31 Jan '25

- Add missing modules to alpine packages as listed in GH #4131   #### 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 - [x] Related to issue #4131 Changes should be backported to 6.0 branch, not 5.8 branch since it contains modules that don't exist in 5.8 #### Description Update `/pkg/kamailio/alpine/APKBUILD` file to add modules that have been added to Kamailio in the last few years. This also includes updating the dependency list for the modules. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4132 -- Commit Summary -- * pkg/kamailio/alpine: Add new modules -- File Changes -- M pkg/kamailio/alpine/APKBUILD (146) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4132.patch https://github.com/kamailio/kamailio/pull/4132.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4132 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4132(a)github.com>

2 3

Kamailio 6.0 presentation at FOSDEM 2025
by Henning Westerholt 31 Jan '25

31 Jan '25

Hello, just a quick announcement, that tomorrow afternoon will be a presentation about Kamailio 6.0 at the FOSDEM conference in Brussels, Belgium [1]. Usually all the talks in this room are streamed online as well. I am happy also to meet during the conference to chat about Kamailio or other topics, just send me a (direct) message. Best regards, Henning [1] https://fosdem.org/2025/schedule/event/fosdem-2025-5978-kamailio-6-0-develo… -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 0

[kamailio/kamailio] db_oracle: fix db_oracle cmake build for oracle 18.3.0.0.0 (PR #4128)
by Ovidiu Sas 31 Jan '25

31 Jan '25

This pull request enables db_oracle to be built against oracle 18.3.0.0.0 dev libraries using cmake. It requires the following env variables to be set: ``` declare -x ORACLE_HOME="/usr/lib/oracle/18.3/client64/" declare -x ORACLE_INCLUDE_DIR="/usr/include/oracle/18.3/client64" ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/4128 -- Commit Summary -- * db_oracle: fix db_oracle build for oracle 18.3.0.0.0 -- File Changes -- M cmake/modules/FindOracle.cmake (3) M src/modules/db_oracle/CMakeLists.txt (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/4128.patch https://github.com/kamailio/kamailio/pull/4128.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/4128 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/4128(a)github.com>

3 2

git:master:77ce71fc: db_oracle: fix db_oracle build for oracle 18.3.0.0.0
by Victor Seva 31 Jan '25

31 Jan '25

Module: kamailio Branch: master Commit: 77ce71fcd4cfb6f0f86313d95341e4abd0031b2c URL: https://github.com/kamailio/kamailio/commit/77ce71fcd4cfb6f0f86313d95341e4a… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-31T12:55:48+01:00 db_oracle: fix db_oracle build for oracle 18.3.0.0.0 --- Modified: cmake/modules/FindOracle.cmake Modified: src/modules/db_oracle/CMakeLists.txt --- Diff: https://github.com/kamailio/kamailio/commit/77ce71fcd4cfb6f0f86313d95341e4a… Patch: https://github.com/kamailio/kamailio/commit/77ce71fcd4cfb6f0f86313d95341e4a… --- diff --git a/cmake/modules/FindOracle.cmake b/cmake/modules/FindOracle.cmake index bc6f64a9bd5..1b88fe4ee04 100644 --- a/cmake/modules/FindOracle.cmake +++ b/cmake/modules/FindOracle.cmake @@ -29,6 +29,9 @@ if(NOT ORACLE_HOME) if(EXISTS $ENV{ORACLE_HOME}) set(ORACLE_HOME $ENV{ORACLE_HOME}) endif() + if(EXISTS $ENV{ORACLE_INCLUDE_DIR}) + set(ORACLE_INCLUDE_DIR $ENV{ORACLE_INCLUDE_DIR}) + endif() endif() message(STATUS "ORACLE_HOME=${ORACLE_HOME}") diff --git a/src/modules/db_oracle/CMakeLists.txt b/src/modules/db_oracle/CMakeLists.txt index 758e78e8b25..66a4ab5ebea 100644 --- a/src/modules/db_oracle/CMakeLists.txt +++ b/src/modules/db_oracle/CMakeLists.txt @@ -6,5 +6,5 @@ add_library(${module_name} SHARED ${MODULE_SOURCES}) find_package(Oracle REQUIRED) # /usr/include/oracle/18.3/client64) -target_include_directories(${module_name} PRIVATE ${Oracle_INCLUDE_DIRS}) -target_link_libraries(${module_name} PRIVATE occi clntsh) +target_include_directories(${module_name} PRIVATE ${ORACLE_INCLUDE_DIR}) +target_link_libraries(${module_name} PRIVATE ${ORACLE_LIBRARIES})

1 0

git:master:f07d8ea5: pkg/kamailio/alpine: Add new modules
by Victor Seva 30 Jan '25

30 Jan '25

Module: kamailio Branch: master Commit: f07d8ea527883009fece7fd2a1c61d0a90a0c660 URL: https://github.com/kamailio/kamailio/commit/f07d8ea527883009fece7fd2a1c61d0… Author: Kaufman <bkaufman(a)bcmone.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2025-01-30T22:32:16+01:00 pkg/kamailio/alpine: Add new modules - Add missing modules to alpine packages as listed in GH #4131 --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/f07d8ea527883009fece7fd2a1c61d0… Patch: https://github.com/kamailio/kamailio/commit/f07d8ea527883009fece7fd2a1c61d0…

1 0

Branching 6.0 series
by Daniel-Constantin Mierla 30 Jan '25

30 Jan '25

Hello, I am trying to figure out what would be the best date to branch 6.0 in the git repo. To allow a bit of time after returning from the winter holidays to tune more the cmake and packaging, I would think that January 15, 2025 could be a good choice. If nobody comes with other opinions/suggestions, then we will go for it. Cheers, Daniel -- Daniel-Constantin Mierla (@ asipto.com) twitter.com/miconda -- linkedin.com/in/miconda Kamailio Consultancy, Training and Development Services -- asipto.com

5 13

git:master:ab1b0327: seas: remove redundant check
by Daniel-Constantin Mierla 30 Jan '25

30 Jan '25

Module: kamailio Branch: master Commit: ab1b032771be9adbb1d643cd44beac0e09a31553 URL: https://github.com/kamailio/kamailio/commit/ab1b032771be9adbb1d643cd44beac0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2025-01-30T11:32:53+01:00 seas: remove redundant check --- Modified: src/modules/seas/ha.c --- Diff: https://github.com/kamailio/kamailio/commit/ab1b032771be9adbb1d643cd44beac0… Patch: https://github.com/kamailio/kamailio/commit/ab1b032771be9adbb1d643cd44beac0… --- diff --git a/src/modules/seas/ha.c b/src/modules/seas/ha.c index 5eb1bbe6ff5..74f3d9a5e6a 100644 --- a/src/modules/seas/ha.c +++ b/src/modules/seas/ha.c @@ -156,7 +156,7 @@ static inline int parse_ping( } string++; } - if(!(ping_period_s && pings_lost_s && ping_timeout_s)) { + if(!(pings_lost_s && ping_timeout_s)) { LM_ERR("malformed ping config string. Unparseable :[%s]\n", string); return -1; }

1 0

← Newer
1
2
3
4
5
6
7
8
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2025