sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
256 discussions

git:master:65df297d: dialog: added missing documentation for end_timeout parameter
by Daniel-Constantin Mierla 09 Apr '18

09 Apr '18

Module: kamailio Branch: master Commit: 65df297db29192b2214a737208518db5cc7bff84 URL: https://github.com/kamailio/kamailio/commit/65df297db29192b2214a737208518db… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-08T09:45:06+02:00 dialog: added missing documentation for end_timeout parameter --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/65df297db29192b2214a737208518db… Patch: https://github.com/kamailio/kamailio/commit/65df297db29192b2214a737208518db… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index 5ed51d450d..a1bc8959a1 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -356,6 +356,27 @@ modparam("dialog", "noack_timeout", 90) </example> </section> + <section id="dialog.p.end_timeout"> + <title><varname>end_timeout</varname> (integer)</title> + <para> + The timeout (in seconds) after which the dialogs in terminated state + are destroyed. + </para> + <para> + <emphasis> + Default value is <quote>300 (5 minutes)</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>end_timeout</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("dialog", "end_timeout", 180) +... +</programlisting> + </example> + </section> + <section id="dialog.p.dlg_extra_hdrs"> <title><varname>dlg_extra_hdrs</varname> (string)</title> <para>

1 0

git:master:25c4b9eb: dialog: print ref and end_ts in dialog list rpc output
by Daniel-Constantin Mierla 07 Apr '18

07 Apr '18

Module: kamailio Branch: master Commit: 25c4b9eb56e0c75daaa98256c590947daa2b9906 URL: https://github.com/kamailio/kamailio/commit/25c4b9eb56e0c75daaa98256c590947… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-07T13:00:54+02:00 dialog: print ref and end_ts in dialog list rpc output --- Modified: src/modules/dialog/dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/25c4b9eb56e0c75daaa98256c590947… Patch: https://github.com/kamailio/kamailio/commit/25c4b9eb56e0c75daaa98256c590947… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index 1689fc9d2b..9ae2ce8090 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -2000,15 +2000,17 @@ static inline void internal_rpc_print_dlg(rpc_t *rpc, void *c, dlg_cell_t *dlg, if (rpc->add(c, "{", &h) < 0) goto error; - rpc->struct_add(h, "ddSSSdddddddd", + rpc->struct_add(h, "dddSSSddddddddd", "h_entry", dlg->h_entry, "h_id", dlg->h_id, + "ref", dlg->ref, "call-id", &dlg->callid, "from_uri", &dlg->from_uri, "to_uri", &dlg->to_uri, "state", dlg->state, "start_ts", dlg->start_ts, "init_ts", dlg->init_ts, + "end_ts", dlg->end_ts, "timeout", dlg->tl.timeout ? time(0) + dlg->tl.timeout - get_ticks() : 0, "lifetime", dlg->lifetime, "dflags", dlg->dflags,

1 0

git:master:66e3c96f: modules: readme files regenerated - dialog ... [skip ci]
by Kamailio Dev 06 Apr '18

06 Apr '18

Module: kamailio Branch: master Commit: 66e3c96f49e25ef7d2441f95b20d34a138572231 URL: https://github.com/kamailio/kamailio/commit/66e3c96f49e25ef7d2441f95b20d34a… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-06T09:31:52+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/66e3c96f49e25ef7d2441f95b20d34a… Patch: https://github.com/kamailio/kamailio/commit/66e3c96f49e25ef7d2441f95b20d34a… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index fbad4ab89f..962046c23d 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -130,6 +130,7 @@ Olle E. Johansson 7.17. dlg_remote_profile(cmd, profile, value, uid, expires) 7.18. dlg_set_ruri() 7.19. dlg_db_load_callid(cival) + 7.20. dlg_db_load_extra() 8. Statistics @@ -257,6 +258,7 @@ Olle E. Johansson 1.77. dlg_remote_profile usage 1.78. dlg_set_ruri() usage 1.79. dlg_db_load_callid() usage + 1.80. dlg_db_load_extra() usage Chapter 1. Admin Guide @@ -355,6 +357,7 @@ Chapter 1. Admin Guide 7.17. dlg_remote_profile(cmd, profile, value, uid, expires) 7.18. dlg_set_ruri() 7.19. dlg_db_load_callid(cival) + 7.20. dlg_db_load_extra() 8. Statistics @@ -1354,11 +1357,11 @@ modparam("dialog", "h_id_start", 5) the rule: h_id_start + N * h_id_step. The first value of N is randomly selected at startup, then incremented by 1 for each new dialog. Setting h_id_start and h_id_step to non-default values should be done when - using dlg_db_load_callid(...) to load dialog records generated by - another Kamailio instance, making also sure that those Kamailio - instances are not going to generate overalapping dialog hash id values - by using different h_id_start and the same h_id_step (h_id_step has to - be greater than the maximum value of h_id_start). + using dlg_db_load_callid(...) or dlg_db_load_extra() to load dialog + records generated by another Kamailio instance, making also sure that + those Kamailio nstances are not going to generate overalapping dialog + hash id values by using different h_id_start and the same h_id_step + (h_id_step has to be greater than the maximum value of h_id_start). Default value is “1”. @@ -1388,6 +1391,7 @@ modparam("dialog", "h_id_step", 10) 7.17. dlg_remote_profile(cmd, profile, value, uid, expires) 7.18. dlg_set_ruri() 7.19. dlg_db_load_callid(cival) + 7.20. dlg_db_load_extra() 7.1. set_dlg_profile(profile,[value]) @@ -1792,6 +1796,25 @@ if(has_totag()) { } ... +7.20. dlg_db_load_extra() + + Load all dialog records from database that are not in memory of the + current Kamailio instance. + + This function can be used from ANY_ROUTE. + + Example 1.80. dlg_db_load_extra() usage +... +if(has_totag()) { + if(!is_known_dlg()) { + dlg_db_load_extra(); + if(!is_known_dlg()) { + xlog("no dialog found with callid: $ci\n"); + } + } +} +... + 8. Statistics 8.1. active_dialogs

1 0

git:master:7ff8f040: dialog: documented dlg_db_load_extra() function
by Daniel-Constantin Mierla 06 Apr '18

06 Apr '18

Module: kamailio Branch: master Commit: 7ff8f04079fc9c7e6710b43c3e893518f17ef48e URL: https://github.com/kamailio/kamailio/commit/7ff8f04079fc9c7e6710b43c3e89351… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-06T09:21:56+02:00 dialog: documented dlg_db_load_extra() function - related to #1274 --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7ff8f04079fc9c7e6710b43c3e89351… Patch: https://github.com/kamailio/kamailio/commit/7ff8f04079fc9c7e6710b43c3e89351… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index d231d9a2f6..5ed51d450d 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -1552,12 +1552,12 @@ modparam("dialog", "h_id_start", 5) with the rule: h_id_start + N * h_id_step. The first value of N is randomly selected at startup, then incremented by 1 for each new dialog. Setting h_id_start and h_id_step to non-default values - should be done when using dlg_db_load_callid(...) to load dialog - records generated by another &kamailio; instance, making also sure - that those &kamailio; instances are not going to generate - overalapping dialog hash id values by using different h_id_start - and the same h_id_step (h_id_step has to be greater than the - maximum value of h_id_start). + should be done when using dlg_db_load_callid(...) or + dlg_db_load_extra() to load dialog records generated by another + &kamailio; instance, making also sure that those &kamailio; + nstances are not going to generate overalapping dialog hash id + values by using different h_id_start and the same h_id_step + (h_id_step has to be greater than the maximum value of h_id_start). </para> <para> <emphasis> @@ -2281,6 +2281,33 @@ if(has_totag()) { } } ... +</programlisting> + </example> + </section> + <section id="dialog.f.dlg_db_load_extra"> + <title> + <function moreinfo="none">dlg_db_load_extra()</function> + </title> + <para> + Load all dialog records from database that are not in memory of the + current &kamailio; instance. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>dlg_db_load_extra()</function> usage</title> + <programlisting format="linespecific"> +... +if(has_totag()) { + if(!is_known_dlg()) { + dlg_db_load_extra(); + if(!is_known_dlg()) { + xlog("no dialog found with callid: $ci\n"); + } + } +} +... </programlisting> </example> </section>

1 0

git:master:0f2f7611: dialog: added dlg_db_load_extra() function
by Daniel-Constantin Mierla 06 Apr '18

06 Apr '18

Module: kamailio Branch: master Commit: 0f2f76115a058161061345477ee55126d7e43420 URL: https://github.com/kamailio/kamailio/commit/0f2f76115a058161061345477ee5512… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-06T09:21:02+02:00 dialog: added dlg_db_load_extra() function - load dialogs from database that are not yet in memory of current kamailio instance --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/0f2f76115a058161061345477ee5512… Patch: https://github.com/kamailio/kamailio/commit/0f2f76115a058161061345477ee5512… --- diff --git a/src/modules/dialog/dialog.c b/src/modules/dialog/dialog.c index a7b95bbd32..1689fc9d2b 100644 --- a/src/modules/dialog/dialog.c +++ b/src/modules/dialog/dialog.c @@ -192,6 +192,7 @@ static int w_dlg_get(struct sip_msg*, char*, char*, char*); static int w_is_known_dlg(struct sip_msg *); static int w_dlg_set_ruri(sip_msg_t *, char *, char *); static int w_dlg_db_load_callid(sip_msg_t *msg, char *ci, char *p2); +static int w_dlg_db_load_extra(sip_msg_t *msg, char *p1, char *p2); static int w_dlg_remote_profile(sip_msg_t *msg, char *cmd, char *pname, char *pval, char *puid, char *expires); @@ -250,6 +251,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"dlg_db_load_callid", (cmd_function)w_dlg_db_load_callid, 1, fixup_spve_null, 0, ANY_ROUTE }, + {"dlg_db_load_extra", (cmd_function)w_dlg_db_load_extra, 0, 0, + 0, ANY_ROUTE }, {"load_dlg", (cmd_function)load_dlg, 0, 0, 0, 0}, {0,0,0,0,0,0} @@ -1837,6 +1840,27 @@ static int w_dlg_db_load_callid(sip_msg_t *msg, char *ci, char *p2) return ki_dlg_db_load_callid(msg, &sc); } +/** + * + */ +static int ki_dlg_db_load_extra(sip_msg_t *msg) +{ + int ret; + + ret = load_dialog_info_from_db(dlg_hash_size, db_fetch_rows, 2, NULL); + + if(ret==0) return 1; + return ret; +} + +/** + * + */ +static int w_dlg_db_load_extra(sip_msg_t *msg, char *p1, char *p2) +{ + return ki_dlg_db_load_extra(msg); +} + /** * */ @@ -1937,6 +1961,11 @@ static sr_kemi_t sr_kemi_dialog_exports[] = { { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("dialog"), str_init("dlg_db_load_extra"), + SR_KEMIP_INT, ki_dlg_db_load_extra, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index a81a72dc97..2a3e4301ad 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -374,8 +374,13 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, dit = dit->next; } if(dit) { - LM_WARN("conflicting dialog id: %u/%u - skipping\n", + if(mode==1) { + LM_WARN("conflicting dialog id: %u/%u - skipping\n", dlg->h_entry, (unsigned int)VAL_INT(values+1)); + } else { + LM_DBG("conflicting dialog id: %u/%u - skipping\n", + dlg->h_entry, (unsigned int)VAL_INT(values+1)); + } dlg_unlock(d_table, &(d_table->entries[dlg->h_entry])); shm_free(dlg); continue; @@ -517,6 +522,23 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, for(i=0; i<loaded_extra; i++) { load_dialog_vars_from_db(fetch_num_rows, 1, &dbuid[i]); } + if(loaded_extra_more) { + /* more dialogs loaded - scan hash table */ + for(i=0; i<d_table->size; i++) { + dlg_lock(d_table, &d_table->entries[i]); + dlg = d_table->entries[i].first; + while (dlg) { + if(dlg->dflags & DLG_FLAG_DB_LOAD_EXTRA) { + dbuid[0].h_entry = dlg->h_entry; + dbuid[0].h_id = dlg->h_id; + load_dialog_vars_from_db(fetch_num_rows, 1, &dbuid[0]); + dlg->dflags &= ~DLG_FLAG_DB_LOAD_EXTRA; + } + dlg = dlg->next; + } + dlg_unlock(d_table, &d_table->entries[i]); + } + } goto end; }

1 0

git:master:daf1e437: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 05 Apr '18

05 Apr '18

Module: kamailio Branch: master Commit: daf1e437ed5fbf076a08ca957ea07930813123d4 URL: https://github.com/kamailio/kamailio/commit/daf1e437ed5fbf076a08ca957ea0793… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-05T20:16:42+02:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/daf1e437ed5fbf076a08ca957ea0793… Patch: https://github.com/kamailio/kamailio/commit/daf1e437ed5fbf076a08ca957ea0793…

1 0

git:master:d6cd5655: textops: documentation for append_body_part_hex()
by Daniel-Constantin Mierla 05 Apr '18

05 Apr '18

Module: kamailio Branch: master Commit: d6cd5655df83d233562ab557a0e73cb5e65f0b1c URL: https://github.com/kamailio/kamailio/commit/d6cd5655df83d233562ab557a0e73cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-05T20:03:44+02:00 textops: documentation for append_body_part_hex() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d6cd5655df83d233562ab557a0e73cb… Patch: https://github.com/kamailio/kamailio/commit/d6cd5655df83d233562ab557a0e73cb… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 3ff09fb812..966169d2dd 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1561,6 +1561,63 @@ Content-Disposition: signal;handling=required 7e Od 04 55 75 69 20 4d 61 6b 65 43 61 6c 6c +--unique-boundary-1 +... +</programlisting> + </example> + </section> + + <section id="textops.f.append_body_part_hex"> + <title> + <function moreinfo="none">append_body_part_hex(txt,content_type[, content_disposition])</function> + </title> + <para> + Append a part on multipart body SIP message, with the content provided + in hexa format. Will use "unique-boundary-1" as boundary. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>txt</emphasis> - content for the multipart body in + hexa format. Spaces can be used between the pairs of hexa digits + to make it easier to read in the config, they are ignored and + not added in the body part. The parameter can include + pseudo-variables. + </para> + </listitem> + <listitem> + <para><emphasis>content_type</emphasis> - value of Content-Type header, + can include pseudo-variables. + </para> + </listitem> + <listitem> + <para><emphasis>content_disposition</emphasis> - value of Content-Disposition header, + can include pseudo-variables. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. + </para> + <para> + The core will take care of the last boundary ending "--". Detecting wich one is + the last and fixing the others if needed. + </para> + <example> + <title><function>append_body_part_hex</function> usage</title> + <programlisting format="linespecific"> +... +$var(b) = "6b 61 6d 61 69 6c 69 6f"; +append_body_part_hex("$var(b)", "application/my-custom-ext"); +... + +# Will append this to the body: + +... +Content-Type: application/my-custom-ext + +kamailio + --unique-boundary-1 ... </programlisting>

1 0

git:master:4deaa7e5: textops: added function append_body_part_hex(...)
by Daniel-Constantin Mierla 05 Apr '18

05 Apr '18

Module: kamailio Branch: master Commit: 4deaa7e5333b9534fcb9cce59cd085abc138ab3f URL: https://github.com/kamailio/kamailio/commit/4deaa7e5333b9534fcb9cce59cd085a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-05T20:03:44+02:00 textops: added function append_body_part_hex(...) - add a new part to the body, with its content provided in hexa (it is converted to decimal before appending) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/4deaa7e5333b9534fcb9cce59cd085a… Patch: https://github.com/kamailio/kamailio/commit/4deaa7e5333b9534fcb9cce59cd085a…

1 0

git:master:8549789a: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 05 Apr '18

05 Apr '18

Module: kamailio Branch: master Commit: 8549789a595fa62dabe877781e6f8d89dbbff0b3 URL: https://github.com/kamailio/kamailio/commit/8549789a595fa62dabe877781e6f8d8… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-05T14:31:36+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/8549789a595fa62dabe877781e6f8d8… Patch: https://github.com/kamailio/kamailio/commit/8549789a595fa62dabe877781e6f8d8… --- diff --git a/src/modules/rtpengine/README b/src/modules/rtpengine/README index 297ff4d517..d6588fdffa 100644 --- a/src/modules/rtpengine/README +++ b/src/modules/rtpengine/README @@ -2008,6 +2008,10 @@ rtpengine_offer(); + record-call=on - instructs RTPEngine to record the session. Use it in rtpengine_offer() to start recording immediately and save the call metadata, as alternative to start_recording(). + + metadata - a generic metadata string. The metadata will be + used when recording calls to provide custom additional + information. More details about this are found in the + rtpengine README. Check also the documentation of RTPEngine, these flags are documented there as well: https://github.com/sipwise/rtpengine.

1 0

git:master:1e712ed9: rtpengine: Add description for metadata flag
by Claudiu Boriga 05 Apr '18

05 Apr '18

Module: kamailio Branch: master Commit: 1e712ed93aef8ab96ee7a9760f89ebc0fd02caff URL: https://github.com/kamailio/kamailio/commit/1e712ed93aef8ab96ee7a9760f89ebc… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2018-04-05T15:30:15+03:00 rtpengine: Add description for metadata flag --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/1e712ed93aef8ab96ee7a9760f89ebc… Patch: https://github.com/kamailio/kamailio/commit/1e712ed93aef8ab96ee7a9760f89ebc… --- diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 8ab9349b35..ae875cfc4a 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -2326,6 +2326,11 @@ rtpengine_offer(); it in rtpengine_offer() to start recording immediately and save the call metadata, as alternative to start_recording(). </para></listitem> + <listitem><para> + <emphasis>metadata</emphasis> - a generic metadata string. The metadata will be used when + recording calls to provide custom additional information. More details about this are found + in the rtpengine README. + </para></listitem> </itemizedlist> <para> Check also the documentation of RTPEngine, these flags are documented there as well:

1 0

← Newer
1
...
19
20
21
22
23
24
25
26
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2018