sr-dev February 2016

sr-dev@lists.kamailio.org

28 participants
302 discussions

[kamailio] tls: enhance the logging of ssl bug #1491 workaround (#519)

by Phil Lavin

- log shm_available_safe() instead of shm_available() as this is what is actually compared in the check - also log the relevant threshold as it is not always obvious if the default value is being used You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/519 -- Commit Summary -- * tls: enhance the logging of ssl bug #1491 workaround * tls: fix line breaks -- File Changes -- M modules/tls/tls_server.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/519.patch https://github.com/kamailio/kamailio/pull/519.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/519

8 years, 9 months

[kamailio] core/futex: fix bug in futex_try (#520)

by tsearle

atomic_cmpxchg returns the previous value. If the previous value was 0 then it was previously unlocked and we now have acquired the lock. Thus, it should be c==0 that is considered as the case we enter the lock, not c!=0 As far as I can tell, lock_try (and lock_set_try) are currently no used anywhere in the code, so this fix shoudn't have any impact You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/520 -- Commit Summary -- * core/futex: fix bug in futex_try -- File Changes -- M futexlock.h (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/520.patch https://github.com/kamailio/kamailio/pull/520.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/520

8 years, 9 months

[kamailio] sdpops improvements and tests (#522)

by Mikko Lehto

Complete re-implementation of sdp_remove_line_by_prefix(), maybe reviewing by diff does not make sense. Also feedback is on unit test is welcome as I have not created such for Kamailio earlier. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/522 -- Commit Summary -- * modules/sdpops: reimplement sdp_remove_line_by_prefix() to fix shortcomings * test/unit: add unit test for sdpops script function sdp_remove_line_by_prefix() -- File Changes -- M modules/sdpops/sdpops_mod.c (118) A test/unit/60-message-sdp0.sip (18) A test/unit/60-message-sdp1.sip (18) A test/unit/60-message-sdp2.sip (19) A test/unit/60-message-sdp3.sip (19) A test/unit/60-message-sdp4.sip (20) A test/unit/60-message-sdp5.sip (20) A test/unit/60-message-sdp6.sip (20) A test/unit/60-message-sdp7.sip (19) A test/unit/60.cfg (41) A test/unit/60.sh (75) A test/unit/include/require.sh (65) -- Patch Links -- https://github.com/kamailio/kamailio/pull/522.patch https://github.com/kamailio/kamailio/pull/522.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/522

8 years, 9 months

git:master:c29c555e: modules/ims_registrar_scscf: extra processes in S-CSCF for generating NOTIFYs

by jaybeepee

Module: kamailio Branch: master Commit: c29c555ec5a328dff6ac2697dfbc6717d8562eeb URL: https://github.com/kamailio/kamailio/commit/c29c555ec5a328dff6ac2697dfbc671… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-02-29T14:27:55+02:00 modules/ims_registrar_scscf: extra processes in S-CSCF for generating NOTIFYs --- Modified: modules/ims_registrar_scscf/reg_mod.c Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_registrar_scscf/registrar_notify.h --- Diff: https://github.com/kamailio/kamailio/commit/c29c555ec5a328dff6ac2697dfbc671… Patch: https://github.com/kamailio/kamailio/commit/c29c555ec5a328dff6ac2697dfbc671…

8 years, 9 months

git:master:54c87a80: modules/ims_usrloc_scscf: extra debugging for contact deletion

by jaybeepee

Module: kamailio Branch: master Commit: 54c87a803d877f40d2915f304c5a67d8ff6a25e8 URL: https://github.com/kamailio/kamailio/commit/54c87a803d877f40d2915f304c5a67d… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-02-29T14:26:36+02:00 modules/ims_usrloc_scscf: extra debugging for contact deletion --- Modified: modules/ims_usrloc_scscf/ucontact.c --- Diff: https://github.com/kamailio/kamailio/commit/54c87a803d877f40d2915f304c5a67d… Patch: https://github.com/kamailio/kamailio/commit/54c87a803d877f40d2915f304c5a67d… --- diff --git a/modules/ims_usrloc_scscf/ucontact.c b/modules/ims_usrloc_scscf/ucontact.c index 971cf88..ac18d15 100644 --- a/modules/ims_usrloc_scscf/ucontact.c +++ b/modules/ims_usrloc_scscf/ucontact.c @@ -186,7 +186,7 @@ void free_ucontact(ucontact_t* _c) { param_t * tmp, *tmp1; if (!_c) return; - LM_DBG("Freeing ucontact [%.*s]\n", _c->aor.len, _c->aor.s); + LM_DBG("Freeing ucontact [%p] => [%.*s]\n", _c, _c->c.len, _c->c.s); if (_c->path.s) shm_free(_c->path.s); if (_c->received.s) shm_free(_c->received.s); if (_c->user_agent.s) shm_free(_c->user_agent.s);

8 years, 9 months

git:master:d7b6b127: modules/ims_usrloc_scscf: delayed deletion of contacts on delete or expiry

by jaybeepee

Module: kamailio Branch: master Commit: d7b6b127bf8c655e5506d8dfdce074defec23737 URL: https://github.com/kamailio/kamailio/commit/d7b6b127bf8c655e5506d8dfdce074d… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-02-29T14:25:21+02:00 modules/ims_usrloc_scscf: delayed deletion of contacts on delete or expiry --- Modified: modules/ims_usrloc_scscf/dlist.c Modified: modules/ims_usrloc_scscf/impurecord.c Modified: modules/ims_usrloc_scscf/udomain.c Modified: modules/ims_usrloc_scscf/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/d7b6b127bf8c655e5506d8dfdce074d… Patch: https://github.com/kamailio/kamailio/commit/d7b6b127bf8c655e5506d8dfdce074d…

8 years, 9 months

git:master:80406a0f: modules/ims_usrloc_scscf: don't load empty scscf contacts from DB

by jaybeepee

Module: kamailio Branch: master Commit: 80406a0f44b0d452ebb4b40a10261e671b8013c8 URL: https://github.com/kamailio/kamailio/commit/80406a0f44b0d452ebb4b40a10261e6… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-02-29T14:21:25+02:00 modules/ims_usrloc_scscf: don't load empty scscf contacts from DB --- Modified: modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/80406a0f44b0d452ebb4b40a10261e6… Patch: https://github.com/kamailio/kamailio/commit/80406a0f44b0d452ebb4b40a10261e6… --- diff --git a/modules/ims_usrloc_scscf/usrloc_db.c b/modules/ims_usrloc_scscf/usrloc_db.c index 6e4890d..2b37434 100644 --- a/modules/ims_usrloc_scscf/usrloc_db.c +++ b/modules/ims_usrloc_scscf/usrloc_db.c @@ -841,6 +841,14 @@ int preload_udomain(db1_con_t* _c, udomain_t* _d) { contact.s = (char*) VAL_STRING(contact_vals); contact.len = strlen(contact.s); } + + if (contact.len <=0 || !contact.s){ + LM_ERR("Unable to insert contact [%.*s] for IMPU [%.*s] into memory... continuing...\n", + contact.len, contact.s, + impu.len, impu.s); + continue; + } + if (dbrow2contact(contact_vals, &contact_data) != 0) { LM_ERR("unable to convert contact row from DB into valid data... moving on\n"); continue;

8 years, 9 months

git:master:16c8d5e4: ims_dialog: fix small refcount bug

by jaybeepee

Module: kamailio Branch: master Commit: 16c8d5e4648ff340e6043f4a38fd57c5c60a3058 URL: https://github.com/kamailio/kamailio/commit/16c8d5e4648ff340e6043f4a38fd57c… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-02-29T14:17:17+02:00 ims_dialog: fix small refcount bug --- Modified: modules/ims_dialog/dlg_hash.c Modified: modules/ims_dialog/dlg_req_within.c Modified: modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/16c8d5e4648ff340e6043f4a38fd57c… Patch: https://github.com/kamailio/kamailio/commit/16c8d5e4648ff340e6043f4a38fd57c… --- diff --git a/modules/ims_dialog/dlg_hash.c b/modules/ims_dialog/dlg_hash.c index 01a51f5..26817ac 100644 --- a/modules/ims_dialog/dlg_hash.c +++ b/modules/ims_dialog/dlg_hash.c @@ -1107,25 +1107,9 @@ void next_state_dlg(struct dlg_cell *dlg, int event, switch (dlg->state) { case DLG_STATE_UNCONFIRMED: case DLG_STATE_EARLY: -// if (to_tag) { -// LM_DBG("Going to check if there is another active branch - we only change state to DELETED if there are no other active branches\n"); -// while (dlg_out) { -// if (dlg_out->to_tag.len == to_tag->len && memcmp(dlg_out->to_tag.s, to_tag->s, dlg_out->to_tag.len) == 0) { -// dlg_out->deleted=1; -// } else { -// if (dlg_out->deleted != 1) { -// LM_DBG("Found a dlg_out (to-tag: [%.*s]) that is not for this event and is not in state deleted, therefore there is another active branch\n", to_tag->len, to_tag->s); -// delete = 0; -// } -// } -// dlg_out = dlg_out->next; -// } -// } - if (delete) { - dlg->state = DLG_STATE_DELETED; - unref_dlg_unsafe(dlg, 1, d_entry); - *unref = 1; - } + // dlg->state = DLG_STATE_DELETED; + unref_dlg_unsafe(dlg, 1, d_entry); + // *unref = 1; break; case DLG_STATE_CONFIRMED: case DLG_STATE_CONFIRMED_NA: diff --git a/modules/ims_dialog/dlg_req_within.c b/modules/ims_dialog/dlg_req_within.c index e8b3ffd..b66ae6b 100644 --- a/modules/ims_dialog/dlg_req_within.c +++ b/modules/ims_dialog/dlg_req_within.c @@ -212,7 +212,7 @@ void bye_reply_cb(struct cell* t, int type, struct tmcb_params* ps) { run_dlg_callbacks(DLGCB_TERMINATED, dlg, ps->req, ps->rpl, DLG_DIR_NONE, 0); /* derefering the dialog */ - unref_dlg(dlg, unref + 1); + unref_dlg(dlg, unref); /*removed the extra +1 on the unref that is usually added in the unref of next_state_dlg */ } if (new_state == DLG_STATE_DELETED && old_state == DLG_STATE_DELETED) { diff --git a/modules/ims_dialog/ims_dialog.c b/modules/ims_dialog/ims_dialog.c index 94c84e6..8fc37e7 100644 --- a/modules/ims_dialog/ims_dialog.c +++ b/modules/ims_dialog/ims_dialog.c @@ -130,7 +130,7 @@ static param_export_t mod_params[] = { { "default_timeout", INT_PARAM, &default_timeout}, { "dlg_extra_hdrs", PARAM_STR, &dlg_extra_hdrs}, //In this new dialog module we always match using DID - //{ "dlg_match_mode", INT_PARAM, &seq_match_mode}, + { "dlg_match_mode", INT_PARAM, &seq_match_mode}, { "db_url", PARAM_STR, &db_url }, { "db_mode", INT_PARAM, &dlg_db_mode_param }, @@ -943,7 +943,6 @@ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { if(rpc->scan(c, "*S", &rpc_extra_hdrs)<1) { rpc_extra_hdrs = dfl_rpc_extra_hdrs; - rpc_extra_hdrs.len = 0; } dlg = lookup_dlg(h_entry, h_id);//increments ref count!

8 years, 9 months

git:master:c9ecbe97: modules/ims_dialog: add default reason headers for mi-terminated dlgs

by jaybeepee

Module: kamailio Branch: master Commit: c9ecbe97af96e20312f1f2daa0afe3b5121cb0c0 URL: https://github.com/kamailio/kamailio/commit/c9ecbe97af96e20312f1f2daa0afe3b… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-02-29T14:13:03+02:00 modules/ims_dialog: add default reason headers for mi-terminated dlgs --- Modified: modules/ims_dialog/dlg_req_within.c Modified: modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ecbe97af96e20312f1f2daa0afe3b… Patch: https://github.com/kamailio/kamailio/commit/c9ecbe97af96e20312f1f2daa0afe3b… --- diff --git a/modules/ims_dialog/dlg_req_within.c b/modules/ims_dialog/dlg_req_within.c index 2de823d..e8b3ffd 100644 --- a/modules/ims_dialog/dlg_req_within.c +++ b/modules/ims_dialog/dlg_req_within.c @@ -403,13 +403,14 @@ struct mi_root * mi_terminate_dlg(struct mi_root *cmd_tree, void *param) { struct mi_node* node; struct dlg_cell * dlg = NULL; - str mi_extra_hdrs = {NULL, 0}; + str mi_extra_hdrs = {"Reason: mi_terminated\r\n", 23}; int status, msg_len; char *msg; str callid = {NULL, 0}; str ftag = {NULL, 0}; str ttag = {NULL, 0}; + str reason = {"mi_terminated", 13}; if (d_table == NULL) goto end; @@ -448,9 +449,9 @@ struct mi_root * mi_terminate_dlg(struct mi_root *cmd_tree, void *param) { dlg = get_dlg(&callid, &ftag, &ttag, &dir); //increments ref count! if (dlg) { - LM_DBG("Found dialog to terminate and it is in state [%i]\n", dlg->state); + LM_DBG("Found dialog to terminate and it is in state [%i] [%.*s]\n", dlg->state, mi_extra_hdrs.len, mi_extra_hdrs.s); - if (dlg_terminate(dlg, 0, NULL/*reson*/, /* all sides of a dialog*/ 2, &mi_extra_hdrs) < 0) { + if (dlg_terminate(dlg, 0, &reason/*reson*/, /* all sides of a dialog*/ 2, &mi_extra_hdrs) < 0) { status = 500; msg = MI_DLG_OPERATION_ERR; msg_len = MI_DLG_OPERATION_ERR_LEN; diff --git a/modules/ims_dialog/ims_dialog.c b/modules/ims_dialog/ims_dialog.c index 6d4732a..94c84e6 100644 --- a/modules/ims_dialog/ims_dialog.c +++ b/modules/ims_dialog/ims_dialog.c @@ -929,7 +929,9 @@ static const char *rpc_end_dlg_entry_id_doc[2] = { static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { unsigned int h_entry, h_id; struct dlg_cell * dlg = NULL; - str rpc_extra_hdrs = {NULL,0}; + str rpc_extra_hdrs = {0,0}; + str dfl_rpc_extra_hdrs = {"Reason: mi_terminated\r\n",23}; + str reason = {"mi_terminated", 12}; int n; n = rpc->scan(c, "dd", &h_entry, &h_id); @@ -940,7 +942,7 @@ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { } if(rpc->scan(c, "*S", &rpc_extra_hdrs)<1) { - rpc_extra_hdrs.s = NULL; + rpc_extra_hdrs = dfl_rpc_extra_hdrs; rpc_extra_hdrs.len = 0; } @@ -951,8 +953,8 @@ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { } unref_dlg(dlg, 1); - - dlg_terminate(dlg, NULL, NULL/*reason*/, 2, NULL); + LM_DBG("Setting reason to [%.*s] and extra headers to [%.*s]\n", reason.len, reason.s, rpc_extra_hdrs.len, rpc_extra_hdrs.s); + dlg_terminate(dlg, NULL, &reason/*reason*/, 2, &rpc_extra_hdrs); }

8 years, 9 months

git:master:176c98b0: modules/ims_dialog: check branch is set before dereferencing

by jaybeepee

Module: kamailio Branch: master Commit: 176c98b0241433ef3e4cb22d55154bede1636791 URL: https://github.com/kamailio/kamailio/commit/176c98b0241433ef3e4cb22d55154be… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-02-29T14:11:04+02:00 modules/ims_dialog: check branch is set before dereferencing --- Modified: modules/ims_dialog/dlg_hash.c --- Diff: https://github.com/kamailio/kamailio/commit/176c98b0241433ef3e4cb22d55154be… Patch: https://github.com/kamailio/kamailio/commit/176c98b0241433ef3e4cb22d55154be… --- diff --git a/modules/ims_dialog/dlg_hash.c b/modules/ims_dialog/dlg_hash.c index 5860df4..01a51f5 100644 --- a/modules/ims_dialog/dlg_hash.c +++ b/modules/ims_dialog/dlg_hash.c @@ -510,7 +510,7 @@ struct dlg_cell_out* build_new_dlg_out(struct dlg_cell *dlg, str* to_uri, str* t p = (char*) (dlg_out + 1); - if (branch->len > 0) { + if (branch && branch->len > 0) { dlg_out->branch.s = p; dlg_out->branch.len = branch->len; memcpy(p, branch->s, branch->len);

8 years, 9 months

← Newer
1
2
3
4
5
6
7
8
...
31
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2016