sr-dev August 2016

sr-dev@lists.kamailio.org

25 participants
197 discussions

git:master:3b2f7ce0: Merge pull request #724 from phil-lavin/bugfix-presence-race

by GitHub

Module: kamailio Branch: master Commit: 3b2f7ce020db3537383a8585931fe8a420f683b6 URL: https://github.com/kamailio/kamailio/commit/3b2f7ce020db3537383a8585931fe8a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-22T09:40:53+02:00 Merge pull request #724 from phil-lavin/bugfix-presence-race presence: Always check if a record exists for this dialog before inserting --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/3b2f7ce020db3537383a8585931fe8a… Patch: https://github.com/kamailio/kamailio/commit/3b2f7ce020db3537383a8585931fe8a…

8 years, 5 months

git:master:3b206c86: presence: log when presentity is deleted due to already existing

by Phil Lavin

Module: kamailio Branch: master Commit: 3b206c864126a75a00c2c6abe4afed766d278b04 URL: https://github.com/kamailio/kamailio/commit/3b206c864126a75a00c2c6abe4afed7… Author: Phil Lavin <phil.lavin(a)synety.com> Committer: Phil Lavin <phil.lavin(a)synety.com> Date: 2016-07-27T11:25:40+01:00 presence: log when presentity is deleted due to already existing --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/3b206c864126a75a00c2c6abe4afed7… Patch: https://github.com/kamailio/kamailio/commit/3b206c864126a75a00c2c6abe4afed7… --- diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index 33947dc..bed8f02 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -383,6 +383,8 @@ int delete_presentity_if_dialog_id_exists(presentity_t* presentity, char* dialog old_presentity.event = presentity->event; old_presentity.etag = tmp_db_etag; + LM_WARN("Presentity already exists - deleting it\n"); + delete_presentity(&old_presentity); pa_dbf.free_result(pa_db, result);

8 years, 5 months

git:master:3c09579d: presence: fix memory leak introduced by last commit

by Phil Lavin

Module: kamailio Branch: master Commit: 3c09579d5e677ac7a27b2386545dc580697934b5 URL: https://github.com/kamailio/kamailio/commit/3c09579d5e677ac7a27b2386545dc58… Author: Phil Lavin <phil.lavin(a)synety.com> Committer: Phil Lavin <phil.lavin(a)synety.com> Date: 2016-07-25T14:39:35+01:00 presence: fix memory leak introduced by last commit --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/3c09579d5e677ac7a27b2386545dc58… Patch: https://github.com/kamailio/kamailio/commit/3c09579d5e677ac7a27b2386545dc58… --- diff --git a/modules/presence/presentity.c b/modules/presence/presentity.c index 549f753..33947dc 100644 --- a/modules/presence/presentity.c +++ b/modules/presence/presentity.c @@ -550,6 +550,8 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, goto error; } + free(dialog_id); + LM_DBG("inserting %d cols into table\n",n_query_cols); if (pa_dbf.insert(pa_db, query_cols, query_vals, n_query_cols) < 0) @@ -650,9 +652,10 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, goto error; } + free(dialog_id); + if(is_dialog== 1) /* if the new body has a dialog - overwrite */ { - free(dialog_id); goto after_dialog_check; }

8 years, 5 months

git:master:122e9b42: presence: Always check if a record exists for this dialog before inserting

by Phil Lavin

Module: kamailio Branch: master Commit: 122e9b423d1c25bf34f6d7be995b992ca61c2fa3 URL: https://github.com/kamailio/kamailio/commit/122e9b423d1c25bf34f6d7be995b992… Author: Phil Lavin <phil.lavin(a)synety.com> Committer: Phil Lavin <phil.lavin(a)synety.com> Date: 2016-07-22T10:49:33+01:00 presence: Always check if a record exists for this dialog before inserting - The presence implementation is a little dubious, to say the least. It probably wants re-writing at some stage. However, this fixes a race condition that could have a number of causes in which the PUA is unaware of the eTag at the point it sends the PUBLISH. --- Modified: modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/122e9b423d1c25bf34f6d7be995b992… Patch: https://github.com/kamailio/kamailio/commit/122e9b423d1c25bf34f6d7be995b992…

8 years, 5 months

[kamailio/kamailio] presence: Always check if a record exists for this dialog before inserting (#724)

by Phil Lavin

- The presence implementation is a little dubious, to say the least. It probably wants re-writing at some stage. However, this fixes a race condition that could have a number of causes in which the PUA is unaware of the eTag at the point it sends the PUBLISH. The mechanism is such that the PUA passes the eTag that should be updated in the database into a main Kamailio process via a header in the PUBLISH. It is made aware of the new eTag by the main Kamailio process in the 200 OK. In the scenario when the PUA has not received the 200 OK for the `Trying` `PUBLISH` before it sends the `early` `PUBLISH`, it will send the `early` PUBLISH with no eTag. This results in both `Trying` and `early` being inserted into the database. Only the `early` is updated, as it is the most recent, meaning the `Trying` will stick around in the table until it expires. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/724 -- Commit Summary -- * presence: Always check if a record exists for this dialog before inserting -- File Changes -- M modules/presence/presentity.c (134) -- Patch Links -- https://github.com/kamailio/kamailio/pull/724.patch https://github.com/kamailio/kamailio/pull/724.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/724

8 years, 5 months

git:master:dc6962fb: presence: fix multiple double free on shutdown caught with memlog=1

by Dragos Oancea

Module: kamailio Branch: master Commit: dc6962fb7e02cf44a145e0bafa455873c73ebc2d URL: https://github.com/kamailio/kamailio/commit/dc6962fb7e02cf44a145e0bafa45587… Author: Dragos Oancea <dragos.oancea(a)athonet.com> Committer: Dragos Oancea <dragos.oancea(a)athonet.com> Date: 2016-08-19T17:00:00+02:00 presence: fix multiple double free on shutdown caught with memlog=1 --- Modified: modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/dc6962fb7e02cf44a145e0bafa45587… Patch: https://github.com/kamailio/kamailio/commit/dc6962fb7e02cf44a145e0bafa45587… --- diff --git a/modules/presence/hash.c b/modules/presence/hash.c index 50657e0..bfce59d 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -101,6 +101,7 @@ void destroy_shtable(shtable_t htable, int hash_size) lock_destroy(&htable[i].lock); free_subs_list(htable[i].entries->next, SHM_MEM_TYPE, 1); shm_free(htable[i].entries); + htable[i].entries = NULL; } shm_free(htable); htable= NULL; @@ -345,15 +346,21 @@ void free_subs_list(subs_t* s_array, int mem_type, int ic) s_array= s_array->next; if(mem_type & PKG_MEM_TYPE) { - if(ic) + if(ic) { pkg_free(s->contact.s); + s->contact.s = NULL; + } pkg_free(s); + s = NULL; } else { - if(ic) + if(ic) { shm_free(s->contact.s); + s->contact.s = NULL; + } shm_free(s); + s = NULL; } }

8 years, 5 months

git:master:9f16a7fa: Merge pull request #754 from athonet-open/fix__presence_dbl_free

by GitHub

Module: kamailio Branch: master Commit: 9f16a7fa09ad14295e1b1046de110b546c498b01 URL: https://github.com/kamailio/kamailio/commit/9f16a7fa09ad14295e1b1046de110b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-22T09:40:23+02:00 Merge pull request #754 from athonet-open/fix__presence_dbl_free presence: fix multiple double free on shutdown caught with memlog=1 --- Modified: modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/9f16a7fa09ad14295e1b1046de110b5… Patch: https://github.com/kamailio/kamailio/commit/9f16a7fa09ad14295e1b1046de110b5… --- diff --git a/modules/presence/hash.c b/modules/presence/hash.c index 50657e0..bfce59d 100644 --- a/modules/presence/hash.c +++ b/modules/presence/hash.c @@ -101,6 +101,7 @@ void destroy_shtable(shtable_t htable, int hash_size) lock_destroy(&htable[i].lock); free_subs_list(htable[i].entries->next, SHM_MEM_TYPE, 1); shm_free(htable[i].entries); + htable[i].entries = NULL; } shm_free(htable); htable= NULL; @@ -345,15 +346,21 @@ void free_subs_list(subs_t* s_array, int mem_type, int ic) s_array= s_array->next; if(mem_type & PKG_MEM_TYPE) { - if(ic) + if(ic) { pkg_free(s->contact.s); + s->contact.s = NULL; + } pkg_free(s); + s = NULL; } else { - if(ic) + if(ic) { shm_free(s->contact.s); + s->contact.s = NULL; + } shm_free(s); + s = NULL; } }

8 years, 5 months

[kamailio/kamailio] presence: fix multiple double free on shutdown caught with memlog=1 (#754)

by Dragos Oancea

These small changes fix the bug shown below and another potential one. kamailio[3062]: : <core> [mem/q_malloc.c:453]: qm_free(): BUG: qm_free: freeing already freed pointer (0x7facf958dc08), called from presence: hash.c: delete_shtable(316), first free presence: hash.c: free_subs_list(349) - aborting It's the double free apocalypse day :) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/754 -- Commit Summary -- * presence: fix multiple double free on shutdown caught with memlog=1 -- File Changes -- M modules/presence/hash.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/754.patch https://github.com/kamailio/kamailio/pull/754.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/754

8 years, 5 months

git:master:4344a7fa: Merge pull request #755 from kelchy/master

by GitHub

Module: kamailio Branch: master Commit: 4344a7fa68ac0ce95f5e0d5d5f8df398a6d7586c URL: https://github.com/kamailio/kamailio/commit/4344a7fa68ac0ce95f5e0d5d5f8df39… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2016-08-22T09:37:13+02:00 Merge pull request #755 from kelchy/master permissions: fixed rpc array --- Modified: modules/permissions/hash.c Modified: modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/4344a7fa68ac0ce95f5e0d5d5f8df39… Patch: https://github.com/kamailio/kamailio/commit/4344a7fa68ac0ce95f5e0d5d5f8df39… --- diff --git a/modules/permissions/hash.c b/modules/permissions/hash.c index 9f90bac..e8824f2 100644 --- a/modules/permissions/hash.c +++ b/modules/permissions/hash.c @@ -612,15 +612,15 @@ int addr_hash_table_rpc_print(struct addr_list** table, rpc_t* rpc, void* c) struct addr_list *np; - if (rpc->add(c, "{", &th) < 0) - { - rpc->fault(c, 500, "Internal error creating rpc"); - return -1; - } - for (i = 0; i < PERM_HASH_SIZE; i++) { np = table[i]; while (np) { + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return -1; + } + if(rpc->struct_add(th, "dd{", "table", i, "group", np->grp, @@ -847,13 +847,13 @@ int subnet_table_rpc_print(struct subnet* table, rpc_t* rpc, void* c) count = table[PERM_MAX_SUBNETS].grp; - if (rpc->add(c, "{", &th) < 0) - { - rpc->fault(c, 500, "Internal error creating rpc"); - return -1; - } - for (i = 0; i < count; i++) { + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return -1; + } + if(rpc->struct_add(th, "dd{", "id", i, "group", table[i].grp, diff --git a/modules/permissions/permissions.c b/modules/permissions/permissions.c index b935e37..0445fbb 100644 --- a/modules/permissions/permissions.c +++ b/modules/permissions/permissions.c @@ -1016,8 +1016,8 @@ rpc_export_t permissions_rpc[] = { {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, 0}, {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, 0}, {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, - {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, 0}, - {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, 0}, + {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, RET_ARRAY}, + {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, RET_ARRAY}, {"permissions.domainDump", rpc_domain_name_dump, rpc_domain_name_dump_doc, 0}, {"permissions.testUri", rpc_test_uri, rpc_test_uri_doc, 0}, {0, 0, 0, 0}

8 years, 5 months

git:master:20a4f7e0: permissions: fixed rpc array

by Kelvin Chua

Module: kamailio Branch: master Commit: 20a4f7e029262a94c5c4bcdc68a90e404b506c98 URL: https://github.com/kamailio/kamailio/commit/20a4f7e029262a94c5c4bcdc68a90e4… Author: Kelvin Chua <kelchy(a)gmail.com> Committer: Kelvin Chua <kelchy(a)gmail.com> Date: 2016-08-20T15:03:09Z permissions: fixed rpc array - added array structure when returning multiple address and subnets --- Modified: modules/permissions/hash.c Modified: modules/permissions/permissions.c --- Diff: https://github.com/kamailio/kamailio/commit/20a4f7e029262a94c5c4bcdc68a90e4… Patch: https://github.com/kamailio/kamailio/commit/20a4f7e029262a94c5c4bcdc68a90e4… --- diff --git a/modules/permissions/hash.c b/modules/permissions/hash.c index 9f90bac..e8824f2 100644 --- a/modules/permissions/hash.c +++ b/modules/permissions/hash.c @@ -612,15 +612,15 @@ int addr_hash_table_rpc_print(struct addr_list** table, rpc_t* rpc, void* c) struct addr_list *np; - if (rpc->add(c, "{", &th) < 0) - { - rpc->fault(c, 500, "Internal error creating rpc"); - return -1; - } - for (i = 0; i < PERM_HASH_SIZE; i++) { np = table[i]; while (np) { + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return -1; + } + if(rpc->struct_add(th, "dd{", "table", i, "group", np->grp, @@ -847,13 +847,13 @@ int subnet_table_rpc_print(struct subnet* table, rpc_t* rpc, void* c) count = table[PERM_MAX_SUBNETS].grp; - if (rpc->add(c, "{", &th) < 0) - { - rpc->fault(c, 500, "Internal error creating rpc"); - return -1; - } - for (i = 0; i < count; i++) { + if (rpc->add(c, "{", &th) < 0) + { + rpc->fault(c, 500, "Internal error creating rpc"); + return -1; + } + if(rpc->struct_add(th, "dd{", "id", i, "group", table[i].grp, diff --git a/modules/permissions/permissions.c b/modules/permissions/permissions.c index b935e37..0445fbb 100644 --- a/modules/permissions/permissions.c +++ b/modules/permissions/permissions.c @@ -1016,8 +1016,8 @@ rpc_export_t permissions_rpc[] = { {"permissions.trustedReload", rpc_trusted_reload, rpc_trusted_reload_doc, 0}, {"permissions.addressReload", rpc_address_reload, rpc_address_reload_doc, 0}, {"permissions.trustedDump", rpc_trusted_dump, rpc_trusted_dump_doc, 0}, - {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, 0}, - {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, 0}, + {"permissions.addressDump", rpc_address_dump, rpc_address_dump_doc, RET_ARRAY}, + {"permissions.subnetDump", rpc_subnet_dump, rpc_subnet_dump_doc, RET_ARRAY}, {"permissions.domainDump", rpc_domain_name_dump, rpc_domain_name_dump_doc, 0}, {"permissions.testUri", rpc_test_uri, rpc_test_uri_doc, 0}, {0, 0, 0, 0}

8 years, 5 months

← Newer
1
...
10
11
12
13
14
15
16
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2016