[sr-dev] git:master:2bb65fe9: Revert "Makefile.group: move carrierroute to extra modules, don't depend on libconfuse"
Module: kamailio Branch: master Commit: 2bb65fe9c1d60d3d2f561cba7c8b1fa800a8ecf3 URL: https://github.com/kamailio/kamailio/commit/2bb65fe9c1d60d3d2f561cba7c8b1fa800a8ecf3 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla 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/2bb65fe9c1d60d3d2f561cba7c8b1fa800a8ecf3.diff Patch: https://github.com/kamailio/kamailio/commit/2bb65fe9c1d60d3d2f561cba7c8b1fa800a8ecf3.patch --- 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) ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] kamailio packaging, change in carrierroute Makefile
Hello, changes expected to affect packaging should be discussed first and then committed, along with related updates to packaging specs. They can break nightly builds for packages, resulting in unnecessary alerts to the mailing list, repeating every day until the dev maintaining the specs is available to do the changes. Not being a critical issue, this can wait to be discussed and done properly. Cheers, Daniel On 03.04.18 22:13, Henning Westerholt wrote: > Hi Guys, > > a quick notice about a change that I did today that may or may not affect > some > of the kamailio packaging. > > Some years ago the carrierroute module was changed to do not depend on the > library libconfuse (commit 4c4f2c2bedb4a) anymore. > > I changed the git master Makefile to move the carrierroute module from a > dedicated module to the extra module group. > > I had a quick look to the packaging, for e.g. debian builds carrierroute is > as > own module with a dependency to libconfuse. This should be changed, its not > necessary to build it as own package and the dependency is not needed > anymore. > You could move it as well to the extra modules package. > > Thanks and regards, > > Henning > > > > ___ > Kamailio (SER) - Development Mailing List > sr-dev@lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - April 16-18, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] module FAQ, private contact replacement
Hello, On 03.04.18 21:54, Henning Westerholt wrote: > Am Montag, 2. April 2018, 09:08:04 CEST schrieb Daniel-Constantin Mierla: >> I would not involve management address in the readme of the modules, a >> lot of people consider their use of kamailio private and will "abuse" it >> for support. >> >> Using sr-users there was a temporary hack when forking from ser and not >> having seradmin anymore, which, obviously, got forgotten. But the age of >> this (likely more than 10 years) shows it is not necessary at all, so my >> suggestion is to remove it all together. >> >> People have figured out what to do when needing to send something more >> sensitive, there is a contact page on webite. Anyhow, based on your >> commit on this matter, there are rather few modules with this remark >> comparing with over all number of module. > Hi Daniel, > > ok - I commited it already, as you saw. > > I will change it to involve only security bugs, this way we could easily > change it when we have a dedicated security contact address. If we get to > much > spam, I will remove it completely. I still think this is not the right way to do it, but remove it completely. It is not across all modules, only couple of them. And again, so far nobody actually used it. When having to report something more sensitive, people found the way to do it. Management doesn't have to do anything with those modules and should not get involved in their readme. There is a contact page with more details on project's website. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - April 16-18, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] Kamailio start failed as carrierrouter (#1492)
Could reproduce this as well. -- 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#issuecomment-378393003___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] kamailio packaging, change in carrierroute Makefile
Hi Guys, a quick notice about a change that I did today that may or may not affect some of the kamailio packaging. Some years ago the carrierroute module was changed to do not depend on the library libconfuse (commit 4c4f2c2bedb4a) anymore. I changed the git master Makefile to move the carrierroute module from a dedicated module to the extra module group. I had a quick look to the packaging, for e.g. debian builds carrierroute is as own module with a dependency to libconfuse. This should be changed, its not necessary to build it as own package and the dependency is not needed anymore. You could move it as well to the extra modules package. Thanks and regards, Henning ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] module FAQ, private contact replacement
Am Montag, 2. April 2018, 09:08:04 CEST schrieb Daniel-Constantin Mierla: > I would not involve management address in the readme of the modules, a > lot of people consider their use of kamailio private and will "abuse" it > for support. > > Using sr-users there was a temporary hack when forking from ser and not > having seradmin anymore, which, obviously, got forgotten. But the age of > this (likely more than 10 years) shows it is not necessary at all, so my > suggestion is to remove it all together. > > People have figured out what to do when needing to send something more > sensitive, there is a contact page on webite. Anyhow, based on your > commit on this matter, there are rather few modules with this remark > comparing with over all number of module. Hi Daniel, ok - I commited it already, as you saw. I will change it to involve only security bugs, this way we could easily change it when we have a dedicated security contact address. If we get to much spam, I will remove it completely. Best regards, Henning ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:60fc3698: dialog: fix warning about wrong function prototype for dmq_send_all_dlgs(..)
Module: kamailio Branch: master Commit: 60fc36982d804466dd2a38f8c47e05e3cbf20ad9 URL: https://github.com/kamailio/kamailio/commit/60fc36982d804466dd2a38f8c47e05e3cbf20ad9 Author: Henning WesterholtCommitter: Henning Westerholt 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/60fc36982d804466dd2a38f8c47e05e3cbf20ad9.diff Patch: https://github.com/kamailio/kamailio/commit/60fc36982d804466dd2a38f8c47e05e3cbf20ad9.patch --- 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 = {_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(); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:27c23f57: dialog: fix warning about unused end label, left over from commit 5362d0f78ef
Module: kamailio Branch: master Commit: 27c23f57f70936e557d9566e6122958c2e032970 URL: https://github.com/kamailio/kamailio/commit/27c23f57f70936e557d9566e6122958c2e032970 Author: Henning WesterholtCommitter: Henning Westerholt Date: 2018-04-03T21:52:14+02:00 dialog: fix warning about unused end label, left over from commit 5362d0f78ef --- Modified: src/modules/dialog/dlg_db_handler.c --- Diff: https://github.com/kamailio/kamailio/commit/27c23f57f70936e557d9566e6122958c2e032970.diff Patch: https://github.com/kamailio/kamailio/commit/27c23f57f70936e557d9566e6122958c2e032970.patch --- diff --git a/src/modules/dialog/dlg_db_handler.c b/src/modules/dialog/dlg_db_handler.c index 8b057a6d43..42274d07de 100644 --- a/src/modules/dialog/dlg_db_handler.c +++ b/src/modules/dialog/dlg_db_handler.c @@ -465,7 +465,6 @@ static 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: @@ -574,7 +573,6 @@ static int load_dialog_vars_from_db(int fetch_num_rows) } } -end: dialog_dbf.free_result(dialog_db_handle, res); return 0; error: ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:6f79e7cc: modules: readme files regenerated - acc ... [skip ci]
Module: kamailio Branch: master Commit: 6f79e7ccf985ea06e9f50862b59ef7e5b535fe54 URL: https://github.com/kamailio/kamailio/commit/6f79e7ccf985ea06e9f50862b59ef7e5b535fe54 Author: Kamailio DevCommitter: Kamailio Dev Date: 2018-04-03T21:46:45+02:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README Modified: src/modules/app_perl/README Modified: src/modules/cdp/README Modified: src/modules/cdp_avp/README Modified: src/modules/dialog/README Modified: src/modules/dispatcher/README Modified: src/modules/ims_dialog/README Modified: src/modules/ims_registrar_scscf/README Modified: src/modules/ims_usrloc_pcscf/README Modified: src/modules/nathelper/README Modified: src/modules/registrar/README Modified: src/modules/rtpengine/README Modified: src/modules/rtpproxy/README Modified: src/modules/snmpstats/README --- Diff: https://github.com/kamailio/kamailio/commit/6f79e7ccf985ea06e9f50862b59ef7e5b535fe54.diff Patch: https://github.com/kamailio/kamailio/commit/6f79e7ccf985ea06e9f50862b59ef7e5b535fe54.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:049dbce5: modules doc FAQ: change private contact to include only security issues
Module: kamailio Branch: master Commit: 049dbce568eafe985539675a935f0a46a128ea5f URL: https://github.com/kamailio/kamailio/commit/049dbce568eafe985539675a935f0a46a128ea5f Author: Henning WesterholtCommitter: Henning Westerholt Date: 2018-04-03T21:37:15+02:00 modules doc FAQ: change private contact to include only security issues --- Modified: src/modules/acc/doc/acc_faq.xml Modified: src/modules/app_perl/doc/app_perl_faq.xml Modified: src/modules/cdp/doc/cdp_faq.xml Modified: src/modules/cdp_avp/doc/cdp_avp_faq.xml Modified: src/modules/dialog/doc/dialog_faq.xml Modified: src/modules/dispatcher/doc/dispatcher_faq.xml Modified: src/modules/ims_dialog/doc/ims_dialog_faq.xml Modified: src/modules/ims_registrar_scscf/doc/ims_registrar_scscf_faq.xml Modified: src/modules/ims_usrloc_pcscf/doc/ims_usrloc_pcscf_faq.xml Modified: src/modules/nathelper/doc/nathelper_faq.xml Modified: src/modules/registrar/doc/registrar_faq.xml Modified: src/modules/rtpengine/doc/rtpengine_faq.xml Modified: src/modules/rtpproxy/doc/rtpproxy_faq.xml Modified: src/modules/snmpstats/doc/snmpstats_faq.xml --- Diff: https://github.com/kamailio/kamailio/commit/049dbce568eafe985539675a935f0a46a128ea5f.diff Patch: https://github.com/kamailio/kamailio/commit/049dbce568eafe985539675a935f0a46a128ea5f.patch ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] git:master:1af3caf4: core: removed invalid lock release introduced by commit f775e4000e
Am Dienstag, 3. April 2018, 18:04:50 CEST schrieb Daniel-Constantin Mierla: > Module: kamailio > Branch: master > Commit: 1af3caf427d3268fe7caa8d8dbd4ff2f6f3ec59d > URL: > https://github.com/kamailio/kamailio/commit/1af3caf427d3268fe7caa8d8dbd4ff2 > f6f3ec59d > > Author: Daniel-Constantin Mierla> Committer: Daniel-Constantin Mierla > Date: 2018-04-03T18:03:55+02:00 > > core: removed invalid lock release introduced by commit f775e4000e > [..] Hi Daniel, thank you - my review did unfortunately not catches this. Henning ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:1af3caf4: core: removed invalid lock release introduced by commit f775e4000e
Module: kamailio Branch: master Commit: 1af3caf427d3268fe7caa8d8dbd4ff2f6f3ec59d URL: https://github.com/kamailio/kamailio/commit/1af3caf427d3268fe7caa8d8dbd4ff2f6f3ec59d Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-04-03T18:03:55+02:00 core: removed invalid lock release introduced by commit f775e4000e --- Modified: src/core/receive.c --- Diff: https://github.com/kamailio/kamailio/commit/1af3caf427d3268fe7caa8d8dbd4ff2f6f3ec59d.diff Patch: https://github.com/kamailio/kamailio/commit/1af3caf427d3268fe7caa8d8dbd4ff2f6f3ec59d.patch --- diff --git a/src/core/receive.c b/src/core/receive.c index 27d4bd9986..2b8b2c7f56 100644 --- a/src/core/receive.c +++ b/src/core/receive.c @@ -395,11 +395,10 @@ int receive_msg(char *buf, unsigned int len, struct receive_info *rcv_info) rec_lock_set_get(ksr_route_locks_set, cidlockidx); ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL, NULL); rec_lock_set_release(ksr_route_locks_set, cidlockidx); - sr_kemi_act_ctx_set(bctx); } else { ret = keng->froute(msg, CORE_ONREPLY_ROUTE, NULL, NULL); - rec_lock_set_release(ksr_route_locks_set, cidlockidx); } + sr_kemi_act_ctx_set(bctx); } else { if(unlikely(cidlockset)) { rec_lock_set_get(ksr_route_locks_set, cidlockidx); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] ndb_redis: adds support for sentinel (#1493)
Pre-Submission Checklist - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] 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) - [x] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) Checklist: - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue # (replace with an open issue number) Description Allows kamailio to connect to a sentinel to find out which redis instance to connect to. I modified the README in this commit but this is the generated file, I did not change it by hand. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1493 -- Commit Summary -- * ndb_redis: adds support for sentinel -- File Changes -- M src/modules/ndb_redis/README (9) M src/modules/ndb_redis/doc/ndb_redis_admin.xml (7) M src/modules/ndb_redis/redis_client.c (75) M src/modules/ndb_redis/redis_client.h (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1493.patch https://github.com/kamailio/kamailio/pull/1493.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/1493 ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] [kamailio/kamailio] Kamailio start failed as carrierrouter (#1492)
### 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.50 hash_index = 1 status = 1 comment = "First Master" } target 192.168.1.2 { prob = 0.50 hash_index = 2 status = 1 comment = "Firts Slave" } } } domain second { prefix +99 { max_targets = 2 target 192.168.1.3 { prob = 0.50 hash_index = 1 status = 1 comment = "Second Master" } target 192.168.1.4 { prob = 0.50 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/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___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:4c4a8e3f: app_sqlang: updated to use kemi api sr_kemi_core_set_drop()
Module: kamailio Branch: master Commit: 4c4a8e3fcf4492b9acc87ff47df63b7ab0b35429 URL: https://github.com/kamailio/kamailio/commit/4c4a8e3fcf4492b9acc87ff47df63b7ab0b35429 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-04-03T10:12:03+02:00 app_sqlang: updated to use kemi api sr_kemi_core_set_drop() --- Modified: src/modules/app_sqlang/app_sqlang_api.c --- Diff: https://github.com/kamailio/kamailio/commit/4c4a8e3fcf4492b9acc87ff47df63b7ab0b35429.diff Patch: https://github.com/kamailio/kamailio/commit/4c4a8e3fcf4492b9acc87ff47df63b7ab0b35429.patch --- diff --git a/src/modules/app_sqlang/app_sqlang_api.c b/src/modules/app_sqlang/app_sqlang_api.c index f41e665358..624e13908f 100644 --- a/src/modules/app_sqlang/app_sqlang_api.c +++ b/src/modules/app_sqlang/app_sqlang_api.c @@ -538,7 +538,7 @@ static SQInteger sqlang_sr_drop (HSQUIRRELVM J) } else { _sr_J_env.J_exit = 1; } - sr_kemi_core_drop(NULL); + sr_kemi_core_set_drop(NULL); return sq_throwerror(J, _SC("~~ksr~exit~~")); } ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:42f53e1c: app_lua: updated to use kemi api sr_kemi_core_set_drop()
Module: kamailio Branch: master Commit: 42f53e1ca7b0a5e246d470f7cf0b26aeca9b9c2a URL: https://github.com/kamailio/kamailio/commit/42f53e1ca7b0a5e246d470f7cf0b26aeca9b9c2a Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-04-03T10:11:51+02:00 app_lua: updated to use kemi api sr_kemi_core_set_drop() --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/42f53e1ca7b0a5e246d470f7cf0b26aeca9b9c2a.diff Patch: https://github.com/kamailio/kamailio/commit/42f53e1ca7b0a5e246d470f7cf0b26aeca9b9c2a.patch --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 72d2eb0ddf..f6155dc741 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1769,7 +1769,7 @@ static int sr_kemi_lua_drop (lua_State *L) str *s; LM_DBG("script drop call\n"); - sr_kemi_core_drop(NULL); + sr_kemi_core_set_drop(NULL); s = sr_kemi_lua_exit_string_get(); lua_getglobal(L, "error"); lua_pushstring(L, s->s); ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:84bf4ccb: app_jsdt: updated to use kemi api sr_kemi_core_set_drop()
Module: kamailio Branch: master Commit: 84bf4ccbbaef10718853453c577202b241101684 URL: https://github.com/kamailio/kamailio/commit/84bf4ccbbaef10718853453c577202b241101684 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-04-03T10:11:08+02:00 app_jsdt: updated to use kemi api sr_kemi_core_set_drop() --- Modified: src/modules/app_jsdt/app_jsdt_api.c --- Diff: https://github.com/kamailio/kamailio/commit/84bf4ccbbaef10718853453c577202b241101684.diff Patch: https://github.com/kamailio/kamailio/commit/84bf4ccbbaef10718853453c577202b241101684.patch --- diff --git a/src/modules/app_jsdt/app_jsdt_api.c b/src/modules/app_jsdt/app_jsdt_api.c index 0657507f12..8f4f3de18c 100644 --- a/src/modules/app_jsdt/app_jsdt_api.c +++ b/src/modules/app_jsdt/app_jsdt_api.c @@ -413,7 +413,7 @@ static int jsdt_sr_exit (duk_context *J) */ static int jsdt_sr_drop (duk_context *J) { - sr_kemi_core_drop(NULL); + sr_kemi_core_set_drop(NULL); duk_eval_string_noresult(J, JSDT_SR_EXIT_EXEC_STR); return 0; } ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:f5be7179: core: kemi - renamed drop prototype to sr_kemi_core_set_drop()
Module: kamailio Branch: master Commit: f5be717996b6e3ad6c9d98f1d856e48414faa405 URL: https://github.com/kamailio/kamailio/commit/f5be717996b6e3ad6c9d98f1d856e48414faa405 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-04-03T10:08:51+02:00 core: kemi - renamed drop prototype to sr_kemi_core_set_drop() - match the implementation after kemi API update for drop --- Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/f5be717996b6e3ad6c9d98f1d856e48414faa405.diff Patch: https://github.com/kamailio/kamailio/commit/f5be717996b6e3ad6c9d98f1d856e48414faa405.patch --- diff --git a/src/core/kemi.h b/src/core/kemi.h index db8595977d..d19e094c63 100644 --- a/src/core/kemi.h +++ b/src/core/kemi.h @@ -128,6 +128,6 @@ run_act_ctx_t* sr_kemi_act_ctx_get(void); str *sr_kemi_param_map_get_name(int ptype); str *sr_kemi_param_map_get_params(int *ptypes); -int sr_kemi_core_drop(sip_msg_t *msg); +int sr_kemi_core_set_drop(sip_msg_t *msg); #endif ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] kazoo: wrong BLF when used application/dialog-info+xml (#1489)
@lazedo, I will create docker container using your repo and test on my servers -- 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/1489#issuecomment-378156475___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] DB Postgres BLOB conversion for presence (#1255)
@lazedo, think i will do hotfix/workarround using other way. Thanks -- 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/1255#issuecomment-378155849___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:162c304d: ipops: use proper variable for ipv6 subnet comparison
Module: kamailio Branch: master Commit: 162c304d1264044ac1a46a379b75bafb4c91bcfd URL: https://github.com/kamailio/kamailio/commit/162c304d1264044ac1a46a379b75bafb4c91bcfd Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-04-03T09:24:11+02:00 ipops: use proper variable for ipv6 subnet comparison --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/162c304d1264044ac1a46a379b75bafb4c91bcfd.diff Patch: https://github.com/kamailio/kamailio/commit/162c304d1264044ac1a46a379b75bafb4c91bcfd.patch --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index dd783180a6..e2a25f38f9 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -415,7 +415,7 @@ int _ip_is_in_subnet_v6(struct in6_addr *ip, char *net, size_t netlen, else ipv6_mask[i] = 0x00; } for (i=0; i<16; i++) ip->s6_addr[i] &= ipv6_mask[i]; - if (memcmp(ip->s6_addr, ip->s6_addr, sizeof(net_addr.s6_addr)) == 0) + if (memcmp(ip->s6_addr, net_addr.s6_addr, sizeof(net_addr.s6_addr)) == 0) return 1; return 0; } ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:a5dd60c8: ipops: mask subnet address for ipv6 comparison
Module: kamailio Branch: master Commit: a5dd60c8d7e04731f12108838a3c82149e04ef9c URL: https://github.com/kamailio/kamailio/commit/a5dd60c8d7e04731f12108838a3c82149e04ef9c Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-04-03T09:27:19+02:00 ipops: mask subnet address for ipv6 comparison - coherent with ipv4 behaviour --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a5dd60c8d7e04731f12108838a3c82149e04ef9c.diff Patch: https://github.com/kamailio/kamailio/commit/a5dd60c8d7e04731f12108838a3c82149e04ef9c.patch --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index e2a25f38f9..262f4a8494 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -415,6 +415,7 @@ int _ip_is_in_subnet_v6(struct in6_addr *ip, char *net, size_t netlen, else ipv6_mask[i] = 0x00; } for (i=0; i<16; i++) ip->s6_addr[i] &= ipv6_mask[i]; + for (i=0; i<16; i++) net_addr.s6_addr[i] &= ipv6_mask[i]; if (memcmp(ip->s6_addr, net_addr.s6_addr, sizeof(net_addr.s6_addr)) == 0) return 1; return 0; ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] IPOPS is_in_subnet function doesn't return TRUE for host address in cidr notation (#1250)
Closed #1250. -- 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/1250#event-1553391792___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
[sr-dev] git:master:1f675c68: ipops: mask subnet address when comparing
Module: kamailio Branch: master Commit: 1f675c68b3ed2b2e0a497fecd942c9213f0de058 URL: https://github.com/kamailio/kamailio/commit/1f675c68b3ed2b2e0a497fecd942c9213f0de058 Author: Daniel-Constantin MierlaCommitter: Daniel-Constantin Mierla Date: 2018-04-03T09:11:37+02:00 ipops: mask subnet address when comparing - allow using full ip address when specifying subnet parameter - more flexibility on using values from sip message - GH #1250 --- Modified: src/modules/ipops/ipops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1f675c68b3ed2b2e0a497fecd942c9213f0de058.diff Patch: https://github.com/kamailio/kamailio/commit/1f675c68b3ed2b2e0a497fecd942c9213f0de058.patch --- diff --git a/src/modules/ipops/ipops_mod.c b/src/modules/ipops/ipops_mod.c index 2e1e990613..dd783180a6 100644 --- a/src/modules/ipops/ipops_mod.c +++ b/src/modules/ipops/ipops_mod.c @@ -390,7 +390,7 @@ int _ip_is_in_subnet_v4(struct in_addr *ip, char *net, size_t netlen, if (netmask == 32) ipv4_mask = 0x; else ipv4_mask = htonl(~(0x >> netmask)); - if ((ip->s_addr & ipv4_mask) == net_addr.s_addr) + if ((ip->s_addr & ipv4_mask) == (net_addr.s_addr & ipv4_mask)) return 1; return 0; } @@ -1456,4 +1456,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_ipops_exports); return 0; -} \ No newline at end of file +} ___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] IPOPS is_in_subnet function doesn't return TRUE for host address in cidr notation (#1250)
Implemented in latest master. -- 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/1250#issuecomment-378151951___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] kazoo: wrong BLF when used application/dialog-info+xml (#1489)
@sergey-safarov this doesn't look like a kamailio issue. you may need to capture amqp packets from/to kamailio andalso look into kamailio logs. the items you're reporting as `unexpected` seem like an `expectation from user` rather than `unexpected because current state is ...`. what i mean is, the attached pcap is not enough to do an assessement of a possible issue that doesn't occur with other deployments of kamailio with kazoo. -- 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/1489#issuecomment-378147878___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev
Re: [sr-dev] [kamailio/kamailio] DB Postgres BLOB conversion for presence (#1255)
@sergey-safarov hot fix for what exactly ? this seems `PostgreSQL` driver specific -- 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/1255#issuecomment-378146365___ Kamailio (SER) - Development Mailing List sr-dev@lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-dev