sr-dev March 2016

sr-dev@lists.kamailio.org

27 participants
388 discussions

git:master:d3d1592e: pv: fix compile warning for shm_initialized() test
by Daniel-Constantin Mierla 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: d3d1592eb7148586cb70e93f549ff11fd5cf5316 URL: https://github.com/kamailio/kamailio/commit/d3d1592eb7148586cb70e93f549ff11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-29T23:13:37+02:00 pv: fix compile warning for shm_initialized() test - coherent whitepacing across the file --- Modified: modules/pv/pv_shv.c --- Diff: https://github.com/kamailio/kamailio/commit/d3d1592eb7148586cb70e93f549ff11… Patch: https://github.com/kamailio/kamailio/commit/d3d1592eb7148586cb70e93f549ff11…

1 0

git:master:594d1090: pv: coherent indentation and whitespacing
by Daniel-Constantin Mierla 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: 594d1090b1b4cea26892f14f0adebc46bc05314b URL: https://github.com/kamailio/kamailio/commit/594d1090b1b4cea26892f14f0adebc4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2016-03-29T23:13:37+02:00 pv: coherent indentation and whitespacing --- Modified: modules/pv/pv_core.c --- Diff: https://github.com/kamailio/kamailio/commit/594d1090b1b4cea26892f14f0adebc4… Patch: https://github.com/kamailio/kamailio/commit/594d1090b1b4cea26892f14f0adebc4…

1 0

git:4.4:ac90a7c1: Update hep.c
by Alexandr Dubovikov 29 Mar '16

29 Mar '16

Module: kamailio Branch: 4.4 Commit: ac90a7c1066cc8a5e01152a1c6bfc704f6667d98 URL: https://github.com/kamailio/kamailio/commit/ac90a7c1066cc8a5e01152a1c6bfc70… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <shurik(a)d.start4.info> Date: 2016-03-29T22:34:20+02:00 Update hep.c --- Modified: modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/ac90a7c1066cc8a5e01152a1c6bfc70… Patch: https://github.com/kamailio/kamailio/commit/ac90a7c1066cc8a5e01152a1c6bfc70… --- diff --git a/modules/sipcapture/hep.c b/modules/sipcapture/hep.c index 6c934dc..bbafa5a 100644 --- a/modules/sipcapture/hep.c +++ b/modules/sipcapture/hep.c @@ -66,6 +66,9 @@ int hep_msg_received(void *data) len = (unsigned *)srevp[1]; ri = (struct receive_info *)srevp[2]; + correlation_id = NULL; + authkey = NULL; + count++; struct hep_hdr *heph; /* hep_hdr */ @@ -100,6 +103,9 @@ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri){ memset(heptime, 0, sizeof(struct hep_timehdr)); struct hep_ip6hdr *hepip6h = NULL; + + correlation_id = NULL; + authkey = NULL; hep_offset = 0;

1 0

git:4.4:78a43ba3: Merge pull request #554 from adubovikov/4.4
by Alexandr Dubovikov 29 Mar '16

29 Mar '16

Module: kamailio Branch: 4.4 Commit: 78a43ba3f86c336295d5385c8d5ec3039c3c1032 URL: https://github.com/kamailio/kamailio/commit/78a43ba3f86c336295d5385c8d5ec30… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: 2016-03-29T23:17:03+02:00 Merge pull request #554 from adubovikov/4.4 modules/sipcapture: fixed correlation_id pointer for HEPv2/v1 --- Modified: modules/sipcapture/hep.c --- Diff: https://github.com/kamailio/kamailio/commit/78a43ba3f86c336295d5385c8d5ec30… Patch: https://github.com/kamailio/kamailio/commit/78a43ba3f86c336295d5385c8d5ec30… --- diff --git a/modules/sipcapture/hep.c b/modules/sipcapture/hep.c index 6c934dc..bbafa5a 100644 --- a/modules/sipcapture/hep.c +++ b/modules/sipcapture/hep.c @@ -66,6 +66,9 @@ int hep_msg_received(void *data) len = (unsigned *)srevp[1]; ri = (struct receive_info *)srevp[2]; + correlation_id = NULL; + authkey = NULL; + count++; struct hep_hdr *heph; /* hep_hdr */ @@ -100,6 +103,9 @@ int hepv2_received(char *buf, unsigned int len, struct receive_info *ri){ memset(heptime, 0, sizeof(struct hep_timehdr)); struct hep_ip6hdr *hepip6h = NULL; + + correlation_id = NULL; + authkey = NULL; hep_offset = 0;

1 0

[kamailio/kamailio] modules/sipcapture: fixed correlation_id pointer for HEPv2/v1 (#554)
by Alexandr Dubovikov 29 Mar '16

29 Mar '16

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/554 -- Commit Summary -- * Update hep.c -- File Changes -- M modules/sipcapture/hep.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/554.patch https://github.com/kamailio/kamailio/pull/554.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/554

1 1

git:master:5a2e4b0b: modules/ims_dialog: improved printing of dialogs via RPC
by jaybeepee 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: 5a2e4b0bf934d1151214c4de089f22ec0297a237 URL: https://github.com/kamailio/kamailio/commit/5a2e4b0bf934d1151214c4de089f22e… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-03-29T15:54:10+02:00 modules/ims_dialog: improved printing of dialogs via RPC --- Modified: modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/5a2e4b0bf934d1151214c4de089f22e… Patch: https://github.com/kamailio/kamailio/commit/5a2e4b0bf934d1151214c4de089f22e… --- diff --git a/modules/ims_dialog/ims_dialog.c b/modules/ims_dialog/ims_dialog.c index 299e6d6..3562235 100644 --- a/modules/ims_dialog/ims_dialog.c +++ b/modules/ims_dialog/ims_dialog.c @@ -826,10 +826,13 @@ static int w_is_known_dlg(struct sip_msg *msg) { static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, struct dlg_cell *dlg, void *dh) { void* dlg_outs_h; + void* root; + void* roota; struct dlg_cell_out* dlg_out; - rpc->struct_add(dh, "dd", "Entry", dlg->h_entry, "Id", dlg->h_id); - rpc->struct_add(dh, "SSSSSSSsd{", + rpc->struct_add(dh, "{", "Dialog", &root); + rpc->struct_add(root, "dd", "Entry", dlg->h_entry, "Id", dlg->h_id); + rpc->struct_add(root, "SSSSSSSsd[", "RURI", &dlg->req_uri, "From", &dlg->from_uri, "Call-ID", &dlg->callid, @@ -839,15 +842,17 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, struct dlg_cell * "From Tag", &dlg->from_tag, "State", state_to_char(dlg->state), "Ref", dlg->ref, - "dlg_outs", &dlg_outs_h + "dlg_outs", &roota ); lock_get(dlg->dlg_out_entries_lock); dlg_out = dlg->dlg_entry_out.first; while (dlg_out) { - rpc->struct_add(dlg_outs_h, "dd", "Entry", dlg_out->h_entry, "Id", dlg_out->h_id); - dlg_out = dlg_out->next; + + rpc->struct_add(roota, "{", "dlg_out", &dlg_outs_h); + rpc->struct_add(dlg_outs_h, "dd", "Entry", dlg_out->h_entry, "Id", dlg_out->h_id); + dlg_out = dlg_out->next; } lock_release(dlg->dlg_out_entries_lock); @@ -875,7 +880,7 @@ static void internal_rpc_print_dlgs(rpc_t *rpc, void *c) rpc->fault(c, 500, "Internal error creating top rpc"); return; } - if (rpc->struct_add(ah, "d{", "Size", (int) d_table->size, "Dialogs", &dh) < 0) { + if (rpc->struct_add(ah, "d[", "Size", (int) d_table->size, "Dialogs", &dh) < 0) { rpc->fault(c, 500, "Internal error creating inner struct"); return; }

1 0

git:master:20787d75: modules/ims_dialog: only create dlg_out on response codes < 299
by jaybeepee 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: 20787d75ded26dcb0958cb74c546137c59d3a4ec URL: https://github.com/kamailio/kamailio/commit/20787d75ded26dcb0958cb74c546137… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-03-29T15:53:06+02:00 modules/ims_dialog: only create dlg_out on response codes < 299 --- Modified: modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/20787d75ded26dcb0958cb74c546137… Patch: https://github.com/kamailio/kamailio/commit/20787d75ded26dcb0958cb74c546137… --- diff --git a/modules/ims_dialog/dlg_handlers.c b/modules/ims_dialog/dlg_handlers.c index b4b5592..dd23154 100644 --- a/modules/ims_dialog/dlg_handlers.c +++ b/modules/ims_dialog/dlg_handlers.c @@ -1341,25 +1341,27 @@ void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) { lock_release(dlg->dlg_out_entries_lock); if (!dlg_out) { - if (rpl->via1->branch && (&rpl->via1->branch->value) && (rpl->via1->branch->value.len > 0)) { - branch = rpl->via1->branch->value; - } - - LM_DBG("No dlg_out entry found - creating a new dialog_out entry on dialog [%p]\n", dlg); - dlg_out = build_new_dlg_out(dlg, &to_uri, &to_tag, &branch); + if (rpl->first_line.u.reply.statuscode < 299) { /*we don't care about failure responses to dialog - not necessary to create dialog out...*/ + if (rpl->via1->branch && (&rpl->via1->branch->value) && (rpl->via1->branch->value.len > 0)) { + branch = rpl->via1->branch->value; + } - link_dlg_out(dlg, dlg_out, 0); + LM_DBG("No dlg_out entry found - creating a new dialog_out entry on dialog [%p]\n", dlg); + dlg_out = build_new_dlg_out(dlg, &to_uri, &to_tag, &branch); - /* save callee's cseq, caller cseq, callee contact and callee record route*/ - if (populate_leg_info(dlg, rpl, t, DLG_CALLEE_LEG, &to_tag) != 0) { - LM_ERR("could not add further info to the dlg out\n"); - } + link_dlg_out(dlg, dlg_out, 0); - if (!dlg_out) { - LM_ERR("failed to create new dialog out structure\n"); - goto done; - //TODO do something on this error! + /* save callee's cseq, caller cseq, callee contact and callee record route*/ + if (populate_leg_info(dlg, rpl, t, DLG_CALLEE_LEG, &to_tag) != 0) { + LM_ERR("could not add further info to the dlg out\n"); + } + if (!dlg_out) { + LM_ERR("failed to create new dialog out structure\n"); + goto done; + //TODO do something on this error! + + } } } else { //This dlg_out already exists, update cseq and contact if present

1 0

git:master:4161fdd7: modules/ims_dialog: extra error condition logging
by jaybeepee 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: 4161fdd7ad1f4273f9e02eb0093dde502f248157 URL: https://github.com/kamailio/kamailio/commit/4161fdd7ad1f4273f9e02eb0093dde5… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-03-29T15:52:34+02:00 modules/ims_dialog: extra error condition logging --- Modified: modules/ims_dialog/dlg_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/4161fdd7ad1f4273f9e02eb0093dde5… Patch: https://github.com/kamailio/kamailio/commit/4161fdd7ad1f4273f9e02eb0093dde5… --- diff --git a/modules/ims_dialog/dlg_handlers.c b/modules/ims_dialog/dlg_handlers.c index e8b2c04..b4b5592 100644 --- a/modules/ims_dialog/dlg_handlers.c +++ b/modules/ims_dialog/dlg_handlers.c @@ -187,7 +187,10 @@ int populate_leg_info(struct dlg_cell *dlg, struct sip_msg *msg, /* extract the contact address */ if (!msg->contact && (parse_headers(msg, HDR_CONTACT_F, 0) < 0 || !msg->contact)) { - LM_ERR("bad sip message or missing Contact hdr\n"); + if (msg->first_line.type == SIP_REQUEST) + LM_ERR("bad sip message or missing Contact hdr for message [%.*s]\n", msg->first_line.u.request.method.len, msg->first_line.u.request.method.s); + else + LM_ERR("bad sip message or missing Contact hdr for message [%.*s]\n", msg->first_line.u.reply.status.len, msg->first_line.u.reply.status.s); goto error0; } if (parse_contact(msg->contact) < 0 ||

1 0

git:master:c1ca9f58: modules/ims_dialog: end all active calls
by jaybeepee 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: c1ca9f58c12962c8b1dee715facc47248fd852ca URL: https://github.com/kamailio/kamailio/commit/c1ca9f58c12962c8b1dee715facc472… Author: jaybeepee <jason.penton(a)gmail.com> Committer: jaybeepee <jason.penton(a)gmail.com> Date: 2016-03-29T15:49:14+02:00 modules/ims_dialog: end all active calls --- Modified: modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/c1ca9f58c12962c8b1dee715facc472… Patch: https://github.com/kamailio/kamailio/commit/c1ca9f58c12962c8b1dee715facc472… --- diff --git a/modules/ims_dialog/ims_dialog.c b/modules/ims_dialog/ims_dialog.c index 8fc37e7..299e6d6 100644 --- a/modules/ims_dialog/ims_dialog.c +++ b/modules/ims_dialog/ims_dialog.c @@ -921,9 +921,9 @@ static const char *rpc_end_dlg_entry_id_doc[2] = { "End a given dialog based on [h_entry] [h_id]", 0 }; - - - +static const char *rpc_end_all_active_dlg_doc[2] = { + "End all ACTIVE dialogs", 0 +}; /* Wrapper for terminating dialog from API - from other modules */ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { @@ -957,10 +957,55 @@ static void rpc_end_dlg_entry_id(rpc_t *rpc, void *c) { } +static void rpc_end_all_active_dlg (rpc_t *rpc, void *c) +{ + struct dlg_cell * dlg = NULL, + * dlg_to_term = NULL; + dlg_entry_t entry; + + unsigned int i_count = 0, + h_index = 0; + + str rpc_extra_hdrs = {0,0}; + str dfl_rpc_extra_hdrs = {"Reason: mi_terminated\r\n",23}; + str reason = {"mi_terminated", 12}; + + + if (!d_table) + { + rpc->fault(c, 500, "Dialog hash table not initialized"); + return; + } + if (!d_table->size) return; + + rpc_extra_hdrs = dfl_rpc_extra_hdrs; + LM_DBG("Setting reason to [%.*s] and extra headers to [%.*s]\n", + reason.len, reason.s, rpc_extra_hdrs.len, rpc_extra_hdrs.s); + + for (h_index = 0 ; h_index < d_table->size; h_index++) + { + entry = d_table->entries[h_index]; + dlg_to_term = entry.first; + for (; dlg_to_term;) + { + dlg = dlg_to_term->next ; + if (dlg_to_term->state == DLG_STATE_CONFIRMED) + { + unref_dlg(dlg_to_term, 1); + rpc_extra_hdrs = dfl_rpc_extra_hdrs; + dlg_terminate(dlg_to_term, NULL, &reason/*reason*/, 2, &rpc_extra_hdrs); + i_count++; + } + dlg_to_term = dlg; + } + } + LM_DBG("Terminated %d active dialogs from rpc call",i_count); +} static rpc_export_t rpc_methods[] = { {"dlg2.list", rpc_print_dlgs, rpc_print_dlgs_doc, 0}, {"dlg2.end_dlg", rpc_end_dlg_entry_id, rpc_end_dlg_entry_id_doc, 0}, + {"dlg2.end_all_active_dlg", rpc_end_all_active_dlg, rpc_end_all_active_dlg_doc, 0}, {0, 0, 0, 0} };

1 0

git:master:d2a4c554: modules/ims_registrar_scscf: fix to include contacts in NOTIFY on explicit dereg
by Richard Good 29 Mar '16

29 Mar '16

Module: kamailio Branch: master Commit: d2a4c554dadf94f71466b8ab1785cfa0e11b8cb1 URL: https://github.com/kamailio/kamailio/commit/d2a4c554dadf94f71466b8ab1785cfa… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2016-03-29T10:18:11+02:00 modules/ims_registrar_scscf: fix to include contacts in NOTIFY on explicit dereg --- Modified: modules/ims_registrar_scscf/cxdx_callbacks.c Modified: modules/ims_registrar_scscf/registrar_notify.c Modified: modules/ims_registrar_scscf/registrar_notify.h Modified: modules/ims_registrar_scscf/save.c Modified: modules/ims_registrar_scscf/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/d2a4c554dadf94f71466b8ab1785cfa… Patch: https://github.com/kamailio/kamailio/commit/d2a4c554dadf94f71466b8ab1785cfa…

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2016