sr-dev April 2022

sr-dev@lists.kamailio.org

17 participants
286 discussions

git:5.4:10be3004: pkg: fix debian lintian error after kamailio scripts changed to python3 [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.4 Commit: 10be300458db9c6e9e1800c080bd7665ba5d7f62 URL: https://github.com/kamailio/kamailio/commit/10be300458db9c6e9e1800c080bd766… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T10:38:31+02:00 pkg: fix debian lintian error after kamailio scripts changed to python3 [skip ci] (cherry picked from commit b7b33ad13942a7f0ef48ed9487541cd418f137f6) --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/10be300458db9c6e9e1800c080bd766… Patch: https://github.com/kamailio/kamailio/commit/10be300458db9c6e9e1800c080bd766… --- diff --git a/pkg/kamailio/deb/bionic/control b/pkg/kamailio/deb/bionic/control index 107d662084..cb1f6dabbf 100644 --- a/pkg/kamailio/deb/bionic/control +++ b/pkg/kamailio/deb/bionic/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/buster/control b/pkg/kamailio/deb/buster/control index 107d662084..cb1f6dabbf 100644 --- a/pkg/kamailio/deb/buster/control +++ b/pkg/kamailio/deb/buster/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index b0233c812b..73bdf702cc 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -74,7 +74,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/focal/control b/pkg/kamailio/deb/focal/control index 107d662084..cb1f6dabbf 100644 --- a/pkg/kamailio/deb/focal/control +++ b/pkg/kamailio/deb/focal/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/jessie/control b/pkg/kamailio/deb/jessie/control index ef10eef8b4..2c3993b5e8 100644 --- a/pkg/kamailio/deb/jessie/control +++ b/pkg/kamailio/deb/jessie/control @@ -70,7 +70,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/precise/control b/pkg/kamailio/deb/precise/control index 89da6133a9..5d5dabc02b 100644 --- a/pkg/kamailio/deb/precise/control +++ b/pkg/kamailio/deb/precise/control @@ -61,7 +61,6 @@ Pre-Depends: Depends: adduser, lsb-base, - python, python3, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/sid/control b/pkg/kamailio/deb/sid/control index 107d662084..cb1f6dabbf 100644 --- a/pkg/kamailio/deb/sid/control +++ b/pkg/kamailio/deb/sid/control @@ -71,7 +71,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/stretch/control b/pkg/kamailio/deb/stretch/control index 26c5daca3f..50087da12d 100644 --- a/pkg/kamailio/deb/stretch/control +++ b/pkg/kamailio/deb/stretch/control @@ -73,7 +73,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/trusty/control b/pkg/kamailio/deb/trusty/control index 3d35498cf1..f6ac6fd860 100644 --- a/pkg/kamailio/deb/trusty/control +++ b/pkg/kamailio/deb/trusty/control @@ -65,7 +65,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces: diff --git a/pkg/kamailio/deb/wheezy/control b/pkg/kamailio/deb/wheezy/control index 89da6133a9..5d5dabc02b 100644 --- a/pkg/kamailio/deb/wheezy/control +++ b/pkg/kamailio/deb/wheezy/control @@ -61,7 +61,6 @@ Pre-Depends: Depends: adduser, lsb-base, - python, python3, ${misc:Depends}, ${shlibs:Depends}, diff --git a/pkg/kamailio/deb/xenial/control b/pkg/kamailio/deb/xenial/control index b4ecf0870d..2850a659ee 100644 --- a/pkg/kamailio/deb/xenial/control +++ b/pkg/kamailio/deb/xenial/control @@ -76,7 +76,7 @@ Pre-Depends: Depends: adduser, lsb-base, - python, + python3, ${misc:Depends}, ${shlibs:Depends}, Replaces:

1 0

git:5.4:8ec4d583: pkg/kamailio/deb: remove python*-dev dependency for module package [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.4 Commit: 8ec4d583bd0836dd1e0dd94dd3896f1d4351de8d URL: https://github.com/kamailio/kamailio/commit/8ec4d583bd0836dd1e0dd94dd3896f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T10:38:41+02:00 pkg/kamailio/deb: remove python*-dev dependency for module package [skip ci] (cherry picked from commit 39a0a5d6f43ab265f1003f7bbb6e981bcd2e3b72) --- Modified: pkg/kamailio/deb/bionic/control Modified: pkg/kamailio/deb/buster/control Modified: pkg/kamailio/deb/debian/control Modified: pkg/kamailio/deb/focal/control Modified: pkg/kamailio/deb/jessie/control Modified: pkg/kamailio/deb/precise/control Modified: pkg/kamailio/deb/sid/control Modified: pkg/kamailio/deb/stretch/control Modified: pkg/kamailio/deb/trusty/control Modified: pkg/kamailio/deb/wheezy/control Modified: pkg/kamailio/deb/xenial/control --- Diff: https://github.com/kamailio/kamailio/commit/8ec4d583bd0836dd1e0dd94dd3896f1… Patch: https://github.com/kamailio/kamailio/commit/8ec4d583bd0836dd1e0dd94dd3896f1…

1 0

git:5.5:c8af56f4: pkg/kamailio/deb: fix lintian warnings [skip ci]
by Victor Seva 26 Apr '22

26 Apr '22

Module: kamailio Branch: 5.5 Commit: c8af56f46822504e0cd1cfa79f12c6f20e335ccb URL: https://github.com/kamailio/kamailio/commit/c8af56f46822504e0cd1cfa79f12c6f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2022-04-26T10:21:39+02:00 pkg/kamailio/deb: fix lintian warnings [skip ci] (cherry picked from commit dfbeb92a956009fc57070ac988cb0177f9c8192f) --- Added: pkg/kamailio/deb/bionic/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bionic/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bookworm/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/bullseye/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/buster/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/debian/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/focal/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/jessie/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/precise/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/sid/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/stretch/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/trusty/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/wheezy/kamailio-systemd-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-secsipid-modules.lintian-overrides Added: pkg/kamailio/deb/xenial/kamailio-systemd-modules.lintian-overrides Modified: pkg/kamailio/deb/bionic/copyright Modified: pkg/kamailio/deb/bionic/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/bullseye/copyright Modified: pkg/kamailio/deb/bullseye/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/buster/copyright Modified: pkg/kamailio/deb/buster/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/debian/copyright Modified: pkg/kamailio/deb/debian/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/focal/copyright Modified: pkg/kamailio/deb/focal/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/jessie/copyright Modified: pkg/kamailio/deb/jessie/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/precise/copyright Modified: pkg/kamailio/deb/precise/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/sid/copyright Modified: pkg/kamailio/deb/sid/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/stretch/copyright Modified: pkg/kamailio/deb/stretch/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/trusty/copyright Modified: pkg/kamailio/deb/trusty/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/wheezy/copyright Modified: pkg/kamailio/deb/wheezy/kamailio-tls-modules.lintian-overrides Modified: pkg/kamailio/deb/xenial/copyright Modified: pkg/kamailio/deb/xenial/kamailio-tls-modules.lintian-overrides --- Diff: https://github.com/kamailio/kamailio/commit/c8af56f46822504e0cd1cfa79f12c6f… Patch: https://github.com/kamailio/kamailio/commit/c8af56f46822504e0cd1cfa79f12c6f…

1 0

[kamailio/kamailio] pkg alpine renamed malloc_test to misctest (PR #3093)
by Ben Kaufman 25 Apr '22

25 Apr '22

FIX #3091 Building APKs fail due to rename of malloc_test module  #### 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:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [x] Related to issue FIX #3091 #### Description Refactored reference to `malloc_test` in `pkg/kamailio/alpine/APKBUILDER` to `misctest` due to module rename. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/3093 -- Commit Summary -- * pkg alpine renamed malloc_test to misctest -- File Changes -- M pkg/kamailio/alpine/APKBUILD (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/3093.patch https://github.com/kamailio/kamailio/pull/3093.diff -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/3093 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/pull/3093(a)github.com>

2 2

[kamailio/kamailio] Building APKs fail due to rename of malloc_test module (Issue #3091)
by Ben Kaufman 25 Apr '22

25 Apr '22

In 5.6, the module `malloc_test` was renamed to `misctest`, but the refernce in `pkg/kamailio/alpine/APKBUILD` was not changed to reflect this, so following the APK build instructions `/pkg/kamailio/README.md` fail. I admittedly know very little about the APK package building process, but this looks very straight forward. I'll submit a PR once I've finished testing it out. -- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/3091 You are receiving this because you are subscribed to this thread. Message ID: <kamailio/kamailio/issues/3091(a)github.com>

2 1

git:master:96c402b9: pkg alpine renamed malloc_test to misctest
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 96c402b94ada3556218d9924d89d53bf5663b203 URL: https://github.com/kamailio/kamailio/commit/96c402b94ada3556218d9924d89d53b… Author: Kaufman <bkaufman(a)nexvortex.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T18:16:14+02:00 pkg alpine renamed malloc_test to misctest - Fix #3091 Building APKs fail due to rename of malloc_test module --- Modified: pkg/kamailio/alpine/APKBUILD --- Diff: https://github.com/kamailio/kamailio/commit/96c402b94ada3556218d9924d89d53b… Patch: https://github.com/kamailio/kamailio/commit/96c402b94ada3556218d9924d89d53b… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index f23ad03308..6bf221630d 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -77,7 +77,7 @@ _mod_list_dbuid="db2_ops uid_auth_db uid_avp_db uid_domain uid_gflags \ uid_uri_db" # - modules for devel purposes -_mod_list_devel="malloc_test print print_lib" +_mod_list_devel="misctest print print_lib" # - modules depending on pcre3 library _mod_list_pcre="dialplan lcr regex"

1 0

git:master:5e274713: siprepo: unlink item from hash table based on rmode
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 5e27471312c110ce19cfa0bfa5a29abcd03daec6 URL: https://github.com/kamailio/kamailio/commit/5e27471312c110ce19cfa0bfa5a29ab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T15:08:15+02:00 siprepo: unlink item from hash table based on rmode --- Modified: src/modules/siprepo/siprepo_data.c Modified: src/modules/siprepo/siprepo_data.h --- Diff: https://github.com/kamailio/kamailio/commit/5e27471312c110ce19cfa0bfa5a29ab… Patch: https://github.com/kamailio/kamailio/commit/5e27471312c110ce19cfa0bfa5a29ab… --- diff --git a/src/modules/siprepo/siprepo_data.c b/src/modules/siprepo/siprepo_data.c index 0c9873e3c2..603d3744c1 100644 --- a/src/modules/siprepo/siprepo_data.c +++ b/src/modules/siprepo/siprepo_data.c @@ -108,6 +108,25 @@ siprepo_msg_t *siprepo_msg_find(sip_msg_t *msg, str *callid, str *msgid, int lmo return 0; } +/** + * + */ +void siprepo_msg_unlink(siprepo_msg_t *it, unsigned int slotid) +{ + if(it->prev==NULL) { + _siprepo_table[slotid].plist = it->next; + if(_siprepo_table[slotid].plist) { + _siprepo_table[slotid].plist->prev = NULL; + } + } else { + it->prev->next = it->next; + } + if(it->next!=NULL) { + it->next->prev = it->prev; + } + return; +} + /** * */ @@ -334,9 +353,15 @@ int siprepo_msg_pull(sip_msg_t *msg, str *callid, str *msgid, str *rname, lmsg.set_global_address = default_global_address; lmsg.set_global_port = default_global_port; + if(rmode & SIPREPO_RMODE_RM) { + siprepo_msg_unlink(it, slotid); + shm_free(it); + } + + lock_release(&_siprepo_table[slotid].lock); + if(parse_msg(lmsg.buf, lmsg.len, &lmsg) != 0) { LM_ERR("failed to parse msg id [%.*s]\n", msgid->len, msgid->s); - lock_release(&_siprepo_table[slotid].lock); return 1; } if(unlikely(parse_headers(&lmsg, HDR_FROM_F|HDR_TO_F|HDR_CALLID_F|HDR_CSEQ_F, 0) @@ -394,17 +419,7 @@ void siprepo_timer_exec(unsigned int ticks, int worker, void *param) lock_get(&_siprepo_table[i].lock); for(it=_siprepo_table[i].plist; it!=NULL; it=it->next) { if(it->itime+_siprepo_expire < tnow) { - if(it->prev==NULL) { - _siprepo_table[i].plist = it->next; - if(_siprepo_table[i].plist) { - _siprepo_table[i].plist->prev = NULL; - } - } else { - it->prev->next = it->next; - } - if(it->next!=NULL) { - it->next->prev = it->prev; - } + siprepo_msg_unlink(it, slotid); if(elist) { it->next = elist; elist = it; diff --git a/src/modules/siprepo/siprepo_data.h b/src/modules/siprepo/siprepo_data.h index 2750189ae0..683348c8b0 100644 --- a/src/modules/siprepo/siprepo_data.h +++ b/src/modules/siprepo/siprepo_data.h @@ -27,6 +27,8 @@ #include "../../core/parser/msg_parser.h" +#define SIPREPO_RMODE_RM 1 + typedef struct siprepo_msg { unsigned int hid; int mtype;

1 0

git:master:72443722: rls: free resources in case of errors
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 72443722d7fda4289390ef8bc20ad91990b895a7 URL: https://github.com/kamailio/kamailio/commit/72443722d7fda4289390ef8bc20ad91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T12:04:06+02:00 rls: free resources in case of errors --- Modified: src/modules/rls/resource_notify.c --- Diff: https://github.com/kamailio/kamailio/commit/72443722d7fda4289390ef8bc20ad91… Patch: https://github.com/kamailio/kamailio/commit/72443722d7fda4289390ef8bc20ad91… --- diff --git a/src/modules/rls/resource_notify.c b/src/modules/rls/resource_notify.c index 0f31e7c877..d3ad4fd1fc 100644 --- a/src/modules/rls/resource_notify.c +++ b/src/modules/rls/resource_notify.c @@ -146,6 +146,9 @@ int send_notify(xmlDocPtr * rlmi_doc, char * buf, int buf_len, int result = 0; str rlmi_cont= {0, 0}, multi_cont; + if(rlmi_doc==NULL || *rlmi_doc==NULL) { + return -1; + } xmlDocDumpFormatMemory(*rlmi_doc,(xmlChar**)(void*)&rlmi_cont.s, &rlmi_cont.len, 0); @@ -183,7 +186,6 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, subs_t* dialog= NULL; int len_est = 0; int resource_added = 0; /* Flag to indicate that we have added at least one resource */ - int ok = 0; /* generate the boundary string */ boundary_string= generate_string(BOUNDARY_STRING_LEN); @@ -431,7 +433,6 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, } done: - ok = 1; if (dbmode == RLS_DB_ONLY && rls_dbf.end_transaction) { if (rls_dbf.end_transaction(rls_db) < 0) @@ -456,11 +457,10 @@ static void send_notifies(db1_res_t *result, int did_col, int resource_uri_col, LM_ERR("in abort_transaction\n"); } - if(ok==0) { - if(rlmi_doc!=NULL) { - xmlFreeDoc(rlmi_doc); - } + if(rlmi_doc!=NULL) { + xmlFreeDoc(rlmi_doc); } + return; }

1 0

git:master:3553ee0b: janssonrpcc: free resources in case of errors
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: 3553ee0b4e2e973a742c5c73f43d848496959723 URL: https://github.com/kamailio/kamailio/commit/3553ee0b4e2e973a742c5c73f43d848… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T11:39:10+02:00 janssonrpcc: free resources in case of errors --- Modified: src/modules/janssonrpcc/janssonrpc_io.c Modified: src/modules/janssonrpcc/janssonrpc_request.c Modified: src/modules/janssonrpcc/janssonrpc_server.c Modified: src/modules/janssonrpcc/janssonrpc_srv.c --- Diff: https://github.com/kamailio/kamailio/commit/3553ee0b4e2e973a742c5c73f43d848… Patch: https://github.com/kamailio/kamailio/commit/3553ee0b4e2e973a742c5c73f43d848… --- diff --git a/src/modules/janssonrpcc/janssonrpc_io.c b/src/modules/janssonrpcc/janssonrpc_io.c index 5e9d01d004..830c2b9611 100644 --- a/src/modules/janssonrpcc/janssonrpc_io.c +++ b/src/modules/janssonrpcc/janssonrpc_io.c @@ -442,6 +442,7 @@ int jsonrpc_send(str conn, jsonrpc_request_t* req, bool notify_only) if (sent) { if (notify_only == true) { // free the request if using janssonrpc_notification function free_req_cmd(req->cmd); + req->cmd = NULL; free_request(req); } else { struct timeval tv; diff --git a/src/modules/janssonrpcc/janssonrpc_request.c b/src/modules/janssonrpcc/janssonrpc_request.c index ecd43c1476..758c56b61d 100644 --- a/src/modules/janssonrpcc/janssonrpc_request.c +++ b/src/modules/janssonrpcc/janssonrpc_request.c @@ -217,7 +217,7 @@ void retry_cb(int fd, short event, void* arg) DEBUG("retrying request: id=%d\n", req->id); - if(jsonrpc_send(req->cmd->conn, req, 0)<0) { + if(jsonrpc_send(req->cmd->conn, req, false)<0) { goto error; } diff --git a/src/modules/janssonrpcc/janssonrpc_server.c b/src/modules/janssonrpcc/janssonrpc_server.c index 6c4b999b50..16365fe214 100644 --- a/src/modules/janssonrpcc/janssonrpc_server.c +++ b/src/modules/janssonrpcc/janssonrpc_server.c @@ -278,7 +278,7 @@ int jsonrpc_server_from_srv(str conn, str srv, DBG("server %s\n", srv_record->name); server = create_server(); - CHECK_MALLOC(server); + CHECK_MALLOC_GOTO(server, error); shm_str_dup(&server->conn, &conn); CHECK_MALLOC_GOTO(server->conn.s, error); diff --git a/src/modules/janssonrpcc/janssonrpc_srv.c b/src/modules/janssonrpcc/janssonrpc_srv.c index 3ce7e28676..e29767ffa7 100644 --- a/src/modules/janssonrpcc/janssonrpc_srv.c +++ b/src/modules/janssonrpcc/janssonrpc_srv.c @@ -89,6 +89,7 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) continue; srv_record = (struct srv_rdata*)l->rdata; if (srv_record == NULL) { + free_rdata_list(head); ERR("BUG: null rdata\n"); return -1; } @@ -109,16 +110,16 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) jsonrpc_server_group_t* cgroup = NULL; for(cgroup=conn_group; cgroup!=NULL; cgroup=cgroup->next) { new_server = create_server(); - CHECK_MALLOC(new_server); + CHECK_MALLOC_GOTO(new_server, errdup); shm_str_dup(&new_server->conn, &cgroup->conn); - CHECK_MALLOC(new_server->conn.s); + CHECK_MALLOC_GOTO(new_server->conn.s, errdup); shm_str_dup(&new_server->addr, &name); - CHECK_MALLOC(new_server->addr.s); + CHECK_MALLOC_GOTO(new_server->addr.s, errdup); shm_str_dup(&new_server->srv, &srv); - CHECK_MALLOC(new_server->srv.s); + CHECK_MALLOC_GOTO(new_server->srv.s, errdup); new_server->port = srv_record->port; new_server->priority = srv_record->priority; @@ -129,6 +130,7 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) addto_server_list(new_server, &new_servers); } } + free_rdata_list(head); if(iter <= 0) goto end; @@ -204,6 +206,12 @@ int refresh_srv(jsonrpc_srv_t* srv_obj) free_server_list(rm_servers); return retval; + +errdup: + free_rdata_list(head); + free_server_list(new_servers); + free_server(new_server); + return -1; } void free_srv(jsonrpc_srv_t* srv)

1 0

git:master:ef62bfb2: core: mem/tlsf - handle return codes during memory pool init
by Daniel-Constantin Mierla 25 Apr '22

25 Apr '22

Module: kamailio Branch: master Commit: ef62bfb27514dc7ec3b603bee661cfac18c4fe93 URL: https://github.com/kamailio/kamailio/commit/ef62bfb27514dc7ec3b603bee661cfa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2022-04-25T09:46:18+02:00 core: mem/tlsf - handle return codes during memory pool init --- Modified: src/core/mem/tlsf_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/ef62bfb27514dc7ec3b603bee661cfa… Patch: https://github.com/kamailio/kamailio/commit/ef62bfb27514dc7ec3b603bee661cfa… --- diff --git a/src/core/mem/tlsf_malloc.c b/src/core/mem/tlsf_malloc.c index 19b71a8be3..805ada03cc 100644 --- a/src/core/mem/tlsf_malloc.c +++ b/src/core/mem/tlsf_malloc.c @@ -936,7 +936,13 @@ tlsf_t tlsf_create(void* mem) tlsf_t tlsf_create_with_pool(void* mem, size_t bytes) { tlsf_t tlsf = tlsf_create(mem); - tlsf_add_pool(tlsf, (char*)mem + tlsf_size(), bytes - tlsf_size()); + if(tlsf) { + pool_t p; + p = tlsf_add_pool(tlsf, (char*)mem + tlsf_size(), bytes - tlsf_size()); + if(!p) { + return NULL; + } + } return tlsf; } @@ -1387,6 +1393,12 @@ int tlsf_malloc_init_pkg_manager(void) _tlsf_pkg_pool = malloc(pkg_mem_size); if (_tlsf_pkg_pool) { _tlsf_pkg_block = tlsf_create_with_pool(_tlsf_pkg_pool, pkg_mem_size); + if(_tlsf_pkg_block==NULL) { + LM_CRIT("could not create tlsf pkg memory pool\n"); + fprintf(stderr, "could not create tlsf pkg memory pool: %ld bytes\n", + pkg_mem_size); + return -1; + } } else { LOG(L_CRIT, "could not initialize tlsf pkg memory pool\n"); fprintf(stderr, "Too much tlsf pkg memory demanded: %ld bytes\n", @@ -1639,6 +1651,12 @@ int tlsf_malloc_init_shm_manager(void) _tlsf_shm_pool = shm_core_get_pool(); if (_tlsf_shm_pool) { _tlsf_shm_block = tlsf_create_with_pool(_tlsf_shm_pool, shm_mem_size); + if(!_tlsf_shm_block) { + LM_CRIT("could not create tlsf shm memory pool\n"); + fprintf(stderr, "could not create tlsf shm memory pool: %ld bytes\n", + shm_mem_size); + return -1; + } } else { LOG(L_CRIT, "could not initialize tlsf shm memory pool\n"); fprintf(stderr, "Too much tlsf shm memory demanded: %ld bytes\n",

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2022