sr-dev February 2017

sr-dev@lists.kamailio.org

29 participants
364 discussions

git:5.0:ff2f146a: pkg/kamailio/deb: strip default -02 from CC_EXTRA_OPTS

by Victor Seva

Module: kamailio Branch: 5.0 Commit: ff2f146a53edbdbdba543b2700d6fcd17a40edb0 URL: https://github.com/kamailio/kamailio/commit/ff2f146a53edbdbdba543b2700d6fcd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-22T15:19:18+01:00 pkg/kamailio/deb: strip default -02 from CC_EXTRA_OPTS Fix #1004 (cherry picked from commit 6ba9900f3c83bbd68ef868a8910590f6c9fbe88f) --- Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/ff2f146a53edbdbdba543b2700d6fcd… Patch: https://github.com/kamailio/kamailio/commit/ff2f146a53edbdbdba543b2700d6fcd…

7 years, 9 months

git:master:6ba9900f: pkg/kamailio/deb: strip default -02 from CC_EXTRA_OPTS

by Victor Seva

Module: kamailio Branch: master Commit: 6ba9900f3c83bbd68ef868a8910590f6c9fbe88f URL: https://github.com/kamailio/kamailio/commit/6ba9900f3c83bbd68ef868a8910590f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-22T15:18:23+01:00 pkg/kamailio/deb: strip default -02 from CC_EXTRA_OPTS Fix #1004 --- Modified: pkg/kamailio/deb/debian/rules Modified: pkg/kamailio/deb/jessie/rules Modified: pkg/kamailio/deb/precise/rules Modified: pkg/kamailio/deb/sid/rules Modified: pkg/kamailio/deb/stretch/rules Modified: pkg/kamailio/deb/trusty/rules Modified: pkg/kamailio/deb/wheezy/rules Modified: pkg/kamailio/deb/xenial/rules --- Diff: https://github.com/kamailio/kamailio/commit/6ba9900f3c83bbd68ef868a8910590f… Patch: https://github.com/kamailio/kamailio/commit/6ba9900f3c83bbd68ef868a8910590f…

7 years, 9 months

[kamailio/kamailio] compiler warnings when compiling core/cfg/cfg_ctx.c (#1004)

by juha-h

On Debian Jessie, I get the warnings below when compiling core/cfg/cfg_ctx.c of Kamailio 5.0. If I remove -Wall, the warnings do not show up, but that is not a solution. -- Juha ---------------------------------------------------------------------- gcc -funroll-loops -Wcast-align -m64 -minline-all-stringops -falign-loops -ftree-vectorize -fno-strict-overflow -Wall -D_FORTIFY_SOURCE=2 -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -DVERSION_NODATE -DNAME='"sip-proxy"' -DVERSION='"5.0.0-b14"' -DARCH='"x86_64"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.9.2"' -D__CPU_x86_64 -D__OS_linux -DSER_VER=5000000 -DCFG_DIR='"/etc/sip-proxy/"' -DRUN_DIR='"/var/run/sip-proxy"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DWITH_XAVP -DMEM_JOIN_FREE -DMEM_JOIN_FREE -DF_MALLOC -DQ_MALLOC -DTLSF_MALLOC -DUSE_TLS -DTLS_HOOKS -DUSE_CORE_STATS -DSTATISTICS -DMALLOC_STATS -DWITH_AS_SUPPORT -DUSE_SCTP -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_IP_MREQN -DUSE_RAW_SOCKS -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -c core/cfg/cfg_ctx.c -o core/cfg/cfg_ctx.o -MMD -MP core/cfg/cfg_ctx.c: In function cfg_set_now: core/cfg/cfg_ctx.c:485:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] group_inst = (cfg_group_inst_t *)translate_pointer((char *)new_array, ^ core/cfg/cfg_ctx.c:489:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ core/cfg/cfg_ctx.c:559:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (block && (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array)) ^ core/cfg/cfg_ctx.c:559:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] core/cfg/cfg_ctx.c:560:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] new_array = CFG_GROUP_META(block, group)->array; ^ core/cfg/cfg_ctx.c:579:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[i] = CFG_GROUP_META(*cfg_global, group)->array; ^ core/cfg/cfg_ctx.c: In function cfg_commit: core/cfg/cfg_ctx.c:1120:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (!(CFG_GROUP_META(block, group)->array = ^ core/cfg/cfg_ctx.c:1128:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[replaced_num] = CFG_GROUP_META(*cfg_global, group)->array; ^ core/cfg/cfg_ctx.c:1180:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (CFG_GROUP_META(block, changed->group)->array != CFG_GROUP_META(*cfg_global, changed->group)->array) ^ core/cfg/cfg_ctx.c:1180:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] core/cfg/cfg_ctx.c:1185:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[replaced_num] = CFG_GROUP_META(*cfg_global, group)->array; ^ core/cfg/cfg_ctx.c:1220:4: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(block, group)->array ^ core/cfg/cfg_ctx.c:1221:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (CFG_GROUP_META(block, group)->array != CFG_GROUP_META(*cfg_global, group)->array) ^ core/cfg/cfg_ctx.c:1221:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] core/cfg/cfg_ctx.c:1223:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] shm_free(CFG_GROUP_META(block, group)->array); ^ core/cfg/cfg_ctx.c: In function cfg_add_group_inst: core/cfg/cfg_ctx.c:1577:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ core/cfg/cfg_ctx.c:1578:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->num++; ^ core/cfg/cfg_ctx.c:1580:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(*cfg_global, group)->array) { ^ core/cfg/cfg_ctx.c:1589:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[0] = CFG_GROUP_META(*cfg_global, group)->array; ^ core/cfg/cfg_ctx.c: In function cfg_del_group_inst: core/cfg/cfg_ctx.c:1673:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->array = new_array; ^ core/cfg/cfg_ctx.c:1674:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] CFG_GROUP_META(block, group)->num--; ^ core/cfg/cfg_ctx.c:1676:2: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] if (CFG_GROUP_META(*cfg_global, group)->array) { ^ core/cfg/cfg_ctx.c:1687:5: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (*(char **)(group_inst->vars + var->offset) != NULL) ^ core/cfg/cfg_ctx.c:1705:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] && (*(char **)(group_inst->vars + var->offset) != NULL) ^ core/cfg/cfg_ctx.c:1707:6: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[num] = *(char **)(group_inst->vars + var->offset); ^ core/cfg/cfg_ctx.c:1713:3: warning: dereferencing type-punned pointer will break strict-aliasing rules [-Wstrict-aliasing] replaced[num] = CFG_GROUP_META(*cfg_global, group)->array; ^ -- 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/issues/1004

7 years, 9 months

git:master:567b560c: Merge pull request #999 from zxcpoiu/rtpengine-unsigned-setid

by GitHub

Module: kamailio Branch: master Commit: 567b560cc5ca35bfe0a6557f959f954d18850866 URL: https://github.com/kamailio/kamailio/commit/567b560cc5ca35bfe0a6557f959f954… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: GitHub <noreply(a)github.com> Date: 2017-02-22T08:39:02-05:00 Merge pull request #999 from zxcpoiu/rtpengine-unsigned-setid rtpengine: really do allow unsigned setid --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h Modified: src/modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/567b560cc5ca35bfe0a6557f959f954… Patch: https://github.com/kamailio/kamailio/commit/567b560cc5ca35bfe0a6557f959f954…

7 years, 9 months

git:master:4b0095fb: rtpengine: really do allow unsigned setid

by zxcpoiu

Module: kamailio Branch: master Commit: 4b0095fb5500ed382dbddec8abff937c39554f00 URL: https://github.com/kamailio/kamailio/commit/4b0095fb5500ed382dbddec8abff937… Author: zxcpoiu <zxcpoiu(a)gmail.com> Committer: zxcpoiu <zxcpoiu(a)gmail.com> Date: 2017-02-22T13:14:52+08:00 rtpengine: really do allow unsigned setid --- Modified: src/modules/rtpengine/rtpengine.c Modified: src/modules/rtpengine/rtpengine.h Modified: src/modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/4b0095fb5500ed382dbddec8abff937… Patch: https://github.com/kamailio/kamailio/commit/4b0095fb5500ed382dbddec8abff937…

7 years, 9 months

[kamailio/kamailio] rtpengine: really do allow unsigned setid (#999)

by zxcpoiu

## Motivation 1. DOC says `setid` in mysql should be `UNSIGNED INT`: http://www.kamailio.org/docs/modules/4.4.x/modules/rtpengine.html#rtpengine… http://www.kamailio.org/docs/modules/4.4.x/modules/rtpengine.html#rtpengine… 2. kamailio did report invalid value if `setid` less than 0. 3. kamailio rtpengine module declares setid as `int setid`, thus we can not use setid more than 2147483647 This PR changes declaration of `setid` from `int` to `unsigned int` ## UNSURE (REVIEW NEEDED): I'm not sure about: should `int_val` in `fixup_set_ip` at [rtpengine.c#L910](https://github.com/kamailio/kamailio/blob/master/src/modu… be declared as `unsigned int` as well? not sure about the usage of `int pv_locate_name()` and `unsigned short str2s()` in the `fixup_set_ip()` function. should we use `str2int` instead `str2s` ? let me know if I'm on the wrong direction You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/999 -- Commit Summary -- * rtpengine: really do allow unsigned setid -- File Changes -- M src/modules/rtpengine/rtpengine.c (4) M src/modules/rtpengine/rtpengine.h (2) M src/modules/rtpengine/rtpengine_db.c (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/999.patch https://github.com/kamailio/kamailio/pull/999.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/999

7 years, 9 months

git:4.4:4a41962b: presence: remove transaction creation from publ_notify_notifier() and mark_presentity_for_delete()

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 4a41962b0389f37dbc4d905afd25e2cda5e7c39c URL: https://github.com/kamailio/kamailio/commit/4a41962b0389f37dbc4d905afd25e2c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-22T09:57:33+01:00 presence: remove transaction creation from publ_notify_notifier() and mark_presentity_for_delete() * publ_notify_notifier() and mark_presentity_for_delete() are called inside a already created transaction * adding transaction handle for msg_presentity_clean() fix #960 (cherry picked from commit 6d157a4af708108b90a338614869de0ceeb94b68) --- Modified: modules/presence/notify.c Modified: modules/presence/presentity.c Modified: modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/4a41962b0389f37dbc4d905afd25e2c… Patch: https://github.com/kamailio/kamailio/commit/4a41962b0389f37dbc4d905afd25e2c… --- diff --git a/modules/presence/notify.c b/modules/presence/notify.c index 9e50375..354dc1d 100644 --- a/modules/presence/notify.c +++ b/modules/presence/notify.c @@ -1348,15 +1348,6 @@ int publ_notify_notifier(str pres_uri, pres_ev_t *event) result_cols[r_to_tag_col=n_result_cols++] = &str_to_tag_col; result_cols[r_from_tag_col=n_result_cols++] = &str_from_tag_col; - if (pa_dbf.start_transaction) - { - if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) - { - LM_ERR("in start_transaction\n"); - goto error; - } - } - if(query_fn(pa_db, query_cols, 0, query_vals, result_cols, n_query_cols, n_result_cols, 0, &result )< 0) { @@ -1385,26 +1376,11 @@ int publ_notify_notifier(str pres_uri, pres_ev_t *event) set_updated(&subs); } - if (pa_dbf.end_transaction) - { - if (pa_dbf.end_transaction(pa_db) < 0) - { - LM_ERR("in end_transaction\n"); - goto error; - } - } - ret = RES_ROW_N(result); error: if (result) pa_dbf.free_result(pa_db, result); - if (pa_dbf.abort_transaction) - { - if (pa_dbf.abort_transaction(pa_db) < 0) - LM_ERR("in abort_transaction\n"); - } - return ret; } diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index 3f79cfa..b515149 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -1564,15 +1564,6 @@ int mark_presentity_for_delete(presentity_t *pres) result_cols[0] = &str_body_col; - if (pa_dbf.start_transaction) - { - if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) - { - LM_ERR("in start_transaction\n"); - goto error; - } - } - if (query_fn(pa_db, query_cols, 0, query_vals, result_cols, n_query_cols, 1, 0, &result) < 0) { @@ -1653,15 +1644,6 @@ int mark_presentity_for_delete(presentity_t *pres) goto error; } - if (pa_dbf.end_transaction) - { - if (pa_dbf.end_transaction(pa_db) < 0) - { - LM_ERR("in end_transaction\n"); - goto error; - } - } - if (pa_dbf.affected_rows) ret = pa_dbf.affected_rows(pa_db); else @@ -1673,12 +1655,6 @@ int mark_presentity_for_delete(presentity_t *pres) if (cur_body) pkg_free(cur_body); if (result) pa_dbf.free_result(pa_db, result); - if (pa_dbf.abort_transaction) - { - if (pa_dbf.abort_transaction(pa_db) < 0) - LM_ERR("in abort_transaction\n"); - } - return ret; } diff --git a/modules/presence/publish.c b/modules/presence/publish.c index 73a64c6..8249aa4 100644 --- a/modules/presence/publish.c +++ b/modules/presence/publish.c @@ -156,9 +156,22 @@ void msg_presentity_clean(unsigned int ticks,void *param) if (pres_notifier_processes > 0) { + if (pa_dbf.start_transaction) + { + if (pa_dbf.start_transaction(pa_db, db_table_lock) < 0) + { + LM_ERR("in start_transaction\n"); + goto error; + } + } if ((num_watchers = publ_notify_notifier(uri, pres.event)) < 0) { LM_ERR("Updating watcher records\n"); + if (pa_dbf.abort_transaction) + { + if (pa_dbf.abort_transaction(pa_db) < 0) + LM_ERR("in abort_transaction\n"); + } goto error; } @@ -167,6 +180,11 @@ void msg_presentity_clean(unsigned int ticks,void *param) if (mark_presentity_for_delete(&pres) < 0) { LM_ERR("Marking presentity\n"); + if (pa_dbf.abort_transaction) + { + if (pa_dbf.abort_transaction(pa_db) < 0) + LM_ERR("in abort_transaction\n"); + } goto error; } } @@ -178,6 +196,14 @@ void msg_presentity_clean(unsigned int ticks,void *param) goto error; } } + if (pa_dbf.end_transaction) + { + if (pa_dbf.end_transaction(pa_db) < 0) + { + LM_ERR("in end_transaction\n"); + goto error; + } + } } else {

7 years, 9 months

git:4.4:5b34d844: usrloc: fix ucontact shared leak

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 5b34d844c2cf6caba5888f26789c1472802fb0b8 URL: https://github.com/kamailio/kamailio/commit/5b34d844c2cf6caba5888f26789c147… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-22T09:20:05+01:00 usrloc: fix ucontact shared leak keep a copy of urecord if mode is DB_ONLY as it is static preventing leaking ucontact to shared memory Fix #1000 See #997 for details (cherry picked from commit 819f9eae0066a94081b0805dadf69bd57050e4f0) --- Modified: modules/usrloc/ucontact.c Modified: modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/5b34d844c2cf6caba5888f26789c147… Patch: https://github.com/kamailio/kamailio/commit/5b34d844c2cf6caba5888f26789c147… --- diff --git a/modules/usrloc/ucontact.c b/modules/usrloc/ucontact.c index 68e0359..ea0e8db 100644 --- a/modules/usrloc/ucontact.c +++ b/modules/usrloc/ucontact.c @@ -1672,6 +1672,7 @@ static inline int update_contact_db(ucontact_t* _c) */ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) { + struct urecord _ur; /* we have to update memory in any case, but database directly * only in db_mode 1 */ if (mem_update_ucontact( _c, _ci) < 0) { @@ -1680,6 +1681,8 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) } if (db_mode==DB_ONLY) { + /* urecord is static generate a copy for later */ + if (_r) memcpy(&_ur, _r, sizeof(struct urecord)); if (update_contact_db(_c) < 0) return -1; } @@ -1690,8 +1693,14 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) run_ul_callbacks( UL_CONTACT_UPDATE, _c); } - if (_r && db_mode!=DB_ONLY) - update_contact_pos( _r, _c); + if (_r) { + if (db_mode!=DB_ONLY) { + update_contact_pos( _r, _c); + } else { + /* urecord was static restore copy */ + memcpy(_r, &_ur, sizeof(struct urecord)); + } + } st_update_ucontact(_c); diff --git a/modules/usrloc/urecord.c b/modules/usrloc/urecord.c index a6e7cec..821821d 100644 --- a/modules/usrloc/urecord.c +++ b/modules/usrloc/urecord.c @@ -568,12 +568,16 @@ void release_urecord(urecord_t* _r) int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci, ucontact_t** _c) { + struct urecord _ur; if ( ((*_c)=mem_insert_ucontact(_r, _contact, _ci)) == 0) { LM_ERR("failed to insert contact\n"); return -1; } if (db_mode==DB_ONLY) { + /* urecord is static generate a copy for later */ + memcpy(&_ur, _r, sizeof(struct urecord)); + if (db_insert_ucontact(*_c) < 0) { LM_ERR("failed to insert in database\n"); return -1; @@ -586,13 +590,19 @@ int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci, run_ul_callbacks( UL_CONTACT_INSERT, *_c); } - if (db_mode == WRITE_THROUGH) { - if (db_insert_ucontact(*_c) < 0) { - LM_ERR("failed to insert in database\n"); - return -1; - } else { - (*_c)->state = CS_SYNC; - } + switch (db_mode) { + case WRITE_THROUGH: + if (db_insert_ucontact(*_c) < 0) { + LM_ERR("failed to insert in database\n"); + return -1; + } else { + (*_c)->state = CS_SYNC; + } + break; + case DB_ONLY: + /* urecord was static restore copy */ + memcpy(_r, &_ur, sizeof(struct urecord)); + break; } return 0; @@ -608,11 +618,22 @@ int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci, int delete_ucontact(urecord_t* _r, struct ucontact* _c) { int ret = 0; + struct urecord _ur; + + if (db_mode==DB_ONLY) { + /* urecord is static generate a copy for later */ + memcpy(&_ur, _r, sizeof(struct urecord)); + } if (exists_ulcb_type(UL_CONTACT_DELETE)) { run_ul_callbacks( UL_CONTACT_DELETE, _c); } + if (db_mode==DB_ONLY) { + /* urecord was static restore copy */ + memcpy(_r, &_ur, sizeof(struct urecord)); + } + if (st_delete_ucontact(_c) > 0) { if (db_mode == WRITE_THROUGH || db_mode==DB_ONLY) { if (db_delete_ucontact(_c) < 0) {

7 years, 9 months

git:4.4:36814faf: pua_reginfo: fix memory leak when usrloc is DB_ONLY

by Victor Seva

Module: kamailio Branch: 4.4 Commit: 36814fafb02980e6165351e7cbe1acac0d11248d URL: https://github.com/kamailio/kamailio/commit/36814fafb02980e6165351e7cbe1aca… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-22T09:20:05+01:00 pua_reginfo: fix memory leak when usrloc is DB_ONLY As release_urecord() clearly says: /*! * \brief Release urecord previously obtained through get_urecord * \warning Failing to calls this function after get_urecord will * result in a memory leak when the DB_ONLY mode is used. When * the records is later deleted, e.g. with delete_urecord, then * its not necessary, as this function already releases the record. * \param _r released record */ (cherry picked from commit 1b0e1c3cbdd162fcd438a7d9bb412ddce73bc214) --- Modified: modules/pua_reginfo/notify.c Modified: modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/36814fafb02980e6165351e7cbe1aca… Patch: https://github.com/kamailio/kamailio/commit/36814fafb02980e6165351e7cbe1aca… --- diff --git a/modules/pua_reginfo/notify.c b/modules/pua_reginfo/notify.c index 4bdd4ca..51e27eb 100644 --- a/modules/pua_reginfo/notify.c +++ b/modules/pua_reginfo/notify.c @@ -458,7 +458,7 @@ int process_body(str notify_body, udomain_t * domain) { } } next_registration: - // if (ul_record) ul.release_urecord(ul_record); + if (ul_record) ul.release_urecord(ul_record); /* Unlock the domain for this AOR: */ if (aor_key.len > 0) ul.unlock_udomain(domain, &aor_key); diff --git a/modules/pua_reginfo/usrloc_cb.c b/modules/pua_reginfo/usrloc_cb.c index 7f84788..3e00a0e 100644 --- a/modules/pua_reginfo/usrloc_cb.c +++ b/modules/pua_reginfo/usrloc_cb.c @@ -223,7 +223,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { publ_info_t publ; str content_type; udomain_t * domain; - urecord_t * record; + urecord_t * record = NULL; int res; str uri = {NULL, 0}; str user = {NULL, 0}; @@ -332,6 +332,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { if(body->s) xmlFree(body->s); pkg_free(body); } + if(record) ul.release_urecord(record); return; }

7 years, 9 months

git:5.0:324039ad: usrloc: fix ucontact shared leak

by Victor Seva

Module: kamailio Branch: 5.0 Commit: 324039ad3f89462e615b58949aaae21459ef9ece URL: https://github.com/kamailio/kamailio/commit/324039ad3f89462e615b58949aaae21… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2017-02-22T08:37:39+01:00 usrloc: fix ucontact shared leak keep a copy of urecord if mode is DB_ONLY as it is static preventing leaking ucontact to shared memory Fix #1000 See #997 for details (cherry picked from commit 819f9eae0066a94081b0805dadf69bd57050e4f0) --- Modified: src/modules/usrloc/ucontact.c Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/324039ad3f89462e615b58949aaae21… Patch: https://github.com/kamailio/kamailio/commit/324039ad3f89462e615b58949aaae21… --- diff --git a/src/modules/usrloc/ucontact.c b/src/modules/usrloc/ucontact.c index a5531f4..630a4bd 100644 --- a/src/modules/usrloc/ucontact.c +++ b/src/modules/usrloc/ucontact.c @@ -1672,6 +1672,7 @@ static inline int update_contact_db(ucontact_t* _c) */ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) { + struct urecord _ur; /* we have to update memory in any case, but database directly * only in db_mode 1 */ if (mem_update_ucontact( _c, _ci) < 0) { @@ -1680,6 +1681,8 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) } if (db_mode==DB_ONLY) { + /* urecord is static generate a copy for later */ + if (_r) memcpy(&_ur, _r, sizeof(struct urecord)); if (update_contact_db(_c) < 0) return -1; } @@ -1690,8 +1693,14 @@ int update_ucontact(struct urecord* _r, ucontact_t* _c, ucontact_info_t* _ci) run_ul_callbacks( UL_CONTACT_UPDATE, _c); } - if (_r && db_mode!=DB_ONLY) - update_contact_pos( _r, _c); + if (_r) { + if (db_mode!=DB_ONLY) { + update_contact_pos( _r, _c); + } else { + /* urecord was static restore copy */ + memcpy(_r, &_ur, sizeof(struct urecord)); + } + } st_update_ucontact(_c); diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index 0ff43c9..9223b85 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -568,12 +568,16 @@ void release_urecord(urecord_t* _r) int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci, ucontact_t** _c) { + struct urecord _ur; if ( ((*_c)=mem_insert_ucontact(_r, _contact, _ci)) == 0) { LM_ERR("failed to insert contact\n"); return -1; } if (db_mode==DB_ONLY) { + /* urecord is static generate a copy for later */ + memcpy(&_ur, _r, sizeof(struct urecord)); + if (db_insert_ucontact(*_c) < 0) { LM_ERR("failed to insert in database\n"); return -1; @@ -586,13 +590,19 @@ int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci, run_ul_callbacks( UL_CONTACT_INSERT, *_c); } - if (db_mode == WRITE_THROUGH) { - if (db_insert_ucontact(*_c) < 0) { - LM_ERR("failed to insert in database\n"); - return -1; - } else { - (*_c)->state = CS_SYNC; - } + switch (db_mode) { + case WRITE_THROUGH: + if (db_insert_ucontact(*_c) < 0) { + LM_ERR("failed to insert in database\n"); + return -1; + } else { + (*_c)->state = CS_SYNC; + } + break; + case DB_ONLY: + /* urecord was static restore copy */ + memcpy(_r, &_ur, sizeof(struct urecord)); + break; } return 0; @@ -608,11 +618,22 @@ int insert_ucontact(urecord_t* _r, str* _contact, ucontact_info_t* _ci, int delete_ucontact(urecord_t* _r, struct ucontact* _c) { int ret = 0; + struct urecord _ur; + + if (db_mode==DB_ONLY) { + /* urecord is static generate a copy for later */ + memcpy(&_ur, _r, sizeof(struct urecord)); + } if (exists_ulcb_type(UL_CONTACT_DELETE)) { run_ul_callbacks( UL_CONTACT_DELETE, _c); } + if (db_mode==DB_ONLY) { + /* urecord was static restore copy */ + memcpy(_r, &_ur, sizeof(struct urecord)); + } + if (st_delete_ucontact(_c) > 0) { if (db_mode == WRITE_THROUGH || db_mode==DB_ONLY) { if (db_delete_ucontact(_c) < 0) {

7 years, 9 months

← Newer
1
...
8
9
10
11
12
13
14
...
37
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2017