Module: kamailio
Branch: master
Commit: 7f2d7aae71758b5b682d5d77d7b7b0187b583de7
URL: https://github.com/kamailio/kamailio/commit/7f2d7aae71758b5b682d5d77d7b7b01…
Author: Daniel-Constantin Mierla <miconda(a)gmail.com>
Committer: Daniel-Constantin Mierla <miconda(a)gmail.com>
Date: 2019-05-29T11:18:20+02:00
app_lua: removed old Lua sr module exports
- exporting only KSR via KEMI framework
- Lua sr module is relocated to app_lua_sr kamailio module, to be
obsoleted and removed over the time
- export KSR.pv submodule using implementation from core
---
Modified: src/modules/app_lua/app_lua_api.c
Modified: src/modules/app_lua/app_lua_api.h
Modified: src/modules/app_lua/app_lua_kemi_export.c
Modified: src/modules/app_lua/app_lua_mod.c
Removed: src/modules/app_lua/app_lua_exp.c
Removed: src/modules/app_lua/app_lua_exp.h
Removed: src/modules/app_lua/app_lua_sr.c
Removed: src/modules/app_lua/app_lua_sr.h
---
Diff: https://github.com/kamailio/kamailio/commit/7f2d7aae71758b5b682d5d77d7b7b01…
Patch: https://github.com/kamailio/kamailio/commit/7f2d7aae71758b5b682d5d77d7b7b01…
Module: kamailio
Branch: master
Commit: decfc7ff92fafe157c1b56201de6c4817e2034d4
URL: https://github.com/kamailio/kamailio/commit/decfc7ff92fafe157c1b56201de6c48…
Author: Kamailio Dev <kamailio.dev(a)kamailio.org>
Committer: Kamailio Dev <kamailio.dev(a)kamailio.org>
Date: 2019-05-28T22:01:49+02:00
modules: readme files regenerated - siptrace ... [skip ci]
---
Modified: src/modules/siptrace/README
---
Diff: https://github.com/kamailio/kamailio/commit/decfc7ff92fafe157c1b56201de6c48…
Patch: https://github.com/kamailio/kamailio/commit/decfc7ff92fafe157c1b56201de6c48…
---
diff --git a/src/modules/siptrace/README b/src/modules/siptrace/README
index 7ffcc90253..6849bce7f7 100644
--- a/src/modules/siptrace/README
+++ b/src/modules/siptrace/README
@@ -565,6 +565,10 @@ kamcmd siptrace.status check
case of internal timeouts) won't be traced. At the moment kamailio
offers no posibility to trace those messages.
+ Trace_info xavp name is reserved by this module. Any use of xavp with
+ this name will result in overlapping internal avp used by the module
+ therefore causing unknown consequences.
+
Example 1.22. Send relayed ACK message
...
onsend_route {
Before this data was serialized in order to fit a normal AVP and
be passed to DLGCB_CREATED callback. Moreover for transaction tracing
data was allocated in current process memory which would have crashed
if the reply were to be recieved in a different process. With the
current implementation data is allocated in shared memory, all processes
having access to it.
For dialogs data is passed through xavp to dlgcb created. From
there all dialog callbacks are registered and they receive argument
the pointer to siptrace info. For transactions the pointer is passed
as dialog callback parameter.
<!-- Kamailio Pull Request Template -->
<!--
IMPORTANT:
- for detailed contributing guidelines, read:
https://github.com/kamailio/kamailio/blob/master/.github/CONTRIBUTING.md
- pull requests must be done to master branch, unless they are backports
of fixes from master branch to a stable branch
- backports to stable branches must be done with 'git cherry-pick -x ...'
- code is contributed under BSD for core and main components (tm, sl, auth, tls)
- code is contributed GPLv2 or a compatible license for the other components
- GPL code is contributed with OpenSSL licensing exception
-->
#### Pre-Submission Checklist
<!-- Go over all points below, and after creating the PR, tick all the checkboxes that apply -->
<!-- All points should be verified, otherwise, read the CONTRIBUTING guidelines from above-->
<!-- If you're unsure about any of these, don't hesitate to ask on sr-dev mailing list -->
- [ ] Commit message has the format required by CONTRIBUTING guide
- [ ] Commits are split per component (core, individual modules, libs, utils, ...)
- [ ] Each component has a single commit (if not, squash them into one commit)
- [ ] 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
- [ ] 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:
<!-- Go over all points below, and after creating the PR, tick the checkboxes that apply -->
- [ ] PR should be backported to stable branches
- [ ] Tested changes locally
- [ ] Related to issue #1955
#### Description
<!-- Describe your changes in detail -->
You can view, comment on, or merge this pull request online at:
https://github.com/kamailio/kamailio/pull/1963
-- Commit Summary --
* siptrace: use xavps to pass data for the duration of transaction/dialog
-- File Changes --
M src/modules/siptrace/siptrace.c (238)
-- Patch Links --
https://github.com/kamailio/kamailio/pull/1963.patchhttps://github.com/kamailio/kamailio/pull/1963.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/1963
Module: kamailio
Branch: master
Commit: 244eb42c3bba647582fdc5ef0d61573bd18a5f3d
URL: https://github.com/kamailio/kamailio/commit/244eb42c3bba647582fdc5ef0d61573…
Author: iionita <ionut-razvan.ionita(a)1and1.ro>
Committer: Henning Westerholt <henningw(a)users.noreply.github.com>
Date: 2019-05-28T21:56:25+02:00
siptrace: document usage of trace_info xavp to prevent overlapping
---
Modified: src/modules/siptrace/doc/siptrace_admin.xml
---
Diff: https://github.com/kamailio/kamailio/commit/244eb42c3bba647582fdc5ef0d61573…
Patch: https://github.com/kamailio/kamailio/commit/244eb42c3bba647582fdc5ef0d61573…
---
diff --git a/src/modules/siptrace/doc/siptrace_admin.xml b/src/modules/siptrace/doc/siptrace_admin.xml
index b3cb739130..0ec443ce3a 100644
--- a/src/modules/siptrace/doc/siptrace_admin.xml
+++ b/src/modules/siptrace/doc/siptrace_admin.xml
@@ -662,6 +662,11 @@ hlog("$hdr(P-MyID)", "Another one with a custom correlation ID");
case of internal timeouts) won't be traced. At the moment kamailio offers
no posibility to trace those messages.
</para>
+ <para>
+ <emphasis>Trace_info</emphasis> xavp name is reserved by this module.
+ Any use of xavp with this name will result in overlapping internal
+ avp used by the module therefore causing unknown consequences.
+ </para>
<example>
<title>Send relayed ACK message</title>
<programlisting format="linespecific">
Module: kamailio
Branch: master
Commit: 26f68412921323a6c681a14718f0091f42a44167
URL: https://github.com/kamailio/kamailio/commit/26f68412921323a6c681a14718f0091…
Author: iionita <ionut-razvan.ionita(a)1and1.ro>
Committer: Henning Westerholt <henningw(a)users.noreply.github.com>
Date: 2019-05-28T21:56:25+02:00
siptrace: avoid flooding logs with unnecessary errors on common scenarios
---
Modified: src/modules/siptrace/siptrace.c
---
Diff: https://github.com/kamailio/kamailio/commit/26f68412921323a6c681a14718f0091…
Patch: https://github.com/kamailio/kamailio/commit/26f68412921323a6c681a14718f0091…
---
diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c
index 95753610f7..8fa832a043 100644
--- a/src/modules/siptrace/siptrace.c
+++ b/src/modules/siptrace/siptrace.c
@@ -1814,13 +1814,18 @@ static void trace_dialog(struct dlg_cell* dlg, int type, struct dlg_cb_params *p
}
if (!(params->req->msg_flags & FL_SIPTRACE)) {
- LM_ERR("Trace is off for this request...\n");
+ LM_DBG("Trace is off for this request...\n");
return;
}
xavp = xavp_get(&xavp_trace_info_name_s, NULL);
if (!xavp) {
- LM_ERR("%.*s xavp not registered\n", xavp_trace_info_name_s.len,
+ /* this actually happens when only the transaction is traced
+ * FL_SIPTRACE is set from trace_onreq_out
+ * but xavp is set only for dialogs so this will avoid
+ * registering dialog callbacks which is the desired behavior */
+ LM_DBG("%.*s xavp not registered! "
+ "Probably incoming E2E CANCEL!\n", xavp_trace_info_name_s.len,
xavp_trace_info_name_s.s);
return;
}
Module: kamailio
Branch: master
Commit: 796a12d6ef27c01e9c5a9ad36b82833b03b62109
URL: https://github.com/kamailio/kamailio/commit/796a12d6ef27c01e9c5a9ad36b82833…
Author: iionita <ionut-razvan.ionita(a)1and1.ro>
Committer: Henning Westerholt <henningw(a)users.noreply.github.com>
Date: 2019-05-28T21:56:25+02:00
siptrace: use xavps to pass data for the duration of transaction/dialog
Before this data was serialized in order to fit a normal AVP and
be passed to DLGCB_CREATED callback. Moreover for transaction tracing
data was allocated in current process memory which would have crashed
if the reply were to be recieved in a different process. With the
current implementation data is allocated in shared memory, all processes
having access to it.
For dialogs data is passed through xavp to dlgcb created. From
there all dialog callbacks are registered and they receive argument
the pointer to siptrace info. For transactions the pointer is passed
as dialog callback parameter.
---
Modified: src/modules/siptrace/siptrace.c
---
Diff: https://github.com/kamailio/kamailio/commit/796a12d6ef27c01e9c5a9ad36b82833…
Patch: https://github.com/kamailio/kamailio/commit/796a12d6ef27c01e9c5a9ad36b82833…