sr-dev September 2022

sr-dev@lists.kamailio.org

16 participants
275 discussions

git:5.5:b92a8a0d: Makefile.defs: version set to 5.5.5

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: b92a8a0db4cfa25f6c9231c4bc855ff3fb3a5845 URL: https://github.com/kamailio/kamailio/commit/b92a8a0db4cfa25f6c9231c4bc855ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T10:21:25+02:00 Makefile.defs: version set to 5.5.5 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/b92a8a0db4cfa25f6c9231c4bc855ff… Patch: https://github.com/kamailio/kamailio/commit/b92a8a0db4cfa25f6c9231c4bc855ff… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 5fdc880c31..0e49c6f0c4 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 5 -SUBLEVEL = 4 +SUBLEVEL = 5 EXTRAVERSION = # memory manager switcher

2 years, 2 months

git:5.5:8e388fc0: pkg/kamailio/deb: version set 5.5.5

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 8e388fc0d8077ea8eed2c97c2f12a34f4a371fe8 URL: https://github.com/kamailio/kamailio/commit/8e388fc0d8077ea8eed2c97c2f12a34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T10:20:43+02:00 pkg/kamailio/deb: version set 5.5.5 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/bullseye/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/focal/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/8e388fc0d8077ea8eed2c97c2f12a34… Patch: https://github.com/kamailio/kamailio/commit/8e388fc0d8077ea8eed2c97c2f12a34…

2 years, 2 months

git:5.5:75a4adb1: pkg: version set to 5.5.5 for rpm and alpine specs

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 75a4adb1a5f2b99951f2519bc2513d2d2842e273 URL: https://github.com/kamailio/kamailio/commit/75a4adb1a5f2b99951f2519bc2513d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T10:19:40+02:00 pkg: version set to 5.5.5 for rpm and alpine specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/75a4adb1a5f2b99951f2519bc2513d2… Patch: https://github.com/kamailio/kamailio/commit/75a4adb1a5f2b99951f2519bc2513d2… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index 7d276753249..e35b095c359 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.5.4 +pkgver=5.5.5 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 1833f6086ee..63d6edbc0d1 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.5.4 +%define ver 5.5.5 %define rel dev1.0%{dist} %if 0%{?fedora}

2 years, 2 months

Releasing Kamailio v5.5.5

by Daniel-Constantin Mierla

Hello, I am considering to release Kamailio v5.5.5 soon, likely on Monday or Tuesday next week (Sep 19 or 20, 2022). This is the usual heads up notification to see if anyone is aware of issues not yet reported to bug tracker and if yes, do it as soon as possible to give them a chance to be fixed. Cheers, Daniel -- Daniel-Constantin Mierla -- www.asipto.com www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Online Oct 10-13, 2022 (Europe Timezone) * https://www.asipto.com/sw/kamailio-advanced-training-online/

2 years, 2 months

git:master:f7b35f05: acc_json: update to free cdr core attrs

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: f7b35f05f31bd7cc01aea4572c79ba48d84d8123 URL: https://github.com/kamailio/kamailio/commit/f7b35f05f31bd7cc01aea4572c79ba4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:40:37+02:00 acc_json: update to free cdr core attrs --- Modified: src/modules/acc_json/acc_json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f7b35f05f31bd7cc01aea4572c79ba4… Patch: https://github.com/kamailio/kamailio/commit/f7b35f05f31bd7cc01aea4572c79ba4… --- diff --git a/src/modules/acc_json/acc_json_mod.c b/src/modules/acc_json/acc_json_mod.c index 42d29c8ae54..accd054de64 100644 --- a/src/modules/acc_json/acc_json_mod.c +++ b/src/modules/acc_json/acc_json_mod.c @@ -452,14 +452,13 @@ int cdr_json_write(struct dlg_cell *dlg, struct sip_msg *req, cdr_info_t *inf) inf->tarr + attr_cnt); attr_cnt += extra_cnt; } else if (cdr_expired_dlg_enable){ - int dlg_index = 0; - dlg_index += accb.get_extra_dlg_attrs( cdr_extra, + extra_cnt += accb.get_extra_dlg_attrs( cdr_extra, dlg, inf->varr + attr_cnt, inf->iarr + attr_cnt, inf->tarr + attr_cnt, &dlgb); - attr_cnt += dlg_index; + attr_cnt += extra_cnt; } struct acc_extra *extra = cdr_extra; @@ -516,7 +515,7 @@ int cdr_json_write(struct dlg_cell *dlg, struct sip_msg *req, cdr_info_t *inf) json_object_clear(object); json_decref(object); } - /* free memory allocated by get_extra_attrs */ - free_strar_mem(&(inf->tarr[core_cnt]), &(inf->varr[core_cnt]), extra_cnt, attr_cnt); + /* free memory allocated by cdr core+extra attrs */ + free_strar_mem(&(inf->tarr[0]), &(inf->varr[0]), attr_cnt, attr_cnt); return 1; }

2 years, 2 months

git:master:d616dc46: acc: clone dlg core attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: d616dc46b5373b1474bf855afde4c5687d2a2d09 URL: https://github.com/kamailio/kamailio/commit/d616dc46b5373b1474bf855afde4c56… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:40:36+02:00 acc: clone dlg core attributes - GH #3243 --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/d616dc46b5373b1474bf855afde4c56… Patch: https://github.com/kamailio/kamailio/commit/d616dc46b5373b1474bf855afde4c56… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index 8c51881dd7..1efa6515e6 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -96,9 +96,8 @@ int cdr_core2strar( struct dlg_cell* dlg, int* unused, char* types) { - str* start = NULL; - str* end = NULL; - str* duration = NULL; + str* dlgvals[MAX_CDR_CORE]; /* start, end, duration */ + int i; if( !dlg || !values || !types) { @@ -106,18 +105,40 @@ int cdr_core2strar( struct dlg_cell* dlg, return 0; } - start = dlgb.get_dlg_var( dlg, (str*)&cdr_start_str); - end = dlgb.get_dlg_var( dlg, (str*)&cdr_end_str); - duration = dlgb.get_dlg_var( dlg, (str*)&cdr_duration_str); - - values[0] = ( start != NULL ? *start : empty_string); - types[0] = ( start != NULL ? TYPE_DATE : TYPE_NULL); - - values[1] = ( end != NULL ? *end : empty_string); - types[1] = ( end != NULL ? TYPE_DATE : TYPE_NULL); - - values[2] = ( duration != NULL ? *duration : empty_string); - types[2] = ( duration != NULL ? TYPE_DOUBLE : TYPE_NULL); + dlgvals[0] = dlgb.get_dlg_var( dlg, (str*)&cdr_start_str); /* start */ + dlgvals[1] = dlgb.get_dlg_var( dlg, (str*)&cdr_end_str); /* end */ + dlgvals[2] = dlgb.get_dlg_var( dlg, (str*)&cdr_duration_str); /* duration */ + + for(i=0; i<MAX_CDR_CORE; i++) { + if (dlgvals[i]!=NULL) { + values[i].s = (char *)pkg_malloc(dlgvals[i]->len + 1); + if (values[i].s == NULL ) { + PKG_MEM_ERROR; + /* cleanup already allocated memory and + * return that we didn't do anything */ + for (i = i-1; i >= 0; i--) { + if (NULL != values[i].s){ + pkg_free(values[i].s); + values[i].s = NULL; + } + } + return 0; + } + memcpy(values[i].s, dlgvals[i]->s, dlgvals[i]->len); + values[i].s[dlgvals[i]->len] = '\0'; + values[i].len = dlgvals[i]->len; + if(i!=2) { + /* [0] - start; [1] - end */ + types[i] = TYPE_DATE; + } else { + /* [2] - duration */ + types[i] = TYPE_DOUBLE; + } + } else { + values[i] = empty_string; + types[i] = TYPE_NULL; + } + } return MAX_CDR_CORE; } @@ -272,15 +293,15 @@ static int db_write_cdr( struct dlg_cell* dialog, } } - /* Free memory allocated by acc_extra.c/extra2strar */ - free_strar_mem( &(cdr_type_array[core_cnt]), &(cdr_value_array[core_cnt]), - extra_cnt, attr_cnt); + /* Free memory allocated by core+extra attrs */ + free_strar_mem( &(cdr_type_array[0]), &(cdr_value_array[0]), + attr_cnt, attr_cnt); return 0; error: - /* Free memory allocated by acc_extra.c/extra2strar */ - free_strar_mem( &(cdr_type_array[core_cnt]), &(cdr_value_array[core_cnt]), - extra_cnt, attr_cnt); + /* Free memory allocated by core+extra attrs */ + free_strar_mem( &(cdr_type_array[0]), &(cdr_value_array[0]), + attr_cnt, attr_cnt); return -1; }

2 years, 2 months

git:master:c5f71a45: acc: more meaningful array index names for building cdr attributes

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c5f71a45c7c55af0cf4a6aa482d8a57018af7900 URL: https://github.com/kamailio/kamailio/commit/c5f71a45c7c55af0cf4a6aa482d8a57… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:40:36+02:00 acc: more meaningful array index names for building cdr attributes --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/c5f71a45c7c55af0cf4a6aa482d8a57… Patch: https://github.com/kamailio/kamailio/commit/c5f71a45c7c55af0cf4a6aa482d8a57… --- diff --git a/src/modules/acc/acc_cdr.c b/src/modules/acc/acc_cdr.c index d3009c8538..8c51881dd7 100644 --- a/src/modules/acc/acc_cdr.c +++ b/src/modules/acc/acc_cdr.c @@ -130,8 +130,9 @@ static db_val_t *db_cdr_vals = NULL; static int db_write_cdr( struct dlg_cell* dialog, struct sip_msg* message) { - int m = 0; - int n = 0; + int attr_cnt = 0; + int core_cnt = 0; + int extra_cnt = 0; int i; db_func_t *df=NULL; db1_con_t *dh=NULL; @@ -155,12 +156,13 @@ static int db_write_cdr( struct dlg_cell* dialog, dh = (db1_con_t*)vh; /* get default values */ - m = cdr_core2strar( dialog, + core_cnt = cdr_core2strar( dialog, cdr_value_array, cdr_int_array, cdr_type_array); + attr_cnt += core_cnt; - for(i=0; i<m; i++) { + for(i=0; i<core_cnt; i++) { db_cdr_keys[i] = &cdr_attrs[i]; /* reset errno, some strtoX don't reset it */ errno = 0; @@ -219,24 +221,24 @@ static int db_write_cdr( struct dlg_cell* dialog, /* get extra values */ if (message) { - n += extra2strar( cdr_extra, + extra_cnt = extra2strar( cdr_extra, message, - cdr_value_array + m, - cdr_int_array + m, - cdr_type_array + m); - m += n; + cdr_value_array + attr_cnt, + cdr_int_array + attr_cnt, + cdr_type_array + attr_cnt); + attr_cnt += extra_cnt;; } else if (cdr_expired_dlg_enable){ LM_WARN( "fallback to dlg_only search because of message doesn't exist.\n"); - n += extra2strar_dlg_only( cdr_extra, + extra_cnt = extra2strar_dlg_only( cdr_extra, dialog, - cdr_value_array + m, - cdr_int_array + m, - cdr_type_array +m, + cdr_value_array + attr_cnt, + cdr_int_array + attr_cnt, + cdr_type_array + attr_cnt, &dlgb); - m += n; + attr_cnt += extra_cnt; } - for( ; i<m; i++) { + for( ; i<attr_cnt; i++) { db_cdr_keys[i] = &cdr_attrs[i]; if (cdr_extra_nullable == 1 && cdr_type_array[i] == TYPE_NULL) { @@ -254,29 +256,31 @@ static int db_write_cdr( struct dlg_cell* dialog, } if(acc_db_insert_mode==1 && df->insert_delayed!=NULL) { - if (df->insert_delayed(dh, db_cdr_keys, db_cdr_vals, m) < 0) { + if (df->insert_delayed(dh, db_cdr_keys, db_cdr_vals, attr_cnt) < 0) { LM_ERR("failed to insert delayed into database\n"); goto error; } } else if(acc_db_insert_mode==2 && df->insert_async!=NULL) { - if (df->insert_async(dh, db_cdr_keys, db_cdr_vals, m) < 0) { + if (df->insert_async(dh, db_cdr_keys, db_cdr_vals, attr_cnt) < 0) { LM_ERR("failed to insert async into database\n"); goto error; } } else { - if (df->insert(dh, db_cdr_keys, db_cdr_vals, m) < 0) { + if (df->insert(dh, db_cdr_keys, db_cdr_vals, attr_cnt) < 0) { LM_ERR("failed to insert into database\n"); goto error; } } /* Free memory allocated by acc_extra.c/extra2strar */ - free_strar_mem( &(cdr_type_array[m-n]), &(cdr_value_array[m-n]), n, m); + free_strar_mem( &(cdr_type_array[core_cnt]), &(cdr_value_array[core_cnt]), + extra_cnt, attr_cnt); return 0; error: /* Free memory allocated by acc_extra.c/extra2strar */ - free_strar_mem( &(cdr_type_array[m-n]), &(cdr_value_array[m-n]), n, m); + free_strar_mem( &(cdr_type_array[core_cnt]), &(cdr_value_array[core_cnt]), + extra_cnt, attr_cnt); return -1; }

2 years, 2 months

[kamailio/kamailio] 5.5 (PR #3244)

by Atanas Bakalov

#### 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 rx_aar: unreference dialog in case of aar update release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3244 -- Commit Summary -- * rx_aar: unreference dialog in case of aar update (#3104) * ims_qos: fix compilation warning -- File Changes -- M src/modules/ims_qos/rx_aar.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3244.patch https://github.com/kamailio/kamailio/pull/3244.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3244 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3244(a)github.com>

2 years, 2 months

git:5.5:32bd4d53: ims_qos: fix compilation warning

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 32bd4d5370b9342d2df09269087b47d94e7f4ca5 URL: https://github.com/kamailio/kamailio/commit/32bd4d5370b9342d2df09269087b47d… Author: Atanas Bakalov <atanas(a)wgtwo.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:22:50+02:00 ims_qos: fix compilation warning (cherry picked from commit bd4cc486879616d502362dd464b04d7d3c2865c4) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/32bd4d5370b9342d2df09269087b47d… Patch: https://github.com/kamailio/kamailio/commit/32bd4d5370b9342d2df09269087b47d… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 148224b4cc..efe3ffdf8b 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -53,6 +53,7 @@ #include "../cdp_avp/cdp_avp_mod.h" #include "../../modules/ims_dialog/dlg_load.h" +#include "../../modules/ims_dialog/dlg_hash.h" #include "../../modules/tm/tm_load.h" #include "../ims_usrloc_pcscf/usrloc.h" #include "rx_authdata.h"

2 years, 2 months

git:5.5:45ef2fab: rx_aar: unreference dialog in case of aar update (#3104)

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.5 Commit: 45ef2fab63eaae18c4a0e41ffc0487829105b481 URL: https://github.com/kamailio/kamailio/commit/45ef2fab63eaae18c4a0e41ffc04878… Author: Atanas Bakalov <atanas.bakalov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-09-19T08:22:50+02:00 rx_aar: unreference dialog in case of aar update (#3104) - release the dialog reference even for aar updates as the dialog was already referenced when issuing the aar request Co-authored-by: Atanas Bakalov <atanas(a)wgtwo.com> (cherry picked from commit ab8cb43c83f8c9528e45a5b57fbb1440360f201e) --- Modified: src/modules/ims_qos/rx_aar.c --- Diff: https://github.com/kamailio/kamailio/commit/45ef2fab63eaae18c4a0e41ffc04878… Patch: https://github.com/kamailio/kamailio/commit/45ef2fab63eaae18c4a0e41ffc04878… --- diff --git a/src/modules/ims_qos/rx_aar.c b/src/modules/ims_qos/rx_aar.c index 6a2d60c9012..148224b4cce 100644 --- a/src/modules/ims_qos/rx_aar.c +++ b/src/modules/ims_qos/rx_aar.c @@ -177,6 +177,8 @@ void async_aar_callback(int is_timeout, void *param, AAAMessage *aaa, long elaps STR_SHM_DUP(*passed_rx_session_id, aaa->sessionId->data, "cb_passed_rx_session_id"); LM_DBG("passed rx session id [%.*s]", passed_rx_session_id->len, passed_rx_session_id->s); dlgb.register_dlgcb_nodlg( data->dlg, DLGCB_TERMINATED | DLGCB_DESTROY | DLGCB_EXPIRED | DLGCB_RESPONSE_WITHIN | DLGCB_CONFIRMED | DLGCB_FAILED, callback_dialog, (void*) (passed_rx_session_id), free_dialog_data); + } else { + unref_dlg(data->dlg, 1); } result = CSCF_RETURN_TRUE; } else {

2 years, 2 months

← Newer
1
...
15
16
17
18
19
20
21
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2022