sr-dev April 2018

sr-dev@lists.kamailio.org

19 participants
257 discussions

git:5.1:6770fe86: carrierroute: fixed duplicate options definition error when parsing src file
by Lucian Balaceanu 04 Apr '18

04 Apr '18

Module: kamailio Branch: 5.1 Commit: 6770fe866dc6ed301b536a6132dc50e9844e720e URL: https://github.com/kamailio/kamailio/commit/6770fe866dc6ed301b536a6132dc50e… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2018-04-04T14:04:55+03:00 carrierroute: fixed duplicate options definition error when parsing src file - added logic to reset_prefix_opts to reset all target_options fields (including "visited") (cherry picked from commit dc8faaf57a9c85b7133f112bdedd328a9520eb73) --- Modified: src/modules/carrierroute/cr_config.c --- Diff: https://github.com/kamailio/kamailio/commit/6770fe866dc6ed301b536a6132dc50e… Patch: https://github.com/kamailio/kamailio/commit/6770fe866dc6ed301b536a6132dc50e… --- diff --git a/src/modules/carrierroute/cr_config.c b/src/modules/carrierroute/cr_config.c index 40523d9544..920ae4142c 100644 --- a/src/modules/carrierroute/cr_config.c +++ b/src/modules/carrierroute/cr_config.c @@ -97,6 +97,9 @@ static int init_target_opts(){ } static void reset_prefix_opts(){ + memset(&(target_options[PO_MAX_TARGETS].value),'\0', sizeof(union opt_data)); + prefix_options[PO_MAX_TARGETS].visited = 0; + prefix_options[PO_MAX_TARGETS].no_elems = 0; prefix_options[PO_MAX_TARGETS].value.int_data=-1; }

1 0

[kamailio/kamailio] Kamailio start failed as carrierrouter (#1492)
by Oleh Horbachov 04 Apr '18

04 Apr '18

### Description  Kamailio start failed as carrierrouter ### Troubleshooting Main error `[parser_carrierroute.c:271]: parse_options(): Duplicate option definition max_targets` #### Reproduction Define module ``` modparam("carrierroute", "config_source", "file") modparam("carrierroute", "match_mode", 128) modparam("carrierroute", "config_file", "/etc/kamailio/carrierroute.conf") ``` Create carrierroute.conf like in module documentation ``` domain first { prefix + { max_targets = 2 target 192.168.1.1 { prob = 0.500000 hash_index = 1 status = 1 comment = "First Master" } target 192.168.1.2 { prob = 0.500000 hash_index = 2 status = 1 comment = "Firts Slave" } } } domain second { prefix +99 { max_targets = 2 target 192.168.1.3 { prob = 0.500000 hash_index = 1 status = 1 comment = "Second Master" } target 192.168.1.4 { prob = 0.500000 hash_index = 2 status = 1 comment = "Second Slave" } } } ``` #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: INFO: carrierroute [carrierroute.c:213]: mod_init(): use file as configuration source Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: INFO: carrierroute [cr_carrier.c:98]: add_domain_data(): adding domain 1 'first' to carrier 1 'default' Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: INFO: carrierroute [cr_rule.c:118]: add_route_rule(): no backed up rules Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: INFO: carrierroute [cr_rule.c:118]: add_route_rule(): no backed up rules Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: INFO: carrierroute [cr_carrier.c:98]: add_domain_data(): adding domain 2 'second' to carrier 1 'default' Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: ERROR: carrierroute [parser_carrierroute.c:271]: parse_options(): Duplicate option definition max_targets Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: ERROR: carrierroute [cr_config.c:351]: load_config(): Error in parsing Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: ERROR: carrierroute [cr_data.c:185]: reload_route_data(): could not load routing data Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: ERROR: carrierroute [carrierroute.c:255]: mod_init(): could not prepare route data Apr 3 09:50:18 localhost /usr/sbin/kamailio[16964]: ERROR: <core> [core/sr_module.c:987]: init_mod(): Error while initializing module carrierroute (/usr/lib64/kamailio/modules/carrierroute.so) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.2 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, 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 on 11:28:18 Mar 20 2018 with gcc 4.8.5 ``` * **Operating System**:  ``` Linux localhost 3.10.0-693.21.1.el7.x86_64 #1 SMP Wed Mar 7 19:03:37 UTC 2018 x86_64 x86_64 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/1492

3 5

git:master:dc8faaf5: carrierroute: fixed duplicate options definition error when parsing src file
by Lucian Balaceanu 04 Apr '18

04 Apr '18

Module: kamailio Branch: master Commit: dc8faaf57a9c85b7133f112bdedd328a9520eb73 URL: https://github.com/kamailio/kamailio/commit/dc8faaf57a9c85b7133f112bdedd328… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2018-04-04T10:52:56+03:00 carrierroute: fixed duplicate options definition error when parsing src file - added logic to reset_prefix_opts to reset all target_options fields (including "visited") --- Modified: src/modules/carrierroute/cr_config.c --- Diff: https://github.com/kamailio/kamailio/commit/dc8faaf57a9c85b7133f112bdedd328… Patch: https://github.com/kamailio/kamailio/commit/dc8faaf57a9c85b7133f112bdedd328… --- diff --git a/src/modules/carrierroute/cr_config.c b/src/modules/carrierroute/cr_config.c index 40523d9544..920ae4142c 100644 --- a/src/modules/carrierroute/cr_config.c +++ b/src/modules/carrierroute/cr_config.c @@ -97,6 +97,9 @@ static int init_target_opts(){ } static void reset_prefix_opts(){ + memset(&(target_options[PO_MAX_TARGETS].value),'\0', sizeof(union opt_data)); + prefix_options[PO_MAX_TARGETS].visited = 0; + prefix_options[PO_MAX_TARGETS].no_elems = 0; prefix_options[PO_MAX_TARGETS].value.int_data=-1; }

1 0

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

04 Apr '18

Module: kamailio Branch: master Commit: b27475511756b04fe4d4ee5f76bcc14e4186bc58 URL: https://github.com/kamailio/kamailio/commit/b27475511756b04fe4d4ee5f76bcc14… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-04-04T09:01:55+02:00 modules: readme files regenerated - dialog ... [skip ci] --- Modified: src/modules/dialog/README --- Diff: https://github.com/kamailio/kamailio/commit/b27475511756b04fe4d4ee5f76bcc14… Patch: https://github.com/kamailio/kamailio/commit/b27475511756b04fe4d4ee5f76bcc14… --- diff --git a/src/modules/dialog/README b/src/modules/dialog/README index 506e066948..597e06efd1 100644 --- a/src/modules/dialog/README +++ b/src/modules/dialog/README @@ -127,6 +127,7 @@ Olle E. Johansson 7.16. dlg_set_property(attr) 7.17. dlg_remote_profile(cmd, profile, value, uid, expires) 7.18. dlg_set_ruri() + 7.19. dlg_db_load_callid(cival) 8. Statistics @@ -251,6 +252,7 @@ Olle E. Johansson 1.74. dlg_set_property usage 1.75. dlg_remote_profile usage 1.76. dlg_set_ruri() usage + 1.77. dlg_db_load_callid() usage Chapter 1. Admin Guide @@ -346,6 +348,7 @@ Chapter 1. Admin Guide 7.16. dlg_set_property(attr) 7.17. dlg_remote_profile(cmd, profile, value, uid, expires) 7.18. dlg_set_ruri() + 7.19. dlg_db_load_callid(cival) 8. Statistics @@ -1342,6 +1345,7 @@ end 7.16. dlg_set_property(attr) 7.17. dlg_remote_profile(cmd, profile, value, uid, expires) 7.18. dlg_set_ruri() + 7.19. dlg_db_load_callid(cival) 7.1. set_dlg_profile(profile,[value]) @@ -1727,6 +1731,25 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { } ... +7.19. dlg_db_load_callid(cival) + + Load dialog record from database matching on Call-Id provided as + parameter. + + This function can be used from ANY_ROUTE. + + Example 1.77. dlg_db_load_callid() usage +... +if(has_totag()) { + if(!is_known_dlg()) { + dlg_db_load_callid("$ci"); + if(!is_known_dlg()) { + xlog("no dialog found with callid: $ci\n"); + } + } +} +... + 8. Statistics 8.1. active_dialogs

1 0

git:master:0180884c: dialog: documentation for dlg_db_load_callid()
by Daniel-Constantin Mierla 04 Apr '18

04 Apr '18

Module: kamailio Branch: master Commit: 0180884c6111b6a1d88fc558acbc801718c011b8 URL: https://github.com/kamailio/kamailio/commit/0180884c6111b6a1d88fc558acbc801… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-04T08:45:25+02:00 dialog: documentation for dlg_db_load_callid() --- Modified: src/modules/dialog/doc/dialog_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/0180884c6111b6a1d88fc558acbc801… Patch: https://github.com/kamailio/kamailio/commit/0180884c6111b6a1d88fc558acbc801… --- diff --git a/src/modules/dialog/doc/dialog_admin.xml b/src/modules/dialog/doc/dialog_admin.xml index ddceb4e634..3a5a348abc 100644 --- a/src/modules/dialog/doc/dialog_admin.xml +++ b/src/modules/dialog/doc/dialog_admin.xml @@ -2200,6 +2200,33 @@ if(has_totag() and is_present_hf("Route") and uri==myself ) { } } ... +</programlisting> + </example> + </section> + <section id="dialog.f.dlg_db_load_callid"> + <title> + <function moreinfo="none">dlg_db_load_callid(cival)</function> + </title> + <para> + Load dialog record from database matching on Call-Id provided + as parameter. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>dlg_db_load_callid()</function> usage</title> + <programlisting format="linespecific"> +... +if(has_totag()) { + if(!is_known_dlg()) { + dlg_db_load_callid("$ci"); + if(!is_known_dlg()) { + xlog("no dialog found with callid: $ci\n"); + } + } +} +... </programlisting> </example> </section>

1 0

git:master:f7ed7d28: dialog: added end labels needed by dlg_db_load_callid()
by Daniel-Constantin Mierla 04 Apr '18

04 Apr '18

Module: kamailio Branch: master Commit: f7ed7d289978490f374f4f3eea52e91dccc3752f URL: https://github.com/kamailio/kamailio/commit/f7ed7d289978490f374f4f3eea52e91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-04T08:47:25+02:00 dialog: added end labels needed by dlg_db_load_callid() - they were removed by commit 27c23f57f70936e557d9566e6122958c2e032970 not being used after a previous commit, but meanwhile this function was developed --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/f7ed7d289978490f374f4f3eea52e91… Patch: https://github.com/kamailio/kamailio/commit/f7ed7d289978490f374f4f3eea52e91… --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index ecacb1c43e..0a902952c3 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -503,6 +503,7 @@ int load_dialog_info_from_db(int dlg_hash_size, int fetch_num_rows, } } +end: dialog_dbf.free_result(dialog_db_handle, res); return 0; error: @@ -634,6 +635,7 @@ static int load_dialog_vars_from_db(int fetch_num_rows, int mode, } } +end: dialog_dbf.free_result(dialog_db_handle, res); return 0; error:

1 0

git:master:3d3f5ca1: dialog: added function dlg_db_load_callid(val)
by Daniel-Constantin Mierla 04 Apr '18

04 Apr '18

Module: kamailio Branch: master Commit: 3d3f5ca116353cc618f52d5c2792f360377a63ca URL: https://github.com/kamailio/kamailio/commit/3d3f5ca116353cc618f52d5c2792f36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-04T08:45:24+02:00 dialog: added function dlg_db_load_callid(val) - load dialog from database based on callid parameter - related to GH #1274 --- Modified: src/modules/dialog/dialog.c Modified: src/modules/dialog/dlg_db_handler.c Modified: src/modules/dialog/dlg_db_handler.h Modified: src/modules/dialog/dlg_hash.h --- Diff: https://github.com/kamailio/kamailio/commit/3d3f5ca116353cc618f52d5c2792f36… Patch: https://github.com/kamailio/kamailio/commit/3d3f5ca116353cc618f52d5c2792f36…

1 0

git:master:2bb65fe9: Revert "Makefile.group: move carrierroute to extra modules, don't depend on libconfuse"
by Daniel-Constantin Mierla 03 Apr '18

03 Apr '18

Module: kamailio Branch: master Commit: 2bb65fe9c1d60d3d2f561cba7c8b1fa800a8ecf3 URL: https://github.com/kamailio/kamailio/commit/2bb65fe9c1d60d3d2f561cba7c8b1fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-04-03T23:34:05+02:00 Revert "Makefile.group: move carrierroute to extra modules, don't depend on libconfuse" - this reverts commit 8dbfdc7b1213da2b614b4a6d90680ffd0e8a3fc8. - avoid eventual Jenkins failures when building nightly deb packages from master - initial commit should be pushed along with related updates to deb packaging specs --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/2bb65fe9c1d60d3d2f561cba7c8b1fa… Patch: https://github.com/kamailio/kamailio/commit/2bb65fe9c1d60d3d2f561cba7c8b1fa… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 0ee75fe3e6..82834596cf 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -18,7 +18,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ auth_xkeys smsops tsilo cfgt statsc topos sipdump # - extra used modules, with no extra dependency -mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp carrierroute \ +mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \ xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops app_sqlang acc_diameter evrexec @@ -71,6 +71,9 @@ mod_list_snmpstats=snmpstats # - modules depending on expat library mod_list_xmpp=xmpp +# - modules depending on confuse library +mod_list_carrierroute=carrierroute + # - modules depending on bdb (db4) library mod_list_berkeley=db_berkeley @@ -210,7 +213,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_mysql) $(mod_list_postgres) \ $(mod_list_unixodbc) $(mod_list_xmldeps) \ $(mod_list_perldeps) $(mod_list_cpl) \ - $(mod_list_xmpp) \ + $(mod_list_xmpp) $(mod_list_carrierroute) \ $(mod_list_berkeley) $(mod_list_utils) \ $(mod_list_memcached) \ $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) \ @@ -331,6 +334,9 @@ module_group_ksnmpstats=$(mod_list_snmpstats) # pkg xmpp module module_group_kxmpp=$(mod_list_xmpp) +# pkg carrierroute module +module_group_kcarrierroute=$(mod_list_carrierroute) + # pkg berkeley module module_group_kberkeley=$(mod_list_berkeley)

1 0

git:master:8dbfdc7b: Makefile.group: move carrierroute to extra modules, don't depend on libconfuse
by Henning Westerholt 03 Apr '18

03 Apr '18

Module: kamailio Branch: master Commit: 8dbfdc7b1213da2b614b4a6d90680ffd0e8a3fc8 URL: https://github.com/kamailio/kamailio/commit/8dbfdc7b1213da2b614b4a6d90680ff… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-03T22:03:07+02:00 Makefile.group: move carrierroute to extra modules, don't depend on libconfuse - move carrierroute module to extra module group, as it don't depends on the libconfuse library anymore --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/8dbfdc7b1213da2b614b4a6d90680ff… Patch: https://github.com/kamailio/kamailio/commit/8dbfdc7b1213da2b614b4a6d90680ff… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 82834596cf..0ee75fe3e6 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -18,7 +18,7 @@ mod_list_basic=async auth benchmark blst cfg_rpc cfgutils corex counters \ auth_xkeys smsops tsilo cfgt statsc topos sipdump # - extra used modules, with no extra dependency -mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp \ +mod_list_extra=avp auth_diameter call_control call_obj dmq domainpolicy msrp carrierroute \ pdb qos sca seas sms sst timer tmrec uac_redirect xhttp \ xhttp_rpc xprint jsonrpcs nosip dmq_usrloc statsd rtjson \ log_custom keepalive ss7ops app_sqlang acc_diameter evrexec @@ -71,9 +71,6 @@ mod_list_snmpstats=snmpstats # - modules depending on expat library mod_list_xmpp=xmpp -# - modules depending on confuse library -mod_list_carrierroute=carrierroute - # - modules depending on bdb (db4) library mod_list_berkeley=db_berkeley @@ -213,7 +210,7 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ $(mod_list_mysql) $(mod_list_postgres) \ $(mod_list_unixodbc) $(mod_list_xmldeps) \ $(mod_list_perldeps) $(mod_list_cpl) \ - $(mod_list_xmpp) $(mod_list_carrierroute) \ + $(mod_list_xmpp) \ $(mod_list_berkeley) $(mod_list_utils) \ $(mod_list_memcached) \ $(mod_list_tlsdeps) $(mod_list_tlsdeps_curl) \ @@ -334,9 +331,6 @@ module_group_ksnmpstats=$(mod_list_snmpstats) # pkg xmpp module module_group_kxmpp=$(mod_list_xmpp) -# pkg carrierroute module -module_group_kcarrierroute=$(mod_list_carrierroute) - # pkg berkeley module module_group_kberkeley=$(mod_list_berkeley)

1 0

git:master:60fc3698: dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..)
by Henning Westerholt 03 Apr '18

03 Apr '18

Module: kamailio Branch: master Commit: 60fc36982d804466dd2a38f8c47e05e3cbf20ad9 URL: https://github.com/kamailio/kamailio/commit/60fc36982d804466dd2a38f8c47e05e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: 2018-04-03T21:52:14+02:00 dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..) --- Modified: src/modules/dialog/dlg_dmq.c --- Diff: https://github.com/kamailio/kamailio/commit/60fc36982d804466dd2a38f8c47e05e… Patch: https://github.com/kamailio/kamailio/commit/60fc36982d804466dd2a38f8c47e05e… --- diff --git a/src/modules/dialog/dlg_dmq.c b/src/modules/dialog/dlg_dmq.c index 1a27842254..8ed9dce1d3 100644 --- a/src/modules/dialog/dlg_dmq.c +++ b/src/modules/dialog/dlg_dmq.c @@ -35,7 +35,7 @@ dmq_api_t dlg_dmqb; dmq_peer_t* dlg_dmq_peer = NULL; dmq_resp_cback_t dlg_dmq_resp_callback = {&dlg_dmq_resp_callback_f, 0}; -int dmq_send_all_dlgs(); +int dmq_send_all_dlgs(dmq_node_t* dmq_node); int dlg_dmq_request_sync();

1 0

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