sr-dev February 2018

sr-dev@lists.kamailio.org

33 participants
355 discussions

[kamailio/kamailio] Issue with Socket selection on Forwarding ACK message (#1428)
by Thomas Carvello 15 Feb '18

15 Feb '18

### Description  ### Troubleshooting #### Reproduction we have an issue with our Kamailio. This configuration is multi-homed, we have two network interfaces, one on a private network and on the public Internet. Kamailio is configured to listen on port 5060 and 5066 on both interfaces. We register two users Alice and Bob on the public Internet using port 5066. Both users are behind a NAT and we capture the SIP exchange on the proxy server. We have set the parameter mhomed=1 ![image](https://user-images.githubusercontent.com/16304253/35796442-e642d466-0a5c-11e8-846f-a538e3185a69.png) The ACK packet gets relayed with the wrong source port. Then the NAT rejects the packet and the call cannot be established. Also, if we set mhomed=0 it works BUT we are not sure that multi homed is handled correctly. the issue seems to be located in the RR module and the loose_route() function. In the after_loose() function in loose.c, the function set_force_socket() is called only if a DOUBLE route is mentioned in the route set of the ACK message But when both users are using 5066 as proxy port, we get only ONE route for the proxy in the route set (and to us it is OK). In this case, we get a trace: "No next URI found" and the code exits. Later in the message processing, when t_relay() is called, the forward_request() selects the first socket defined in our configuration instead. At this point, we can't presume what socket we be select. We believe that it is a software bug and that after_loose() should force the send_socket even though we have only one route in the route set #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions Adding the process of set_force_socket in case we have one route and only. L.808 if (res > 0) { /* No next route found */ LM_DBG("No next URI found\n"); > if (!use_ob) { > if ((si = grep_sock_info( &puri.host, puri.port_no?puri.port_no:proto_default_port(puri.proto), puri.proto)) != 0) { > set_force_socket(_m, si); > } else if ((si = grep_sock_info( &puri.host, puri.port_no, puri.proto)) != 0) { > set_force_socket(_m, si); > } else { > if (enable_socket_mismatch_warning) { > LM_WARN("no socket found to match second RR (%.*s)\n", > rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); > if(!is_myself(&puri)) { > LM_WARN("second RR uri is not myself (%.*s)\n", > rt->nameaddr.uri.len, ZSW(rt->nameaddr.uri.s)); > } > } > } > } status = (preloaded ? NOT_RR_DRIVEN : RR_DRIVEN); goto done; } ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- 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/1428

3 14

[kamailio/kamailio] acc: new json format with outputs to mqueue or syslog (#1437)
by Julien Chavanton 14 Feb '18

14 Feb '18

#### 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) - [x] 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 #XXXX (replace XXXX with an open issue number) #### Description This commit is introducing JSON format for ACC events. 2 way to output the ACC events are proposed/implemented (syslog and mqueue) The option to use db_flastore was considered and found less attractive, mainly because the DB abstraction layer is not making much sense, example reformatting the data many times ... and other outputs could benefit from JSON format. 1- syslog (directly from the module, because it may be valuable to run Kamailio using runit or in docker and not "daemionizing" it anymore while still using syslog for acc events) 2- mqueue this way you may be able to control the acc event from Kamailio routing script, and example is provided using the http_client module to publish to NSQD This seemed to be the best approach to remain as compatible as possible with the ACC module and benefit from it, while introducing the JSON format. Many parameters are reused like time_mode, log_extra, log_facility, it seemed like reusing was making sense, this may be questionable. If jansson or mqueue is not available or loaded the module will still build and run disabling the extra features ---------------------------------------------------------- #### Usage example where we use mqueue and process acc events in other worker processes. example also inluded in the doc ``` # example using json_mqueue/http_client to publish to NSQD max_while_loops=100000 modparam("mqueue", "mqueue", "name=acc_events;size=100000") modparam("acc", "json_mqueue", "acc_events") modparam("acc", "json_flag", 2) modparam("acc", "log_extra", "caller_ip_port=$avp(caller_ip_port);") modparam("rtimer", "timer", "name=nsqt;interval=1;mode=1;") modparam("rtimer", "exec", "timer=nsqt;route=RUN_CDR_PUBLISH") modparam("http_client", "keep_connections", 1) modparam("http_client", "httpcon", "nsqd=>http://localhost:4151/pub?topic=acc") route[RUN_CDR_PUBLISH] { $var(count) = 0; while (mq_fetch("acc_events")) { $var(q_size) = mq_size("acc_events"); $var(count) = $var(count) + 1; xinfo("[RUN_CDR_PUBLISH][$var(q_size)][$var(count)][$mqk(acc_events)][$mqv(acc_events)]\n"); $var(res) = http_connect("nsqd", "", "application/json", $mqv(acc_events), "$var(nsq_res)"); if ($var(res) != "200") { mq_add("acc_events", "acc_key", "$mqv(acc_events)"); return; } } if ($var(count) > 0 ) { xinfo("[RUN_CDR_PUBLISH]done count[$var(count)]\n"); } } ``` #### Load testing Load tests where conducted with both json_syslog and json_mqueue/http to NSQD, latency was very stable it was high because the test server used was on West coast California >> New-Jersey >> California ![image](https://user-images.githubusercontent.com/3736014/36117214-a6ebcebc-0fed-11e8-928c-9ff9321bef86.png) average message/response latency graph in ms/sec ---------------------------------------------------------- Using voip_perf to send SIP compliant traffic (INVITE < 100 < 180 < 200 > ACK || BYE < 200) 7M SIP messages calls sent > 800/sec https://github.com/jchavanton/voip_perf ``` Total 1000000 INVITE calls sent in 1037082 ms at rate of 819/sec Total 1000000 responses received in 1037881 ms at rate of 818/sec: Detailed responses received: - 200 responses: 1000000 (OK) ------ TOTAL responses: 1000000 (rate=818/sec) ``` All the ACC events where queued in NSQD and written to SYSLOG without introducing delay. ``` curl -v http://127.0.0.1:4151/stats nsqd v1.0.0-compat (built w/go1.8) start_time 2018-02-12T17:10:58Z uptime 33m4.181861175s Health: OK [acc ] depth: 3000004 be-depth: 2990004 msgs: 3000004 e2e%: ``` ``` wc -l /var/log/json_acc.log 3000004 /var/log/json_acc.log ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1437 -- Commit Summary -- * acc: new json format with outputs to mqueue or syslog -- File Changes -- M src/modules/acc/Makefile (12) M src/modules/acc/acc.c (109) M src/modules/acc/acc.h (1) M src/modules/acc/acc_logic.c (27) M src/modules/acc/acc_mod.c (25) M src/modules/acc/acc_mod.h (3) M src/modules/acc/doc/acc.xml (10) M src/modules/acc/doc/acc_admin.xml (121) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1437.patch https://github.com/kamailio/kamailio/pull/1437.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/1437

2 6

git:master:e727ddce: db_redis: Install redis schema along with module
by Andreas Granig 14 Feb '18

14 Feb '18

Module: kamailio Branch: master Commit: e727ddcef5113c5235d8d2dde9da86a8c2d2b4bb URL: https://github.com/kamailio/kamailio/commit/e727ddcef5113c5235d8d2dde9da86a… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-02-14T15:38:03+01:00 db_redis: Install redis schema along with module --- Modified: src/modules/db_redis/Makefile Modified: utils/kamctl/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/e727ddcef5113c5235d8d2dde9da86a… Patch: https://github.com/kamailio/kamailio/commit/e727ddcef5113c5235d8d2dde9da86a… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index 58ecd04d36..c4aa0d0731 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -35,3 +35,8 @@ SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules + +install-redis-scripts: $(bin_prefix)/$(bin_dir) + REDISON=yes $(MAKE) -C ../../../utils/kamctl/ install-modules + +install-scripts: install-redis-scripts diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 3804d70dc7..9736cf2895 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -264,7 +264,18 @@ install-modules: $(bin_prefix)/$(bin_dir) fi ;\ done ; \ fi - + # install Redis stuff + if [ "$(REDISON)" = "yes" ]; then \ + mkdir -p $(data_prefix)/$(data_dir)/db_redis/kamailio ; \ + for FILE in $(wildcard db_redis/kamailio/*) ; do \ + if [ -f $$FILE ] ; then \ + $(INSTALL_TOUCH) $$FILE \ + $(data_prefix)/$(data_dir)/db_redis/kamailio/`basename "$$FILE"` ; \ + $(INSTALL_CFG) $$FILE \ + $(data_prefix)/$(data_dir)/db_redis/kamailio/`basename "$$FILE"` ; \ + fi ;\ + done ; \ + fi $(cfg_prefix)/$(cfg_dir): mkdir -p $(cfg_prefix)/$(cfg_dir)

1 0

git:master:0da66e70: db_redis: update to hiredis.h include path and deal with broken pkg-config spec
by Daniel-Constantin Mierla 14 Feb '18

14 Feb '18

Module: kamailio Branch: master Commit: 0da66e70bfc390e310f05da0d7ed9a7d1eb7c599 URL: https://github.com/kamailio/kamailio/commit/0da66e70bfc390e310f05da0d7ed9a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-14T11:25:30+01:00 db_redis: update to hiredis.h include path and deal with broken pkg-config spec - fix for broken output of pkg-config for hiredis - same for ndb_redis from 4a40dd39cec713c569dc3480c905d808026aad39 --- Modified: src/modules/db_redis/Makefile Modified: src/modules/db_redis/redis_connection.h --- Diff: https://github.com/kamailio/kamailio/commit/0da66e70bfc390e310f05da0d7ed9a7… Patch: https://github.com/kamailio/kamailio/commit/0da66e70bfc390e310f05da0d7ed9a7… --- diff --git a/src/modules/db_redis/Makefile b/src/modules/db_redis/Makefile index 2aec964196..58ecd04d36 100644 --- a/src/modules/db_redis/Makefile +++ b/src/modules/db_redis/Makefile @@ -18,6 +18,12 @@ ifeq ($(HIREDIS_BUILDER),) else HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) HIREDISLIBS = $(shell $(HIREDIS_BUILDER) --libs) + +ifeq ($(HIREDISLIBS),-L -lhiredis) + HIREDISDEFS = $(shell $(HIREDIS_BUILDER) --cflags) /opt/local/include + HIREDISLIBS = -L/opt/local/lib -lhiredis +endif + endif DEFS+=$(HIREDISDEFS) diff --git a/src/modules/db_redis/redis_connection.h b/src/modules/db_redis/redis_connection.h index d6ed4e4ec3..35d58e46a4 100644 --- a/src/modules/db_redis/redis_connection.h +++ b/src/modules/db_redis/redis_connection.h @@ -23,7 +23,7 @@ #ifndef _REDIS_CONNECTION_H_ #define _REDIS_CONNECTION_H_ -#include <hiredis.h> +#include <hiredis/hiredis.h> #include "db_redis_mod.h"

1 0

git:master:65fab0d0: core: atomic - updated email addres in warning message
by Daniel-Constantin Mierla 14 Feb '18

14 Feb '18

Module: kamailio Branch: master Commit: 65fab0d02271c242d6e43e499198ee1da2275a4b URL: https://github.com/kamailio/kamailio/commit/65fab0d02271c242d6e43e499198ee1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-14T11:23:55+01:00 core: atomic - updated email addres in warning message --- Modified: src/core/atomic/atomic_alpha.h Modified: src/core/atomic/atomic_mips2.h Modified: src/core/atomic/atomic_ppc.h --- Diff: https://github.com/kamailio/kamailio/commit/65fab0d02271c242d6e43e499198ee1… Patch: https://github.com/kamailio/kamailio/commit/65fab0d02271c242d6e43e499198ee1… --- diff --git a/src/core/atomic/atomic_alpha.h b/src/core/atomic/atomic_alpha.h index 3eecb91381..56ee8cde73 100644 --- a/src/core/atomic/atomic_alpha.h +++ b/src/core/atomic/atomic_alpha.h @@ -36,7 +36,7 @@ #define HAVE_ASM_INLINE_MEMBAR #warning alpha atomic code was not tested, please report problems to \ - serdev(a)iptel.org or andrei(a)iptel.org + sr-dev(a)lists.kamailio.org #ifdef NOSMP #define membar() asm volatile ("" : : : "memory") /* gcc do not cache barrier*/ diff --git a/src/core/atomic/atomic_mips2.h b/src/core/atomic/atomic_mips2.h index 7d19b4ad87..9c6a1e5643 100644 --- a/src/core/atomic/atomic_mips2.h +++ b/src/core/atomic/atomic_mips2.h @@ -39,7 +39,7 @@ #ifdef __CPU_mips64 #warning mips64 atomic code was not tested, please report problems to \ - serdev(a)iptel.org or andrei(a)iptel.org + sr-dev(a)lists.kamailio.org #endif #ifdef NOSMP diff --git a/src/core/atomic/atomic_ppc.h b/src/core/atomic/atomic_ppc.h index bb8c43a121..2eefa79b26 100644 --- a/src/core/atomic/atomic_ppc.h +++ b/src/core/atomic/atomic_ppc.h @@ -38,7 +38,7 @@ #ifdef __CPU_ppc64 #warning powerpc64 atomic code was not tested, please report problems to \ - serdev(a)iptel.org or andrei(a)iptel.org + sr-dev(a)lists.kamailio.org #endif

1 0

[kamailio/kamailio] The phonenum module README is missing from 5.1 web docs (#1438)
by Olle E. Johansson 14 Feb '18

14 Feb '18

https://kamailio.org/docs/modules/5.1.x/ Can't find the phonenum module there. -- 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/1438

2 2

git:master:94e2fe9a: Merge pull request #1432 from agranig/agranig/db_redis
by GitHub 14 Feb '18

14 Feb '18

Module: kamailio Branch: master Commit: 94e2fe9ac3624d367e6e2e48b691cbd2715d9dc1 URL: https://github.com/kamailio/kamailio/commit/94e2fe9ac3624d367e6e2e48b691cbd… Author: Andreas Granig <agranig(a)linguin.org> Committer: GitHub <noreply(a)github.com> Date: 2018-02-14T10:28:29+01:00 Merge pull request #1432 from agranig/agranig/db_redis db_redis: Implement db_redis generic db driver --- Added: doc/stylesheets/dbschema_k/xsl/db_redis.xsl Added: src/modules/db_redis/Makefile Added: src/modules/db_redis/README Added: src/modules/db_redis/db_redis_mod.c Added: src/modules/db_redis/db_redis_mod.h Added: src/modules/db_redis/doc/Makefile Added: src/modules/db_redis/doc/db_redis.xml Added: src/modules/db_redis/doc/db_redis_admin.xml Added: src/modules/db_redis/redis_connection.c Added: src/modules/db_redis/redis_connection.h Added: src/modules/db_redis/redis_dbase.c Added: src/modules/db_redis/redis_dbase.h Added: src/modules/db_redis/redis_table.c Added: src/modules/db_redis/redis_table.h Added: utils/kamctl/db_redis/kamailio/acc Added: utils/kamctl/db_redis/kamailio/acc_cdrs Added: utils/kamctl/db_redis/kamailio/active_watchers Added: utils/kamctl/db_redis/kamailio/address Added: utils/kamctl/db_redis/kamailio/aliases Added: utils/kamctl/db_redis/kamailio/carrier_name Added: utils/kamctl/db_redis/kamailio/carrierfailureroute Added: utils/kamctl/db_redis/kamailio/carrierroute Added: utils/kamctl/db_redis/kamailio/cpl Added: utils/kamctl/db_redis/kamailio/dbaliases Added: utils/kamctl/db_redis/kamailio/dialog Added: utils/kamctl/db_redis/kamailio/dialog_vars Added: utils/kamctl/db_redis/kamailio/dialplan Added: utils/kamctl/db_redis/kamailio/dispatcher Added: utils/kamctl/db_redis/kamailio/domain Added: utils/kamctl/db_redis/kamailio/domain_attrs Added: utils/kamctl/db_redis/kamailio/domain_name Added: utils/kamctl/db_redis/kamailio/domainpolicy Added: utils/kamctl/db_redis/kamailio/dr_gateways Added: utils/kamctl/db_redis/kamailio/dr_groups Added: utils/kamctl/db_redis/kamailio/dr_gw_lists Added: utils/kamctl/db_redis/kamailio/dr_rules Added: utils/kamctl/db_redis/kamailio/globalblacklist Added: utils/kamctl/db_redis/kamailio/grp Added: utils/kamctl/db_redis/kamailio/htable Added: utils/kamctl/db_redis/kamailio/imc_members Added: utils/kamctl/db_redis/kamailio/imc_rooms Added: utils/kamctl/db_redis/kamailio/lcr_gw Added: utils/kamctl/db_redis/kamailio/lcr_rule Added: utils/kamctl/db_redis/kamailio/lcr_rule_target Added: utils/kamctl/db_redis/kamailio/location Added: utils/kamctl/db_redis/kamailio/location_attrs Added: utils/kamctl/db_redis/kamailio/matrix Added: utils/kamctl/db_redis/kamailio/missed_calls Added: utils/kamctl/db_redis/kamailio/mohqcalls Added: utils/kamctl/db_redis/kamailio/mohqueues Added: utils/kamctl/db_redis/kamailio/mtree Added: utils/kamctl/db_redis/kamailio/mtrees Added: utils/kamctl/db_redis/kamailio/pdt Added: utils/kamctl/db_redis/kamailio/pl_pipes Added: utils/kamctl/db_redis/kamailio/presentity Added: utils/kamctl/db_redis/kamailio/pua Added: utils/kamctl/db_redis/kamailio/purplemap Added: utils/kamctl/db_redis/kamailio/re_grp Added: utils/kamctl/db_redis/kamailio/rls_presentity Added: utils/kamctl/db_redis/kamailio/rls_watchers Added: utils/kamctl/db_redis/kamailio/rtpengine Added: utils/kamctl/db_redis/kamailio/rtpproxy Added: utils/kamctl/db_redis/kamailio/sca_subscriptions Added: utils/kamctl/db_redis/kamailio/silo Added: utils/kamctl/db_redis/kamailio/sip_trace Added: utils/kamctl/db_redis/kamailio/speed_dial Added: utils/kamctl/db_redis/kamailio/subscriber Added: utils/kamctl/db_redis/kamailio/topos_d Added: utils/kamctl/db_redis/kamailio/topos_t Added: utils/kamctl/db_redis/kamailio/trusted Added: utils/kamctl/db_redis/kamailio/uacreg Added: utils/kamctl/db_redis/kamailio/uid_credentials Added: utils/kamctl/db_redis/kamailio/uid_domain Added: utils/kamctl/db_redis/kamailio/uid_domain_attrs Added: utils/kamctl/db_redis/kamailio/uid_global_attrs Added: utils/kamctl/db_redis/kamailio/uid_uri Added: utils/kamctl/db_redis/kamailio/uid_uri_attrs Added: utils/kamctl/db_redis/kamailio/uid_user_attrs Added: utils/kamctl/db_redis/kamailio/uri Added: utils/kamctl/db_redis/kamailio/userblacklist Added: utils/kamctl/db_redis/kamailio/usr_preferences Added: utils/kamctl/db_redis/kamailio/version Added: utils/kamctl/db_redis/kamailio/watchers Added: utils/kamctl/db_redis/kamailio/xcap Modified: src/Makefile.groups Modified: src/lib/srdb1/schema/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/94e2fe9ac3624d367e6e2e48b691cbd… Patch: https://github.com/kamailio/kamailio/commit/94e2fe9ac3624d367e6e2e48b691cbd…

1 0

git:master:56ad1423: db_redis: Use schema files and improve keys def
by Andreas Granig 14 Feb '18

14 Feb '18

Module: kamailio Branch: master Commit: 56ad14236c02af1c82e3bdbcf1f85bb6f0efd728 URL: https://github.com/kamailio/kamailio/commit/56ad14236c02af1c82e3bdbcf1f85bb… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-02-13T16:37:42+01:00 db_redis: Use schema files and improve keys def * Auto-generate schema files for redis from xml specs and use them in module instead of having to define them as mod params. * Allow key definition line by line with multiple "keys" mod params. * Fetch table versions from schema to avoid having to populate them in Redis. * Fix reconnection issues on connection drops when Redis takes longer to start. * Fix documentation formatting issues. --- Added: doc/stylesheets/dbschema_k/xsl/db_redis.xsl Added: utils/kamctl/db_redis/kamailio/acc Added: utils/kamctl/db_redis/kamailio/acc_cdrs Added: utils/kamctl/db_redis/kamailio/active_watchers Added: utils/kamctl/db_redis/kamailio/address Added: utils/kamctl/db_redis/kamailio/aliases Added: utils/kamctl/db_redis/kamailio/carrier_name Added: utils/kamctl/db_redis/kamailio/carrierfailureroute Added: utils/kamctl/db_redis/kamailio/carrierroute Added: utils/kamctl/db_redis/kamailio/cpl Added: utils/kamctl/db_redis/kamailio/dbaliases Added: utils/kamctl/db_redis/kamailio/dialog Added: utils/kamctl/db_redis/kamailio/dialog_vars Added: utils/kamctl/db_redis/kamailio/dialplan Added: utils/kamctl/db_redis/kamailio/dispatcher Added: utils/kamctl/db_redis/kamailio/domain Added: utils/kamctl/db_redis/kamailio/domain_attrs Added: utils/kamctl/db_redis/kamailio/domain_name Added: utils/kamctl/db_redis/kamailio/domainpolicy Added: utils/kamctl/db_redis/kamailio/dr_gateways Added: utils/kamctl/db_redis/kamailio/dr_groups Added: utils/kamctl/db_redis/kamailio/dr_gw_lists Added: utils/kamctl/db_redis/kamailio/dr_rules Added: utils/kamctl/db_redis/kamailio/globalblacklist Added: utils/kamctl/db_redis/kamailio/grp Added: utils/kamctl/db_redis/kamailio/htable Added: utils/kamctl/db_redis/kamailio/imc_members Added: utils/kamctl/db_redis/kamailio/imc_rooms Added: utils/kamctl/db_redis/kamailio/lcr_gw Added: utils/kamctl/db_redis/kamailio/lcr_rule Added: utils/kamctl/db_redis/kamailio/lcr_rule_target Added: utils/kamctl/db_redis/kamailio/location Added: utils/kamctl/db_redis/kamailio/location_attrs Added: utils/kamctl/db_redis/kamailio/matrix Added: utils/kamctl/db_redis/kamailio/missed_calls Added: utils/kamctl/db_redis/kamailio/mohqcalls Added: utils/kamctl/db_redis/kamailio/mohqueues Added: utils/kamctl/db_redis/kamailio/mtree Added: utils/kamctl/db_redis/kamailio/mtrees Added: utils/kamctl/db_redis/kamailio/pdt Added: utils/kamctl/db_redis/kamailio/pl_pipes Added: utils/kamctl/db_redis/kamailio/presentity Added: utils/kamctl/db_redis/kamailio/pua Added: utils/kamctl/db_redis/kamailio/purplemap Added: utils/kamctl/db_redis/kamailio/re_grp Added: utils/kamctl/db_redis/kamailio/rls_presentity Added: utils/kamctl/db_redis/kamailio/rls_watchers Added: utils/kamctl/db_redis/kamailio/rtpengine Added: utils/kamctl/db_redis/kamailio/rtpproxy Added: utils/kamctl/db_redis/kamailio/sca_subscriptions Added: utils/kamctl/db_redis/kamailio/silo Added: utils/kamctl/db_redis/kamailio/sip_trace Added: utils/kamctl/db_redis/kamailio/speed_dial Added: utils/kamctl/db_redis/kamailio/subscriber Added: utils/kamctl/db_redis/kamailio/topos_d Added: utils/kamctl/db_redis/kamailio/topos_t Added: utils/kamctl/db_redis/kamailio/trusted Added: utils/kamctl/db_redis/kamailio/uacreg Added: utils/kamctl/db_redis/kamailio/uid_credentials Added: utils/kamctl/db_redis/kamailio/uid_domain Added: utils/kamctl/db_redis/kamailio/uid_domain_attrs Added: utils/kamctl/db_redis/kamailio/uid_global_attrs Added: utils/kamctl/db_redis/kamailio/uid_uri Added: utils/kamctl/db_redis/kamailio/uid_uri_attrs Added: utils/kamctl/db_redis/kamailio/uid_user_attrs Added: utils/kamctl/db_redis/kamailio/uri Added: utils/kamctl/db_redis/kamailio/userblacklist Added: utils/kamctl/db_redis/kamailio/usr_preferences Added: utils/kamctl/db_redis/kamailio/version Added: utils/kamctl/db_redis/kamailio/watchers Added: utils/kamctl/db_redis/kamailio/xcap Modified: src/lib/srdb1/schema/Makefile Modified: src/modules/db_redis/README Modified: src/modules/db_redis/db_redis_mod.c Modified: src/modules/db_redis/db_redis_mod.h Modified: src/modules/db_redis/doc/db_redis.xml Modified: src/modules/db_redis/doc/db_redis_admin.xml Modified: src/modules/db_redis/redis_connection.c Modified: src/modules/db_redis/redis_dbase.c Modified: src/modules/db_redis/redis_table.c Modified: src/modules/db_redis/redis_table.h --- Diff: https://github.com/kamailio/kamailio/commit/56ad14236c02af1c82e3bdbcf1f85bb… Patch: https://github.com/kamailio/kamailio/commit/56ad14236c02af1c82e3bdbcf1f85bb…

1 0

git:master:53e746b5: db_redis: Implement db_redis generic db driver
by Andreas Granig 14 Feb '18

14 Feb '18

Module: kamailio Branch: master Commit: 53e746b5c527fa542e4b2b7353af5a3b4042d7d2 URL: https://github.com/kamailio/kamailio/commit/53e746b5c527fa542e4b2b7353af5a3… Author: Andreas Granig <agranig(a)sipwise.com> Committer: Andreas Granig <agranig(a)sipwise.com> Date: 2018-02-08T15:54:02+01:00 db_redis: Implement db_redis generic db driver This module implements a generic db driver for kamailio. It requires a "schema" and "key" definition of "tables" and corresponding keys for redis in the kamailio config file, otherwise it's supposed to work with every module. Implemented methods are query (w/o order-by), insert, update, delete. Tested with usrloc and acc. --- Added: src/modules/db_redis/Makefile Added: src/modules/db_redis/README Added: src/modules/db_redis/db_redis_mod.c Added: src/modules/db_redis/db_redis_mod.h Added: src/modules/db_redis/doc/Makefile Added: src/modules/db_redis/doc/db_redis.xml Added: src/modules/db_redis/doc/db_redis_admin.xml Added: src/modules/db_redis/redis_connection.c Added: src/modules/db_redis/redis_connection.h Added: src/modules/db_redis/redis_dbase.c Added: src/modules/db_redis/redis_dbase.h Added: src/modules/db_redis/redis_table.c Added: src/modules/db_redis/redis_table.h Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/53e746b5c527fa542e4b2b7353af5a3… Patch: https://github.com/kamailio/kamailio/commit/53e746b5c527fa542e4b2b7353af5a3…

1 0

git:master:136f0b6a: core: kemi - exported more core functions
by Daniel-Constantin Mierla 13 Feb '18

13 Feb '18

Module: kamailio Branch: master Commit: 136f0b6afae9279b07ba827451cc5a80980134b5 URL: https://github.com/kamailio/kamailio/commit/136f0b6afae9279b07ba827451cc5a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-13T12:47:46+01:00 core: kemi - exported more core functions - add_local_rport(), set_advertised_address(addr), set_advertised_port(port) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/136f0b6afae9279b07ba827451cc5a8… Patch: https://github.com/kamailio/kamailio/commit/136f0b6afae9279b07ba827451cc5a8… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 5631f4b909..a24f1b869d 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -498,6 +498,20 @@ static int sr_kemi_core_force_rport(sip_msg_t *msg) return SR_KEMI_TRUE; } +/** + * + */ +static int sr_kemi_core_add_local_rport(sip_msg_t *msg) +{ + if(msg==NULL) { + LM_WARN("invalid msg parameter\n"); + return SR_KEMI_FALSE; + } + + msg->msg_flags|=FL_ADD_LOCAL_RPORT; + return SR_KEMI_TRUE; +} + /** * */ @@ -696,6 +710,68 @@ static int sr_kemi_core_set_reply_no_connect(sip_msg_t *msg) return SR_KEMI_TRUE; } +/** + * + */ +static int sr_kemi_core_set_advertised_address(sip_msg_t *msg, str *addr) +{ +#define SR_ADV_ADDR_SIZE 128 + static char _sr_adv_addr_buf[SR_ADV_ADDR_SIZE]; + + if(addr==NULL || addr->s==NULL) { + LM_ERR("invalid addr parameter\n"); + return SR_KEMI_FALSE; + } + + if(addr->len>=SR_ADV_ADDR_SIZE) { + LM_ERR("addr parameter is too large\n"); + return SR_KEMI_FALSE; + } + + if(msg==NULL) { + LM_WARN("invalid msg parameter\n"); + return SR_KEMI_FALSE; + } + + memcpy(_sr_adv_addr_buf, addr->s, addr->len); + _sr_adv_addr_buf[addr->len] = '\0'; + msg->set_global_address.s = _sr_adv_addr_buf; + msg->set_global_address.len = addr->len; + + return SR_KEMI_TRUE; +} + +/** + * + */ +static int sr_kemi_core_set_advertised_port(sip_msg_t *msg, str *port) +{ +#define SR_ADV_PORT_SIZE 8 + static char _sr_adv_port_buf[SR_ADV_PORT_SIZE]; + + if(port==NULL || port->s==NULL) { + LM_ERR("invalid port parameter\n"); + return SR_KEMI_FALSE; + } + + if(port->len>=SR_ADV_PORT_SIZE) { + LM_ERR("port parameter is too large\n"); + return SR_KEMI_FALSE; + } + + if(msg==NULL) { + LM_WARN("invalid msg parameter\n"); + return SR_KEMI_FALSE; + } + + memcpy(_sr_adv_port_buf, port->s, port->len); + _sr_adv_port_buf[port->len] = '\0'; + msg->set_global_port.s = _sr_adv_port_buf; + msg->set_global_port.len = port->len; + + return SR_KEMI_TRUE; +} + /** * */ @@ -825,6 +901,11 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("add_local_rport"), + SR_KEMIP_BOOL, sr_kemi_core_add_local_rport, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { str_init(""), str_init("is_method"), SR_KEMIP_BOOL, sr_kemi_core_is_method, { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, @@ -860,6 +941,16 @@ static sr_kemi_t _sr_kemi_core[] = { { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init(""), str_init("set_advertised_address"), + SR_KEMIP_INT, sr_kemi_core_set_advertised_address, + { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init(""), str_init("set_advertised_port"), + SR_KEMIP_INT, sr_kemi_core_set_advertised_port, + { SR_KEMIP_STR, 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 } } };

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2018