sr-dev August 2020

sr-dev@lists.kamailio.org

17 participants
210 discussions

git:master:6ce5c0bd: xcap_server: check before going to the end of the buffer

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6ce5c0bdf136ecffd7917f2d60093e1b2c49fa54 URL: https://github.com/kamailio/kamailio/commit/6ce5c0bdf136ecffd7917f2d60093e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-08-02T17:08:49+02:00 xcap_server: check before going to the end of the buffer - use marcros to set and restore char for ending 0 --- Modified: src/modules/xcap_server/xcap_server.c --- Diff: https://github.com/kamailio/kamailio/commit/6ce5c0bdf136ecffd7917f2d60093e1… Patch: https://github.com/kamailio/kamailio/commit/6ce5c0bdf136ecffd7917f2d60093e1… --- diff --git a/src/modules/xcap_server/xcap_server.c b/src/modules/xcap_server/xcap_server.c index ec4a3d1975..1556aa14b9 100644 --- a/src/modules/xcap_server/xcap_server.c +++ b/src/modules/xcap_server/xcap_server.c @@ -321,14 +321,12 @@ int xcaps_xpath_hack(str *buf, int type) } start = buf->s; - c = buf->s[buf->len-1]; - buf->s[buf->len-1] = '\0'; - while((p = strstr(start, match))!=NULL) - { + STR_VTOZ(buf->s[buf->len-1], c); + while((start < buf->s + buf->len - 8) && (p = strstr(start, match))!=NULL) { memcpy(p, repl, 7); start = p + 7; } - buf->s[buf->len-1] = c; + STR_ZTOV(buf->s[buf->len-1], c); return 0; }

2 years, 10 months

git:5.4:73c97ee8: pua: update_version_puadb() use pres_id to select record

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 73c97ee8ca89bea202b09f6b75722396fbe05ba6 URL: https://github.com/kamailio/kamailio/commit/73c97ee8ca89bea202b09f6b7572239… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:44:00+02:00 pua: update_version_puadb() use pres_id to select record * only relevant when db_mode is PUA_DB_ONLY * call_id/to_tag/from_tag values can be "", for instance with DIALOG_PUBLISH.* records. Then **ALL** records get version field update * update_vesion_puadb() is called from send_publish() and pres->id value is valid after a call to get_record_puadb() related to #2414 (cherry picked from commit e4aed5c272c8144dd1ddf58163c3ba501bb46a5b) --- Modified: src/modules/pua/pua_db.c --- Diff: https://github.com/kamailio/kamailio/commit/73c97ee8ca89bea202b09f6b7572239… Patch: https://github.com/kamailio/kamailio/commit/73c97ee8ca89bea202b09f6b7572239… --- diff --git a/src/modules/pua/pua_db.c b/src/modules/pua/pua_db.c index 9a5c34b8ec..9f9b36cab4 100644 --- a/src/modules/pua/pua_db.c +++ b/src/modules/pua/pua_db.c @@ -1485,8 +1485,8 @@ int update_contact_puadb(ua_pres_t *pres, str *contact) int update_version_puadb(ua_pres_t *pres) { - db_key_t q_cols[3], db_cols[1]; - db_val_t q_vals[3], db_vals[1]; + db_key_t q_cols[1], db_cols[1]; + db_val_t q_vals[1], db_vals[1]; int n_query_cols= 0, n_update_cols=0; if (pres==NULL) @@ -1496,22 +1496,10 @@ int update_version_puadb(ua_pres_t *pres) } /* cols and values used for search query */ - q_cols[n_query_cols] = &str_call_id_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->call_id; - n_query_cols++; - - q_cols[n_query_cols] = &str_to_tag_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->to_tag; - n_query_cols++; - - q_cols[n_query_cols] = &str_from_tag_col; + q_cols[n_query_cols] = &str_pres_id_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->from_tag; + q_vals[n_query_cols].val.str_val = pres->id; n_query_cols++; /* we overwrite contact even if not changed */

2 years, 10 months

git:5.4:46b4cc31: pua: fix send_publish() behavior on PUA_DB_ONLY

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 46b4cc31bb2cb0a513ddf283db5d0690b0b04f68 URL: https://github.com/kamailio/kamailio/commit/46b4cc31bb2cb0a513ddf283db5d069… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:43:46+02:00 pua: fix send_publish() behavior on PUA_DB_ONLY * dialog PUBLISH was missing SIP-If-Mach * pua was inserting a new record for every dialog state fixes #2414 (cherry picked from commit 91d9441a242da4746171bfa532fa2378328e8d73) --- Modified: src/modules/pua/send_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/46b4cc31bb2cb0a513ddf283db5d069… Patch: https://github.com/kamailio/kamailio/commit/46b4cc31bb2cb0a513ddf283db5d069… --- diff --git a/src/modules/pua/send_publish.c b/src/modules/pua/send_publish.c index e88c342f5c..338ee892b4 100644 --- a/src/modules/pua/send_publish.c +++ b/src/modules/pua/send_publish.c @@ -516,14 +516,11 @@ int send_publish( publ_info_t* publ ) if (dbmode==PUA_DB_ONLY) { - if (publ->etag) { - memset(&dbpres, 0, sizeof(dbpres)); - dbpres.pres_uri = &pres_uri; - dbpres.watcher_uri = &watcher_uri; - dbpres.extra_headers = &extra_headers; - presentity = get_record_puadb(publ->id, publ->etag, - &dbpres, &res); - } + memset(&dbpres, 0, sizeof(dbpres)); + dbpres.pres_uri = &pres_uri; + dbpres.watcher_uri = &watcher_uri; + dbpres.extra_headers = &extra_headers; + presentity = get_record_puadb(publ->id, publ->etag, &dbpres, &res); } else {

2 years, 10 months

git:5.4:fefe5aa7: pua_bla: clang-format

by Victor Seva

Module: kamailio Branch: 5.4 Commit: fefe5aa727147de608ee9770b06b7f78b72ba4f9 URL: https://github.com/kamailio/kamailio/commit/fefe5aa727147de608ee9770b06b7f7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:43:27+02:00 pua_bla: clang-format * use STR_NULL (cherry picked from commit e542b779b29bda2d0a953a4e55921edc466a3936) --- Modified: src/modules/pua_bla/notify.c Modified: src/modules/pua_bla/pua_bla.c Modified: src/modules/pua_bla/pua_bla.h Modified: src/modules/pua_bla/registrar_cb.c Modified: src/modules/pua_bla/registrar_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/fefe5aa727147de608ee9770b06b7f7… Patch: https://github.com/kamailio/kamailio/commit/fefe5aa727147de608ee9770b06b7f7…

2 years, 10 months

git:5.4:20c9f514: pua_bla: convert to PKG/SHM memory logging helper functions

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 20c9f514b61f5c0c41890650691483ae2b261007 URL: https://github.com/kamailio/kamailio/commit/20c9f514b61f5c0c41890650691483a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:43:12+02:00 pua_bla: convert to PKG/SHM memory logging helper functions * remove trailing spaces * remove history notes and $Id (cherry picked from commit e4895abf5a533b96bf5e7112488a0facaabfc1a7) --- Modified: src/modules/pua_bla/notify.c Modified: src/modules/pua_bla/pua_bla.c Modified: src/modules/pua_bla/pua_bla.h Modified: src/modules/pua_bla/registrar_cb.c Modified: src/modules/pua_bla/registrar_cb.h --- Diff: https://github.com/kamailio/kamailio/commit/20c9f514b61f5c0c41890650691483a… Patch: https://github.com/kamailio/kamailio/commit/20c9f514b61f5c0c41890650691483a…

2 years, 10 months

git:5.4:b5d848e7: pua_usrloc: convert to PKG/SHM memory logging helper functions

by Victor Seva

Module: kamailio Branch: 5.4 Commit: b5d848e774814b0673c4fec1734d6f3de3e1c877 URL: https://github.com/kamailio/kamailio/commit/b5d848e774814b0673c4fec1734d6f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:42:53+02:00 pua_usrloc: convert to PKG/SHM memory logging helper functions (cherry picked from commit be07ed5dd927448ffad3bd77f976249a888cfb2e) --- Modified: src/modules/pua_usrloc/ul_publish.c --- Diff: https://github.com/kamailio/kamailio/commit/b5d848e774814b0673c4fec1734d6f3… Patch: https://github.com/kamailio/kamailio/commit/b5d848e774814b0673c4fec1734d6f3… --- diff --git a/src/modules/pua_usrloc/ul_publish.c b/src/modules/pua_usrloc/ul_publish.c index 0afd6d4201..cb8af0c7fa 100644 --- a/src/modules/pua_usrloc/ul_publish.c +++ b/src/modules/pua_usrloc/ul_publish.c @@ -174,7 +174,7 @@ str* build_pidf(ucontact_t* c) body = (str*)pkg_malloc(sizeof(str)); if(body == NULL) { - LM_ERR("while allocating memory\n"); + PKG_MEM_ERROR; return NULL; } memset(body, 0, sizeof(str)); @@ -253,8 +253,10 @@ void ul_publish(ucontact_t* c, int type, void* param) body = NULL; uri.s = (char*)pkg_malloc(sizeof(char)*(c->aor->len+default_domain.len+6)); - if(uri.s == NULL) + if(uri.s == NULL) { + PKG_MEM_ERROR; goto error; + } memcpy(uri.s, "sip:", 4); uri.len = 4; @@ -278,7 +280,7 @@ void ul_publish(ucontact_t* c, int type, void* param) publ= (publ_info_t*)pkg_malloc(size); if(publ== NULL) { - LM_ERR("no more share memory\n"); + SHM_MEM_ERROR; goto error; } memset(publ, 0, size);

2 years, 10 months

git:5.4:3a44d393: pua: convert to PKG/SHM memory logging helper functions

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 3a44d393dc24d1f7caafedef90c0714c8ed74ff2 URL: https://github.com/kamailio/kamailio/commit/3a44d393dc24d1f7caafedef90c0714… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:42:29+02:00 pua: convert to PKG/SHM memory logging helper functions * remove trailing spaces (cherry picked from commit c91e852d203017b571ae15e48c289f73f4824136) --- Modified: src/modules/pua/add_events.c Modified: src/modules/pua/event_list.c Modified: src/modules/pua/hash.c Modified: src/modules/pua/pua.c Modified: src/modules/pua/pua_callback.c Modified: src/modules/pua/pua_db.c Modified: src/modules/pua/send_publish.c Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/3a44d393dc24d1f7caafedef90c0714… Patch: https://github.com/kamailio/kamailio/commit/3a44d393dc24d1f7caafedef90c0714…

2 years, 10 months

git:5.4:7a440bda: pua_dialoginfo: convert to PKG/SHM memory logging helper functions

by Victor Seva

Module: kamailio Branch: 5.4 Commit: 7a440bdaf8f174f5a97228fab32754daf5cad348 URL: https://github.com/kamailio/kamailio/commit/7a440bdaf8f174f5a97228fab32754d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:42:16+02:00 pua_dialoginfo: convert to PKG/SHM memory logging helper functions (cherry picked from commit 7e5cc3aa21a243ef19ec092fec10043b1178cae7) --- Modified: src/modules/pua_dialoginfo/dialog_publish.c Modified: src/modules/pua_dialoginfo/pua_dialoginfo.c --- Diff: https://github.com/kamailio/kamailio/commit/7a440bdaf8f174f5a97228fab32754d… Patch: https://github.com/kamailio/kamailio/commit/7a440bdaf8f174f5a97228fab32754d… --- diff --git a/src/modules/pua_dialoginfo/dialog_publish.c b/src/modules/pua_dialoginfo/dialog_publish.c index 1abe8cb152..5c901a9845 100644 --- a/src/modules/pua_dialoginfo/dialog_publish.c +++ b/src/modules/pua_dialoginfo/dialog_publish.c @@ -240,7 +240,7 @@ str* build_dialoginfo(char *state, str *entity, str *peer, str *callid, body = (str*)pkg_malloc(sizeof(str)); if(body == NULL) { - LM_ERR("while allocating memory\n"); + PKG_MEM_ERROR; goto error; } memset(body, 0, sizeof(str)); @@ -327,7 +327,7 @@ void dialog_publish(char *state, str* ruri, str *entity, str *peer, str *callid, publ= (publ_info_t*)pkg_malloc(size); if(publ== NULL) { - LM_ERR("no more share memory\n"); + PKG_MEM_ERROR; goto error; } memset(publ, 0, size); diff --git a/src/modules/pua_dialoginfo/pua_dialoginfo.c b/src/modules/pua_dialoginfo/pua_dialoginfo.c index f3932493aa..eb37c61156 100644 --- a/src/modules/pua_dialoginfo/pua_dialoginfo.c +++ b/src/modules/pua_dialoginfo/pua_dialoginfo.c @@ -448,7 +448,7 @@ struct str_list* get_str_list(unsigned short avp_flags, int_str avp_name) { } if (list_current==0) { - LM_ERR("no more shm mem (%d)\n",len); + SHM_MEM_ERROR; return 0; } @@ -483,7 +483,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type) dlginfo = (struct dlginfo_cell*)shm_malloc( len ); if (dlginfo==0) { - LM_ERR("no more shm mem (%d)\n",len); + SHM_MEM_ERROR; return NULL; } memset( dlginfo, 0, len); @@ -531,7 +531,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type) dlginfo->pubruris_caller = (struct str_list*)shm_malloc( sizeof(struct str_list) ); if (dlginfo->pubruris_caller==0) { - LM_ERR("no more shm mem (%d)\n", (int) sizeof(struct str_list)); + SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); return NULL; } @@ -546,7 +546,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type) dlginfo->pubruris_callee = (struct str_list*)shm_malloc( sizeof(struct str_list) ); if (dlginfo->pubruris_callee==0) { - LM_ERR("no more shm mem (%d)\n", (int) sizeof(struct str_list)); + SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); return NULL; } @@ -567,7 +567,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type) dlginfo->pubruris_caller = (struct str_list*)shm_malloc( sizeof(struct str_list) ); if (dlginfo->pubruris_caller==0) { - LM_ERR("no more shm mem (%d)\n", (int) sizeof(struct str_list)); + SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); return NULL; } @@ -577,7 +577,7 @@ struct dlginfo_cell* get_dialog_data(struct dlg_cell *dlg, int type) dlginfo->pubruris_callee = (struct str_list*)shm_malloc( sizeof(struct str_list) ); if (dlginfo->pubruris_callee==0) { - LM_ERR("no more shm mem (%d)\n", (int) sizeof(struct str_list)); + SHM_MEM_ERROR; free_dlginfo_cell(dlginfo); return NULL; }

2 years, 10 months

[kamailio/kamailio] pua: update_version_puadb() use pres_id to select record (#2420)

by Victor Seva

#### 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 #2414 #### Description * only relevant when db_mode is PUA_DB_ONLY * call_id/to_tag/from_tag values can be "", for instance with DIALOG_PUBLISH.* records. Then **ALL** records get version field update * update_vesion_puadb() is called from send_publish() and pres->id value is valid after a call to get_record_puadb() You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2420 -- Commit Summary -- * pua: update_version_puadb() use pres_id to select record -- File Changes -- M src/modules/pua/pua_db.c (20) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2420.patch https://github.com/kamailio/kamailio/pull/2420.diff -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/2420

2 years, 10 months

git:master:e4aed5c2: pua: update_version_puadb() use pres_id to select record

by Victor Seva

Module: kamailio Branch: master Commit: e4aed5c272c8144dd1ddf58163c3ba501bb46a5b URL: https://github.com/kamailio/kamailio/commit/e4aed5c272c8144dd1ddf58163c3ba5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-08-01T10:34:35+02:00 pua: update_version_puadb() use pres_id to select record * only relevant when db_mode is PUA_DB_ONLY * call_id/to_tag/from_tag values can be "", for instance with DIALOG_PUBLISH.* records. Then **ALL** records get version field update * update_vesion_puadb() is called from send_publish() and pres->id value is valid after a call to get_record_puadb() related to #2414 --- Modified: src/modules/pua/pua_db.c --- Diff: https://github.com/kamailio/kamailio/commit/e4aed5c272c8144dd1ddf58163c3ba5… Patch: https://github.com/kamailio/kamailio/commit/e4aed5c272c8144dd1ddf58163c3ba5… --- diff --git a/src/modules/pua/pua_db.c b/src/modules/pua/pua_db.c index 9a5c34b8ec..9f9b36cab4 100644 --- a/src/modules/pua/pua_db.c +++ b/src/modules/pua/pua_db.c @@ -1485,8 +1485,8 @@ int update_contact_puadb(ua_pres_t *pres, str *contact) int update_version_puadb(ua_pres_t *pres) { - db_key_t q_cols[3], db_cols[1]; - db_val_t q_vals[3], db_vals[1]; + db_key_t q_cols[1], db_cols[1]; + db_val_t q_vals[1], db_vals[1]; int n_query_cols= 0, n_update_cols=0; if (pres==NULL) @@ -1496,22 +1496,10 @@ int update_version_puadb(ua_pres_t *pres) } /* cols and values used for search query */ - q_cols[n_query_cols] = &str_call_id_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->call_id; - n_query_cols++; - - q_cols[n_query_cols] = &str_to_tag_col; - q_vals[n_query_cols].type = DB1_STR; - q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->to_tag; - n_query_cols++; - - q_cols[n_query_cols] = &str_from_tag_col; + q_cols[n_query_cols] = &str_pres_id_col; q_vals[n_query_cols].type = DB1_STR; q_vals[n_query_cols].nul = 0; - q_vals[n_query_cols].val.str_val = pres->from_tag; + q_vals[n_query_cols].val.str_val = pres->id; n_query_cols++; /* we overwrite contact even if not changed */

2 years, 10 months

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2020