sr-dev

sr-dev@lists.kamailio.org

20 participants
45174 discussions

git:master:715d49b6: dispatcher: docbook - fixed "Document root element "chapter", must match DOCTYPE root "book"."
by Sergey Safarov 29 Jun '20

29 Jun '20

Module: kamailio Branch: master Commit: 715d49b62bef30b485d3975acd20b406c444956f URL: https://github.com/kamailio/kamailio/commit/715d49b62bef30b485d3975acd20b40… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-25T21:28:19+03:00 dispatcher: docbook - fixed "Document root element "chapter", must match DOCTYPE root "book"." --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/715d49b62bef30b485d3975acd20b40… Patch: https://github.com/kamailio/kamailio/commit/715d49b62bef30b485d3975acd20b40… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index 345f314621..e42c94fa3e 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding='ISO-8859-1'?> -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd" [

1 0

git:master:44f62bd8: dispatcher: docbook - fixed "The content of the parent element type is element only."
by Sergey Safarov 29 Jun '20

29 Jun '20

Module: kamailio Branch: master Commit: 44f62bd8e0a4c0ef7a9d2b87e52941b0f62d41bd URL: https://github.com/kamailio/kamailio/commit/44f62bd8e0a4c0ef7a9d2b87e52941b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-25T21:42:59+03:00 dispatcher: docbook - fixed "The content of the parent element type is element only." --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/44f62bd8e0a4c0ef7a9d2b87e52941b… Patch: https://github.com/kamailio/kamailio/commit/44f62bd8e0a4c0ef7a9d2b87e52941b… --- diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index e42c94fa3e..41a5749387 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -355,31 +355,32 @@ modparam("dispatcher", "force_dst", 1) <para> The addeded fields are: <itemizedlist> - <listitem> - grp - the set id (group id). - </listitem> - <listitem> - uri - the URI address. - </listitem> - <listitem> - sock - the socket pointer. - </listitem> - <listitem> - socket - the socket string - it is added only if xavp_dst_mode has bit 2 set - (value 2). - </listitem> - <listitem> - sockname - the sockname string - it is added only if xavp_dst_mode has bit 3 set - (value 3). - </listitem> - <listitem> - dstid - the destination unique id (in case of call load distribution algorithm). - </listitem> - <listitem> - attrs - the attributes - they are added if xavp_dst_mode does not have - the bit 1 set (value 1). - </listitem> - </itemizedlist> + <listitem> + <para>grp - the set id (group id).</para> + </listitem> + <listitem> + <para>uri - the URI address.</para> + </listitem> + <listitem> + <para>sock - the socket pointer.</para> + </listitem> + <listitem> + <para>socket - the socket string - it is added only if xavp_dst_mode has + bit 2 set (value 2).</para> + </listitem> + <listitem> + <para>sockname - the sockname string - it is added only if xavp_dst_mode + has bit 3 set (value 3).</para> + </listitem> + <listitem> + <para>dstid - the destination unique id (in case of call load distribution + algorithm).</para> + </listitem> + <listitem> + <para>attrs - the attributes - they are added if xavp_dst_mode does not + have the bit 1 set (value 1).</para> + </listitem> + </itemizedlist> </para> <para> <emphasis>

1 0

git:master:60e29f96: dispatcher: docbook space formating
by Sergey Safarov 29 Jun '20

29 Jun '20

Module: kamailio Branch: master Commit: 60e29f96ae57489669d1c266255e94b449e07dac URL: https://github.com/kamailio/kamailio/commit/60e29f96ae57489669d1c266255e94b… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2020-06-25T21:05:55+03:00 dispatcher: docbook space formating --- Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/60e29f96ae57489669d1c266255e94b… Patch: https://github.com/kamailio/kamailio/commit/60e29f96ae57489669d1c266255e94b…

1 0

git:master:b7c7976d: modules: readme files regenerated - dlgs ... [skip ci]
by Kamailio Dev 29 Jun '20

29 Jun '20

Module: kamailio Branch: master Commit: b7c7976d3e84ac648b689e5e496e619f587a4eb9 URL: https://github.com/kamailio/kamailio/commit/b7c7976d3e84ac648b689e5e496e619… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-29T07:46:20+02:00 modules: readme files regenerated - dlgs ... [skip ci] --- Modified: src/modules/dlgs/README --- Diff: https://github.com/kamailio/kamailio/commit/b7c7976d3e84ac648b689e5e496e619… Patch: https://github.com/kamailio/kamailio/commit/b7c7976d3e84ac648b689e5e496e619… --- diff --git a/src/modules/dlgs/README b/src/modules/dlgs/README index 83cf48594e..837db4330b 100644 --- a/src/modules/dlgs/README +++ b/src/modules/dlgs/README @@ -10,7 +10,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright © 2020 asipto.com + Copyright Â© 2020 asipto.com __________________________________________________________________ Table of Contents @@ -25,18 +25,27 @@ Daniel-Constantin Mierla 3. Parameters - 3.1. lifetime (int) + 3.1. active_lifetime (int) 3.2. timer_interval (int) 4. Functions - 4.1. dlgs_manage(src, dst, data) + 4.1. dlgs_init(src, dst, data) + 4.2. dlgs_update(src) + + 5. RPC Commands + + 5.1. rpc.list + 5.2. rpc.stats List of Examples - 1.1. Set lifetime parameter + 1.1. Set active_lifetime parameter 1.2. Set timer_interval parameter - 1.3. dlgs_manage usage + 1.3. dlgs_init usage + 1.4. dlgs_update usage + 1.5. dlgs.list usage + 1.6. dlgs.stats usage Chapter 1. Admin Guide @@ -50,12 +59,18 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. lifetime (int) + 3.1. active_lifetime (int) 3.2. timer_interval (int) 4. Functions - 4.1. dlgs_manage(src, dst, data) + 4.1. dlgs_init(src, dst, data) + 4.2. dlgs_update(src) + + 5. RPC Commands + + 5.1. rpc.list + 5.2. rpc.stats 1. Overview @@ -90,18 +105,18 @@ Chapter 1. Admin Guide 3. Parameters - 3.1. lifetime (int) + 3.1. active_lifetime (int) 3.2. timer_interval (int) -3.1. lifetime (int) +3.1. active_lifetime (int) The lifetime in seconds of a dialog in memory. Default value is 10800 (3 hours). - Example 1.1. Set lifetime parameter + Example 1.1. Set active_lifetime parameter ... -modparam("dlgs", "lifetime", 3600) +modparam("dlgs", "active_lifetime", 3600) ... 3.2. timer_interval (int) @@ -118,22 +133,63 @@ modparam("dlgs", "timer_interval", 60) 4. Functions - 4.1. dlgs_manage(src, dst, data) + 4.1. dlgs_init(src, dst, data) + 4.2. dlgs_update(src) -4.1. dlgs_manage(src, dst, data) +4.1. dlgs_init(src, dst, data) - Track the dialog corresponding to the current SIP message. It has to be - used for INVITE messages. + Start track the dialog corresponding to the current SIP message. It has + to be used for INVITE messages. This function can be used from ANY_ROUTE. - Example 1.3. dlgs_manage usage + Example 1.3. dlgs_init usage ... request_route { ... if(is_method("INVITE")) { - dlgs_manage("$fu", "$tu", "my data"); + dlgs_init("$fu", "$tu", "my data"); + } + ... +} +... + +4.2. dlgs_update(src) + + Update dialog state. + + This function can be used from ONSEND_ROUTE. + + Example 1.4. dlgs_update usage +... +onsend_route { + ... + if(is_method("INVITE|ACK|BYE")) { + dlgs_init("$fu", "$tu", "my data"); } ... } ... + +5. RPC Commands + + 5.1. rpc.list + 5.2. rpc.stats + +5.1. rpc.list + + List dialog records. + + Example 1.5. dlgs.list usage +... +kamctl rpc dlgs.list +... + +5.2. rpc.stats + + Return dialog statistics. + + Example 1.6. dlgs.stats usage +... +kamctl rpc dlgs.stats +...

1 0

git:master:7a47812f: dlgs: docs for dlg.stats command
by Daniel-Constantin Mierla 29 Jun '20

29 Jun '20

Module: kamailio Branch: master Commit: 7a47812f10f23897f3455a5abbede3a53c8c2d0e URL: https://github.com/kamailio/kamailio/commit/7a47812f10f23897f3455a5abbede3a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-29T07:35:30+02:00 dlgs: docs for dlg.stats command --- Modified: src/modules/dlgs/doc/dlgs_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/7a47812f10f23897f3455a5abbede3a… Patch: https://github.com/kamailio/kamailio/commit/7a47812f10f23897f3455a5abbede3a… --- diff --git a/src/modules/dlgs/doc/dlgs_admin.xml b/src/modules/dlgs/doc/dlgs_admin.xml index 7bf05d0e3c..5947376689 100644 --- a/src/modules/dlgs/doc/dlgs_admin.xml +++ b/src/modules/dlgs/doc/dlgs_admin.xml @@ -174,6 +174,22 @@ onsend_route { ... &kamctl; rpc dlgs.list ... +</programlisting> + </example> + </section> + <section id="dlgs.rpc.stats"> + <title> + <function moreinfo="none">rpc.stats</function> + </title> + <para> + Return dialog statistics. + </para> + <example> + <title><function>dlgs.stats</function> usage</title> + <programlisting format="linespecific"> +... +&kamctl; rpc dlgs.stats +... </programlisting> </example> </section>

1 0

git:master:f757a5e1: dlgs: update final stats when item is destroyed
by Daniel-Constantin Mierla 29 Jun '20

29 Jun '20

Module: kamailio Branch: master Commit: f757a5e1a092bff4a1dbaa7da2d02f06e3a3e32e URL: https://github.com/kamailio/kamailio/commit/f757a5e1a092bff4a1dbaa7da2d02f0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-29T07:35:30+02:00 dlgs: update final stats when item is destroyed --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/f757a5e1a092bff4a1dbaa7da2d02f0… Patch: https://github.com/kamailio/kamailio/commit/f757a5e1a092bff4a1dbaa7da2d02f0… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index e62bd2c97e..3180fa02a2 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -437,8 +437,9 @@ int dlgs_del_item(sip_msg_t *msg) idx = dlgs_get_index(hid, dsht->htsize); /* head test and return */ - if(dsht->slots[idx].first == NULL) + if(dsht->slots[idx].first == NULL) { return 0; + } lock_get(&dsht->slots[idx].lock); it = dsht->slots[idx].first; @@ -456,6 +457,7 @@ int dlgs_del_item(sip_msg_t *msg) it->next->prev = it->prev; dsht->slots[idx].esize--; lock_release(&dsht->slots[idx].lock); + dlgs_update_stats(&dsht->fstats, it->state, 1); dlgs_item_free(it); return 0; } @@ -687,6 +689,7 @@ void dlgs_ht_timer(unsigned int ticks, void *param) it->prev = ite->prev; } } + dlgs_update_stats(&_dlgs_htb->fstats, ite->state, 1); dlgs_item_free(ite); } }

1 0

git:master:5c2b93f6: dlgs: dlgs.stats rpc command
by Daniel-Constantin Mierla 29 Jun '20

29 Jun '20

Module: kamailio Branch: master Commit: 5c2b93f61b8970cd174c4d4055f7dbc1ddccaa12 URL: https://github.com/kamailio/kamailio/commit/5c2b93f61b8970cd174c4d4055f7dbc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-06-29T07:35:30+02:00 dlgs: dlgs.stats rpc command --- Modified: src/modules/dlgs/dlgs_records.c --- Diff: https://github.com/kamailio/kamailio/commit/5c2b93f61b8970cd174c4d4055f7dbc… Patch: https://github.com/kamailio/kamailio/commit/5c2b93f61b8970cd174c4d4055f7dbc… --- diff --git a/src/modules/dlgs/dlgs_records.c b/src/modules/dlgs/dlgs_records.c index 6fcfa50945..e62bd2c97e 100644 --- a/src/modules/dlgs/dlgs_records.c +++ b/src/modules/dlgs/dlgs_records.c @@ -707,6 +707,57 @@ static const char *dlgs_rpc_stats_doc[2] = { */ static void dlgs_rpc_stats(rpc_t *rpc, void *ctx) { + void *th; + void *ti; + dlgs_stats_t *sti; + dlgs_stats_t sta; + int i; + + if(_dlgs_htb == NULL) { + return; + } + + if (rpc->add(ctx, "{", &th) < 0) { + rpc->fault(ctx, 500, "Internal error creating rpc"); + return; + } + i = 0; + do { + if(i==0) { + sti = &_dlgs_htb->fstats; + if(rpc->struct_add(th, "{", "final", &ti)<0) { + rpc->fault(ctx, 500, "Internal error creating final stats"); + return; + } + } else { + memset(&sta, 0, sizeof(dlgs_stats_t)); + for(i=0; i<_dlgs_htb->htsize; i++) { + sta.c_init += _dlgs_htb->slots[i].astats.c_init; + sta.c_progress += _dlgs_htb->slots[i].astats.c_progress; + sta.c_answered += _dlgs_htb->slots[i].astats.c_answered; + sta.c_confirmed += _dlgs_htb->slots[i].astats.c_confirmed; + sta.c_terminted += _dlgs_htb->slots[i].astats.c_terminted; + sta.c_notanswered += _dlgs_htb->slots[i].astats.c_notanswered; + } + sti = &sta; + if(rpc->struct_add(th, "{", "active", &ti)<0) { + rpc->fault(ctx, 500, "Internal error creating final stats"); + return; + } + i = 1; + } + if(rpc->struct_add(ti, "uuuuuu", + "init", sti->c_init, + "progress", sti->c_progress, + "answered", sti->c_answered, + "confirmed", sti->c_confirmed, + "terminted", sti->c_terminted, + "notanswered", sti->c_notanswered)<0) { + rpc->fault(ctx, 500, "Internal error creating values"); + return; + } + i++; + } while(i<2); } static const char *dlgs_rpc_list_doc[2] = {

1 0

git:master:61d9d204: modules: readme files regenerated - ims_charging ... [skip ci]
by Kamailio Dev 28 Jun '20

28 Jun '20

Module: kamailio Branch: master Commit: 61d9d204c33c1b140ed90d51e9af13ec4ed12a96 URL: https://github.com/kamailio/kamailio/commit/61d9d204c33c1b140ed90d51e9af13e… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-06-28T15:01:25+02:00 modules: readme files regenerated - ims_charging ... [skip ci] --- Modified: src/modules/ims_charging/README --- Diff: https://github.com/kamailio/kamailio/commit/61d9d204c33c1b140ed90d51e9af13e… Patch: https://github.com/kamailio/kamailio/commit/61d9d204c33c1b140ed90d51e9af13e… --- diff --git a/src/modules/ims_charging/README b/src/modules/ims_charging/README index e9b08478c3..3311e14c9a 100644 --- a/src/modules/ims_charging/README +++ b/src/modules/ims_charging/README @@ -575,7 +575,7 @@ modparam("ims_charging", "destination_host", "ocs.kamailio-ims.org") Destination realm to be used in Diameter messages to charging-server. - Default value is "ims.smilecoms.com". + Default value is "". Example 1.16. destination_realmparameter usage ...

1 0

git:master:f679c118: ims_charging: fix error in destination_realm default vaulue
by Henning Westerholt 28 Jun '20

28 Jun '20

Module: kamailio Branch: master Commit: f679c118a589c80cb84954fb46271adef596e049 URL: https://github.com/kamailio/kamailio/commit/f679c118a589c80cb84954fb46271ad… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-06-28T12:56:01Z ims_charging: fix error in destination_realm default vaulue --- Modified: src/modules/ims_charging/doc/ims_charging_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/f679c118a589c80cb84954fb46271ad… Patch: https://github.com/kamailio/kamailio/commit/f679c118a589c80cb84954fb46271ad… --- diff --git a/src/modules/ims_charging/doc/ims_charging_admin.xml b/src/modules/ims_charging/doc/ims_charging_admin.xml index d6b959f41f..4c68b6e29c 100644 --- a/src/modules/ims_charging/doc/ims_charging_admin.xml +++ b/src/modules/ims_charging/doc/ims_charging_admin.xml @@ -549,7 +549,7 @@ modparam("ims_charging", "destination_host", "ocs.kamailio-ims.org") <para>Destination realm to be used in Diameter messages to charging-server.</para> - <para><emphasis>Default value is "ims.smilecoms.com".</emphasis></para> + <para><emphasis>Default value is "".</emphasis></para> <example> <title><varname>destination_realm</varname>parameter usage</title>

1 0

[kamailio/kamailio] Help for register kazoo to kamailio registrar server (#2378)
by Mohammad Dhnavi 27 Jun '20

27 Jun '20

### Description  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.8 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 6.3.0 ``` * **Operating System**:  ``` Linux trunk2-sbc 4.9.0-6-amd64 #1 SMP Debian 4.9.88-1+deb9u1 (2018-05-07) x86_64 GNU/Linux ``` -- 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/issues/2378

2 2

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev