- sr-dev - kamailio.org

[kamailio/kamailio] topos and dialog timeout conflict (#1216)
by dryvoip 24 Jan '18

24 Jan '18

### Description When topos is loaded and dialog is configured to timeout a call by sending BYE to each side, the Route: header is lost and one of the BYEs is not sent to the correct destination. This problem does not exist when topos is not loaded. ### Troubleshooting #### Reproduction ``` modparam("dialog", "rr_param", "dv") modparam("dialog", "profiles_with_value", "inbound_call ; outbound_call; timed_call") modparam("dialog", "dlg_match_mode", 1) modparam("dialog", "dlg_flag", 4) modparam("dialog", "send_bye", 1) modparam("dialog", "timer_procs", 1) modparam("dialog", "timeout_noreset", 1) modparam("dialog", "default_timeout", 43200) $avp(limit) = 15; dlg_manage(); dlg_set_timeout_by_profile("timed_call", "1", "$avp(limit)"); dlg_set_timeout($avp(limit)); set_dlg_profile("timed_call", "1"); ``` #### Log Messages ``` Aug 14 11:06:28 x /usr/sbin/kamailio[11925]: WARNING: dialog [dlg_req_within.c:216]: bye_reply_cb(): inconsitent dlg timer data on dlg 0x7fe5e0b162f8 [438:1408] with clid 'fPBP01fpFOA5Lq6aVwtZ6Q..' and tags '9f514a4f' 'as6e1fd9bc' Aug 14 11:06:28 x /usr/sbin/kamailio[11925]: NOTICE: acc [acc_cdr.c:352]: log_write_cdr(): start_time=1502733971.701; end_time=1502733988.052; duration=16.351 Aug 14 11:06:28 x /usr/sbin/kamailio[11925]: WARNING: acc [acc_cdr.c:219]: db_write_cdr(): fallback to dlg_only search because of message doesn't exist. ``` #### SIP Traffic Good bye (without topos loaded) ``` 2017-08-14 10:06:29 -0800 : 10.10.10.180:5060 -> 10.10.10.177:5065 BYE sip:2505551234@10.20.20.224:5060 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.180;branch=z9hG4bKbe16.c8c401b7000000000000000000000000.0 To: <sip:2505551234@mtl.dryvoip.ca;transport=UDP>;tag=as6e1fd9bc From: <sip:1715033_123@mtl.dryvoip.ca;transport=UDP>;tag=9f514a4f CSeq: 3 BYE Call-ID: fPBP01fpFOA5Lq6aVwtZ6Q.. Route: <sip:10.10.10.177:5065;lr=on> Content-Length: 0 User-Agent: kamailio (5.0.2 (x86_64/linux)) Max-Forwards: 70 ``` Bad bye (with topos loaded) ``` 2017-08-14 09:50:35 -0800 : 10.10.10.180:5060 -> 10.20.20.224:5060 BYE sip:2505551234@10.20.20.224:5060 SIP/2.0 Via: SIP/2.0/UDP 10.10.10.180;branch=z9hG4bK2409.87c78083000000000000000000000000.0 To: <sip:2505551234@mtl.dryvoip.ca;transport=UDP>;tag=as574ee653 From: <sip:1715033_123@mtl.dryvoip.ca;transport=UDP>;tag=df42e302 CSeq: 3 BYE Call-ID: s1A7v71pjL_HNxHBscGpSg.. Content-Length: 0 User-Agent: kamailio (5.0.2 (x86_64/linux)) Max-Forwards: 70 ``` ### Possible Solutions ### Additional Information ``` version: kamailio 5.0.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 12:04:13 Jun 26 2017 with gcc 4.4.7 ``` -- 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/1216

3 27

[kamailio/kamailio] carrierroute: cr.dump_routes prints error or hangs after over 100 prefixes (#1304)
by Rick 24 Jan '18

24 Jan '18

### Description Try to fill carrierroute with routing data and test result with `kamcmd`, but the rpc command never gives a result. ### Troubleshooting #### Reproduction ``` /* ----- ctl params -------------------------------------------------------- */ modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") modparam("ctl", "mode", 0660) /* ----- carrierroute params ----------------------------------------------- */ modparam("carrierroute", "config_source", "db") modparam("carrierroute", "db_url", "EXTERN_READ_DBURL") modparam("carrierroute", "fetch_rows", 2000) modparam("carrierroute", "db_load_description", 1) modparam("carrierroute", "match_mode", 10) modparam("carrierroute", "avoid_failed_destinations", 1) ``` Kamailio is running with the following parameters: ``` /usr/local/sbin/kamailio -u kamailio -g kamailio -m 512 -M 20 -n 16 ``` Fill carrierroute table with 110 Routes, do a routes reload and than try to get the routes dumped. `kamcmd cr.reload_routes` and after that issue `kamcmd cr.dump_routes`, which hangs and don't return a result. #### Log Messages ``` nothing regarding carrierroute in the log ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.1.0-dev8 (x86_64/freebsd) 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, 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, select, kqueue. id: unknown compiled on 20:35:54 Nov 1 2017 with clang 4.0 ``` * **Operating System**:  ``` FreeBSD 11.1-RELEASE ``` -- 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/1304

2 7

[kamailio/kamailio] http_async_client crash in 5.0.5 (does not crash in 5.0.4) (#1400)
by Alexandru Pirvulescu 24 Jan '18

24 Jan '18

### Description Kamailio started to crash in 5.0.5 in http_async_client module. Works in 5.0.4 ### Troubleshooting #### Reproduction Use http_async_client. #### Debugging Data Not yet extracted. Need to figure out how to access the core because it is a container. #### Log Messages ``` 4(30) : <core> [core/mem/q_malloc.c:483]: qm_free(): BUG: qm_free: freeing already freed pointer (0x7fccc205d368), called from http_async_client: async_http.c: set_query_params(599), first free http_async_client: async_http.c: set_query_params(599) - aborting 51(77) CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 35 0(1) ALERT: <core> [main.c:742]: handle_sigs(): child process 30 exited by a signal 6 0(1) ALERT: <core> [main.c:745]: handle_sigs(): core was generated 0(1) INFO: <core> [main.c:768]: handle_sigs(): terminating due to SIGCHLD ``` #### SIP Traffic ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.5 (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 with gcc 5.3.1 ``` * **Operating System**: ``` Ubuntu 16.04 (Xenial) ``` -- 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/1400

3 3

git:master:12f6992b: json: add transformation
by Emmanuel Schmidbauer 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 12f6992bfaf833179f826033102054ad984f22e1 URL: https://github.com/kamailio/kamailio/commit/12f6992bfaf833179f826033102054a… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-19T14:01:24-07:00 json: add transformation --- Added: src/modules/json/json_trans.c Added: src/modules/json/json_trans.h Modified: src/modules/json/doc/json_admin.xml Modified: src/modules/json/json_funcs.c Modified: src/modules/json/json_funcs.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/12f6992bfaf833179f826033102054a… Patch: https://github.com/kamailio/kamailio/commit/12f6992bfaf833179f826033102054a…

1 0

git:master:9d8e9574: Merge pull request #1404 from kamailio/json-transformation
by GitHub 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 9d8e957419f36b5ca11144b6f52f005a2b04ef43 URL: https://github.com/kamailio/kamailio/commit/9d8e957419f36b5ca11144b6f52f005… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-24T09:35:59+01:00 Merge pull request #1404 from kamailio/json-transformation json: add transformation --- Added: src/modules/json/json_trans.c Added: src/modules/json/json_trans.h Modified: src/modules/json/doc/json_admin.xml Modified: src/modules/json/json_funcs.c Modified: src/modules/json/json_funcs.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9d8e957419f36b5ca11144b6f52f005… Patch: https://github.com/kamailio/kamailio/commit/9d8e957419f36b5ca11144b6f52f005…

1 0

[kamailio/kamailio] json: add transformation (#1404)
by Emmanuel Schmidbauer 24 Jan '18

24 Jan '18

this was borrowed from the `kazoo` and `nsq` module json transformations i think it makes the most sense in this module as I'd like to use the transformation without loading the `kazoo` or `nsq` modules. It can be very useful for parsing json data from pseudo-variables like $rb. if this can be merged, I will deprecate the transformation in `nsq` and maintain this code. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1404 -- Commit Summary -- * json: add transformation -- File Changes -- M src/modules/json/doc/json_admin.xml (26) M src/modules/json/json_funcs.c (283) M src/modules/json/json_funcs.h (27) M src/modules/json/json_mod.c (40) A src/modules/json/json_trans.c (451) A src/modules/json/json_trans.h (51) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1404.patch https://github.com/kamailio/kamailio/pull/1404.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/1404

2 3

Errored: kamailio/kamailio#5420 (master - e62fa8f)
by Travis CI 24 Jan '18

24 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5420 Status: Errored Duration: 11 minutes and 17 seconds Commit: e62fa8f (master) Author: Daniel-Constantin Mierla Message: sipt: Makefile - define KAMAILIO_MOD_INTERFACE View the changeset: https://github.com/kamailio/kamailio/compare/43434ee8a1d6...e62fa8f7813a View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/332676623?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:e62fa8f7: sipt: Makefile - define KAMAILIO_MOD_INTERFACE
by Daniel-Constantin Mierla 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: e62fa8f7813a0d22f4db30a99bcee541103f21b3 URL: https://github.com/kamailio/kamailio/commit/e62fa8f7813a0d22f4db30a99bcee54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T09:21:30+01:00 sipt: Makefile - define KAMAILIO_MOD_INTERFACE --- Modified: src/modules/sipt/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/e62fa8f7813a0d22f4db30a99bcee54… Patch: https://github.com/kamailio/kamailio/commit/e62fa8f7813a0d22f4db30a99bcee54… --- diff --git a/src/modules/sipt/Makefile b/src/modules/sipt/Makefile index 93defc7f01..86edf13735 100644 --- a/src/modules/sipt/Makefile +++ b/src/modules/sipt/Makefile @@ -1,7 +1,7 @@ # # sipt module makefile # -# +# # WARNING: do not run this directly, it should be run by the master Makefile include ../../Makefile.defs @@ -10,7 +10,7 @@ NAME=sipt.so LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE include ../../Makefile.modules

1 0

git:master:cd0e1bd2: janssonrpcc: Makefile - define KAMAILIO_MOD_INTERFACE
by Daniel-Constantin Mierla 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: cd0e1bd26cc31c001707ce98d084310979071fb0 URL: https://github.com/kamailio/kamailio/commit/cd0e1bd26cc31c001707ce98d084310… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T09:21:17+01:00 janssonrpcc: Makefile - define KAMAILIO_MOD_INTERFACE --- Modified: src/modules/janssonrpcc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/cd0e1bd26cc31c001707ce98d084310… Patch: https://github.com/kamailio/kamailio/commit/cd0e1bd26cc31c001707ce98d084310… --- diff --git a/src/modules/janssonrpcc/Makefile b/src/modules/janssonrpcc/Makefile index 596b3d42f5..10ea4446ce 100644 --- a/src/modules/janssonrpcc/Makefile +++ b/src/modules/janssonrpcc/Makefile @@ -1,5 +1,5 @@ # -# janssonrpc-c module makefile +# janssonrpcc module makefile # # # WARNING: do not run this directly, it should be run by the master Makefile @@ -20,7 +20,7 @@ else LIBS+= $(shell pkg-config --libs libevent) endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib include ../../Makefile.modules

1 0

git:master:86589cdd: jansson: Makefile - define KAMAILIO_MOD_INTERFACE
by Daniel-Constantin Mierla 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 86589cdda4f5390099165670d68d49f5c8b44af1 URL: https://github.com/kamailio/kamailio/commit/86589cdda4f5390099165670d68d49f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T09:21:05+01:00 jansson: Makefile - define KAMAILIO_MOD_INTERFACE --- Modified: src/modules/jansson/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/86589cdda4f5390099165670d68d49f… Patch: https://github.com/kamailio/kamailio/commit/86589cdda4f5390099165670d68d49f… --- diff --git a/src/modules/jansson/Makefile b/src/modules/jansson/Makefile index 7680f71819..f3a18c5b83 100644 --- a/src/modules/jansson/Makefile +++ b/src/modules/jansson/Makefile @@ -23,7 +23,7 @@ else LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljansson endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib include ../../Makefile.modules

1 0

git:master:22421845: cnxcc: Makefile - define KAMAILIO_MOD_INTERFACE
by Daniel-Constantin Mierla 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 22421845cfcc0eab194ac510bfc378f72765a059 URL: https://github.com/kamailio/kamailio/commit/22421845cfcc0eab194ac510bfc378f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T09:20:33+01:00 cnxcc: Makefile - define KAMAILIO_MOD_INTERFACE --- Modified: src/modules/cnxcc/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/22421845cfcc0eab194ac510bfc378f… Patch: https://github.com/kamailio/kamailio/commit/22421845cfcc0eab194ac510bfc378f… --- diff --git a/src/modules/cnxcc/Makefile b/src/modules/cnxcc/Makefile index 73b5408dbd..41803d1383 100644 --- a/src/modules/cnxcc/Makefile +++ b/src/modules/cnxcc/Makefile @@ -47,7 +47,7 @@ endif DEFS+=$(HIREDISDEFS) $(LEVENTDEFS) LIBS=$(HIREDISLIBS) $(LEVENTLIBS) -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 include ../../Makefile.modules

1 0

git:master:43434ee8: modules: readme files regenerated - cfg_rpc ... [skip ci]
by Kamailio Dev 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: 43434ee8a1d65276dfbfce2f866f91d4bf0682fc URL: https://github.com/kamailio/kamailio/commit/43434ee8a1d65276dfbfce2f866f91d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-23T17:46:38+01:00 modules: readme files regenerated - cfg_rpc ... [skip ci] --- Modified: src/modules/cfg_rpc/README --- Diff: https://github.com/kamailio/kamailio/commit/43434ee8a1d65276dfbfce2f866f91d… Patch: https://github.com/kamailio/kamailio/commit/43434ee8a1d65276dfbfce2f866f91d… --- diff --git a/src/modules/cfg_rpc/README b/src/modules/cfg_rpc/README index 93d31e0a0c..9f3c25820a 100644 --- a/src/modules/cfg_rpc/README +++ b/src/modules/cfg_rpc/README @@ -147,12 +147,15 @@ Chapter 1. Admin Guide 3.2. cfg.get cfg.get - Get the value of a configuration variable. The function - accepts two parameters: group name, variable name. The group name can - optionally contain the group instance id, for example foo[5]. + accepts two parameters: group name, variable name, but if all the + elements belonging to a certain group is wanted to be retrieved then + only the group name would suffice as the function parameter. The group + name can optionally contain the group instance id, for example foo[5]. Example 1.2. Use cfg.get RPC command ... # kamcmd cfg.get core debug +# kamcmd cfg.get tm ... 3.3. cfg.seti

1 0

[kamailio/kamailio] cfg_rpc: extending the functionality of cfg.get command (#1321)
by hdikme 23 Jan '18

23 Jan '18

- rpc_get function can be also called with only entering the group name information. Before it used to work only with group name and variable name and returning the value for a variable. With the enhancement, it is also possible to retrieve all variable values belonging to a specific group. e.g.: kamcmd cfg.get core. Above given example will print the values of all variables of the configuration group "core".   #### Pre-Submission Checklist    - [ ] Commit message has the format required by CONTRIBUTING guide - [ ] Commits are split per component (core, individual modules, libs, utils, ...) - [ ] 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) - [ ] 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 - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  rpc_get function can be also called with only entering the group name information. Before it used to work only with group name and variable name and returning the value for a variable. With the enhancement, it is also possible to retrieve all variable values belonging to a specific group. e.g.: kamcmd cfg.get core. Above given example will print the values of all variables of the configuration group "core". You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1321 -- Commit Summary -- * cfg_rpc: extending the functionality of cfg.get command -- File Changes -- M src/modules/cfg_rpc/cfg_rpc.c (112) M src/modules/cfg_rpc/doc/rpc.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1321.patch https://github.com/kamailio/kamailio/pull/1321.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/1321

2 11

git:master:95e82d91: cfg_rcp: allow getting 0 values in rpc cfg.get
by Daniel-Constantin Mierla 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: 95e82d9135180be519192029d3f6edcf56eddb59 URL: https://github.com/kamailio/kamailio/commit/95e82d9135180be519192029d3f6edc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T17:32:23+01:00 cfg_rcp: allow getting 0 values in rpc cfg.get - issue introduced in previous commit - log message for dynamic values to be skipped --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/95e82d9135180be519192029d3f6edc… Patch: https://github.com/kamailio/kamailio/commit/95e82d9135180be519192029d3f6edc… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index a2d44e3acc..d865eae561 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -381,18 +381,20 @@ static void rpc_get(rpc_t* rpc, void* c) for (i=0; def[i].name; i++) { var.s = def[i].name; var.len = (int)strlen(def[i].name); - LM_DBG("getting value for variable: %.*s.%.*s\n", group.len, group.s, - var.len, var.s); + LM_DBG("getting value for variable: %.*s.%.*s\n", + group.len, group.s, var.len, var.s); val = NULL; ret = cfg_get_by_name(ctx, &group, group_id, &var, &val, &val_type); if (ret < 0) { rpc->fault(c, 400, "Failed to get the variable"); return; - } else if (ret > 0 || val==NULL) { + } else if (ret > 0) { + LM_DBG("skipping dynamic (callback) value for variable:" + " %.*s.%.*s (%p/%d)\n", + group.len, group.s, var.len, var.s, val, ret); continue; } - LM_DBG("type: %d value: %p\n", val_type, val); switch (val_type) { case CFG_VAR_INT: rpc->struct_add(rh, "d", var.s, (int)(long)val);

1 0

git:master:a9972863: ctl: proper handling of optional param specifier (*) in rpc scan
by Daniel-Constantin Mierla 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: a9972863681059c647af4bafd0d9a20f7648c801 URL: https://github.com/kamailio/kamailio/commit/a9972863681059c647af4bafd0d9a20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T17:33:39+01:00 ctl: proper handling of optional param specifier (*) in rpc scan --- Modified: src/modules/ctl/binrpc_run.c --- Diff: https://github.com/kamailio/kamailio/commit/a9972863681059c647af4bafd0d9a20… Patch: https://github.com/kamailio/kamailio/commit/a9972863681059c647af4bafd0d9a20… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index 74d71dc8f9..efff292081 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -841,11 +841,11 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) /* clear the previously saved error code */ rpc_fault_reset(ctx); - va_start(ap, fmt); orig_fmt=fmt; nofault = 0; modifiers=0; autoconv=autoconvert; + va_start(ap, fmt); for (;*fmt; fmt++){ switch(*fmt){ case '*': /* start of optional parameters */ @@ -918,7 +918,7 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) error_read: /* Do not immediately send out the error message, the user might retry the scan with different parameters */ - if(nofault==0 || ((err!=E_BINRPC_MORE_DATA) && (err!=E_BINRPC_EOP))) + if(nofault==0 || ((err!=E_BINRPC_MORE_DATA) && (err!=E_BINRPC_EOP))) { rpc_fault_prepare(ctx, 400, "error at parameter %d: expected %s type but" " %s", ctx->in.record_no, rpc_type_name(v.type), binrpc_error(err)); @@ -927,6 +927,11 @@ static int rpc_scan(struct binrpc_ctx* ctx, char* fmt, ...) ": %s", ctx->in.record_no, ctx->in.ctx.offset, v.type, binrpc_error(err)); */ + } + if(nofault==1 && (err==E_BINRPC_MORE_DATA || err==E_BINRPC_EOP)) { + va_end(ap); + return (int)(fmt-orig_fmt)-modifiers; + } goto error_ret; error_not_supported: rpc_fault(ctx, 500, "internal server error, type %d not supported",

1 0

git:master:e98bd848: cfg_rpc: documentation about group vars listing with rpc cfg.get
by Daniel-Constantin Mierla 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: e98bd84810b8faa7faf7af3384fc2c979725fe86 URL: https://github.com/kamailio/kamailio/commit/e98bd84810b8faa7faf7af3384fc2c9… Author: Huseyin Dikme <hueseyin.dikme(a)1und1.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T16:59:25+01:00 cfg_rpc: documentation about group vars listing with rpc cfg.get - part of PR #1321 --- Modified: src/modules/cfg_rpc/doc/rpc.xml --- Diff: https://github.com/kamailio/kamailio/commit/e98bd84810b8faa7faf7af3384fc2c9… Patch: https://github.com/kamailio/kamailio/commit/e98bd84810b8faa7faf7af3384fc2c9… --- diff --git a/src/modules/cfg_rpc/doc/rpc.xml b/src/modules/cfg_rpc/doc/rpc.xml index 9298247d83..9e4f2003eb 100644 --- a/src/modules/cfg_rpc/doc/rpc.xml +++ b/src/modules/cfg_rpc/doc/rpc.xml @@ -35,7 +35,8 @@ <para> <emphasis>cfg.get</emphasis> - Get the value of a configuration variable. The function accepts two parameters: - group name, variable name. The group name can optionally contain the + group name, variable name, but if all the elements belonging to a certain group is wanted to be retrieved + then only the group name would suffice as the function parameter. The group name can optionally contain the group instance id, for example foo[5]. </para> <example> @@ -43,6 +44,7 @@ <programlisting format="linespecific"> ... # &sercmd; cfg.get core debug +# &sercmd; cfg.get tm ... </programlisting> </example>

1 0

git:master:4920d1c5: cfg_rpc: rpc command cfg.get accepts group name to list its vars
by Daniel-Constantin Mierla 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: 4920d1c5df277526dcb27d34bfedab4cc2815bde URL: https://github.com/kamailio/kamailio/commit/4920d1c5df277526dcb27d34bfedab4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-23T16:56:51+01:00 cfg_rpc: rpc command cfg.get accepts group name to list its vars - if only one parameter is given (group name), cfg.get returns a structure with all variables and their values in the group - patched enhaced from the PR #1321 by Huseyin Dikme <hueseyin.dikme(a)1und1.de> --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/4920d1c5df277526dcb27d34bfedab4… Patch: https://github.com/kamailio/kamailio/commit/4920d1c5df277526dcb27d34bfedab4… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index f62855b092..a2d44e3acc 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -310,48 +310,113 @@ static const char* rpc_get_doc[2] = { static void rpc_get(rpc_t* rpc, void* c) { - str group, var; - void *val; - unsigned int val_type; - int ret; - unsigned int *group_id; + str group, var; + void *val; + unsigned int val_type; + int ret, n; + unsigned int *group_id; + void *rh = NULL; - if (rpc->scan(c, "SS", &group, &var) < 2) + n = rpc->scan(c, "S*S", &group, &var); + /* 2: both group and variable name are present + * -1: only group is present, print all variables in the group */ + if(n<1) { + rpc->fault(c, 500, "Failed to get the parameters"); return; - + } + if (n == 1) { + var.s = NULL; + var.len = 0; + } if (get_group_id(&group, &group_id)) { rpc->fault(c, 400, "Wrong group syntax. Use either \"group\", or \"group[id]\""); return; } + if(var.len != 0) { + LM_DBG("getting value for variable: %.*s.%.*s\n", group.len, group.s, + var.len, var.s); + /* print value for one variable */ + val = NULL; + ret = cfg_get_by_name(ctx, &group, group_id, &var, + &val, &val_type); + if (ret < 0) { + rpc->fault(c, 400, "Failed to get the variable"); + return; + } else if (ret > 0) { + rpc->fault(c, 400, "Variable exists, but it is not readable via RPC interface"); + return; + } + switch (val_type) { + case CFG_VAR_INT: + rpc->add(c, "d", (int)(long)val); + break; + case CFG_VAR_STRING: + rpc->add(c, "s", (char *)val); + break; + case CFG_VAR_STR: + rpc->add(c, "S", (str *)val); + break; + case CFG_VAR_POINTER: + rpc->rpl_printf(c, "%p", val); + break; + } + } else { + /* print values for all variables in the group */ + void *h; + str gname; + cfg_def_t *def; + int i; + char pbuf[32]; + int plen; + LM_DBG("getting values for group: %.*s\n", group.len, group.s); + rpc->add(c, "{", &rh); + if(rh==NULL) { + LM_ERR("failed to add root structure\n"); + rpc->fault(c, 500, "Failed to add root structure"); + return; + } + cfg_get_group_init(&h); + while(cfg_get_group_next(&h, &gname, &def)) { + if (((gname.len == group.len) && (memcmp(gname.s, group.s, group.len) == 0))) { + for (i=0; def[i].name; i++) { + var.s = def[i].name; + var.len = (int)strlen(def[i].name); + LM_DBG("getting value for variable: %.*s.%.*s\n", group.len, group.s, + var.len, var.s); + val = NULL; + ret = cfg_get_by_name(ctx, &group, group_id, &var, + &val, &val_type); + if (ret < 0) { + rpc->fault(c, 400, "Failed to get the variable"); + return; + } else if (ret > 0 || val==NULL) { + continue; + } + LM_DBG("type: %d value: %p\n", val_type, val); + switch (val_type) { + case CFG_VAR_INT: + rpc->struct_add(rh, "d", var.s, (int)(long)val); + break; + case CFG_VAR_STRING: + rpc->struct_add(rh, "s", var.s, (char *)val); + break; + case CFG_VAR_STR: + rpc->struct_add(rh, "S", var.s, (str *)val); + break; + case CFG_VAR_POINTER: + plen = snprintf(pbuf, 32, "%p", val); + if(plen>0 && plen<32) { + rpc->struct_add(rh, "s", var.s, pbuf); + } else { + LM_ERR("error adding: %.*s.%s\n", + group.len, group.s, var.s); + } + break; + } - ret = cfg_get_by_name(ctx, &group, group_id, &var, - &val, &val_type); - if (ret < 0) { - rpc->fault(c, 400, "Failed to get the variable"); - return; - - } else if (ret > 0) { - rpc->fault(c, 400, "Variable exists, but it is not readable via RPC interface"); - return; - } - - switch (val_type) { - case CFG_VAR_INT: - rpc->add(c, "d", (int)(long)val); - break; - - case CFG_VAR_STRING: - rpc->add(c, "s", (char *)val); - break; - - case CFG_VAR_STR: - rpc->add(c, "S", (str *)val); - break; - - case CFG_VAR_POINTER: - rpc->rpl_printf(c, "%p", val); - break; - + } + } + } } }

1 0

git:5.1:47821c58: kazoo: change string parameters to PARAM_STR
by Luis Azedo 23 Jan '18

23 Jan '18

Module: kamailio Branch: 5.1 Commit: 47821c5871d188ac04b6e366717a314a8d710699 URL: https://github.com/kamailio/kamailio/commit/47821c5871d188ac04b6e366717a314… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-01-23T10:24:53Z kazoo: change string parameters to PARAM_STR (cherry picked from commit 3018595d13dde08d15e8063cecb42a01ea271b66) --- Modified: src/modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/47821c5871d188ac04b6e366717a314… Patch: https://github.com/kamailio/kamailio/commit/47821c5871d188ac04b6e366717a314… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 40535aa82b..ca7bdfe000 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -159,8 +159,8 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { - {"node_hostname", STR_PARAM, &dbk_node_hostname.s}, - {"amqp_connection", STR_PARAM|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, + {"node_hostname", PARAM_STR, &dbk_node_hostname}, + {"amqp_connection", PARAM_STRING|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, @@ -171,31 +171,31 @@ static param_export_t params[] = { {"amqp_waitframe_timeout_sec", INT_PARAM, &kz_amqp_tv.tv_sec}, {"amqp_consumer_processes", INT_PARAM, &dbk_consumer_processes}, {"amqp_consumer_workers", INT_PARAM, &dbk_consumer_workers}, - {"amqp_consumer_event_key", STR_PARAM, &dbk_consumer_event_key.s}, - {"amqp_consumer_event_subkey", STR_PARAM, &dbk_consumer_event_subkey.s}, + {"amqp_consumer_event_key", PARAM_STR, &dbk_consumer_event_key}, + {"amqp_consumer_event_subkey", PARAM_STR, &dbk_consumer_event_subkey}, {"amqp_query_timeout_micro", INT_PARAM, &kz_qtimeout_tv.tv_usec}, {"amqp_query_timeout_sec", INT_PARAM, &kz_qtimeout_tv.tv_sec}, {"amqp_internal_loop_count", INT_PARAM, &dbk_internal_loop_count}, {"amqp_consumer_loop_count", INT_PARAM, &dbk_consumer_loop_count}, {"amqp_consumer_ack_loop_count", INT_PARAM, &dbk_consumer_ack_loop_count}, {"pua_include_entity", INT_PARAM, &dbk_include_entity}, - {"presentity_table", STR_PARAM, &kz_presentity_table.s}, - {"db_url", STR_PARAM, &kz_db_url.s}, + {"presentity_table", PARAM_STR, &kz_presentity_table}, + {"db_url", PARAM_STR, &kz_db_url}, {"pua_mode", INT_PARAM, &dbk_pua_mode}, {"single_consumer_on_reconnect", INT_PARAM, &dbk_single_consumer_on_reconnect}, {"consume_messages_on_reconnect", INT_PARAM, &dbk_consume_messages_on_reconnect}, - {"amqp_query_timeout_avp", STR_PARAM, &kz_query_timeout_avp.s}, - {"json_escape_char", STR_PARAM, &kz_json_escape_str.s}, - {"app_name", STR_PARAM, &kz_app_name.s}, + {"amqp_query_timeout_avp", PARAM_STR, &kz_query_timeout_avp}, + {"json_escape_char", PARAM_STR, &kz_json_escape_str}, + {"app_name", PARAM_STR, &kz_app_name}, {"use_federated_exchange", INT_PARAM, &dbk_use_federated_exchange}, - {"federated_exchange", STR_PARAM, &dbk_federated_exchange.s}, + {"federated_exchange", PARAM_STR, &dbk_federated_exchange}, {"amqp_heartbeats", INT_PARAM, &dbk_use_hearbeats}, - {"amqp_primary_zone", STR_PARAM, &dbk_primary_zone_name.s}, + {"amqp_primary_zone", PARAM_STR, &dbk_primary_zone_name}, {"amqp_command_hashtable_size", INT_PARAM, &dbk_command_table_size}, - {"amqp_result_avp", STR_PARAM, &kz_query_result_avp.s}, - {"amqps_ca_cert", STR_PARAM, &kz_amqps_ca_cert.s}, - {"amqps_cert", STR_PARAM, &kz_amqps_cert.s}, - {"amqps_key", STR_PARAM, &kz_amqps_key.s}, + {"amqp_result_avp", PARAM_STR, &kz_query_result_avp}, + {"amqps_ca_cert", PARAM_STR, &kz_amqps_ca_cert}, + {"amqps_cert", PARAM_STR, &kz_amqps_cert}, + {"amqps_key", PARAM_STR, &kz_amqps_key}, {"amqps_verify_peer", INT_PARAM, &kz_amqps_verify_peer}, {"amqps_verify_hostname", INT_PARAM, &kz_amqps_verify_hostname}, {"pua_lock_type", INT_PARAM, &kz_pua_lock_type}, @@ -255,11 +255,6 @@ static int mod_init(void) { LM_ERR("You must set the node_hostname parameter\n"); return -1; } - dbk_node_hostname.len = strlen(dbk_node_hostname.s); - - dbk_consumer_event_key.len = strlen(dbk_consumer_event_key.s); - dbk_consumer_event_subkey.len = strlen(dbk_consumer_event_subkey.s); - if(kz_init_avp()) { LM_ERR("Error in avp params\n");

1 0

git:5.0:d99e2f81: kazoo: change string parameters to PARAM_STR
by Luis Azedo 23 Jan '18

23 Jan '18

Module: kamailio Branch: 5.0 Commit: d99e2f8118dca4cd55a3e4138809cebeb8cdb139 URL: https://github.com/kamailio/kamailio/commit/d99e2f8118dca4cd55a3e4138809ceb… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-01-23T10:24:17Z kazoo: change string parameters to PARAM_STR (cherry picked from commit 3018595d13dde08d15e8063cecb42a01ea271b66) --- Modified: src/modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/d99e2f8118dca4cd55a3e4138809ceb… Patch: https://github.com/kamailio/kamailio/commit/d99e2f8118dca4cd55a3e4138809ceb… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 40535aa82b..ca7bdfe000 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -159,8 +159,8 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { - {"node_hostname", STR_PARAM, &dbk_node_hostname.s}, - {"amqp_connection", STR_PARAM|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, + {"node_hostname", PARAM_STR, &dbk_node_hostname}, + {"amqp_connection", PARAM_STRING|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, @@ -171,31 +171,31 @@ static param_export_t params[] = { {"amqp_waitframe_timeout_sec", INT_PARAM, &kz_amqp_tv.tv_sec}, {"amqp_consumer_processes", INT_PARAM, &dbk_consumer_processes}, {"amqp_consumer_workers", INT_PARAM, &dbk_consumer_workers}, - {"amqp_consumer_event_key", STR_PARAM, &dbk_consumer_event_key.s}, - {"amqp_consumer_event_subkey", STR_PARAM, &dbk_consumer_event_subkey.s}, + {"amqp_consumer_event_key", PARAM_STR, &dbk_consumer_event_key}, + {"amqp_consumer_event_subkey", PARAM_STR, &dbk_consumer_event_subkey}, {"amqp_query_timeout_micro", INT_PARAM, &kz_qtimeout_tv.tv_usec}, {"amqp_query_timeout_sec", INT_PARAM, &kz_qtimeout_tv.tv_sec}, {"amqp_internal_loop_count", INT_PARAM, &dbk_internal_loop_count}, {"amqp_consumer_loop_count", INT_PARAM, &dbk_consumer_loop_count}, {"amqp_consumer_ack_loop_count", INT_PARAM, &dbk_consumer_ack_loop_count}, {"pua_include_entity", INT_PARAM, &dbk_include_entity}, - {"presentity_table", STR_PARAM, &kz_presentity_table.s}, - {"db_url", STR_PARAM, &kz_db_url.s}, + {"presentity_table", PARAM_STR, &kz_presentity_table}, + {"db_url", PARAM_STR, &kz_db_url}, {"pua_mode", INT_PARAM, &dbk_pua_mode}, {"single_consumer_on_reconnect", INT_PARAM, &dbk_single_consumer_on_reconnect}, {"consume_messages_on_reconnect", INT_PARAM, &dbk_consume_messages_on_reconnect}, - {"amqp_query_timeout_avp", STR_PARAM, &kz_query_timeout_avp.s}, - {"json_escape_char", STR_PARAM, &kz_json_escape_str.s}, - {"app_name", STR_PARAM, &kz_app_name.s}, + {"amqp_query_timeout_avp", PARAM_STR, &kz_query_timeout_avp}, + {"json_escape_char", PARAM_STR, &kz_json_escape_str}, + {"app_name", PARAM_STR, &kz_app_name}, {"use_federated_exchange", INT_PARAM, &dbk_use_federated_exchange}, - {"federated_exchange", STR_PARAM, &dbk_federated_exchange.s}, + {"federated_exchange", PARAM_STR, &dbk_federated_exchange}, {"amqp_heartbeats", INT_PARAM, &dbk_use_hearbeats}, - {"amqp_primary_zone", STR_PARAM, &dbk_primary_zone_name.s}, + {"amqp_primary_zone", PARAM_STR, &dbk_primary_zone_name}, {"amqp_command_hashtable_size", INT_PARAM, &dbk_command_table_size}, - {"amqp_result_avp", STR_PARAM, &kz_query_result_avp.s}, - {"amqps_ca_cert", STR_PARAM, &kz_amqps_ca_cert.s}, - {"amqps_cert", STR_PARAM, &kz_amqps_cert.s}, - {"amqps_key", STR_PARAM, &kz_amqps_key.s}, + {"amqp_result_avp", PARAM_STR, &kz_query_result_avp}, + {"amqps_ca_cert", PARAM_STR, &kz_amqps_ca_cert}, + {"amqps_cert", PARAM_STR, &kz_amqps_cert}, + {"amqps_key", PARAM_STR, &kz_amqps_key}, {"amqps_verify_peer", INT_PARAM, &kz_amqps_verify_peer}, {"amqps_verify_hostname", INT_PARAM, &kz_amqps_verify_hostname}, {"pua_lock_type", INT_PARAM, &kz_pua_lock_type}, @@ -255,11 +255,6 @@ static int mod_init(void) { LM_ERR("You must set the node_hostname parameter\n"); return -1; } - dbk_node_hostname.len = strlen(dbk_node_hostname.s); - - dbk_consumer_event_key.len = strlen(dbk_consumer_event_key.s); - dbk_consumer_event_subkey.len = strlen(dbk_consumer_event_subkey.s); - if(kz_init_avp()) { LM_ERR("Error in avp params\n");

1 0

git:master:3018595d: kazoo: change string parameters to PARAM_STR
by lazedo 23 Jan '18

23 Jan '18

Module: kamailio Branch: master Commit: 3018595d13dde08d15e8063cecb42a01ea271b66 URL: https://github.com/kamailio/kamailio/commit/3018595d13dde08d15e8063cecb42a0… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2018-01-23T10:20:52Z kazoo: change string parameters to PARAM_STR --- Modified: src/modules/kazoo/kazoo.c --- Diff: https://github.com/kamailio/kamailio/commit/3018595d13dde08d15e8063cecb42a0… Patch: https://github.com/kamailio/kamailio/commit/3018595d13dde08d15e8063cecb42a0… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 40535aa82b..ca7bdfe000 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -159,8 +159,8 @@ static cmd_export_t cmds[] = { }; static param_export_t params[] = { - {"node_hostname", STR_PARAM, &dbk_node_hostname.s}, - {"amqp_connection", STR_PARAM|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, + {"node_hostname", PARAM_STR, &dbk_node_hostname}, + {"amqp_connection", PARAM_STRING|USE_FUNC_PARAM,(void*)kz_amqp_add_connection}, {"amqp_max_channels", INT_PARAM, &dbk_channels}, {"amqp_timmer_process_interval", INT_PARAM, &kz_timer_ms}, {"amqp_consumer_ack_timeout_micro", INT_PARAM, &kz_ack_tv.tv_usec}, @@ -171,31 +171,31 @@ static param_export_t params[] = { {"amqp_waitframe_timeout_sec", INT_PARAM, &kz_amqp_tv.tv_sec}, {"amqp_consumer_processes", INT_PARAM, &dbk_consumer_processes}, {"amqp_consumer_workers", INT_PARAM, &dbk_consumer_workers}, - {"amqp_consumer_event_key", STR_PARAM, &dbk_consumer_event_key.s}, - {"amqp_consumer_event_subkey", STR_PARAM, &dbk_consumer_event_subkey.s}, + {"amqp_consumer_event_key", PARAM_STR, &dbk_consumer_event_key}, + {"amqp_consumer_event_subkey", PARAM_STR, &dbk_consumer_event_subkey}, {"amqp_query_timeout_micro", INT_PARAM, &kz_qtimeout_tv.tv_usec}, {"amqp_query_timeout_sec", INT_PARAM, &kz_qtimeout_tv.tv_sec}, {"amqp_internal_loop_count", INT_PARAM, &dbk_internal_loop_count}, {"amqp_consumer_loop_count", INT_PARAM, &dbk_consumer_loop_count}, {"amqp_consumer_ack_loop_count", INT_PARAM, &dbk_consumer_ack_loop_count}, {"pua_include_entity", INT_PARAM, &dbk_include_entity}, - {"presentity_table", STR_PARAM, &kz_presentity_table.s}, - {"db_url", STR_PARAM, &kz_db_url.s}, + {"presentity_table", PARAM_STR, &kz_presentity_table}, + {"db_url", PARAM_STR, &kz_db_url}, {"pua_mode", INT_PARAM, &dbk_pua_mode}, {"single_consumer_on_reconnect", INT_PARAM, &dbk_single_consumer_on_reconnect}, {"consume_messages_on_reconnect", INT_PARAM, &dbk_consume_messages_on_reconnect}, - {"amqp_query_timeout_avp", STR_PARAM, &kz_query_timeout_avp.s}, - {"json_escape_char", STR_PARAM, &kz_json_escape_str.s}, - {"app_name", STR_PARAM, &kz_app_name.s}, + {"amqp_query_timeout_avp", PARAM_STR, &kz_query_timeout_avp}, + {"json_escape_char", PARAM_STR, &kz_json_escape_str}, + {"app_name", PARAM_STR, &kz_app_name}, {"use_federated_exchange", INT_PARAM, &dbk_use_federated_exchange}, - {"federated_exchange", STR_PARAM, &dbk_federated_exchange.s}, + {"federated_exchange", PARAM_STR, &dbk_federated_exchange}, {"amqp_heartbeats", INT_PARAM, &dbk_use_hearbeats}, - {"amqp_primary_zone", STR_PARAM, &dbk_primary_zone_name.s}, + {"amqp_primary_zone", PARAM_STR, &dbk_primary_zone_name}, {"amqp_command_hashtable_size", INT_PARAM, &dbk_command_table_size}, - {"amqp_result_avp", STR_PARAM, &kz_query_result_avp.s}, - {"amqps_ca_cert", STR_PARAM, &kz_amqps_ca_cert.s}, - {"amqps_cert", STR_PARAM, &kz_amqps_cert.s}, - {"amqps_key", STR_PARAM, &kz_amqps_key.s}, + {"amqp_result_avp", PARAM_STR, &kz_query_result_avp}, + {"amqps_ca_cert", PARAM_STR, &kz_amqps_ca_cert}, + {"amqps_cert", PARAM_STR, &kz_amqps_cert}, + {"amqps_key", PARAM_STR, &kz_amqps_key}, {"amqps_verify_peer", INT_PARAM, &kz_amqps_verify_peer}, {"amqps_verify_hostname", INT_PARAM, &kz_amqps_verify_hostname}, {"pua_lock_type", INT_PARAM, &kz_pua_lock_type}, @@ -255,11 +255,6 @@ static int mod_init(void) { LM_ERR("You must set the node_hostname parameter\n"); return -1; } - dbk_node_hostname.len = strlen(dbk_node_hostname.s); - - dbk_consumer_event_key.len = strlen(dbk_consumer_event_key.s); - dbk_consumer_event_subkey.len = strlen(dbk_consumer_event_subkey.s); - if(kz_init_avp()) { LM_ERR("Error in avp params\n");

1 0

Kamailio v5.1.1 Released
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Hello, Kamailio SIP Server v5.1.1 stable release is out. This is a maintenance release of the latest stable branch, 5.1, that includes fixes since the release of v5.1.0. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.1.x. Deployments running previous v5.1.x versions are strongly recommended to be upgraded to v5.1.1. For more details about version 5.1.1 (including links and guidelines to download the tarball or from GIT repository), visit: * https://www.kamailio.org/w/2018/01/kamailio-v5-1-1-released/ RPM, Debian/Ubuntu packages will be available soon as well. Many thanks to all contributing and using Kamailio! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

git:5.1:33cb1f8b: ChangeLog: content updated for v5.1.1
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: 33cb1f8b1224bedcd49d2bce9fa71cef30404b68 URL: https://github.com/kamailio/kamailio/commit/33cb1f8b1224bedcd49d2bce9fa71ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T15:37:59+01:00 ChangeLog: content updated for v5.1.1 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/33cb1f8b1224bedcd49d2bce9fa71ce… Patch: https://github.com/kamailio/kamailio/commit/33cb1f8b1224bedcd49d2bce9fa71ce…

1 0

git:5.1:d3c6227d: Makefile.defs: version set to 5.1.1
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: d3c6227d998f46388338de5a5be8684e02c529a2 URL: https://github.com/kamailio/kamailio/commit/d3c6227d998f46388338de5a5be8684… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T15:31:46+01:00 Makefile.defs: version set to 5.1.1 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/d3c6227d998f46388338de5a5be8684… Patch: https://github.com/kamailio/kamailio/commit/d3c6227d998f46388338de5a5be8684… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 1238e4f99d..5bfc0bf792 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -106,7 +106,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) # version number VERSION = 5 PATCHLEVEL = 1 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory manager switcher

1 0

git:5.1:b631f7e7: pkg/distros: updated version to 5.1.1
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: b631f7e715658fcff15bee6daa889519aa687adf URL: https://github.com/kamailio/kamailio/commit/b631f7e715658fcff15bee6daa88951… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T15:30:33+01:00 pkg/distros: updated version to 5.1.1 --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/freebsd/Makefile Modified: pkg/kamailio/openbsd/Makefile Modified: pkg/kamailio/solaris/pkginfo --- Diff: https://github.com/kamailio/kamailio/commit/b631f7e715658fcff15bee6daa88951… Patch: https://github.com/kamailio/kamailio/commit/b631f7e715658fcff15bee6daa88951… --- diff --git a/pkg/kamailio/alpine/APKBUILD b/pkg/kamailio/alpine/APKBUILD index eebe8d64c3..1e98751427 100644 --- a/pkg/kamailio/alpine/APKBUILD +++ b/pkg/kamailio/alpine/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Nathan Angelacos <nangel(a)alpinelinux.org> pkgname=kamailio -pkgver=5.1.0 +pkgver=5.1.1 pkgrel=0 # If building from a git snapshot, specify the gitcommit diff --git a/pkg/kamailio/freebsd/Makefile b/pkg/kamailio/freebsd/Makefile index 54aa0b760f..03f821c568 100644 --- a/pkg/kamailio/freebsd/Makefile +++ b/pkg/kamailio/freebsd/Makefile @@ -6,7 +6,7 @@ # PORTNAME= kamailio -PORTVERSION= 5.1.0 +PORTVERSION= 5.1.1 CATEGORIES= net MASTER_SITES= http://kamailio.org/pub/kamailio/${PORTVERSION}/src/ DISTNAME= ${PORTNAME}-${PORTVERSION}-tls_src diff --git a/pkg/kamailio/openbsd/Makefile b/pkg/kamailio/openbsd/Makefile index 7f9e292054..3c8053f984 100644 --- a/pkg/kamailio/openbsd/Makefile +++ b/pkg/kamailio/openbsd/Makefile @@ -12,7 +12,7 @@ COMMENT-carrierroute = kamailio carrierroute module COMMENT-snmpstats = kamailio snmpstats module COMMENT-perl = kamailio perl modules -VERSION = 5.1.0 +VERSION = 5.1.1 DISTNAME = kamailio-${VERSION} PKGNAME-main = kamailio-${VERSION} PKGNAME-mysql = kamailio-mysql-${VERSION} diff --git a/pkg/kamailio/solaris/pkginfo b/pkg/kamailio/solaris/pkginfo index c1a1960fa7..66f5c4cbc7 100644 --- a/pkg/kamailio/solaris/pkginfo +++ b/pkg/kamailio/solaris/pkginfo @@ -1,6 +1,6 @@ PKG=Kamailio ARCH=sparc -VERSION=5.1.0 +VERSION=5.1.1 CATEGORY=application EMAIL=miconda(a)gmail.com NAME=Kamailio is a very fast and flexible SIP (RFC3261) proxy server

1 0

git:5.1:246b40b5: pkg/rpms: updated version in spec files
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: 246b40b5048a6c751747fe827f046bb8e0034bed URL: https://github.com/kamailio/kamailio/commit/246b40b5048a6c751747fe827f046bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T15:30:09+01:00 pkg/rpms: updated version in spec files --- Modified: pkg/kamailio/centos/6/kamailio.spec Modified: pkg/kamailio/centos/7/kamailio.spec Modified: pkg/kamailio/fedora/17/kamailio.spec Modified: pkg/kamailio/obs/kamailio.spec Modified: pkg/kamailio/oracle/el6/kamailio.spec Modified: pkg/kamailio/oracle/el7/kamailio.spec Modified: pkg/kamailio/rpm/kamailio.spec-4.1 Modified: pkg/kamailio/rpm/kamailio.spec.CenOS Modified: pkg/kamailio/rpm/kamailio.spec.SuSE --- Diff: https://github.com/kamailio/kamailio/commit/246b40b5048a6c751747fe827f046bb… Patch: https://github.com/kamailio/kamailio/commit/246b40b5048a6c751747fe827f046bb… --- diff --git a/pkg/kamailio/centos/6/kamailio.spec b/pkg/kamailio/centos/6/kamailio.spec index df4419929e..d6df4c05a6 100644 --- a/pkg/kamailio/centos/6/kamailio.spec +++ b/pkg/kamailio/centos/6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.0 +%define ver 5.1.1 %define rel 0%{dist} diff --git a/pkg/kamailio/centos/7/kamailio.spec b/pkg/kamailio/centos/7/kamailio.spec index 2d0099b901..147908d046 100644 --- a/pkg/kamailio/centos/7/kamailio.spec +++ b/pkg/kamailio/centos/7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.0 +%define ver 5.1.1 %define rel dev6%{dist} %bcond_with dnssec diff --git a/pkg/kamailio/fedora/17/kamailio.spec b/pkg/kamailio/fedora/17/kamailio.spec index 446ac8bfb3..224094e16b 100644 --- a/pkg/kamailio/fedora/17/kamailio.spec +++ b/pkg/kamailio/fedora/17/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.0 +%define ver 5.1.1 %define rel 0%{dist} diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index d1c5466cf4..68be69c6c8 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.0 +%define ver 5.1.1 %define rel 0%{dist} %if 0%{?fedora} == 25 diff --git a/pkg/kamailio/oracle/el6/kamailio.spec b/pkg/kamailio/oracle/el6/kamailio.spec index e5807b5ada..23f6de0c0c 100644 --- a/pkg/kamailio/oracle/el6/kamailio.spec +++ b/pkg/kamailio/oracle/el6/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.0 +%define ver 5.1.1 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/oracle/el7/kamailio.spec b/pkg/kamailio/oracle/el7/kamailio.spec index 0547e8b176..a0da154b3c 100644 --- a/pkg/kamailio/oracle/el7/kamailio.spec +++ b/pkg/kamailio/oracle/el7/kamailio.spec @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.0 +%define ver 5.1.1 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec-4.1 b/pkg/kamailio/rpm/kamailio.spec-4.1 index 3acccefe52..b6e3ef0282 100644 --- a/pkg/kamailio/rpm/kamailio.spec-4.1 +++ b/pkg/kamailio/rpm/kamailio.spec-4.1 @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.0 +%define ver 5.1.1 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c avp_radius auth_radius group_radius uri_radius pa postgres osp tlsops unixodbc diff --git a/pkg/kamailio/rpm/kamailio.spec.CenOS b/pkg/kamailio/rpm/kamailio.spec.CenOS index dd4d992106..dd5325ee76 100644 --- a/pkg/kamailio/rpm/kamailio.spec.CenOS +++ b/pkg/kamailio/rpm/kamailio.spec.CenOS @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.0 +%define ver 5.1.1 %define rel 0 %define _sharedir %{_prefix}/share diff --git a/pkg/kamailio/rpm/kamailio.spec.SuSE b/pkg/kamailio/rpm/kamailio.spec.SuSE index ef0eb41161..c679d99f22 100644 --- a/pkg/kamailio/rpm/kamailio.spec.SuSE +++ b/pkg/kamailio/rpm/kamailio.spec.SuSE @@ -1,5 +1,5 @@ %define name kamailio -%define ver 5.1.0 +%define ver 5.1.1 %define rel 0 %define EXCLUDED_MODULES mysql jabber cpl-c auth_radius misc_radius peering postgress pa unixodbc osp tlsops

1 0

Contributing platform specific code to Kamailio
by Tsvetomir Dimitrov 22 Jan '18

22 Jan '18

Hello, I am working on a functionality which handles ipsec tunel creation for VoLTE registration and I'd like to contribute it to the project. However the code is heavily Linux specific - uses xfrm framework, so it won't compile on distribution with older kernels and definitely won't compile on *BSD. How problematic is this? How to handle this implementation so that it gets merged? Right now I can see two options: 1. Implement the functionality in ims_register_pcscf. 2. Implement separate ipsec module and handle the tunel creation/tear down from the configuration. The first solution is definitely the easiest one for implementation, but after my patch the module won't be as portable as it is now and I'm afraid my patch will be rejected. The second one separates the platform specific code in separate module and won't affect ims_register_pcscf. However I need data from ims_usrloc_pcscf, which is not accessible from the configuration. Also, writing separate module for a limited IPSEC handling seems like a overkill for me. What's your opinion? Best regards, Tsvetomir

3 6

git:5.1:7f8a398d: modules/sipcapture fixed LM_ERR to LM_DBG
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: 7f8a398dd18d240efd8eb4377251a8752b321a1e URL: https://github.com/kamailio/kamailio/commit/7f8a398dd18d240efd8eb4377251a87… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T12:16:00+01:00 modules/sipcapture fixed LM_ERR to LM_DBG (cherry picked from commit c2949fe2dc4d1156657cd6bc1683da83eda2a809) --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/7f8a398dd18d240efd8eb4377251a87… Patch: https://github.com/kamailio/kamailio/commit/7f8a398dd18d240efd8eb4377251a87… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 171e1d035c..6e6faa1ad4 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3030,7 +3030,7 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) if(sp == NULL || in == NULL || in->len <= 0) return -1; - LM_ERR("REQUEST, PRE, %.*s\n", in->len, in->s); + LM_DBG("REQUEST, PRE, %.*s\n", in->len, in->s); switch(in->len) { case 5: {

1 0

git:5.1:501fdfe9: sctp: removed unused goto label
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: 501fdfe94211eb525d775738a2f6c77499033447 URL: https://github.com/kamailio/kamailio/commit/501fdfe94211eb525d775738a2f6c77… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T12:15:13+01:00 sctp: removed unused goto label (cherry picked from commit f6232ee6d5d7fed67b6510c8c5ab8e7f6273274e) --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/501fdfe94211eb525d775738a2f6c77… Patch: https://github.com/kamailio/kamailio/commit/501fdfe94211eb525d775738a2f6c77… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 0e0b6eab97..66c71b7889 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -797,9 +797,6 @@ static int sctp_init_sock_opt_common(int s, int af) sctp_err++; goto error; /* critical */ } -#ifdef __OS_linux -ev_success: -#endif #else #error no sctp lib support for SCTP_EVENTS, consider upgrading #endif /* SCTP_EVENTS */

1 0

git:master:f6232ee6: sctp: removed unused goto label
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: f6232ee6d5d7fed67b6510c8c5ab8e7f6273274e URL: https://github.com/kamailio/kamailio/commit/f6232ee6d5d7fed67b6510c8c5ab8e7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:57:05+01:00 sctp: removed unused goto label --- Modified: src/modules/sctp/sctp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/f6232ee6d5d7fed67b6510c8c5ab8e7… Patch: https://github.com/kamailio/kamailio/commit/f6232ee6d5d7fed67b6510c8c5ab8e7… --- diff --git a/src/modules/sctp/sctp_server.c b/src/modules/sctp/sctp_server.c index 0e0b6eab97..66c71b7889 100644 --- a/src/modules/sctp/sctp_server.c +++ b/src/modules/sctp/sctp_server.c @@ -797,9 +797,6 @@ static int sctp_init_sock_opt_common(int s, int af) sctp_err++; goto error; /* critical */ } -#ifdef __OS_linux -ev_success: -#endif #else #error no sctp lib support for SCTP_EVENTS, consider upgrading #endif /* SCTP_EVENTS */

1 0

git:master:c2949fe2: modules/sipcapture fixed LM_ERR to LM_DBG
by GitHub 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: c2949fe2dc4d1156657cd6bc1683da83eda2a809 URL: https://github.com/kamailio/kamailio/commit/c2949fe2dc4d1156657cd6bc1683da8… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-22T10:52:15+01:00 modules/sipcapture fixed LM_ERR to LM_DBG --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/c2949fe2dc4d1156657cd6bc1683da8… Patch: https://github.com/kamailio/kamailio/commit/c2949fe2dc4d1156657cd6bc1683da8… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 171e1d035c..6e6faa1ad4 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3030,7 +3030,7 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) if(sp == NULL || in == NULL || in->len <= 0) return -1; - LM_ERR("REQUEST, PRE, %.*s\n", in->len, in->s); + LM_DBG("REQUEST, PRE, %.*s\n", in->len, in->s); switch(in->len) { case 5: {

1 0

git:master:589e8a83: Merge pull request #1406 from adubovikov/master
by GitHub 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: 589e8a8345da5160c1693c1c6808be4588b625aa URL: https://github.com/kamailio/kamailio/commit/589e8a8345da5160c1693c1c6808be4… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-22T11:32:43+01:00 Merge pull request #1406 from adubovikov/master modules/sipcapture fixed LM_ERR to LM_DBG --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/589e8a8345da5160c1693c1c6808be4… Patch: https://github.com/kamailio/kamailio/commit/589e8a8345da5160c1693c1c6808be4… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 171e1d035c..6e6faa1ad4 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -3030,7 +3030,7 @@ static int pv_parse_hep_name(pv_spec_p sp, str *in) if(sp == NULL || in == NULL || in->len <= 0) return -1; - LM_ERR("REQUEST, PRE, %.*s\n", in->len, in->s); + LM_DBG("REQUEST, PRE, %.*s\n", in->len, in->s); switch(in->len) { case 5: {

1 0

[kamailio/kamailio] modules/sipcapture fixed LM_ERR to LM_DBG (#1406)
by Alexandr Dubovikov 22 Jan '18

22 Jan '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 - [x] Small bug fix (non-breaking change which fixes an issue) #### Checklist:  - [x] PR should be backported to stable branches #### Description fixing LM_ERR logging to LM_DBG in the pv_parse_hep_name() function. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1406 -- Commit Summary -- * modules/sipcapture fixed LM_ERR to LM_DBG -- File Changes -- M src/modules/sipcapture/sipcapture.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1406.patch https://github.com/kamailio/kamailio/pull/1406.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/1406

2 3

git:5.1:70bc83c5: siptrace: fixed unused variable warnings
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: 70bc83c52c6bfe38fd5daa60c3aa449521a063fa URL: https://github.com/kamailio/kamailio/commit/70bc83c52c6bfe38fd5daa60c3aa449… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:27:19+01:00 siptrace: fixed unused variable warnings (cherry picked from commit 7dae4ec9e4be87d5a3406fe2ddeb98328beb1125) --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_send.h --- Diff: https://github.com/kamailio/kamailio/commit/70bc83c52c6bfe38fd5daa60c3aa449… Patch: https://github.com/kamailio/kamailio/commit/70bc83c52c6bfe38fd5daa60c3aa449… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 924c4f52e7..851bf6e0f8 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1016,7 +1016,6 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; sip_msg_t *msg; ip_addr_t to_ip; - int len; dest_info_t *dst; if(t == NULL || ps == NULL) { @@ -1334,7 +1333,6 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) siptrace_data_t sto; sip_msg_t *msg; ip_addr_t to_ip; - int len; char statusbuf[5]; if(slcbp == NULL || slcbp->req == NULL) { diff --git a/src/modules/siptrace/siptrace_send.h b/src/modules/siptrace/siptrace_send.h index 30c33e53b5..867d3995b0 100644 --- a/src/modules/siptrace/siptrace_send.h +++ b/src/modules/siptrace/siptrace_send.h @@ -68,8 +68,9 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2); #define siptrace_copy_proto(vproto, vbuf) do { \ int __olen; \ siptrace_copy_proto_olen(vproto, vbuf, __olen); \ + (void)__olen; \ } while(0) char* siptrace_proto_name(int vproto); -#endif \ No newline at end of file +#endif

1 0

git:5.1:e9549e27: rls: removed local variable contact, unused inside rls_handle_subscribe()
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: e9549e27efaf920e6f0b3d4c7a81129b705326e9 URL: https://github.com/kamailio/kamailio/commit/e9549e27efaf920e6f0b3d4c7a81129… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:26:32+01:00 rls: removed local variable contact, unused inside rls_handle_subscribe() (cherry picked from commit 2aebb2bf1f3d71a0dc7eca847af2aa127ff54453) --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/e9549e27efaf920e6f0b3d4c7a81129… Patch: https://github.com/kamailio/kamailio/commit/e9549e27efaf920e6f0b3d4c7a81129… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index 9222dc72b8..a96d1674f7 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -479,7 +479,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma pres_ev_t* event = NULL; int err_ret = -1; int ret = to_presence_code; - str* contact = NULL; xmlDocPtr doc = NULL; xmlNodePtr service_node = NULL; unsigned int hash_code=0; @@ -802,13 +801,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma ret = 1; stop: forpresence: - if(contact!=NULL) - { - if(contact->s!=NULL) - pkg_free(contact->s); - pkg_free(contact); - } - if(subs.pres_uri.s!=NULL) pkg_free(subs.pres_uri.s); if(subs.record_route.s!=NULL) @@ -829,13 +821,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma error: LM_ERR("occurred in rls_handle_subscribe\n"); - - if(contact!=NULL) - { - if(contact->s!=NULL) - pkg_free(contact->s); - pkg_free(contact); - } if(subs.pres_uri.s!=NULL) pkg_free(subs.pres_uri.s);

1 0

git:5.1:5c19d9bc: uri_db: ki_check_uri_realm() has three string params for kemi exports
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: 5c19d9bcf87a4c5595aa4b0706c45917ca75858d URL: https://github.com/kamailio/kamailio/commit/5c19d9bcf87a4c5595aa4b0706c4591… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:26:08+01:00 uri_db: ki_check_uri_realm() has three string params for kemi exports (cherry picked from commit 4fa92be97bca8da3ce5bf5181ef9262006b4fb9d) --- Modified: src/modules/uri_db/uri_db.c --- Diff: https://github.com/kamailio/kamailio/commit/5c19d9bcf87a4c5595aa4b0706c4591… Patch: https://github.com/kamailio/kamailio/commit/5c19d9bcf87a4c5595aa4b0706c4591… --- diff --git a/src/modules/uri_db/uri_db.c b/src/modules/uri_db/uri_db.c index 583303c9ee..aa8f1ac99a 100644 --- a/src/modules/uri_db/uri_db.c +++ b/src/modules/uri_db/uri_db.c @@ -232,7 +232,7 @@ static sr_kemi_t sr_kemi_uri_db_exports[] = { }, { str_init("uri_db"), str_init("check_uri_realm"), SR_KEMIP_INT, ki_check_uri_realm, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -244,4 +244,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_uri_db_exports); return 0; -} \ No newline at end of file +}

1 0

git:5.1:730fad39: rls: rls_get_service_list() - set to NULL the content of rootdoc pointer
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: 730fad39599c39b1a5c3faa1d9bb9c49db61439b URL: https://github.com/kamailio/kamailio/commit/730fad39599c39b1a5c3faa1d9bb9c4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:26:19+01:00 rls: rls_get_service_list() - set to NULL the content of rootdoc pointer - its a function parameter and expects to be set by the function (cherry picked from commit 5e58d48c980f5e413f47271dd342ee0630722bbb) --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/730fad39599c39b1a5c3faa1d9bb9c4… Patch: https://github.com/kamailio/kamailio/commit/730fad39599c39b1a5c3faa1d9bb9c4… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index c895bd1a93..9222dc72b8 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -272,12 +272,10 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, LM_DBG("service uri %.*s not found in rl document for user" " sip:%.*s@%.*s\n", service_uri->len, service_uri->s, user->len, user->s, domain->len, domain->s); - rootdoc = NULL; if(xmldoc!=NULL) xmlFreeDoc(xmldoc); - } - else - { + *rootdoc = NULL; + } else { *rootdoc = xmldoc; } @@ -290,8 +288,6 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, error: if(result!=NULL) rls_xcap_dbf.free_result(rls_xcap_db, result); - if(xmldoc!=NULL) - xmlFreeDoc(xmldoc); if(xcapdoc!=NULL) pkg_free(xcapdoc);

1 0

git:5.1:f243c5d2: textops: proper parameter types for kemi exports
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: f243c5d2da214bad59adcdc7d702d8da61c5d69f URL: https://github.com/kamailio/kamailio/commit/f243c5d2da214bad59adcdc7d702d8d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:25:58+01:00 textops: proper parameter types for kemi exports (cherry picked from commit 23450310fe6095f612d328871380012f189ac1c3) --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f243c5d2da214bad59adcdc7d702d8d… Patch: https://github.com/kamailio/kamailio/commit/f243c5d2da214bad59adcdc7d702d8d… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 8e7fcdcacd..303dbf055a 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -330,7 +330,7 @@ static int ki_tcp_conid_state(sip_msg_t* msg, int i_conid) LM_DBG("Connection id %d does not exist.\n", i_conid); ret = -1; goto done; - } + } /* Connection structure exists, now check what Kamailio thinks of it */ if (s_con->state == S_CONN_OK) { /* All is fine, return happily */ @@ -383,7 +383,7 @@ static int w_tcp_conid_alive(sip_msg_t* msg, char* conid, char *p2) int ret = w_tcp_conid_state(msg, conid, p2); if (ret >= 1) { return 1; /* TRUE */ - } + } /* We have some kind of problem */ return -1; } @@ -393,7 +393,7 @@ static int ki_tcp_conid_alive(sip_msg_t* msg, int i_conid) int ret = ki_tcp_conid_state(msg, i_conid); if (ret >= 1) { return 1; /* TRUE */ - } + } /* We have some kind of problem */ return -1; } @@ -550,22 +550,22 @@ static sr_kemi_t sr_kemi_tcpops_exports[] = { }, { str_init("tcpops"), str_init("tcp_enable_closed_event"), SR_KEMIP_INT, ki_tcpops_enable_closed_event, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("tcpops"), str_init("tcp_enable_closed_event_cid"), SR_KEMIP_INT, ki_tcpops_enable_closed_event_cid, - { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("tcpops"), str_init("tcp_conid_alive"), SR_KEMIP_INT, ki_tcp_conid_alive, - { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("tcpops"), str_init("tcp_conid_state"), SR_KEMIP_INT, ki_tcp_conid_state, - { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -577,4 +577,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_tcpops_exports); return 0; -} \ No newline at end of file +}

1 0

git:5.1:96c2294e: textops: fixed mixmatching types for exported kemi functions
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: 96c2294eb1a56b67c11d32e8fab55dd75a5fd26d URL: https://github.com/kamailio/kamailio/commit/96c2294eb1a56b67c11d32e8fab55dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:25:47+01:00 textops: fixed mixmatching types for exported kemi functions (cherry picked from commit fb904abd968eb44e797ee7bc08c5705e69de2fc7) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/96c2294eb1a56b67c11d32e8fab55dd… Patch: https://github.com/kamailio/kamailio/commit/96c2294eb1a56b67c11d32e8fab55dd… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 8bd7d883fe..97f1ecff12 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4096,7 +4096,7 @@ static sr_kemi_t sr_kemi_textops_exports[] = { }, { str_init("textops"), str_init("append_body_part_cd"), SR_KEMIP_INT, ki_append_multibody_cd, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textops"), str_init("remove_body_part"),

1 0

git:5.1:a0de4bce: msilo: set parameter names in prototypes
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: a0de4bce7c09d361e2d912ebe8cfcb76a72dac5c URL: https://github.com/kamailio/kamailio/commit/a0de4bce7c09d361e2d912ebe8cfcb7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:25:38+01:00 msilo: set parameter names in prototypes - used in genrating the index for kemi exports (cherry picked from commit 4fbbc544c2c860c24ab3e8d4a4eb362f7f626ee8) --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/a0de4bce7c09d361e2d912ebe8cfcb7… Patch: https://github.com/kamailio/kamailio/commit/a0de4bce7c09d361e2d912ebe8cfcb7… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 2f261d69bd..19c1beb1fd 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -146,8 +146,8 @@ static int ms_skip_notification_flag = -1; static int mod_init(void); static int child_init(int); -static int m_store(struct sip_msg*, str*); -static int m_dump(struct sip_msg*, str*); +static int m_store(sip_msg_t *masg, str *owner_s); +static int m_dump(sip_msg_t *msg, str *owner_s); static int m_store_2(struct sip_msg*, char*, char*); static int m_dump_2(struct sip_msg*, char*, char*); @@ -544,7 +544,7 @@ static int get_non_mandatory_headers(struct sip_msg *msg, char *buf, int buf_len * = "2" -- look for outgoing URI only at to header */ -static int m_store(struct sip_msg* msg, str *owner_s) +static int m_store(sip_msg_t* msg, str *owner_s) { str body, str_hdr, ctaddr; struct to_body *pto, *pfrom; @@ -935,7 +935,7 @@ static int ki_m_store(sip_msg_t* msg) /** * dump message */ -static int m_dump(struct sip_msg* msg, str* owner_s) +static int m_dump(sip_msg_t* msg, str* owner_s) { struct to_body *pto = NULL; db_key_t db_keys[3]; @@ -1652,4 +1652,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_msilo_exports); return 0; -} \ No newline at end of file +}

1 0

git:5.1:bc8dd926: cnxcc: fixed kemi export for signature for ki_get_channel_count()
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: bc8dd9263715479f682062b1fb5a16e265fc4ae0 URL: https://github.com/kamailio/kamailio/commit/bc8dd9263715479f682062b1fb5a16e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T11:25:27+01:00 cnxcc: fixed kemi export for signature for ki_get_channel_count() (cherry picked from commit c668854d05e548bf9d138778307891e914cc565e) --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/bc8dd9263715479f682062b1fb5a16e… Patch: https://github.com/kamailio/kamailio/commit/bc8dd9263715479f682062b1fb5a16e… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index 2cd8a87c6a..d429a50ee5 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -2133,7 +2133,7 @@ static sr_kemi_t sr_kemi_cnxcc_exports[] = { }, { str_init("cnxcc"), str_init("get_channel_count"), SR_KEMIP_INT, ki_get_channel_count, - { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("cnxcc"), str_init("terminate_all"), @@ -2150,4 +2150,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_cnxcc_exports); return 0; -} \ No newline at end of file +}

1 0

git:5.0:470f1885: http_async_client: cleanup avps/xavps after exec route on Http worker
by Victor Seva 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.0 Commit: 470f1885a63518a42b921a93e2dedb604044dd41 URL: https://github.com/kamailio/kamailio/commit/470f1885a63518a42b921a93e2dedb6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-01-22T11:15:15+01:00 http_async_client: cleanup avps/xavps after exec route on Http worker when suspend_transaction is false (cherry picked from commit ad46b115bedec01c52c5a9dcde0756db85ee61ec) --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/470f1885a63518a42b921a93e2dedb6… Patch: https://github.com/kamailio/kamailio/commit/470f1885a63518a42b921a93e2dedb6… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 8386985412..0f1242338b 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -45,6 +45,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/receive.h" #include "../../core/fmsg.h" #include "../../modules/tm/tm_load.h" @@ -226,6 +227,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) fmsg = faked_msg_next(); if (run_top_route(act, fmsg, 0)<0) LM_ERR("failure inside run_top_route\n"); + ksr_msg_env_reset(); } free_sip_msg(ah_reply);

1 0

git:master:7dae4ec9: siptrace: fixed unused variable warnings
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: 7dae4ec9e4be87d5a3406fe2ddeb98328beb1125 URL: https://github.com/kamailio/kamailio/commit/7dae4ec9e4be87d5a3406fe2ddeb983… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-22T10:53:05+01:00 siptrace: fixed unused variable warnings --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_send.h --- Diff: https://github.com/kamailio/kamailio/commit/7dae4ec9e4be87d5a3406fe2ddeb983… Patch: https://github.com/kamailio/kamailio/commit/7dae4ec9e4be87d5a3406fe2ddeb983… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 924c4f52e7..851bf6e0f8 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1016,7 +1016,6 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) siptrace_data_t sto; sip_msg_t *msg; ip_addr_t to_ip; - int len; dest_info_t *dst; if(t == NULL || ps == NULL) { @@ -1334,7 +1333,6 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) siptrace_data_t sto; sip_msg_t *msg; ip_addr_t to_ip; - int len; char statusbuf[5]; if(slcbp == NULL || slcbp->req == NULL) { diff --git a/src/modules/siptrace/siptrace_send.h b/src/modules/siptrace/siptrace_send.h index 30c33e53b5..867d3995b0 100644 --- a/src/modules/siptrace/siptrace_send.h +++ b/src/modules/siptrace/siptrace_send.h @@ -68,8 +68,9 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2); #define siptrace_copy_proto(vproto, vbuf) do { \ int __olen; \ siptrace_copy_proto_olen(vproto, vbuf, __olen); \ + (void)__olen; \ } while(0) char* siptrace_proto_name(int vproto); -#endif \ No newline at end of file +#endif

1 0

git:5.1:54f3a3d9: pkg/kamailio/deb: set version to 5.1.1
by Victor Seva 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: 54f3a3d98682e159988c57fa3e3cf28f6b41a121 URL: https://github.com/kamailio/kamailio/commit/54f3a3d98682e159988c57fa3e3cf28… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-01-22T10:37:52+01:00 pkg/kamailio/deb: set version to 5.1.1 --- Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/54f3a3d98682e159988c57fa3e3cf28… Patch: https://github.com/kamailio/kamailio/commit/54f3a3d98682e159988c57fa3e3cf28… --- diff --git a/pkg/kamailio/deb/buster/changelog b/pkg/kamailio/deb/buster/changelog index 18e2a36357..798ee4ecce 100644 --- a/pkg/kamailio/deb/buster/changelog +++ b/pkg/kamailio/deb/buster/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.1) unstable; urgency=medium + + * version set to 5.1.1 + + -- Victor Seva <vseva(a)debian.org> Mon, 22 Jan 2018 10:37:19 +0100 + kamailio (5.1.0) unstable; urgency=medium * version set to 5.1.0 diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 18e2a36357..798ee4ecce 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.1) unstable; urgency=medium + + * version set to 5.1.1 + + -- Victor Seva <vseva(a)debian.org> Mon, 22 Jan 2018 10:37:19 +0100 + kamailio (5.1.0) unstable; urgency=medium * version set to 5.1.0 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 18e2a36357..798ee4ecce 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.1) unstable; urgency=medium + + * version set to 5.1.1 + + -- Victor Seva <vseva(a)debian.org> Mon, 22 Jan 2018 10:37:19 +0100 + kamailio (5.1.0) unstable; urgency=medium * version set to 5.1.0 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 18e2a36357..798ee4ecce 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.1) unstable; urgency=medium + + * version set to 5.1.1 + + -- Victor Seva <vseva(a)debian.org> Mon, 22 Jan 2018 10:37:19 +0100 + kamailio (5.1.0) unstable; urgency=medium * version set to 5.1.0 diff --git a/pkg/kamailio/deb/sid/changelog b/pkg/kamailio/deb/sid/changelog index 18e2a36357..798ee4ecce 100644 --- a/pkg/kamailio/deb/sid/changelog +++ b/pkg/kamailio/deb/sid/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.1) unstable; urgency=medium + + * version set to 5.1.1 + + -- Victor Seva <vseva(a)debian.org> Mon, 22 Jan 2018 10:37:19 +0100 + kamailio (5.1.0) unstable; urgency=medium * version set to 5.1.0 diff --git a/pkg/kamailio/deb/stretch/changelog b/pkg/kamailio/deb/stretch/changelog index 18e2a36357..798ee4ecce 100644 --- a/pkg/kamailio/deb/stretch/changelog +++ b/pkg/kamailio/deb/stretch/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.1) unstable; urgency=medium + + * version set to 5.1.1 + + -- Victor Seva <vseva(a)debian.org> Mon, 22 Jan 2018 10:37:19 +0100 + kamailio (5.1.0) unstable; urgency=medium * version set to 5.1.0 diff --git a/pkg/kamailio/deb/trusty/changelog b/pkg/kamailio/deb/trusty/changelog index 18e2a36357..798ee4ecce 100644 --- a/pkg/kamailio/deb/trusty/changelog +++ b/pkg/kamailio/deb/trusty/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.1) unstable; urgency=medium + + * version set to 5.1.1 + + -- Victor Seva <vseva(a)debian.org> Mon, 22 Jan 2018 10:37:19 +0100 + kamailio (5.1.0) unstable; urgency=medium * version set to 5.1.0 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 18e2a36357..798ee4ecce 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.1) unstable; urgency=medium + + * version set to 5.1.1 + + -- Victor Seva <vseva(a)debian.org> Mon, 22 Jan 2018 10:37:19 +0100 + kamailio (5.1.0) unstable; urgency=medium * version set to 5.1.0 diff --git a/pkg/kamailio/deb/xenial/changelog b/pkg/kamailio/deb/xenial/changelog index 18e2a36357..798ee4ecce 100644 --- a/pkg/kamailio/deb/xenial/changelog +++ b/pkg/kamailio/deb/xenial/changelog @@ -1,3 +1,9 @@ +kamailio (5.1.1) unstable; urgency=medium + + * version set to 5.1.1 + + -- Victor Seva <vseva(a)debian.org> Mon, 22 Jan 2018 10:37:19 +0100 + kamailio (5.1.0) unstable; urgency=medium * version set to 5.1.0

1 0

[kamailio/kamailio] http_async_client: coredump on 5.0.5 (#1391)
by Victor Seva 22 Jan '18

22 Jan '18

### Description I'm having crashes on the Http worker process. I didn't find a way to reproduce the crash yet. Crashes are happening on two servers after a couple of days. #### Debugging Data Not very useful ``` Core was generated by `/usr/sbin/kamailio -f /etc/kamailio/kamailio.cfg -P /var/run/kamailio/kamailio.'. Program terminated with signal SIGSEGV, Segmentation fault. #0 __GI__IO_wfile_underflow (fp=0x7f45900008c0) at wfileops.c:280 280 wfileops.c: No such file or directory. (gdb) bt #0 __GI__IO_wfile_underflow (fp=0x7f45900008c0) at wfileops.c:280 #1 0x00000000000004b0 in ?? () #2 0x0000000000000428 in ?? () #3 0x00007f459d9e2640 in ?? () #4 0x0000000000000000 in ?? () (gdb) ``` #### Log Messages I have debug enabled for http_async_client module, and this is the last messages before the crash ``` Jan 3 11:02:11 vox-kamailio-1887-0 kamailio[2685]: DEBUG: http_async_client [http_multi.c:67]: timer_cb(): timeout on socket -1 Jan 3 11:02:11 vox-kamailio-1887-0 kamailio[2685]: DEBUG: http_async_client [http_multi.c:53]: multi_timer_cb(): multi_timer_cb: Setting timeout to 1 ms Jan 3 11:02:11 vox-kamailio-1887-0 kamailio[2685]: DEBUG: http_async_client [http_multi.c:561]: check_multi_info(): REMAINING: 2 [...] Jan 3 11:02:15 vox-kamailio-1887-0 kamailio[2702]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 89 Jan 3 11:02:15 vox-kamailio-1887-0 kamailio[2618]: ALERT: <core> [main.c:743]: handle_sigs(): child process 2685 exited by a signal 11 Jan 3 11:02:15 vox-kamailio-1887-0 kamailio[2618]: ALERT: <core> [main.c:746]: handle_sigs(): core was generated ``` ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.5 (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 with gcc 4.8.2 ``` This is 5.0.5 + https://github.com/kamailio/kamailio/pull/1386/commits/388ba3642338992a04ca… Module parameters are: ``` modparam("http_async_client", "connection_timeout", 10000) modparam("http_async_client", "tls_verify_host", 0) modparam("http_async_client", "tls_verify_peer", 0) modparam("http_async_client", "hash_size", 1024) ``` The use of the module is like this: ``` $var(url) = $avp(s:deviceStateURL)+"ari/deviceStates/Custom:" + $avp(s:queueDevice); $http_req(timeout) = 100; $http_req(suspend) = 0; $http_req(authmethod) = 1; $http_req(username) = $sht(lcr=>ari_user); $http_req(password) = $sht(lcr=>ari_pass); http_async_query("$var(url)", "QUEUE_CHECK_STATUS_OR_SET"); ``` * **Operating System**: Ubuntu Trusty -- 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/1391

3 11

git:5.1:a88346c6: http_async_client: cleanup avps/xavps after exec route on Http worker
by Federico Cabiddu 22 Jan '18

22 Jan '18

Module: kamailio Branch: 5.1 Commit: a88346c6106653a9ffa60ad41e143f62dd8af1ea URL: https://github.com/kamailio/kamailio/commit/a88346c6106653a9ffa60ad41e143f6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2018-01-22T10:11:29+01:00 http_async_client: cleanup avps/xavps after exec route on Http worker when suspend_transaction is false (cherry picked from commit ad46b115bedec01c52c5a9dcde0756db85ee61ec) --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/a88346c6106653a9ffa60ad41e143f6… Patch: https://github.com/kamailio/kamailio/commit/a88346c6106653a9ffa60ad41e143f6… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 59106a3bae..87a62ea8f6 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -45,6 +45,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/receive.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" @@ -263,6 +264,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) LM_ERR("error running event route kemi callback\n"); } } + ksr_msg_env_reset(); } done:

1 0

git:master:f6066a02: Merge pull request #1405 from kamailio/vseva/http_async_client_fix
by GitHub 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: f6066a022db81ae4d5f6c5cb5500fdcfdb15e33e URL: https://github.com/kamailio/kamailio/commit/f6066a022db81ae4d5f6c5cb5500fdc… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-22T10:10:51+01:00 Merge pull request #1405 from kamailio/vseva/http_async_client_fix http_async_client: cleanup avps/xavps after exec route on Http worker --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/f6066a022db81ae4d5f6c5cb5500fdc… Patch: https://github.com/kamailio/kamailio/commit/f6066a022db81ae4d5f6c5cb5500fdc… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 59106a3bae..87a62ea8f6 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -45,6 +45,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/receive.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" @@ -263,6 +264,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) LM_ERR("error running event route kemi callback\n"); } } + ksr_msg_env_reset(); } done:

1 0

[kamailio/kamailio] http_async_client: cleanup avps/xavps after exec route on Http worker (#1405)
by Victor Seva 22 Jan '18

22 Jan '18

when suspend_transaction is false As suggested at #1391 to avoid shared memory leak You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1405 -- Commit Summary -- * http_async_client: cleanup avps/xavps after exec route on Http worker -- File Changes -- M src/modules/http_async_client/async_http.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1405.patch https://github.com/kamailio/kamailio/pull/1405.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/1405

2 3

git:master:ad46b115: http_async_client: cleanup avps/xavps after exec route on Http worker
by Victor Seva 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: ad46b115bedec01c52c5a9dcde0756db85ee61ec URL: https://github.com/kamailio/kamailio/commit/ad46b115bedec01c52c5a9dcde0756d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-01-22T09:05:08+01:00 http_async_client: cleanup avps/xavps after exec route on Http worker when suspend_transaction is false --- Modified: src/modules/http_async_client/async_http.c --- Diff: https://github.com/kamailio/kamailio/commit/ad46b115bedec01c52c5a9dcde0756d… Patch: https://github.com/kamailio/kamailio/commit/ad46b115bedec01c52c5a9dcde0756d… --- diff --git a/src/modules/http_async_client/async_http.c b/src/modules/http_async_client/async_http.c index 59106a3bae..87a62ea8f6 100644 --- a/src/modules/http_async_client/async_http.c +++ b/src/modules/http_async_client/async_http.c @@ -45,6 +45,7 @@ #include "../../core/dprint.h" #include "../../core/ut.h" #include "../../core/cfg/cfg_struct.h" +#include "../../core/receive.h" #include "../../core/fmsg.h" #include "../../core/kemi.h" #include "../../modules/tm/tm_load.h" @@ -263,6 +264,7 @@ void async_http_cb(struct http_m_reply *reply, void *param) LM_ERR("error running event route kemi callback\n"); } } + ksr_msg_env_reset(); } done:

1 0

git:master:5e58d48c: rls: rls_get_service_list() - set to NULL the content of rootdoc pointer
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: 5e58d48c980f5e413f47271dd342ee0630722bbb URL: https://github.com/kamailio/kamailio/commit/5e58d48c980f5e413f47271dd342ee0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-21T13:17:46+01:00 rls: rls_get_service_list() - set to NULL the content of rootdoc pointer - its a function parameter and expects to be set by the function --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/5e58d48c980f5e413f47271dd342ee0… Patch: https://github.com/kamailio/kamailio/commit/5e58d48c980f5e413f47271dd342ee0… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index c895bd1a93..9222dc72b8 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -272,12 +272,10 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, LM_DBG("service uri %.*s not found in rl document for user" " sip:%.*s@%.*s\n", service_uri->len, service_uri->s, user->len, user->s, domain->len, domain->s); - rootdoc = NULL; if(xmldoc!=NULL) xmlFreeDoc(xmldoc); - } - else - { + *rootdoc = NULL; + } else { *rootdoc = xmldoc; } @@ -290,8 +288,6 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, error: if(result!=NULL) rls_xcap_dbf.free_result(rls_xcap_db, result); - if(xmldoc!=NULL) - xmlFreeDoc(xmldoc); if(xcapdoc!=NULL) pkg_free(xcapdoc);

1 0

git:master:2aebb2bf: rls: removed local variable contact, unused inside rls_handle_subscribe()
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Module: kamailio Branch: master Commit: 2aebb2bf1f3d71a0dc7eca847af2aa127ff54453 URL: https://github.com/kamailio/kamailio/commit/2aebb2bf1f3d71a0dc7eca847af2aa1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-21T13:20:55+01:00 rls: removed local variable contact, unused inside rls_handle_subscribe() --- Modified: src/modules/rls/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/2aebb2bf1f3d71a0dc7eca847af2aa1… Patch: https://github.com/kamailio/kamailio/commit/2aebb2bf1f3d71a0dc7eca847af2aa1… --- diff --git a/src/modules/rls/subscribe.c b/src/modules/rls/subscribe.c index 9222dc72b8..a96d1674f7 100644 --- a/src/modules/rls/subscribe.c +++ b/src/modules/rls/subscribe.c @@ -479,7 +479,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma pres_ev_t* event = NULL; int err_ret = -1; int ret = to_presence_code; - str* contact = NULL; xmlDocPtr doc = NULL; xmlNodePtr service_node = NULL; unsigned int hash_code=0; @@ -802,13 +801,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma ret = 1; stop: forpresence: - if(contact!=NULL) - { - if(contact->s!=NULL) - pkg_free(contact->s); - pkg_free(contact); - } - if(subs.pres_uri.s!=NULL) pkg_free(subs.pres_uri.s); if(subs.record_route.s!=NULL) @@ -829,13 +821,6 @@ int rls_handle_subscribe(struct sip_msg* msg, str watcher_user, str watcher_doma error: LM_ERR("occurred in rls_handle_subscribe\n"); - - if(contact!=NULL) - { - if(contact->s!=NULL) - pkg_free(contact->s); - pkg_free(contact); - } if(subs.pres_uri.s!=NULL) pkg_free(subs.pres_uri.s);

1 0

Planning the release of v5.1.1
by Daniel-Constantin Mierla 22 Jan '18

22 Jan '18

Hello, I am considering to do the first patch release from 5.1 series at the beginning of next week (most likely on Monday or Tuesday), as usual, if there are issues you are aware of and not reported to bug tracker, do it as soon as possible in order to have a chance to be fixed: - https://github.com/kamailio/kamailio/issues Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 5-7, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 1

git:master:4fa92be9: uri_db: ki_check_uri_realm() has three string params for kemi exports
by Daniel-Constantin Mierla 20 Jan '18

20 Jan '18

Module: kamailio Branch: master Commit: 4fa92be97bca8da3ce5bf5181ef9262006b4fb9d URL: https://github.com/kamailio/kamailio/commit/4fa92be97bca8da3ce5bf5181ef9262… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-20T11:45:51+01:00 uri_db: ki_check_uri_realm() has three string params for kemi exports --- Modified: src/modules/uri_db/uri_db.c --- Diff: https://github.com/kamailio/kamailio/commit/4fa92be97bca8da3ce5bf5181ef9262… Patch: https://github.com/kamailio/kamailio/commit/4fa92be97bca8da3ce5bf5181ef9262… --- diff --git a/src/modules/uri_db/uri_db.c b/src/modules/uri_db/uri_db.c index 583303c9ee..aa8f1ac99a 100644 --- a/src/modules/uri_db/uri_db.c +++ b/src/modules/uri_db/uri_db.c @@ -232,7 +232,7 @@ static sr_kemi_t sr_kemi_uri_db_exports[] = { }, { str_init("uri_db"), str_init("check_uri_realm"), SR_KEMIP_INT, ki_check_uri_realm, - { SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -244,4 +244,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_uri_db_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:fb904abd: textops: fixed mixmatching types for exported kemi functions
by Daniel-Constantin Mierla 20 Jan '18

20 Jan '18

Module: kamailio Branch: master Commit: fb904abd968eb44e797ee7bc08c5705e69de2fc7 URL: https://github.com/kamailio/kamailio/commit/fb904abd968eb44e797ee7bc08c5705… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-20T11:44:31+01:00 textops: fixed mixmatching types for exported kemi functions --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/fb904abd968eb44e797ee7bc08c5705… Patch: https://github.com/kamailio/kamailio/commit/fb904abd968eb44e797ee7bc08c5705… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 8bd7d883fe..97f1ecff12 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -4096,7 +4096,7 @@ static sr_kemi_t sr_kemi_textops_exports[] = { }, { str_init("textops"), str_init("append_body_part_cd"), SR_KEMIP_INT, ki_append_multibody_cd, - { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("textops"), str_init("remove_body_part"),

1 0

git:master:23450310: textops: proper parameter types for kemi exports
by Daniel-Constantin Mierla 20 Jan '18

20 Jan '18

Module: kamailio Branch: master Commit: 23450310fe6095f612d328871380012f189ac1c3 URL: https://github.com/kamailio/kamailio/commit/23450310fe6095f612d328871380012… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-20T11:44:59+01:00 textops: proper parameter types for kemi exports --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/23450310fe6095f612d328871380012… Patch: https://github.com/kamailio/kamailio/commit/23450310fe6095f612d328871380012… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 1e844f5ed8..6162d023d2 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -334,7 +334,7 @@ static int ki_tcp_conid_state(sip_msg_t* msg, int i_conid) LM_DBG("Connection id %d does not exist.\n", i_conid); ret = -1; goto done; - } + } /* Connection structure exists, now check what Kamailio thinks of it */ if (s_con->state == S_CONN_OK) { /* All is fine, return happily */ @@ -387,7 +387,7 @@ static int w_tcp_conid_alive(sip_msg_t* msg, char* conid, char *p2) int ret = w_tcp_conid_state(msg, conid, p2); if (ret >= 1) { return 1; /* TRUE */ - } + } /* We have some kind of problem */ return -1; } @@ -397,7 +397,7 @@ static int ki_tcp_conid_alive(sip_msg_t* msg, int i_conid) int ret = ki_tcp_conid_state(msg, i_conid); if (ret >= 1) { return 1; /* TRUE */ - } + } /* We have some kind of problem */ return -1; } @@ -642,22 +642,22 @@ static sr_kemi_t sr_kemi_tcpops_exports[] = { }, { str_init("tcpops"), str_init("tcp_enable_closed_event"), SR_KEMIP_INT, ki_tcpops_enable_closed_event, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + { SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("tcpops"), str_init("tcp_enable_closed_event_cid"), SR_KEMIP_INT, ki_tcpops_enable_closed_event_cid, - { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("tcpops"), str_init("tcp_conid_alive"), SR_KEMIP_INT, ki_tcp_conid_alive, - { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("tcpops"), str_init("tcp_conid_state"), SR_KEMIP_INT, ki_tcp_conid_state, - { SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, @@ -669,4 +669,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_tcpops_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:4fbbc544: msilo: set parameter names in prototypes
by Daniel-Constantin Mierla 20 Jan '18

20 Jan '18

Module: kamailio Branch: master Commit: 4fbbc544c2c860c24ab3e8d4a4eb362f7f626ee8 URL: https://github.com/kamailio/kamailio/commit/4fbbc544c2c860c24ab3e8d4a4eb362… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-20T11:43:13+01:00 msilo: set parameter names in prototypes - used in genrating the index for kemi exports --- Modified: src/modules/msilo/msilo.c --- Diff: https://github.com/kamailio/kamailio/commit/4fbbc544c2c860c24ab3e8d4a4eb362… Patch: https://github.com/kamailio/kamailio/commit/4fbbc544c2c860c24ab3e8d4a4eb362… --- diff --git a/src/modules/msilo/msilo.c b/src/modules/msilo/msilo.c index 2f261d69bd..19c1beb1fd 100644 --- a/src/modules/msilo/msilo.c +++ b/src/modules/msilo/msilo.c @@ -146,8 +146,8 @@ static int ms_skip_notification_flag = -1; static int mod_init(void); static int child_init(int); -static int m_store(struct sip_msg*, str*); -static int m_dump(struct sip_msg*, str*); +static int m_store(sip_msg_t *masg, str *owner_s); +static int m_dump(sip_msg_t *msg, str *owner_s); static int m_store_2(struct sip_msg*, char*, char*); static int m_dump_2(struct sip_msg*, char*, char*); @@ -544,7 +544,7 @@ static int get_non_mandatory_headers(struct sip_msg *msg, char *buf, int buf_len * = "2" -- look for outgoing URI only at to header */ -static int m_store(struct sip_msg* msg, str *owner_s) +static int m_store(sip_msg_t* msg, str *owner_s) { str body, str_hdr, ctaddr; struct to_body *pto, *pfrom; @@ -935,7 +935,7 @@ static int ki_m_store(sip_msg_t* msg) /** * dump message */ -static int m_dump(struct sip_msg* msg, str* owner_s) +static int m_dump(sip_msg_t* msg, str* owner_s) { struct to_body *pto = NULL; db_key_t db_keys[3]; @@ -1652,4 +1652,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_msilo_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:c668854d: cnxcc: fixed kemi export for signature for ki_get_channel_count()
by Daniel-Constantin Mierla 20 Jan '18

20 Jan '18

Module: kamailio Branch: master Commit: c668854d05e548bf9d138778307891e914cc565e URL: https://github.com/kamailio/kamailio/commit/c668854d05e548bf9d138778307891e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-20T11:42:44+01:00 cnxcc: fixed kemi export for signature for ki_get_channel_count() --- Modified: src/modules/cnxcc/cnxcc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/c668854d05e548bf9d138778307891e… Patch: https://github.com/kamailio/kamailio/commit/c668854d05e548bf9d138778307891e… --- diff --git a/src/modules/cnxcc/cnxcc_mod.c b/src/modules/cnxcc/cnxcc_mod.c index 2cd8a87c6a..d429a50ee5 100644 --- a/src/modules/cnxcc/cnxcc_mod.c +++ b/src/modules/cnxcc/cnxcc_mod.c @@ -2133,7 +2133,7 @@ static sr_kemi_t sr_kemi_cnxcc_exports[] = { }, { str_init("cnxcc"), str_init("get_channel_count"), SR_KEMIP_INT, ki_get_channel_count, - { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_NONE, + { SR_KEMIP_STR, SR_KEMIP_STR, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, { str_init("cnxcc"), str_init("terminate_all"), @@ -2150,4 +2150,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_cnxcc_exports); return 0; -} \ No newline at end of file +}

1 0

Re: [sr-dev] [kamailio/kamailio] usrloc: renamed dmq specific flag from FL_RPL to FL_DMQRPL (0640853)
by Daniel-Constantin Mierla 19 Jan '18

19 Jan '18

OK. I was thinking to ask about, but I thought there is maybe some branch not merged yet using it -- first step was to make it clear a flag related to dmq. -- 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/commit/0640853223af068f191fea62790e00d…

1 0

Re: [sr-dev] [kamailio/kamailio] usrloc: renamed dmq specific flag from FL_RPL to FL_DMQRPL (0640853)
by Charles Chance 19 Jan '18

19 Jan '18

I think the flag can be removed completely. It is unused since b5f94a9. -- 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/commit/0640853223af068f191fea62790e00d…

1 0

git:master:68c476bc: modules: readme files regenerated - usrloc ... [skip ci]
by Kamailio Dev 19 Jan '18

19 Jan '18

Module: kamailio Branch: master Commit: 68c476bcba8e49bc02a13beda431678d93cb2d47 URL: https://github.com/kamailio/kamailio/commit/68c476bcba8e49bc02a13beda431678… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-19T11:31:33+01:00 modules: readme files regenerated - usrloc ... [skip ci] --- Modified: src/modules/usrloc/README --- Diff: https://github.com/kamailio/kamailio/commit/68c476bcba8e49bc02a13beda431678… Patch: https://github.com/kamailio/kamailio/commit/68c476bcba8e49bc02a13beda431678… --- diff --git a/src/modules/usrloc/README b/src/modules/usrloc/README index fb7646597f..58fe8f7d80 100644 --- a/src/modules/usrloc/README +++ b/src/modules/usrloc/README @@ -89,6 +89,7 @@ Carsten Bock 3.43. db_insert_null (int) 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) + 3.46. rm_expired_delay (int) 4. RPC Commands @@ -181,6 +182,7 @@ Carsten Bock 1.43. Set db_insert_null parameter 1.44. Set skip_remote_socket parameter 1.45. Set db_timer_clean parameter + 1.46. Set rm_expired_delay parameter Chapter 1. Admin Guide @@ -242,6 +244,7 @@ Chapter 1. Admin Guide 3.43. db_insert_null (int) 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) + 3.46. rm_expired_delay (int) 4. RPC Commands @@ -367,6 +370,7 @@ Chapter 1. Admin Guide 3.43. db_insert_null (int) 3.44. skip_remote_socket (int) 3.45. db_timer_clean (int) + 3.46. rm_expired_delay (int) 3.1. nat_bflag (integer) @@ -980,6 +984,18 @@ modparam("usrloc", "skip_remote_socket", 1) modparam("usrloc", "db_timer_clean", 1) ... +3.46. rm_expired_delay (int) + + Specify the number of seconds to delay the removal of expired records. + For now it works for DB_ONLY mode (db_mode=3). + + Default value is “0”. + + Example 1.46. Set rm_expired_delay parameter +... +modparam("usrloc", "rm_expired_delay", 30) +... + 4. RPC Commands 4.1. ul.dump

1 0

Errored: kamailio/kamailio#5396 (master - 50c3c0d)
by Travis CI 19 Jan '18

19 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5396 Status: Errored Duration: 11 minutes and 14 seconds Commit: 50c3c0d (master) Author: Daniel-Constantin Mierla Message: usrloc: documentation for rm_expired_delay parameter View the changeset: https://github.com/kamailio/kamailio/compare/72bbf9280879...50c3c0d0bb40 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/330742851?utm_source=email&u… -- You can configure recipients for build notifications in your .travis.yml file. See https://docs.travis-ci.com/user/notifications

1 0

git:master:50c3c0d0: usrloc: documentation for rm_expired_delay parameter
by Daniel-Constantin Mierla 19 Jan '18

19 Jan '18

Module: kamailio Branch: master Commit: 50c3c0d0bb404f1fbd3d618042aa7c2f3533d7b0 URL: https://github.com/kamailio/kamailio/commit/50c3c0d0bb404f1fbd3d618042aa7c2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T11:16:04+01:00 usrloc: documentation for rm_expired_delay parameter --- Modified: src/modules/usrloc/doc/usrloc_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/50c3c0d0bb404f1fbd3d618042aa7c2… Patch: https://github.com/kamailio/kamailio/commit/50c3c0d0bb404f1fbd3d618042aa7c2… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index 96ff750f97..608a85edf1 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -1177,6 +1177,27 @@ modparam("usrloc", "db_timer_clean", 1) </example> </section> + <section id="usrloc.p.rm_expired_delay"> + <title><varname>rm_expired_delay</varname> (int)</title> + <para> + Specify the number of seconds to delay the removal of expired + records. For now it works for DB_ONLY mode (db_mode=3). + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>rm_expired_delay</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "rm_expired_delay", 30) +... +</programlisting> + </example> + </section> + </section> <section>

1 0

git:master:3de21172: usrloc: new parameter rm_expired_delay
by Daniel-Constantin Mierla 19 Jan '18

19 Jan '18

Module: kamailio Branch: master Commit: 3de21172fa0f435a77aea73151a2ddad7a711a8f URL: https://github.com/kamailio/kamailio/commit/3de21172fa0f435a77aea73151a2dda… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T11:05:31+01:00 usrloc: new parameter rm_expired_delay - set how many seconds to delay the removal of an expired record - for now works only in DB_ONLY mode --- Modified: src/modules/usrloc/udomain.c Modified: src/modules/usrloc/urecord.c Modified: src/modules/usrloc/usrloc.h Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3de21172fa0f435a77aea73151a2dda… Patch: https://github.com/kamailio/kamailio/commit/3de21172fa0f435a77aea73151a2dda… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index bf4a040e58..a3d948ad0b 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -42,6 +42,8 @@ #include "usrloc.h" #include "urecord.h" +extern int ul_rm_expired_delay; + #ifdef STATISTICS static char *build_stat_name( str* domain, char *var_name) { @@ -900,7 +902,7 @@ int db_timer_udomain(udomain_t* _d) keys[0] = &expires_col; ops[0] = "<"; vals[0].nul = 0; - UL_DB_EXPIRES_SET(&vals[0], act_time + 1); + UL_DB_EXPIRES_SET(&vals[0], act_time + 1 + ul_rm_expired_delay); keys[1] = &expires_col; ops[1] = OP_NEQ; diff --git a/src/modules/usrloc/urecord.c b/src/modules/usrloc/urecord.c index ef223db960..482c14efcf 100644 --- a/src/modules/usrloc/urecord.c +++ b/src/modules/usrloc/urecord.c @@ -286,8 +286,10 @@ static inline void nodb_timer(urecord_t* _r) if (!VALID_CONTACT(ptr, act_time)) { /* run callbacks for EXPIRE event */ - if (exists_ulcb_type(UL_CONTACT_EXPIRE)) + if (!(ptr->flags&FL_EXPCLB) && exists_ulcb_type(UL_CONTACT_EXPIRE)) { run_ul_callbacks( UL_CONTACT_EXPIRE, ptr); + ptr->flags |= FL_EXPCLB; + } LM_DBG("Binding '%.*s','%.*s' has expired\n", ptr->aor->len, ZSW(ptr->aor->s), diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index ef3572262c..6fb4965539 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -62,6 +62,7 @@ typedef enum flags { FL_NONE = 0, /*!< No flags set */ FL_MEM = 1 << 0, /*!< Update memory only */ FL_DMQRPL = 1 << 1, /*!< DMQ replication */ + FL_EXPCLB = 1 << 2, /*!< Expired callback executed */ FL_ALL = (int)0xFFFFFFFF /*!< All flags set */ } flags_t; diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 2eb9037f24..cedc65a73d 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -111,6 +111,7 @@ int ul_keepalive_timeout = 0; int ul_db_ops_ruid = 1; int ul_expires_type = 0; int ul_db_raw_fetch_type = 0; +int ul_rm_expired_delay = 0; str ul_xavp_contact_name = {0}; @@ -238,6 +239,7 @@ static param_export_t params[] = { {"db_insert_null", PARAM_INT, &ul_db_insert_null}, {"server_id_filter", PARAM_INT, &ul_db_srvid}, {"db_timer_clean", PARAM_INT, &ul_db_timer_clean}, + {"rm_expired_delay", PARAM_INT, &ul_rm_expired_delay}, {0, 0, 0} }; @@ -272,6 +274,17 @@ static int mod_init(void) int i; udomain_t* d; + if(ul_rm_expired_delay!=0) { + if(db_mode != DB_ONLY) { + LM_ERR("rm expired delay feature is available for db only mode\n"); + return -1; + } + } + if(ul_rm_expired_delay<0) { + LM_WARN("rm expired delay value is negative (%d) - setting it to 0\n", + ul_rm_expired_delay); + ul_rm_expired_delay = 0; + } if(sruid_init(&_ul_sruid, '-', "ulcx", SRUID_INC)<0) return -1;

1 0

git:master:06408532: usrloc: renamed dmq specific flag from FL_RPL to FL_DMQRPL
by Daniel-Constantin Mierla 19 Jan '18

19 Jan '18

Module: kamailio Branch: master Commit: 0640853223af068f191fea62790e00d7a6b4319f URL: https://github.com/kamailio/kamailio/commit/0640853223af068f191fea62790e00d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:32:24+01:00 usrloc: renamed dmq specific flag from FL_RPL to FL_DMQRPL --- Modified: src/modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/0640853223af068f191fea62790e00d… Patch: https://github.com/kamailio/kamailio/commit/0640853223af068f191fea62790e00d… --- diff --git a/src/modules/usrloc/usrloc.h b/src/modules/usrloc/usrloc.h index fbec7d844a..ef3572262c 100644 --- a/src/modules/usrloc/usrloc.h +++ b/src/modules/usrloc/usrloc.h @@ -61,7 +61,7 @@ typedef enum cstate { typedef enum flags { FL_NONE = 0, /*!< No flags set */ FL_MEM = 1 << 0, /*!< Update memory only */ - FL_RPL = 1 << 1, /*!< DMQ replication */ + FL_DMQRPL = 1 << 1, /*!< DMQ replication */ FL_ALL = (int)0xFFFFFFFF /*!< All flags set */ } flags_t;

1 0

git: new commits in branch 5.1
by Daniel-Constantin Mierla 19 Jan '18

19 Jan '18

- URL: https://github.com/kamailio/kamailio/commit/59de2edd14cdc6ca1744269f46e3c93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:18:14+01:00 pua: renamed MI flags to reflect use of RPC (cherry picked from commit 5c7bc8a3c1a289111c08334cc4500291f01324aa) - URL: https://github.com/kamailio/kamailio/commit/2dc91981abe7492ee55588ff0026892… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:18:42+01:00 pua_rpc: use RPC flags for callbacks (cherry picked from commit 4d28f007d71d6b49486483ddc4b5307ea36506d5) - URL: https://github.com/kamailio/kamailio/commit/2001fa779952d424032b8bc074f2c40… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:21:05+01:00 kamctl: use VERIFY_USER variable to control if user check is done - help automating some commands such as acl grant (cherry picked from commit 28f107d0eb48c59f0b89dbd9fc0fa24c599ed5f9) - URL: https://github.com/kamailio/kamailio/commit/fb97acea191903ce28c8950cb95f920… Author: Carlos Cruz <carlos(a)irontec.com> Date: 2018-01-19T09:22:29+01:00 acc: use acc.time_mode to save cdrs in gmtime - reuse acc.time_mode modparam for cdr entries, storing start_time and end_time in gmtime if time_mode is 4. GH #1358 (cherry picked from commit 63f747a9adcba51562b7ec6848d1f6454374bfa4) - URL: https://github.com/kamailio/kamailio/commit/958d096dfdb1b569b1f00a6d11c3382… Author: Carlos Cruz <carlos(a)irontec.com> Date: 2018-01-19T09:22:43+01:00 doc: time_mode param used for cdrs too (cherry picked from commit 49dd734c241be1531bf11bb5d1b3f4a658b35031) - URL: https://github.com/kamailio/kamailio/commit/258d9009e8cd9f01863304ebbffeb4d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:23:45+01:00 app_java: declare global variable in c file instead of header file (cherry picked from commit 93606c35ffdcd55ab98c5704880a6d5375aae299) - URL: https://github.com/kamailio/kamailio/commit/dda0e156a9dc973d1d2cbcd39ce72f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:23:59+01:00 app_java: global variables declared in c files - some renamed to avoid global reference conflicts due to common naming (cherry picked from commit c828cf872fe629381a8c9be24058d63add881071) - URL: https://github.com/kamailio/kamailio/commit/2673911a9866953661e95de7f6d63bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:24:10+01:00 app_java: clang format the code (cherry picked from commit fddc58b97796904a17bb2d01f4480e095a5c4cda) - URL: https://github.com/kamailio/kamailio/commit/789e6126195c00120f1ac79c1e1dec4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:24:25+01:00 app_java: fix writing over the size of allocated buffer (cherry picked from commit 441acf646fa9cf2fd1733f05397a43245b98d322) - URL: https://github.com/kamailio/kamailio/commit/ff37363db2d85178a56b2c3cff51b09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:24:39+01:00 db_berkeley: clang-format the code (cherry picked from commit bbedfa4c3db1b8ae02cabb1fa6b2748b7031c8e8) - URL: https://github.com/kamailio/kamailio/commit/23b03bec84ec605472225373b0f83ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:24:51+01:00 snmpstats: keep sockets list pointer global - they are allocated and content could be referenced at runtime, thus no free - free allocated variables in case of errors (cherry picked from commit 8bc890f595005090479cad1670b4360817f307af) - URL: https://github.com/kamailio/kamailio/commit/5d3be2314434cc5207f9f87773ba8e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:25:05+01:00 snmpstats: clang format the code (cherry picked from commit db0b73b0c69014aa0dee41a78d07800812c10746) - URL: https://github.com/kamailio/kamailio/commit/120bd10b63a948f7179e1335b78692c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:25:18+01:00 call_control: keep reference to allocated buffer used for params (cherry picked from commit 37f6e1e7640b29263e85be9e8958ee14912e20a1) - URL: https://github.com/kamailio/kamailio/commit/fe02ca6c76ab969277a1b5e9092a229… Author: Dmitri Savolainen <savolainen(a)erinaco.ru> Date: 2018-01-19T09:25:47+01:00 pv: correct sbranch params appending - some params (like dest uri) were not appended to branch due to a copy-paste typo (cherry picked from commit e66f109c0d2cf657387ee1e0745ff2d55eebcaaa) - URL: https://github.com/kamailio/kamailio/commit/8428dbeff259e9d80e9715fb682a52a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:26:31+01:00 phonenum: Makefile rules to remove cpp object file (cherry picked from commit f170b300857510e91c7a78454be45b68326fc7b3) - URL: https://github.com/kamailio/kamailio/commit/f23191b8cf85efd5e7cb973608e893b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:27:35+01:00 evapi: detect the OS darwin as substring - adjust condition to suit analyzer (cherry picked from commit 81687628bc5fb90a6b126cd2b89c8725a4c3caab) - URL: https://github.com/kamailio/kamailio/commit/108047648d5f614aea5939060e502bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:27:56+01:00 sctp: removed risky workaround for dealing with old libksctp versions - writing over the size of field may have unexpected results (cherry picked from commit b8fb6f9f453a7ab72ea578e8469ae88a831ca0e9) - URL: https://github.com/kamailio/kamailio/commit/7b5f6f7624e5a6bb47a1ccfb3d29bf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:28:07+01:00 sctp: note about using recent versions for libsctp and kernel (cherry picked from commit 12f313c6c7c9b6a9c12d8ee2693cb955c16afe35) - URL: https://github.com/kamailio/kamailio/commit/54190cdec461b5f85bebb9467159292… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:28:16+01:00 sctp: clang format the code (cherry picked from commit ed5a3b04c79fbe071900d53a207c14a379679092) - URL: https://github.com/kamailio/kamailio/commit/7d6d22f8312eda3487f1826d385d851… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-01-19T09:44:23+01:00 app_lua: LUAJIT variable to build agains LuaJIT compiler (cherry picked from commit 41ff35e2ec3f735f818c19cec6697c913dc1a0f7) - URL: https://github.com/kamailio/kamailio/commit/a573d8faabfe7f34083cd8efff25fde… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-01-19T09:44:42+01:00 app_lua: update doc about LUAJIT variable and building against LuaJIT libraries. (cherry picked from commit 55e3b72692d500a988b085c73fefa87e91ff068b) - URL: https://github.com/kamailio/kamailio/commit/aa75f8543a665b6aac3da2dcf5be10d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:45:04+01:00 core: forward - add note about return code of forward_request() (cherry picked from commit 05509f322d5b4ce23b6e5918f4d6bc4e48678202) - URL: https://github.com/kamailio/kamailio/commit/171e3b9f197ffebaa2b1a1959ba109b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:45:33+01:00 tm: handle success return code by forward_request() for e2e ACK - forward_request() returns 0 on success, propagate 1 to config wrapper (cherry picked from commit 52111974b4571e0562e8e731df80f48dbc504915) - URL: https://github.com/kamailio/kamailio/commit/5a03a7a0a014b14b2e528453cc1641a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:46:52+01:00 topos_redis: store and load local side contacts for branch (cherry picked from commit 98a993661cd4fbb574844fbfb012a052cc8e6989) - URL: https://github.com/kamailio/kamailio/commit/087b629506261576509efde32ac83e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:47:15+01:00 snmpstats: init sigaction var and close fd in case of errors (cherry picked from commit 0b7b291ab153472c7d371c29e0c4dfa20c492f08) - URL: https://github.com/kamailio/kamailio/commit/85555549bac9be735ad81b8deff6c8b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:47:27+01:00 snmpstats: free table_info in case of error for SIPStatusCodesTable (cherry picked from commit 172cfd3494db462593da2d04feb6528f9ad3a84c) - URL: https://github.com/kamailio/kamailio/commit/7e8e7e57608e54de4b81c7522cbec89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:47:37+01:00 snmpstats: free allocated vars in case of error during init snmp tables (cherry picked from commit 4d4c91a709aff0b9b15fcc02b44de2106e65903e) - URL: https://github.com/kamailio/kamailio/commit/f2650f0b0d829f70a44f29afe5cf923… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:47:56+01:00 dialog: replaced inline function with a single log with a macro - makes possible to get the file name and line of its usage (cherry picked from commit eb016670220c20f1156be838ca6645265b64eacc) - URL: https://github.com/kamailio/kamailio/commit/ea7900b1e0557d09d0eb6bd233ae424… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:48:13+01:00 core: resolve - use unsigned short int to match dns result types (cherry picked from commit b46d113e941c5429914069be48faa181ba1e805e) - URL: https://github.com/kamailio/kamailio/commit/27787c332b9ea256e135486e1b4f38f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:48:26+01:00 janssonrpcc: use size of data type to allocate memory (cherry picked from commit dba589a52bddc2833c41c91287a328d22fbc2712) - URL: https://github.com/kamailio/kamailio/commit/461b03d166729c41502c683a6e425dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:48:37+01:00 jsonrpcc: init sockaddr_in structure (cherry picked from commit 539abf29103875f7412b7b3b95c5f6663a7afbe8) - URL: https://github.com/kamailio/kamailio/commit/95e0976ce7e1976664f5ae107936e94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:02+01:00 core: resolve - early safety checks to deal faster with broken dns responses (cherry picked from commit 20752cf945d4ba0660d321d73efff5c93f6d20a8) - URL: https://github.com/kamailio/kamailio/commit/a6ad018a1d7d796272bc0cb07f7540c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:16+01:00 websocket: early check for frame size to fit max buf size - avoid decoding a large buffer and then fail - allocate BUF_SIZE+1 for fragment buffer, coherent with other recv buffers (cherry picked from commit 3302687e2b995ee9faab1655e6bb5e5d4a0dbc87) - URL: https://github.com/kamailio/kamailio/commit/39c698d637def67f79a095279d2ca1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:29+01:00 websocket: clang format the code (cherry picked from commit fa7688bb321bbee3d8d6d6c5692c0d142c0830a3) - URL: https://github.com/kamailio/kamailio/commit/bc9f93c2b4029307ed0549365883605… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:37+01:00 websocket: print len in debug messages when decoding frame (cherry picked from commit 2865a1f16490cadb1c07864f270976d7311373a9) - URL: https://github.com/kamailio/kamailio/commit/23e6e6787daed0e4268ab416dde5bb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:49:51+01:00 xcap_client: cast curl setopt params to avoid analyzer warnings (cherry picked from commit 1f5ba1a5ac2f652cd3a374200411767286803f9f) - URL: https://github.com/kamailio/kamailio/commit/383cce7a1f5eb4229bb6a7982352062… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:50:00+01:00 auth_identity: use app name to set curl user agent (cherry picked from commit 741d39251468429788846c8386f445eeede2f7ba) - URL: https://github.com/kamailio/kamailio/commit/3091e65d9ee1ce4c524f1ef359d6164… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:50:11+01:00 mohqueue: handle return code for pv_parse_format() (cherry picked from commit 571c9993bb42a1c22a575874f186cfef06af19e8) - URL: https://github.com/kamailio/kamailio/commit/4b4346000f8de5026619caac39f2ade… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:50:29+01:00 core: pt - helper function to get description for current process (cherry picked from commit 5c4309e47b0f66c3c4a98145a956bfe0b2ce0953) - URL: https://github.com/kamailio/kamailio/commit/79a09341c2df408254975a7749133a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:50:37+01:00 core: print more details about process when doing child init (cherry picked from commit 71f11210b6b36cf69aaf3c8318bba9da3334c4e0) - URL: https://github.com/kamailio/kamailio/commit/9159c87cac34630e5657d46cfbc009d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:51:25+01:00 presence: pass dbf structure by pointer instead of value to function param - passing large values is not optimal (cherry picked from commit aad751ab54f37f3482641488929133296974025e) - URL: https://github.com/kamailio/kamailio/commit/651ff06669f1a286fe93a2b6a3599ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:51:39+01:00 rls: pass dbf structure by pointer instead of value to function param (cherry picked from commit 5097954ce5dbbd1094a022f3ae014c77e389aecb) - URL: https://github.com/kamailio/kamailio/commit/19e32304bfd2ba49cf936db043d26b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:52:07+01:00 http_client: cast parameter to curl function to avoid warnings (cherry picked from commit bab289f36b189a2836ef51acc9e26aed422a7dad) - URL: https://github.com/kamailio/kamailio/commit/93e1da2a8313e19084f13caacfc21fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:52:20+01:00 snmpstats: check the return code when registering statistics (cherry picked from commit 5b00ef8bb31fb029b2d4dedae40e2c7a54841fe6) - URL: https://github.com/kamailio/kamailio/commit/73a5f47e07cafbddb4382c371f6c61d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:52:30+01:00 snmpstats: safety checks on hdr variable (cherry picked from commit 74c02fdb1cd04d674046c38bc2f5193f91da4edf) - URL: https://github.com/kamailio/kamailio/commit/0c2daaf795c5dab543c2b38acddd27d… Author: Hugh Waite <hughw273(a)gmail.com> Date: 2018-01-19T09:52:48+01:00 pkg/kamailio/obs: Minor improvements to kamailio.init file Use $PROG instead of uninitialised $DESC Pass the .cfg file name as a parameter when starting and checking config Use the pidfile when stopping to allow parallel instances (cherry picked from commit f06cad16ddd38771f29bfba29161bfa3ec76354f) - URL: https://github.com/kamailio/kamailio/commit/d54d3244f9496b7963ff8b722ea0431… Author: Hugh Waite <hughw273(a)gmail.com> Date: 2018-01-19T09:52:57+01:00 pkg/kamailio/obs: Move ims_ocs module to ims RPM This module has a dependancy on libkamailio_ims.so so it belongs within the IMS RPM. (cherry picked from commit 6a7ea3d489175659cbfcca4088a8cd26b9352273) - URL: https://github.com/kamailio/kamailio/commit/b05f1eb0248c6a48288d67ffbca3091… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:53:17+01:00 core: typedefed struct proxy_l to proxy_l_t (cherry picked from commit a41db4b0f56eccb8fb12c3c8257fd677d6c62537) - URL: https://github.com/kamailio/kamailio/commit/c7dd9321976c2fed34b58d1cdcdf306… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:53:27+01:00 core: typedefed struct onsend_info to onsend_info_t (cherry picked from commit 697c19b016fb1b0f7678716f31462d3f54d60719) - URL: https://github.com/kamailio/kamailio/commit/d446a4fa070c00db940010c0be02822… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:53:40+01:00 siptrace: define max size for address buffers - use struct types (cherry picked from commit f9b98c647d2de1c279d370a5fb5b49201c117d8a) - URL: https://github.com/kamailio/kamailio/commit/67a796cf731421819b6a5d85a387b96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:53:57+01:00 siptrace: use safety macros to copy values building address buffers (cherry picked from commit ed4a2bc477ebaf60d2fa82a3993dd5a61b54d9d3) - URL: https://github.com/kamailio/kamailio/commit/4d56c16c38b92f0f2ce07daadb9cbb2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:54:09+01:00 siptrace: siptrace_copy_proto() converted to macro (cherry picked from commit aaf3b2e35bf58ad19b2b375f26909b102b7d512f) - URL: https://github.com/kamailio/kamailio/commit/257d351cddef0a8607f93b7cd7c82c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:54:20+01:00 siptrace: retrieve and use the len of proto when building the address (cherry picked from commit 8f51d6b1624ebca08e71061e0c18c68101595201) - URL: https://github.com/kamailio/kamailio/commit/03d584a5db8a71515a2dc3e8f1b3e24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:54:53+01:00 pua: safety check on tuple_id len (cherry picked from commit 2bb33a88881eacb94e2af54d564cdffc00478cea) - URL: https://github.com/kamailio/kamailio/commit/53e21ff455f42905cbd4ee5100d2c44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:55:49+01:00 siptrace: replaced sequeces of string concatenations with safer formatted print - used to build proxy-like addresses (cherry picked from commit 2e46081424240dfb3767da74b0818249dff46802) - URL: https://github.com/kamailio/kamailio/commit/2c790c0c2ccdeb1978bd5ac34d0cd1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:56:00+01:00 siptrace: use same value for "any" address - two variants were used: any:255.255.255.255:5060 and any:255.255.255.255, now any:255.255.255.255:5060 is used everywhere through a define (cherry picked from commit 2ae4d19a5948d771980853bf38aeef8c1553faec) - URL: https://github.com/kamailio/kamailio/commit/c98cd35dec2eaac78a24150d8f0c550… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:56:23+01:00 drouting: free max val for time recurrence struct on update if already set - reported by Uri Shacked (cherry picked from commit e0f95ea7fc691f976564b07436848673c633195d) - URL: https://github.com/kamailio/kamailio/commit/08fd66009294baa4a02e83aee9d48b7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:56:33+01:00 drouting: option to use a static structure for computing ac max val (cherry picked from commit b3e14fc9bd379ad77c13ade0bc60dc32f1d55ade) - URL: https://github.com/kamailio/kamailio/commit/fd9fa1787e28e8e072459e620f5798c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:56:49+01:00 siptrace: simplified internal sip_trace() function using now formatted print (cherry picked from commit 788f81af006f481b23606451d225a86b6b02aac8) - URL: https://github.com/kamailio/kamailio/commit/8a2d2c90d9116744dcc9f54f10b7439… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:57:39+01:00 pipelimit: remove mutiplying the limit with timer interval for TAILDROP alg - the limit is documented as per interval, not per second (closes GH #1390) - renamed macro for default limit to use module specific prefix (cherry picked from commit 1880f1f8be4b51cec2a0567580828e9ac449947d) - URL: https://github.com/kamailio/kamailio/commit/407b257d4ef56730e04888259764ca6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:57:51+01:00 pipelimit: docs - more details about timer interval and limit values (cherry picked from commit 93cfd4e8581fed04d4e596ed7f3d284c53fc5501) - URL: https://github.com/kamailio/kamailio/commit/84e451d44269da540969fc562f5d981… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:58:14+01:00 db2_ops: proper check for memory allocation pointer - check result codes for registering script callbacks (cherry picked from commit 1f9366ab5978ee4aa8fd3cefea0393c94889c26e) - URL: https://github.com/kamailio/kamailio/commit/e900b9450f0f9e8c3adab1610ee0dcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T09:59:19+01:00 core: tcp - typedefed structs (cherry picked from commit edb3d6d848c9ccf85b077950ecf6aec7acf3e5b6) - URL: https://github.com/kamailio/kamailio/commit/a812a627729eda9b6520d805524603e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:00:04+01:00 topos: store and load tags in transaction record (cherry picked from commit 5b2b06ceff61144c5f0cbddacdfcaee18a2e8eff) - URL: https://github.com/kamailio/kamailio/commit/8d3a0145cd603f5e323cb5ea6de0cef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:00:14+01:00 topos_redis: store tags in transaction records (cherry picked from commit 883d49d5ed2cc6140c583559d0f61bde3fa6fdb5) - URL: https://github.com/kamailio/kamailio/commit/11cfb840ad58445b19ec27f73653bb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:00:36+01:00 topos: set uuid fields before checking contact/rr fields (cherry picked from commit 97532ca18f595d89edf9b0b6e6688847aa38dd44) - URL: https://github.com/kamailio/kamailio/commit/be8070c3a9fe4c33ad017f9272e76eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:00:54+01:00 topos: docs - more explicit info about required use of record_route() (cherry picked from commit 4e659b5f3cd9b176e3bf2e20ceebf34d9734707b) - URL: https://github.com/kamailio/kamailio/commit/040a8d2c5863527ac3d26afbd04b7a1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:06+01:00 topos: print warn message when local address is not set (cherry picked from commit ce9f67581f45a00fd879329ffc918b2a7ef9b8d0) - URL: https://github.com/kamailio/kamailio/commit/c60e7025761f7b4a767c8219304cf24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:20+01:00 tm: handle rpc tm.t_uac_start only with From and To headers - reported by GH #1393 (cherry picked from commit 6feb28266210a8210d31d7dac49cf3ea3da06164) - URL: https://github.com/kamailio/kamailio/commit/d23c5d782aaef224e283766e8faeb9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:35+01:00 exec: small typo in log message (cherry picked from commit 8a501f2be2860b1bfd0b9a3d1f63d85f4654fd01) - URL: https://github.com/kamailio/kamailio/commit/f622be60abe31bc4d0618b92caddced… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:45+01:00 exec: clang format the code (cherry picked from commit 34ec1fc381916ee2ce7b08afce413bf2aa427a55) - URL: https://github.com/kamailio/kamailio/commit/ee21e28cb2632d4a7c421c93fae0974… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:01:56+01:00 exec: more info in log messages when uri parsing fails (cherry picked from commit 74c9f53aa736b9d2581666a8a75bc685156447f4) - URL: https://github.com/kamailio/kamailio/commit/a7a087879b850db336c8611349d533b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-19T10:02:53+01:00 siptrace: use formatted print for addresses inside trace_onreq_out() (cherry picked from commit 219072f0ef43eff1a5d4947f6fd71f2fd4fb7d1f) - URL: https://github.com/kamailio/kamailio/commit/f5e9533b0149fdb3f000d2c837075b0… Author: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-01-19T10:03:09+01:00 CDP: Safety checks and warnings for adding applications to a peer definition (cherry picked from commit 72bbf9280879475dcdbda59f00b75a274885abaa)

1 0

git:master:72bbf928: CDP: Safety checks and warnings for adding applications to a peer definition
by Carsten Bock 18 Jan '18

18 Jan '18

Module: kamailio Branch: master Commit: 72bbf9280879475dcdbda59f00b75a274885abaa URL: https://github.com/kamailio/kamailio/commit/72bbf9280879475dcdbda59f00b75a2… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2018-01-18T20:11:50+01:00 CDP: Safety checks and warnings for adding applications to a peer definition --- Modified: src/modules/cdp/peer.h Modified: src/modules/cdp/peerstatemachine.c --- Diff: https://github.com/kamailio/kamailio/commit/72bbf9280879475dcdbda59f00b75a2… Patch: https://github.com/kamailio/kamailio/commit/72bbf9280879475dcdbda59f00b75a2… --- diff --git a/src/modules/cdp/peer.h b/src/modules/cdp/peer.h index c4005515fd..daea465519 100644 --- a/src/modules/cdp/peer.h +++ b/src/modules/cdp/peer.h @@ -101,6 +101,7 @@ typedef struct _peer_t{ str src_addr; /**< IP Address used to connect to the peer */ app_config *applications;/**< list of supported applications */ + int applications_max; /**< size of list of supporter applications*/ int applications_cnt; /**< size of list of supporter applications*/ gen_lock_t *lock; /**< lock for operations with this peer */ diff --git a/src/modules/cdp/peerstatemachine.c b/src/modules/cdp/peerstatemachine.c index 641ec8c7bd..5100e508e8 100644 --- a/src/modules/cdp/peerstatemachine.c +++ b/src/modules/cdp/peerstatemachine.c @@ -670,9 +670,15 @@ void add_peer_application(peer *p, int id, int vendor, app_type type) p->applications[i].vendor == vendor && p->applications[i].type == type) return; + if (p->applications_cnt > p->applications_max) { + LM_ERR("Too many applications for this peer (max %i), not adding Application %i:%i.\n", p->applications_max, id, vendor); + return; + } + p->applications[p->applications_cnt].id = id; p->applications[p->applications_cnt].vendor = vendor; p->applications[p->applications_cnt].type = type; + LM_DBG("Application %i of maximum %i\n", p->applications_cnt, p->applications_max); p->applications_cnt++; } @@ -724,6 +730,7 @@ void save_peer_applications(peer *p,AAAMessage *msg) } p->applications_cnt = 0; p->applications = shm_malloc(sizeof(app_config)*total_cnt); + p->applications_max = total_cnt; if (!p->applications){ LM_ERR("save_peer_applications(): Error allocating %ld bytes! No applications saved...\n", (long int)(sizeof(app_config)*total_cnt)); @@ -1305,5 +1312,3 @@ void Rcv_Process(peer *p, AAAMessage *msg) // AAAPrintMessage(msg); } - -

1 0

[kamailio/kamailio] Kamailio crashes with debug level > 2 and registering from certain SIP clients (#1403)
by mechanixza 18 Jan '18

18 Jan '18

### Description  When registering a soft client running on my Android phone (Grandstream Wave), Kamailio crashes every time when the client registers. When setting the debug level below 3 Kamailio does not crash. I have only found the problem with this SIP client. Others are working fine. ### Troubleshooting #### Reproduction  Set debug level greather than 2 and register the Grandstream Wave soft client from an Android phone. Kamailio then crashes. #### Log Messages  just before crashing I get the following message: 0(7819) ERROR: <core> [core/udp_server.c:484]: udp_rcv_loop(): print buffer building failed (10/16/4) ### Possible Solutions  The problem seems to come from non-printable characters sent by the SIP client causing Kamailio to crash. Changing line 482 in udp_server.c from l = snprintf(printbuf+j, 6, " %02X ", buf[i]); to l = snprintf(printbuf+j, 6, " %02X ", (unsigned char)buf[i]); fixes the problem. The compiler treats buf[i] as a signed integer and prepends 'FFFFFF' to the string making it longer than 6 characters. Casting buf[i] as an unsigned char prevents Kamailio from crashing. ### Additional Information * **Kamailio Version** - output of `kamailio -v` version: kamailio 5.1.0 (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 with gcc 5.3.1 * **Operating System**:  Ubuntu 16.04 (Xenial) -- 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/1403

3 5

git:master:219072f0: siptrace: use formatted print for addresses inside trace_onreq_out()
by Daniel-Constantin Mierla 18 Jan '18

18 Jan '18

Module: kamailio Branch: master Commit: 219072f0ef43eff1a5d4947f6fd71f2fd4fb7d1f URL: https://github.com/kamailio/kamailio/commit/219072f0ef43eff1a5d4947f6fd71f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-18T17:40:42+01:00 siptrace: use formatted print for addresses inside trace_onreq_out() --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/219072f0ef43eff1a5d4947f6fd71f2… Patch: https://github.com/kamailio/kamailio/commit/219072f0ef43eff1a5d4947f6fd71f2… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 3636a0929e..924c4f52e7 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1093,12 +1093,16 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) sto.fromip = trace_local_ip; } else { if(dst == 0 || dst->send_sock == 0 || dst->send_sock->sock_str.s == 0) { - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), + ip_addr2a(&msg->rcv.dst_ip), (int)msg->rcv.dst_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.fromip.s = sto.fromip_buff; + } } else { sto.fromip = dst->send_sock->sock_str; } @@ -1109,13 +1113,16 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { su2ip_addr(&to_ip, &dst->to); - siptrace_copy_proto(dst->proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&to_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, - int2str((unsigned long)su_getport(&dst->to), &len)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(dst->proto), + ip_addr2a(&to_ip), (int)su_getport(&dst->to)); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } } sto.dir = "out";

1 0

git:5.1:476a922a: core: udp server - cast printed debug chars to unsigned
by Daniel-Constantin Mierla 17 Jan '18

17 Jan '18

Module: kamailio Branch: 5.1 Commit: 476a922ad4d50b05a95e43c20c4a2b8b6a98a78f URL: https://github.com/kamailio/kamailio/commit/476a922ad4d50b05a95e43c20c4a2b8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-17T22:49:45+01:00 core: udp server - cast printed debug chars to unsigned - reported by GH #1403 (cherry picked from commit 64a391a2408b1d34569947f8b028915ec3462e6d) --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/476a922ad4d50b05a95e43c20c4a2b8… Patch: https://github.com/kamailio/kamailio/commit/476a922ad4d50b05a95e43c20c4a2b8… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index b88d3d8f51..3d54c5a9a6 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -479,7 +479,7 @@ int udp_rcv_loop() if(isprint(buf[i])) { printbuf[j++] = buf[i]; } else { - l = snprintf(printbuf+j, 6, " %02X ", buf[i]); + l = snprintf(printbuf+j, 6, " %02X ", (unsigned char)buf[i]); if(l<0 || l>=6) { LM_ERR("print buffer building failed (%d/%d/%d)\n", l, j, i);

1 0

git:5.1:d07ecc13: core: udp server - continue when failing to print debug with received chars
by Daniel-Constantin Mierla 17 Jan '18

17 Jan '18

Module: kamailio Branch: 5.1 Commit: d07ecc133d297adfc9a791f1d8eecf3e7250cbf7 URL: https://github.com/kamailio/kamailio/commit/d07ecc133d297adfc9a791f1d8eecf3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-17T22:49:58+01:00 core: udp server - continue when failing to print debug with received chars - reported by GH #1403 (cherry picked from commit 099e784a250581d0c124d6110d3953bfc0716930) --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/d07ecc133d297adfc9a791f1d8eecf3… Patch: https://github.com/kamailio/kamailio/commit/d07ecc133d297adfc9a791f1d8eecf3… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 3d54c5a9a6..def3ac1861 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -483,7 +483,7 @@ int udp_rcv_loop() if(l<0 || l>=6) { LM_ERR("print buffer building failed (%d/%d/%d)\n", l, j, i); - goto error; + continue; /* skip it */ } j += l; }

1 0

git:master:099e784a: core: udp server - continue when failing to print debug with received chars
by Daniel-Constantin Mierla 17 Jan '18

17 Jan '18

Module: kamailio Branch: master Commit: 099e784a250581d0c124d6110d3953bfc0716930 URL: https://github.com/kamailio/kamailio/commit/099e784a250581d0c124d6110d3953b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-17T22:48:11+01:00 core: udp server - continue when failing to print debug with received chars - reported by GH #1403 --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/099e784a250581d0c124d6110d3953b… Patch: https://github.com/kamailio/kamailio/commit/099e784a250581d0c124d6110d3953b… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index 3d54c5a9a6..def3ac1861 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -483,7 +483,7 @@ int udp_rcv_loop() if(l<0 || l>=6) { LM_ERR("print buffer building failed (%d/%d/%d)\n", l, j, i); - goto error; + continue; /* skip it */ } j += l; }

1 0

git:master:64a391a2: core: udp server - cast printed debug chars to unsigned
by Daniel-Constantin Mierla 17 Jan '18

17 Jan '18

Module: kamailio Branch: master Commit: 64a391a2408b1d34569947f8b028915ec3462e6d URL: https://github.com/kamailio/kamailio/commit/64a391a2408b1d34569947f8b028915… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-17T22:37:10+01:00 core: udp server - cast printed debug chars to unsigned - reported by GH #1403 --- Modified: src/core/udp_server.c --- Diff: https://github.com/kamailio/kamailio/commit/64a391a2408b1d34569947f8b028915… Patch: https://github.com/kamailio/kamailio/commit/64a391a2408b1d34569947f8b028915… --- diff --git a/src/core/udp_server.c b/src/core/udp_server.c index b88d3d8f51..3d54c5a9a6 100644 --- a/src/core/udp_server.c +++ b/src/core/udp_server.c @@ -479,7 +479,7 @@ int udp_rcv_loop() if(isprint(buf[i])) { printbuf[j++] = buf[i]; } else { - l = snprintf(printbuf+j, 6, " %02X ", buf[i]); + l = snprintf(printbuf+j, 6, " %02X ", (unsigned char)buf[i]); if(l<0 || l>=6) { LM_ERR("print buffer building failed (%d/%d/%d)\n", l, j, i);

1 0

git:master:74c9f53a: exec: more info in log messages when uri parsing fails
by Daniel-Constantin Mierla 17 Jan '18

17 Jan '18

Module: kamailio Branch: master Commit: 74c9f53aa736b9d2581666a8a75bc685156447f4 URL: https://github.com/kamailio/kamailio/commit/74c9f53aa736b9d2581666a8a75bc68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-17T22:23:35+01:00 exec: more info in log messages when uri parsing fails --- Modified: src/modules/exec/exec_hf.c --- Diff: https://github.com/kamailio/kamailio/commit/74c9f53aa736b9d2581666a8a75bc68… Patch: https://github.com/kamailio/kamailio/commit/74c9f53aa736b9d2581666a8a75bc68… --- diff --git a/src/modules/exec/exec_hf.c b/src/modules/exec/exec_hf.c index 9b5a54a955..5f79441e6a 100644 --- a/src/modules/exec/exec_hf.c +++ b/src/modules/exec/exec_hf.c @@ -78,9 +78,9 @@ static int insert_hf(struct hf_wrapper **list, struct hdr_field *hf) /* if it is OTHER, check name too */ if(hf->type == HDR_OTHER_T && (hf->name.len != i->u.hf->name.len - || strncasecmp(i->u.hf->name.s, hf->name.s, - hf->name.len) - != 0)) + || strncasecmp(i->u.hf->name.s, hf->name.s, + hf->name.len) + != 0)) continue; /* yes, we found a hf of same type */ w->next_same = i->next_same; @@ -472,14 +472,14 @@ static int append_fixed_vars(struct sip_msg *msg, struct hf_wrapper **list) } /* request URI */ uri = msg->new_uri.s && msg->new_uri.len ? &msg->new_uri - : &msg->first_line.u.request.uri; + : &msg->first_line.u.request.uri; if(!append_var(EV_RURI, uri->s, uri->len, list)) { LM_ERR("append_var URI failed\n"); return 0; } /* userpart of request URI */ if(parse_uri(uri->s, uri->len, &parsed_uri) < 0) { - LM_WARN("uri not parsed\n"); + LM_WARN("uri not parsed (%.*s)\n", uri->len, ZSW(uri->s)); } else { if(!append_var(EV_USER, parsed_uri.user.s, parsed_uri.user.len, list)) { LM_ERR("append_var USER failed\n"); @@ -488,18 +488,19 @@ static int append_fixed_vars(struct sip_msg *msg, struct hf_wrapper **list) } /* original URI */ if(!append_var(EV_ORURI, msg->first_line.u.request.uri.s, - msg->first_line.u.request.uri.len, list)) { + msg->first_line.u.request.uri.len, list)) { LM_ERR("append_var O-URI failed\n"); goto error; } /* userpart of request URI */ if(parse_uri(msg->first_line.u.request.uri.s, - msg->first_line.u.request.uri.len, &oparsed_uri) - < 0) { - LM_WARN("orig URI not parsed\n"); + msg->first_line.u.request.uri.len, &oparsed_uri) < 0) { + LM_WARN("orig URI not parsed (%.*s)\n", + msg->first_line.u.request.uri.len, + ZSW( msg->first_line.u.request.uri.s)); } else { if(!append_var( - EV_OUSER, oparsed_uri.user.s, oparsed_uri.user.len, list)) { + EV_OUSER, oparsed_uri.user.s, oparsed_uri.user.len, list)) { LM_ERR("append_var OUSER failed\n"); goto error; }

1 0

git:master:34ec1fc3: exec: clang format the code
by Daniel-Constantin Mierla 17 Jan '18

17 Jan '18

Module: kamailio Branch: master Commit: 34ec1fc381916ee2ce7b08afce413bf2aa427a55 URL: https://github.com/kamailio/kamailio/commit/34ec1fc381916ee2ce7b08afce413bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-17T22:18:20+01:00 exec: clang format the code --- Modified: src/modules/exec/exec.c Modified: src/modules/exec/exec.h Modified: src/modules/exec/exec_hf.c Modified: src/modules/exec/exec_hf.h Modified: src/modules/exec/exec_mod.c Modified: src/modules/exec/kill.c Modified: src/modules/exec/kill.h --- Diff: https://github.com/kamailio/kamailio/commit/34ec1fc381916ee2ce7b08afce413bf… Patch: https://github.com/kamailio/kamailio/commit/34ec1fc381916ee2ce7b08afce413bf…

1 0

git:master:8a501f2b: exec: small typo in log message
by Daniel-Constantin Mierla 17 Jan '18

17 Jan '18

Module: kamailio Branch: master Commit: 8a501f2be2860b1bfd0b9a3d1f63d85f4654fd01 URL: https://github.com/kamailio/kamailio/commit/8a501f2be2860b1bfd0b9a3d1f63d85… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-17T15:05:59+01:00 exec: small typo in log message --- Modified: src/modules/exec/exec_hf.c --- Diff: https://github.com/kamailio/kamailio/commit/8a501f2be2860b1bfd0b9a3d1f63d85… Patch: https://github.com/kamailio/kamailio/commit/8a501f2be2860b1bfd0b9a3d1f63d85… --- diff --git a/src/modules/exec/exec_hf.c b/src/modules/exec/exec_hf.c index e8404216b3..db6d60da3e 100644 --- a/src/modules/exec/exec_hf.c +++ b/src/modules/exec/exec_hf.c @@ -483,7 +483,7 @@ static int append_fixed_vars(struct sip_msg *msg, struct hf_wrapper **list) } else { if (!append_var(EV_OUSER, oparsed_uri.user.s, oparsed_uri.user.len, list)) { - LM_ERR("ppend_var OUSER failed\n"); + LM_ERR("append_var OUSER failed\n"); goto error; } }

1 0

[kamailio/kamailio] Commande tm.t_uac_start issue (#1393)
by JuanPascual2 16 Jan '18

16 Jan '18

Commande tm._uac_start JsonRPC with Headers From, To and Fake works {"id":1,"jsonrpc":"2.0","method":"tm.t_uac_start","params":["REGISTER","sip:suio.com","sip:101.155.139.171:5060","udp:10.155.139.170:5064","From:sip:juan@sui.com\r\nTo:sip:juan@sui.com\r\nFake:hedear\r\n"]} { "jsonrpc": "2.0", "result": { }, "id": 1 } But commande tm.t_uac_start JsonRPC with only Headers From and To doesn't works {"id":1,"jsonrpc":"2.0","method":"tm.t_uac_start","params":["REGISTER","sip:suio.com","sip:101.155.139.171:5060","udp:10.155.139.170:5064","From:sip:juan@sui.com\r\nTo:sip:juan@sui.com\r\n"]} { "jsonrpc": "2.0", "error": { "code": 500, "message": "out of memory" }, "id": 1 } On documentation module tm, only From and To headers are mandatories. 5. RPC Commands 5.1. tm.t_uac_start Generates and sends a local SIP request. Parameters: method - request method RURI - request SIP URI NEXT HOP - next hop SIP URI (OBP); use “.” if no value. socket - local socket to be used for sending the request; use “.” if no value. headers - set of additional headers to be added to the request; at least “From” and “To” headers must be provided) body - (optional, may not be present) request body (if present, requires the “Content-Type” and “Content-length” headers) Best regard Juan -- 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/1393

2 4

git:master:6feb2826: tm: handle rpc tm.t_uac_start only with From and To headers
by Daniel-Constantin Mierla 16 Jan '18

16 Jan '18

Module: kamailio Branch: master Commit: 6feb28266210a8210d31d7dac49cf3ea3da06164 URL: https://github.com/kamailio/kamailio/commit/6feb28266210a8210d31d7dac49cf3e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-16T16:00:37+01:00 tm: handle rpc tm.t_uac_start only with From and To headers - reported by GH #1393 --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/6feb28266210a8210d31d7dac49cf3e… Patch: https://github.com/kamailio/kamailio/commit/6feb28266210a8210d31d7dac49cf3e… --- diff --git a/src/modules/tm/rpc_uac.c b/src/modules/tm/rpc_uac.c index 2247c043d9..ec81f69450 100644 --- a/src/modules/tm/rpc_uac.c +++ b/src/modules/tm/rpc_uac.c @@ -133,8 +133,8 @@ static int rpc_uac_check_msg(rpc_t *rpc, void* c, * @return pkg_malloc'ed header block on success (with *l set to its length), * 0 on error. */ -static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, - struct socket_info* ssock, int* l) +static int get_hfblock(str *uri, struct hdr_field *hf, int proto, + struct socket_info* ssock, str* hout) { struct str_list sl, *last, *i, *foo; int p, frag_len, total_len; @@ -142,6 +142,8 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, str *sock_name, *portname; struct dest_info di; + hout->s = NULL; + hout->len = 0; ret = 0; /* pessimist: assume failure */ total_len = 0; last = &sl; @@ -209,7 +211,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, if(total_len==0) { LM_DBG("empty result for headers block\n"); - goto error; + return 1;; } /* construct a single header block now */ @@ -227,8 +229,9 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, dst += foo->s.len; pkg_free(foo); } - *l = total_len; - return ret; + hout->len = total_len; + hout->s = ret; + return 0; error: i = sl.next; @@ -237,8 +240,7 @@ static char *get_hfblock(str *uri, struct hdr_field *hf, int proto, i = i->next; pkg_free(foo); } - *l = 0; - return 0; + return -1; } @@ -500,10 +502,9 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) if (rpc_uac_check_msg(rpc, c, &faked_msg, &method, &body, &fromtag, &cseq_is, &cseq, &callid)<0) goto error; - hfb.s=get_hfblock(nexthop.len? &nexthop: &ruri, faked_msg.headers, - PROTO_NONE, ssock, &hfb.len); - if (hfb.s==0){ - rpc->fault(c, 500, "out of memory"); + if(get_hfblock(nexthop.len? &nexthop: &ruri, faked_msg.headers, + PROTO_NONE, ssock, &hfb)<0) { + rpc->fault(c, 500, "Failed to build headers block"); goto error; } /* proceed to transaction creation */ @@ -534,7 +535,7 @@ static void rpc_t_uac(rpc_t* rpc, void* c, int reply_wait) memset(&uac_req, 0, sizeof(uac_req)); uac_req.method=&method; - uac_req.headers=&hfb; + if(hfb.s!=NULL && hfb.len>0) uac_req.headers=&hfb; uac_req.body=body.len?&body:0; uac_req.dialog=&dlg; if (reply_wait){ @@ -732,10 +733,9 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, LM_ERR("checking values failed\n"); goto error; } - hfb.s=get_hfblock(nexthop->len? nexthop: ruri, faked_msg.headers, - PROTO_NONE, ssock, &hfb.len); - if (hfb.s==0){ - LM_ERR("out of memory"); + if(get_hfblock(nexthop->len? nexthop: ruri, faked_msg.headers, + PROTO_NONE, ssock, &hfb)<0) { + LM_ERR("failed to get the block of headers"); goto error; } /* proceed to transaction creation */ @@ -766,7 +766,7 @@ int t_uac_send(str *method, str *ruri, str *nexthop, str *send_socket, memset(&uac_req, 0, sizeof(uac_req)); uac_req.method=method; - uac_req.headers=&hfb; + if(hfb.s!=NULL && hfb.len>0) uac_req.headers=&hfb; uac_req.body=body->len?body:0; uac_req.dialog=&dlg;

1 0

Question about cdp development
by Alfonso Pinto 16 Jan '18

16 Jan '18

Hi all, I've to develop a module that uses cdp to contact an HSS. To understand how to use cdp API I'm looking into other modules that already use it. Of course, I read also the module documentation. Looking into ims-registrar-scscf I found something that triggers my curiosity. My question is about this https://github.com/kamailio/kamailio/blob/master/src/modules/ims_registrar_… The effect of that part is that the callback is going to be added only once. In that case, why bother with the lock and the shared variable when the initialisation could be done in mod_init()? If someone can answer it I would be really grateful. Cheers, Alfonso.

1 0

git:master:ce9f6758: topos: print warn message when local address is not set
by Daniel-Constantin Mierla 16 Jan '18

16 Jan '18

Module: kamailio Branch: master Commit: ce9f67581f45a00fd879329ffc918b2a7ef9b8d0 URL: https://github.com/kamailio/kamailio/commit/ce9f67581f45a00fd879329ffc918b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-16T09:06:36+01:00 topos: print warn message when local address is not set --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/ce9f67581f45a00fd879329ffc918b2… Patch: https://github.com/kamailio/kamailio/commit/ce9f67581f45a00fd879329ffc918b2… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 9d56cb945e..95f1097bd6 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -383,6 +383,9 @@ int tps_storage_record(sip_msg_t *msg, tps_data_t *td, int dialog) if(ret<0) goto error; ret = tps_storage_link_msg(msg, td, TPS_DIR_DOWNSTREAM); if(ret<0) goto error; + if(td->as_contact.len <= 0 && td->bs_contact.len <= 0) { + LM_WARN("no local address - do record routing for all initial requests\n"); + } if(dialog==0) { ret = _tps_storage_api.insert_dialog(td); if(ret<0) goto error;

1 0

git:master:d1f1b08e: modules: readme files regenerated - topos ... [skip ci]
by Kamailio Dev 16 Jan '18

16 Jan '18

Module: kamailio Branch: master Commit: d1f1b08e757955158b73841f344b993d52b26d29 URL: https://github.com/kamailio/kamailio/commit/d1f1b08e757955158b73841f344b993… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-16T09:01:41+01:00 modules: readme files regenerated - topos ... [skip ci] --- Modified: src/modules/topos/README --- Diff: https://github.com/kamailio/kamailio/commit/d1f1b08e757955158b73841f344b993… Patch: https://github.com/kamailio/kamailio/commit/d1f1b08e757955158b73841f344b993… --- diff --git a/src/modules/topos/README b/src/modules/topos/README index cf4bce61f6..c921117131 100644 --- a/src/modules/topos/README +++ b/src/modules/topos/README @@ -84,7 +84,10 @@ Chapter 1. Admin Guide The module is transparent for the configuration writer. It only needs to be loaded (tune the parameters if needed). - It works for SIP MESSAGE requests. + It also works for SIP MESSAGE or other requests that do not create a + call dialog -- record_route() must be used for them as well, the + headers are not going to be in the messages sent to the network, they + are needed to know local addresses used to communicate with each side. 2. Dependencies @@ -95,7 +98,8 @@ Chapter 1. Admin Guide The following modules must be loaded before this module: * rr module - server must perform record routing to ensure in-dialog - requests are encoded/decoded. + requests are encoded/decoded (it must be done for all initial + requests). * database module - to store the data for topology stripping and restoring.

1 0

git:master:22e4167e: modules: readme files regenerated - tcpops ... [skip ci]
by Kamailio Dev 16 Jan '18

16 Jan '18

Module: kamailio Branch: master Commit: 22e4167ebca08ee0fca155e9a230fd719e00a6e7 URL: https://github.com/kamailio/kamailio/commit/22e4167ebca08ee0fca155e9a230fd7… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-15T13:01:30+01:00 modules: readme files regenerated - tcpops ... [skip ci] --- Modified: src/modules/tcpops/README --- Diff: https://github.com/kamailio/kamailio/commit/22e4167ebca08ee0fca155e9a230fd7… Patch: https://github.com/kamailio/kamailio/commit/22e4167ebca08ee0fca155e9a230fd7… --- diff --git a/src/modules/tcpops/README b/src/modules/tcpops/README index b0a0c3b9e1..896eed34a6 100644 --- a/src/modules/tcpops/README +++ b/src/modules/tcpops/README @@ -30,6 +30,7 @@ Olle E. Johansson 3.4. tcp_keepalive_disable([conid]) 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) + 3.7. tcp_get_conid(hostport, pvname) 4. Event routes @@ -47,6 +48,7 @@ Olle E. Johansson 1.5. tcp_keepalive_disable usage 1.6. tcp_set_connection_lifetime usage 1.7. tcp_set_closed_event usage + 1.8. tcp_get_conid usage Chapter 1. Admin Guide @@ -65,6 +67,7 @@ Chapter 1. Admin Guide 3.4. tcp_keepalive_disable([conid]) 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) + 3.7. tcp_get_conid(hostport, pvname) 4. Event routes @@ -114,6 +117,7 @@ modparam("tcpops", "closed_event", 0) 3.4. tcp_keepalive_disable([conid]) 3.5. tcp_set_connection_lifetime([conid], lifetime) 3.6. tcp_enable_closed_event([conid]) + 3.7. tcp_get_conid(hostport, pvname) 3.1. tcp_conid_alive(conid) @@ -292,6 +296,29 @@ event_route[tcp:closed] { xlog("connection $conid was closed"); } +3.7. tcp_get_conid(hostport, pvname) + + Get the connection id based on target host:port. The connection id is + set in the variable named by pvname parameter. + + Meaning of the parameters is as follows: + * hostport - target "host:port" address, the port can be ommited + (default to 5060) and the parameter can contain variables. + * pvname - target variable name. + + Return values: + + 1: connection was found + + -1: connection was not found or an error occured + + Example 1.8. tcp_get_conid usage +... + if(tcp_conid_alive("127.0.0.1:5060", "$var(conid)")) { + xlog("connection id is: $var(conid)\n"); + } +... + 4. Event routes 4.1. tcp:closed

3 2

git:5.1:038b47b4: Merge pull request #1401 from sergey-safarov/docker
by GitHub 16 Jan '18

16 Jan '18

Module: kamailio Branch: 5.1 Commit: 038b47b4d5157d61cfbce27acba6cf0ed345f3b9 URL: https://github.com/kamailio/kamailio/commit/038b47b4d5157d61cfbce27acba6cf0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-16T08:49:05+01:00 Merge pull request #1401 from sergey-safarov/docker pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/038b47b4d5157d61cfbce27acba6cf0… Patch: https://github.com/kamailio/kamailio/commit/038b47b4d5157d61cfbce27acba6cf0… --- diff --git a/pkg/docker b/pkg/docker index 1368cea8a4..d5eef889b8 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 1368cea8a47edae754ded68ff61e263fcad29fee +Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060

1 0

git:5.1:434f66ac: pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo
by Sergey Safarov 16 Jan '18

16 Jan '18

Module: kamailio Branch: 5.1 Commit: 434f66ac4385c8aa1fcf6547041e03fab89bd90e URL: https://github.com/kamailio/kamailio/commit/434f66ac4385c8aa1fcf6547041e03f… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-01-15T08:25:55-05:00 pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/434f66ac4385c8aa1fcf6547041e03f… Patch: https://github.com/kamailio/kamailio/commit/434f66ac4385c8aa1fcf6547041e03f… --- diff --git a/pkg/docker b/pkg/docker index 1368cea8a4..d5eef889b8 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 1368cea8a47edae754ded68ff61e263fcad29fee +Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060

1 0

[kamailio/kamailio] pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo (#1401)
by sergey-safarov 16 Jan '18

16 Jan '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1401 -- Commit Summary -- * pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1401.patch https://github.com/kamailio/kamailio/pull/1401.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/1401

2 1

git:master:4e659b5f: topos: docs - more explicit info about required use of record_route()
by Daniel-Constantin Mierla 16 Jan '18

16 Jan '18

Module: kamailio Branch: master Commit: 4e659b5f3cd9b176e3bf2e20ceebf34d9734707b URL: https://github.com/kamailio/kamailio/commit/4e659b5f3cd9b176e3bf2e20ceebf34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-16T08:46:39+01:00 topos: docs - more explicit info about required use of record_route() --- Modified: src/modules/topos/doc/topos_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4e659b5f3cd9b176e3bf2e20ceebf34… Patch: https://github.com/kamailio/kamailio/commit/4e659b5f3cd9b176e3bf2e20ceebf34… --- diff --git a/src/modules/topos/doc/topos_admin.xml b/src/modules/topos/doc/topos_admin.xml index bda8ab766d..3320bf3642 100644 --- a/src/modules/topos/doc/topos_admin.xml +++ b/src/modules/topos/doc/topos_admin.xml @@ -26,7 +26,10 @@ loaded (tune the parameters if needed). </para> <para> - It works for SIP MESSAGE requests. + It also works for SIP MESSAGE or other requests that do not create + a call dialog -- record_route() must be used for them as well, the + headers are not going to be in the messages sent to the network, they + are needed to know local addresses used to communicate with each side. </para> </section> <section> @@ -39,7 +42,8 @@ <listitem> <para> <emphasis>rr module</emphasis> - server must perform record - routing to ensure in-dialog requests are encoded/decoded. + routing to ensure in-dialog requests are encoded/decoded (it + must be done for all initial requests). </para> </listitem> <listitem>

1 0

git:master:97532ca1: topos: set uuid fields before checking contact/rr fields
by Daniel-Constantin Mierla 16 Jan '18

16 Jan '18

Module: kamailio Branch: master Commit: 97532ca18f595d89edf9b0b6e6688847aa38dd44 URL: https://github.com/kamailio/kamailio/commit/97532ca18f595d89edf9b0b6e668884… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-14T06:04:22+01:00 topos: set uuid fields before checking contact/rr fields --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/97532ca18f595d89edf9b0b6e668884… Patch: https://github.com/kamailio/kamailio/commit/97532ca18f595d89edf9b0b6e668884… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 27231bec38..9d56cb945e 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -214,19 +214,10 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) } else { sv = td->as_contact; } - if(sv.len<=0) { - /* no contact - skip */ - return 0; - } - if(td->cp + 8 + (2*uuid->len) + sv.len >= td->cbuf + TPS_DATA_SIZE) { LM_ERR("insufficient data buffer\n"); return -1; } - if (parse_uri(sv.s, sv.len, &puri) < 0) { - LM_ERR("failed to parse the uri\n"); - return -1; - } if(dir==TPS_DIR_DOWNSTREAM) { td->b_uuid.s = td->cp; *td->cp = 'b'; @@ -234,8 +225,6 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) memcpy(td->cp, uuid->s, uuid->len); td->cp += uuid->len; td->b_uuid.len = td->cp - td->b_uuid.s; - - td->bs_contact.s = td->cp; } else { td->a_uuid.s = td->cp; *td->cp = 'a'; @@ -243,7 +232,20 @@ int tps_storage_fill_contact(sip_msg_t *msg, tps_data_t *td, str *uuid, int dir) memcpy(td->cp, uuid->s, uuid->len); td->cp += uuid->len; td->a_uuid.len = td->cp - td->a_uuid.s; + } + if(sv.len<=0) { + /* no contact - skip */ + return 0; + } + + if (parse_uri(sv.s, sv.len, &puri) < 0) { + LM_ERR("failed to parse the uri\n"); + return -1; + } + if(dir==TPS_DIR_DOWNSTREAM) { + td->bs_contact.s = td->cp; + } else { td->as_contact.s = td->cp; } *td->cp = '<';

1 0

[kamailio/kamailio] sanity() test passes on invalid uri (#1289)
by juha-h 15 Jan '18

15 Jan '18

K master sanity() test passes URI hostpart that contains ` (back quote) character and possibly other invalid hostpart characters: Config: modparam("sanity", "default_checks", 1024) /* URI checks */ modparam("sanity", "uri_checks", 3) /* RURI, From */ xlog("L_INFO", "Checking $ru\n"); if (!sanity_check()) xlog("L_INFO", "Check failed\n"); else xlog("L_INFO", "Check passed\n"); Syslog: Oct 27 17:17:38 lohi /usr/bin/sip-proxy[31946]: INFO: Checking sip:jh at te`st.fi Oct 27 17:17:38 lohi /usr/bin/sip-proxy[31946]: INFO: Check passed According to RFC3261: hostname = *( domainlabel "." ) toplabel [ "." ] domainlabel = alphanum / alphanum *( alphanum / "-" ) alphanum -- 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/1289

2 3

git:master:883d49d5: topos_redis: store tags in transaction records
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 883d49d5ed2cc6140c583559d0f61bde3fa6fdb5 URL: https://github.com/kamailio/kamailio/commit/883d49d5ed2cc6140c583559d0f61bd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T16:43:18+01:00 topos_redis: store tags in transaction records --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/883d49d5ed2cc6140c583559d0f61bd… Patch: https://github.com/kamailio/kamailio/commit/883d49d5ed2cc6140c583559d0f61bd… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index 91aff1a410..b0086478e2 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -477,6 +477,9 @@ int tps_redis_insert_branch(tps_data_t *td) TPS_REDIS_SET_ARGS(&td->as_contact, argc, &tt_key_as_contact, argv, argvlen); TPS_REDIS_SET_ARGS(&td->bs_contact, argc, &tt_key_bs_contact, argv, argvlen); + TPS_REDIS_SET_ARGS(&td->a_tag, argc, &tt_key_a_tag, argv, argvlen); + TPS_REDIS_SET_ARGS(&td->b_tag, argc, &tt_key_b_tag, argv, argvlen); + rrpl = _tps_redis_api.exec_argv(rsrv, argc, (const char **)argv, argvlen); if(rrpl==NULL) { LM_ERR("failed to execute redis command\n"); @@ -869,6 +872,12 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, } else if(skey.len==tt_key_bs_contact.len && strncmp(skey.s, tt_key_bs_contact.s, skey.len)==0) { TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->bs_contact); + } else if(skey.len==tt_key_a_tag.len + && strncmp(skey.s, tt_key_a_tag.s, skey.len)==0) { + TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->a_tag); + } else if(skey.len==tt_key_b_tag.len + && strncmp(skey.s, tt_key_b_tag.s, skey.len)==0) { + TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->b_tag); } else { LM_WARN("unknow key[%.*s]\n", skey.len, skey.s); }

1 0

git:master:5b2b06ce: topos: store and load tags in transaction record
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 5b2b06ceff61144c5f0cbddacdfcaee18a2e8eff URL: https://github.com/kamailio/kamailio/commit/5b2b06ceff61144c5f0cbddacdfcaee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T16:34:46+01:00 topos: store and load tags in transaction record --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5b2b06ceff61144c5f0cbddacdfcaee… Patch: https://github.com/kamailio/kamailio/commit/5b2b06ceff61144c5f0cbddacdfcaee… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6502f491f3..27231bec38 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -748,6 +748,16 @@ int tps_db_insert_branch(tps_data_t *td) db_vals[nr_keys].val.str_val = TPS_STRZ(td->bs_contact); nr_keys++; + db_keys[nr_keys] = &tt_col_a_tag; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].val.str_val = TPS_STRZ(td->a_tag); + nr_keys++; + + db_keys[nr_keys] = &tt_col_b_tag; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].val.str_val = TPS_STRZ(td->b_tag); + nr_keys++; + if (_tpsdbf.use_table(_tps_db_handle, &tt_table_name) < 0) { LM_ERR("failed to perform use table\n"); return -1; @@ -920,6 +930,8 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, db_cols[nr_cols++] = &tt_col_b_contact; db_cols[nr_cols++] = &tt_col_as_contact; db_cols[nr_cols++] = &tt_col_bs_contact; + db_cols[nr_cols++] = &tt_col_a_tag; + db_cols[nr_cols++] = &tt_col_b_tag; if (_tpsdbf.use_table(_tps_db_handle, &tt_table_name) < 0) { LM_ERR("failed to perform use table\n"); @@ -966,6 +978,8 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, TPS_DATA_APPEND_DB(sd, db_res, n, &sd->b_contact); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->as_contact); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->bs_contact); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->a_tag); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->b_tag); n++; done: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0)

1 0

git:5.1:63d32809: topos: update contact only for INVTE requests within dialog
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: 5.1 Commit: 63d328097c43a27f72e3f59143f1b5add563febe URL: https://github.com/kamailio/kamailio/commit/63d328097c43a27f72e3f59143f1b5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T16:02:32+01:00 topos: update contact only for INVTE requests within dialog (cherry picked from commit 914e56b4bdb553234eaa9a0025e1cdf0c84001b6) --- Modified: src/modules/topos/tps_msg.c --- Diff: https://github.com/kamailio/kamailio/commit/63d328097c43a27f72e3f59143f1b5a… Patch: https://github.com/kamailio/kamailio/commit/63d328097c43a27f72e3f59143f1b5a… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 632d8119be..0027a08203 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -1002,9 +1002,9 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) if(dialog!=0) { tps_storage_end_dialog(msg, &mtsd, ptsd); - } - if(tps_storage_update_dialog(msg, &mtsd, &stsd, TPS_DBU_CONTACT)<0) { - goto error; + if(tps_storage_update_dialog(msg, &mtsd, &stsd, TPS_DBU_CONTACT)<0) { + goto error; + } } done:

1 0

git:5.1:5cba2384: topos: sotre and load local side contacts in branch record
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: 5.1 Commit: 5cba238409e4e4b6381d291024eea1c3ed8cb5b4 URL: https://github.com/kamailio/kamailio/commit/5cba238409e4e4b6381d291024eea1c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T16:02:11+01:00 topos: sotre and load local side contacts in branch record - recover them on retransmissions, otherwise no contact header is added on initial request routing - reported by GH #1356 (cherry picked from commit dd1872fb5f876fc004c320a1daba55a5ce6f3dc2) --- Modified: src/modules/topos/tps_msg.c Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/5cba238409e4e4b6381d291024eea1c… Patch: https://github.com/kamailio/kamailio/commit/5cba238409e4e4b6381d291024eea1c… --- diff --git a/src/modules/topos/tps_msg.c b/src/modules/topos/tps_msg.c index 26e25b42c0..632d8119be 100644 --- a/src/modules/topos/tps_msg.c +++ b/src/modules/topos/tps_msg.c @@ -931,7 +931,7 @@ int tps_request_sent(sip_msg_t *msg, int dialog, int local) str xuuid; uint32_t direction = TPS_DIR_DOWNSTREAM; - LM_DBG("handling outgoing request\n"); + LM_DBG("handling outgoing request (%d, %d)\n", dialog, local); memset(&mtsd, 0, sizeof(tps_data_t)); memset(&btsd, 0, sizeof(tps_data_t)); diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 5662b80654..6502f491f3 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -728,6 +728,26 @@ int tps_db_insert_branch(tps_data_t *td) db_vals[nr_keys].val.str_val = TPS_STRZ(td->s_cseq); nr_keys++; + db_keys[nr_keys] = &tt_col_a_contact; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].val.str_val = TPS_STRZ(td->a_contact); + nr_keys++; + + db_keys[nr_keys] = &tt_col_b_contact; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].val.str_val = TPS_STRZ(td->b_contact); + nr_keys++; + + db_keys[nr_keys] = &tt_col_as_contact; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].val.str_val = TPS_STRZ(td->as_contact); + nr_keys++; + + db_keys[nr_keys] = &tt_col_bs_contact; + db_vals[nr_keys].type = DB1_STR; + db_vals[nr_keys].val.str_val = TPS_STRZ(td->bs_contact); + nr_keys++; + if (_tpsdbf.use_table(_tps_db_handle, &tt_table_name) < 0) { LM_ERR("failed to perform use table\n"); return -1; @@ -898,6 +918,8 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, db_cols[nr_cols++] = &tt_col_s_cseq; db_cols[nr_cols++] = &tt_col_a_contact; db_cols[nr_cols++] = &tt_col_b_contact; + db_cols[nr_cols++] = &tt_col_as_contact; + db_cols[nr_cols++] = &tt_col_bs_contact; if (_tpsdbf.use_table(_tps_db_handle, &tt_table_name) < 0) { LM_ERR("failed to perform use table\n"); @@ -942,6 +964,8 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->a_contact); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->b_contact); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->as_contact); n++; + TPS_DATA_APPEND_DB(sd, db_res, n, &sd->bs_contact); n++; done: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) @@ -1251,7 +1275,9 @@ int tps_db_update_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, db_vals[nr_keys].val.str_val = TPS_STRZ(sd->a_uuid); } else { if(sd->b_uuid.len<=0) { - LM_ERR("no valid dlg uuid\n"); + LM_ERR("no valid dlg uuid (%d:%.*s - %d:%.*s)\n", + sd->a_uuid.len, sd->a_uuid.len, ZSW(sd->a_uuid.s), + sd->b_uuid.len, sd->b_uuid.len, ZSW(sd->b_uuid.s)); return -1; } db_vals[nr_keys].val.str_val = TPS_STRZ(sd->b_uuid);

1 0

[kamailio/kamailio] dialog: track_cseq_updates after failing uac_auth (#1359)
by Carlos Cruz Luengo 15 Jan '18

15 Jan '18

### Description [track_cseq_updates](http://kamailio.org/docs/modules/4.4.x/modules/dialog.h… of _dialog_ module seems to fail in cseq number adaptation of subsequent ACK once [uac_auth()](http://kamailio.org/docs/modules/4.4.x/modules/uac.html#uac.f.u… function of _uac_ module transaction fails: 1. INVITE sent by UAC (CSeq 100). 1. 407 from UAS. 1. INVITE generated by uac_auth (CSeq 101). 1. 500 from UAS. 1. INVITE to another carrier (CSeq 100) 1. 200 OK from carrier. 1. ACK (CSeq 101 instead of 100). ACK CSeq is increased by one but it shouldn't as it is acknowledging INVITE in step 5. ### Troubleshooting #### Reproduction The issue can be reproduced with the logic mentioned above (track_cseq_updates=1): - Initial INVITE - INVITE generated by uac_auth in failure_route - INVITE to another destination in failure_route - CSeq in ACK is increased by one #### SIP Traffic See attached pcap file ([cseq_tracking_wrong_ack.pcap.gz](https://github.com/kamailio/kamailio/files…) that involves following parties: - 155.179.229.105: UAC that sends the INVITE. - 155.179.229.109: Kamailio - 202.165.186.162: Initial carrier (the one that asks for SIP auth) - 9.189.124.97: Second carrier ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.6 (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 with gcc 4.9.2 ``` * **Operating System**:  ``` Linux 3.16.0-4-amd64 #1 SMP Debian 3.16.7-ckt25-2 (2016-04-08) x86_64 GNU/Linux ``` Is there any way to disable CSeq mangling triggered by uac_auth once this transaction fails to prevent this mangling from breaking the subsequent ACK transaction? Thank you and regards, -- 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/1359

2 4

git:master:acc370ae: modules: readme files regenerated - textopsx ... [skip ci]
by Kamailio Dev 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: acc370ae9f192475b86ee54b93b3d8485637c55e URL: https://github.com/kamailio/kamailio/commit/acc370ae9f192475b86ee54b93b3d84… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-15T15:46:29+01:00 modules: readme files regenerated - textopsx ... [skip ci] --- Modified: src/modules/textopsx/README --- Diff: https://github.com/kamailio/kamailio/commit/acc370ae9f192475b86ee54b93b3d84… Patch: https://github.com/kamailio/kamailio/commit/acc370ae9f192475b86ee54b93b3d84… --- diff --git a/src/modules/textopsx/README b/src/modules/textopsx/README index 071eec2ee6..60b458d189 100644 --- a/src/modules/textopsx/README +++ b/src/modules/textopsx/README @@ -156,8 +156,8 @@ if(msg_apply_changes()) Example 1.2. change_reply_status usage ... -onreply_route { - if (@status == "603") { +reply_route { + if (status == "603") { change_reply_status(404, "Not Found"); exit; }

1 0

[kamailio/kamailio] 500 error on invite response (#1395)
by Pau Giralt 15 Jan '18

15 Jan '18

### Description In some calls I'm getting a 500 error on invite message reponse without reason message. Some times it works well and others the 500 error arises with the same code and situation. #### Log Messages ``` Jan 11 13:48:47 kamailio-alone /usr/sbin/kamailio[21953]: DEBUG: <core> [parser/msg_parser.c:616]: parse_msg(): SIP Reply (status): Jan 11 13:48:47 kamailio-alone /usr/sbin/kamailio[21953]: DEBUG: <core> [parser/msg_parser.c:618]: parse_msg(): version: <SIP/2.0> Jan 11 13:48:47 kamailio-alone /usr/sbin/kamailio[21953]: DEBUG: <core> [parser/msg_parser.c:620]: parse_msg(): status: <500> Jan 11 13:48:47 kamailio-alone /usr/sbin/kamailio[21953]: DEBUG: <core> [parser/msg_parser.c:622]: parse_msg(): reason: <> DEBUG: <core> [msg_translator.c:2246]: generate_res_buf_from_sip_res(): copied size: orig:130, new: 14, rest: 420 msg=#012SIP/2.0 500 #015#012Via: SIP/2.0/UDP 37.133.221.218:9773;rport=9773;received=37.133.221.218;branch=z9hG4bKPj8d748325-ecc1-40dd-9f19-0edbe38f46a0#015#012Record-Route: <sip:146.185.142.19:9773;lr>#015#012Call-ID: 36fa4c8e-2e61-4b24-a775-584b2616b889#015#012From: <sip:+34639446862@146.185.142.19>;tag=179c6cb5-593e-4442-8596-1f40def7b336#015#012To: <sip:+34696501510@146.185.142.19>;tag=206c2f8e-2b61-4c51-af6b-7332e1830952#015#012CSeq: 9763 INVITE#015#012Content-Length: 0 ``` #### SIP Traffic ``` U 2018/01/11 13:55:40.134061 37.133.221.218:9773 -> 146.185.142.19:9773 INVITE sip:+34696501510@146.185.142.19:9773 SIP/2.0. Via: SIP/2.0/UDP 37.133.221.218:9773;rport;branch=z9hG4bKPj042d70a5-e935-4129-90d2-29ba7679fdc3. Max-Forwards: 70. From: sip:+34639446862@146.185.142.19;tag=bc792be2-981c-45b9-9d59-cd46951d60cd. To: sip:+34696501510@146.185.142.19. Contact: <sip:+34639446862@37.133.221.218:9773;ob>. Call-ID: 0cbfc14f-69bb-4390-887a-ed9f673c58bc. CSeq: 25548 INVITE. Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS. Supported: replaces, 100rel, timer, norefersub. Session-Expires: 1800. Min-SE: 90. Content-Type: application/sdp. Content-Length: 476. . v=0. o=- 3724667739 3724667739 IN IP4 192.168.1.141. s=pjmedia. b=AS:84. t=0 0. a=X-nat:0. m=audio 4000 RTP/AVP 98 97 99 104 3 0 8 9 96. c=IN IP4 192.168.1.141. b=TIAS:64000. a=rtcp:4001 IN IP4 192.168.1.141. a=sendrecv. a=rtpmap:98 speex/16000. a=rtpmap:97 speex/8000. a=rtpmap:99 speex/32000. a=rtpmap:104 iLBC/8000. a=fmtp:104 mode=30. a=rtpmap:3 GSM/8000. a=rtpmap:0 PCMU/8000. a=rtpmap:8 PCMA/8000. a=rtpmap:9 G722/8000. a=rtpmap:96 telephone-event/8000. a=fmtp:96 0-16. U 2018/01/11 13:55:40.143355 146.185.142.19:9773 -> 37.133.221.218:9773 SIP/2.0 100 trying -- your call is important to us. Via: SIP/2.0/UDP 37.133.221.218:9773;rport=9773;branch=z9hG4bKPj042d70a5-e935-4129-90d2-29ba7679fdc3;received=37.133.221.218. From: sip:+34639446862@146.185.142.19;tag=bc792be2-981c-45b9-9d59-cd46951d60cd. To: sip:+34696501510@146.185.142.19. Call-ID: 0cbfc14f-69bb-4390-887a-ed9f673c58bc. CSeq: 25548 INVITE. Server: kamailio (4.3.4 (x86_64/linux)). Content-Length: 0. . U 2018/01/11 13:55:40.144092 146.185.142.19:9773 -> 37.133.221.218:1353 INVITE sip:+34696501510@37.133.221.218:1353;ob SIP/2.0. Record-Route: <sip:146.185.142.19:9773;lr>. Via: SIP/2.0/UDP 146.185.142.19:9773;branch=z9hG4bK6df7.9f8cf260e72edcb1fae300fb37edaa58.0. Via: SIP/2.0/UDP 37.133.221.218:9773;received=37.133.221.218;rport=9773;branch=z9hG4bKPj042d70a5-e935-4129-90d2-29ba7679fdc3. Max-Forwards: 69. From: sip:+34639446862@146.185.142.19;tag=bc792be2-981c-45b9-9d59-cd46951d60cd. To: sip:+34696501510@146.185.142.19. Contact: <sip:+34639446862@37.133.221.218:9773;ob>. Call-ID: 0cbfc14f-69bb-4390-887a-ed9f673c58bc. CSeq: 25548 INVITE. Allow: PRACK, INVITE, ACK, BYE, CANCEL, UPDATE, INFO, SUBSCRIBE, NOTIFY, REFER, MESSAGE, OPTIONS. Supported: replaces, 100rel, timer, norefersub. Session-Expires: 1800. Min-SE: 90. Content-Type: application/sdp. Content-Length: 476. . v=0. o=- 3724667739 3724667739 IN IP4 192.168.1.141. s=pjmedia. b=AS:84. t=0 0. a=X-nat:0. m=audio 4000 RTP/AVP 98 97 99 104 3 0 8 9 96. c=IN IP4 192.168.1.141. b=TIAS:64000. a=rtcp:4001 IN IP4 192.168.1.141. a=sendrecv. a=rtpmap:98 speex/16000. a=rtpmap:97 speex/8000. a=rtpmap:99 speex/32000. a=rtpmap:104 iLBC/8000. a=fmtp:104 mode=30. a=rtpmap:3 GSM/8000. a=rtpmap:0 PCMU/8000. a=rtpmap:8 PCMA/8000. a=rtpmap:9 G722/8000. a=rtpmap:96 telephone-event/8000. a=fmtp:96 0-16. U 2018/01/11 13:55:40.459709 37.133.221.218:1353 -> 146.185.142.19:9773 SIP/2.0 100 Trying. Via: SIP/2.0/UDP 146.185.142.19:9773;received=146.185.142.19;branch=z9hG4bK6df7.9f8cf260e72edcb1fae300fb37edaa58.0. Via: SIP/2.0/UDP 37.133.221.218:9773;rport=9773;received=37.133.221.218;branch=z9hG4bKPj042d70a5-e935-4129-90d2-29ba7679fdc3. Record-Route: <sip:146.185.142.19:9773;lr>. Call-ID: 0cbfc14f-69bb-4390-887a-ed9f673c58bc. From: <sip:+34639446862@146.185.142.19>;tag=bc792be2-981c-45b9-9d59-cd46951d60cd. To: <sip:+34696501510@146.185.142.19>. CSeq: 25548 INVITE. Content-Length: 0. . U 2018/01/11 13:55:40.459844 37.133.221.218:1353 -> 146.185.142.19:9773 SIP/2.0 500 . Via: SIP/2.0/UDP 146.185.142.19:9773;received=146.185.142.19;branch=z9hG4bK6df7.9f8cf260e72edcb1fae300fb37edaa58.0. Via: SIP/2.0/UDP 37.133.221.218:9773;rport=9773;received=37.133.221.218;branch=z9hG4bKPj042d70a5-e935-4129-90d2-29ba7679fdc3. Record-Route: <sip:146.185.142.19:9773;lr>. Call-ID: 0cbfc14f-69bb-4390-887a-ed9f673c58bc. From: <sip:+34639446862@146.185.142.19>;tag=bc792be2-981c-45b9-9d59-cd46951d60cd. To: <sip:+34696501510@146.185.142.19>;tag=fe966b81-31e8-484a-9cce-625f31915529. CSeq: 25548 INVITE. Content-Length: 0. . U 2018/01/11 13:55:40.463028 146.185.142.19:9773 -> 37.133.221.218:1353 ACK sip:+34696501510@37.133.221.218:1353;ob SIP/2.0. Via: SIP/2.0/UDP 146.185.142.19:9773;branch=z9hG4bK6df7.9f8cf260e72edcb1fae300fb37edaa58.0. Max-Forwards: 69. From: sip:+34639446862@146.185.142.19;tag=bc792be2-981c-45b9-9d59-cd46951d60cd. To: <sip:+34696501510@146.185.142.19>;tag=fe966b81-31e8-484a-9cce-625f31915529. Call-ID: 0cbfc14f-69bb-4390-887a-ed9f673c58bc. CSeq: 25548 ACK. Content-Length: 0. . ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.6 (x86_64/linux) becbde 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: becbde compiled on 08:18:45 Jul 3 2017 with gcc 5.4.0 ``` -- 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/1395

2 6

git:5.1:93ff80f3: textopsx: docs - fixed example for change_reply_status()
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: 5.1 Commit: 93ff80f39971589ab48ffa6a4903cae86948861f URL: https://github.com/kamailio/kamailio/commit/93ff80f39971589ab48ffa6a4903cae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T15:22:04+01:00 textopsx: docs - fixed example for change_reply_status() (cherry picked from commit 6e1e7fe306ebf97fb27b8a1d9e4f57e139d418f2) --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/93ff80f39971589ab48ffa6a4903cae… Patch: https://github.com/kamailio/kamailio/commit/93ff80f39971589ab48ffa6a4903cae… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 5412476ace..c96fb1fff9 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -76,8 +76,8 @@ if(msg_apply_changes()) <title><function>change_reply_status</function> usage</title> <programlisting> ... -onreply_route { - if (@status == "603") { +reply_route { + if (status == "603") { change_reply_status(404, "Not Found"); exit; }

1 0

git:master:6e1e7fe3: textopsx: docs - fixed example for change_reply_status()
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 6e1e7fe306ebf97fb27b8a1d9e4f57e139d418f2 URL: https://github.com/kamailio/kamailio/commit/6e1e7fe306ebf97fb27b8a1d9e4f57e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T15:21:20+01:00 textopsx: docs - fixed example for change_reply_status() --- Modified: src/modules/textopsx/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/6e1e7fe306ebf97fb27b8a1d9e4f57e… Patch: https://github.com/kamailio/kamailio/commit/6e1e7fe306ebf97fb27b8a1d9e4f57e… --- diff --git a/src/modules/textopsx/doc/functions.xml b/src/modules/textopsx/doc/functions.xml index 5412476ace..c96fb1fff9 100644 --- a/src/modules/textopsx/doc/functions.xml +++ b/src/modules/textopsx/doc/functions.xml @@ -76,8 +76,8 @@ if(msg_apply_changes()) <title><function>change_reply_status</function> usage</title> <programlisting> ... -onreply_route { - if (@status == "603") { +reply_route { + if (status == "603") { change_reply_status(404, "Not Found"); exit; }

1 0

git:master:9cc9785c: tcpops: documentation for tcp_get_conid()
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 9cc9785cef0a8abf3fa09de1f5da4dd52133be39 URL: https://github.com/kamailio/kamailio/commit/9cc9785cef0a8abf3fa09de1f5da4dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T12:57:16+01:00 tcpops: documentation for tcp_get_conid() --- Modified: src/modules/tcpops/doc/functions.xml --- Diff: https://github.com/kamailio/kamailio/commit/9cc9785cef0a8abf3fa09de1f5da4dd… Patch: https://github.com/kamailio/kamailio/commit/9cc9785cef0a8abf3fa09de1f5da4dd… --- diff --git a/src/modules/tcpops/doc/functions.xml b/src/modules/tcpops/doc/functions.xml index 9f51668787..baff1bcf13 100644 --- a/src/modules/tcpops/doc/functions.xml +++ b/src/modules/tcpops/doc/functions.xml @@ -259,4 +259,39 @@ event_route[tcp:closed] { ]]></programlisting> </example> </section> + <section id="tcpops.f.tcp_get_conid"> + <title> + <function>tcp_get_conid(hostport, pvname)</function> + </title> + <para> + Get the connection id based on target host:port. The connection id + is set in the variable named by pvname parameter. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>hostport</emphasis> - target "host:port" address, + the port can be ommited (default to 5060) and the parameter can + contain variables. + </para> + </listitem> + <listitem> + <para><emphasis>pvname</emphasis> - target variable name. + </para> + </listitem> + </itemizedlist> + <para>Return values:</para> + <para>1: connection was found</para> + <para>-1: connection was not found or an error occured</para> + <example> + <title><function>tcp_get_conid</function> usage</title> + <programlisting><![CDATA[ +... + if(tcp_conid_alive("127.0.0.1:5060", "$var(conid)")) { + xlog("connection id is: $var(conid)\n"); + } +... + ]]></programlisting> + </example> + </section> </section>

1 0

git:master:381dfada: tcpops: added function to get connection id based on target host:port
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 381dfada3989d86a2afa88d7c13859b073c403d7 URL: https://github.com/kamailio/kamailio/commit/381dfada3989d86a2afa88d7c13859b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T12:50:57+01:00 tcpops: added function to get connection id based on target host:port - tcp_get_connid(hostport, pvname) - connection id is set in pvar paraemter --- Modified: src/modules/tcpops/tcpops_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/381dfada3989d86a2afa88d7c13859b… Patch: https://github.com/kamailio/kamailio/commit/381dfada3989d86a2afa88d7c13859b… --- diff --git a/src/modules/tcpops/tcpops_mod.c b/src/modules/tcpops/tcpops_mod.c index 8e7fcdcacd..1e844f5ed8 100644 --- a/src/modules/tcpops/tcpops_mod.c +++ b/src/modules/tcpops/tcpops_mod.c @@ -33,6 +33,8 @@ #include "../../core/globals.h" #include "../../core/sr_module.h" #include "../../core/tcp_options.h" +#include "../../core/resolve.h" +#include "../../core/lvalue.h" #include "../../core/dprint.h" #include "../../core/mod_fix.h" #include "../../core/events.h" @@ -58,7 +60,7 @@ static int w_tcpops_enable_closed_event1(sip_msg_t* msg, char* con, char* p2); static int w_tcpops_enable_closed_event0(sip_msg_t* msg, char* p1, char* p2); static int w_tcp_conid_state(sip_msg_t* msg, char* con, char *p2); static int w_tcp_conid_alive(sip_msg_t* msg, char* con, char *p2); - +static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn); static int fixup_numpv(void** param, int param_no); @@ -81,6 +83,8 @@ static cmd_export_t cmds[]={ 0, 0, REQUEST_ROUTE|ONREPLY_ROUTE}, {"tcp_conid_state", (cmd_function)w_tcp_conid_state, 1, fixup_numpv, 0, ANY_ROUTE}, + {"tcp_get_conid", (cmd_function)w_tcp_get_conid, 2, + fixup_spve_pvar, fixup_free_spve_pvar, ANY_ROUTE}, {"tcp_conid_alive", (cmd_function)w_tcp_conid_alive, 1, fixup_numpv, 0, ANY_ROUTE}, {0, 0, 0, 0, 0, 0} @@ -513,6 +517,94 @@ static int fixup_numpv(void** param, int param_no) return fixup_igp_null(param, 1); } +/** + * + */ +static int ki_tcp_get_conid_helper(sip_msg_t* msg, str *saddr, pv_spec_t *pvs) +{ + int conid = 0; + sip_uri_t uaddr, *u; + dest_info_t dst; + char *p; + int ret; + ticks_t clifetime; + tcp_connection_t *c; + ip_addr_t ip; + int port; + pv_value_t val; + + if(pvs->setf==NULL) { + LM_ERR("output variable is read only\n"); + return -1; + } + + init_dest_info(&dst); + + u = &uaddr; + u->port_no = 5060; + u->host = *saddr; + /* detect ipv6 */ + p = memchr(saddr->s, ']', saddr->len); + if (p) { + p++; + p = memchr(p, ':', saddr->s + saddr->len - p); + } else { + p = memchr(saddr->s, ':', saddr->len); + } + if (p) { + u->host.len = p - saddr->s; + p++; + u->port_no = str2s(p, saddr->len - (p - saddr->s), NULL); + } + + ret = sip_hostport2su(&dst.to, &u->host, u->port_no, &dst.proto); + if(ret!=0) { + LM_ERR("failed to resolve [%.*s]\n", u->host.len, ZSW(u->host.s)); + return E_BUG; + } + + dst.proto = PROTO_TCP; + dst.id = 0; + clifetime = cfg_get(tcp, tcp_cfg, con_lifetime); + su2ip_addr(&ip, &dst.to); + port = su_getport(&dst.to); + c = tcpconn_get(dst.id, &ip, port, NULL, clifetime); + + if (unlikely(c==0)) { + goto setvalue; + } + conid = c->id; + tcpconn_put(c); + +setvalue: + memset(&val, 0, sizeof(pv_value_t)); + val.ri = conid; + val.flags = PV_VAL_INT; + if(pvs->setf(msg, &pvs->pvp, (int)EQ_T, &val)<0) { + LM_ERR("failed to set the output var\n"); + return -1; + } + if(conid==0) { + return -1; + } + return 1; +} + +/** + * + */ +static int w_tcp_get_conid(sip_msg_t* msg, char *paddr, char *pvn) +{ + str saddr; + + if(fixup_get_svalue(msg, (gparam_t*)paddr, &saddr)<0) { + LM_ERR("failed to get address parameter\n"); + return -1; + } + + return ki_tcp_get_conid_helper(msg, &saddr, (pv_spec_t*)pvn); +} + /** * */

1 0

git:master:edb3d6d8: core: tcp - typedefed structs
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: edb3d6d848c9ccf85b077950ecf6aec7acf3e5b6 URL: https://github.com/kamailio/kamailio/commit/edb3d6d848c9ccf85b077950ecf6aec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T12:50:57+01:00 core: tcp - typedefed structs --- Modified: src/core/tcp_conn.h --- Diff: https://github.com/kamailio/kamailio/commit/edb3d6d848c9ccf85b077950ecf6aec… Patch: https://github.com/kamailio/kamailio/commit/edb3d6d848c9ccf85b077950ecf6aec… --- diff --git a/src/core/tcp_conn.h b/src/core/tcp_conn.h index d966511b03..dfa3dcfb37 100644 --- a/src/core/tcp_conn.h +++ b/src/core/tcp_conn.h @@ -162,23 +162,23 @@ struct tcp_req{ struct tcp_connection; /* tcp port alias structure */ -struct tcp_conn_alias{ +typedef struct tcp_conn_alias { struct tcp_connection* parent; struct tcp_conn_alias* next; struct tcp_conn_alias* prev; unsigned short port; /* alias port */ unsigned short hash; /* hash index in the address hash */ -}; +} tcp_conn_alias_t; #ifdef TCP_ASYNC - struct tcp_wbuffer{ + typedef struct tcp_wbuffer { struct tcp_wbuffer* next; unsigned int b_size; char buf[1]; - }; + } tcp_wbuffer_t; - struct tcp_wbuffer_queue{ + typedef struct tcp_wbuffer_queue { struct tcp_wbuffer* first; struct tcp_wbuffer* last; ticks_t wr_timeout; /* write timeout*/ @@ -186,11 +186,11 @@ struct tcp_conn_alias{ unsigned int offset; /* offset in the first wbuffer were data starts */ unsigned int last_used; /* how much of the last buffer is used */ - }; + } tcp_wbuffer_queue_t; #endif -struct tcp_connection{ +typedef struct tcp_connection { int s; /*socket, used by "tcp main" */ int fd; /* used only by "children", don't modify it! private data! */ gen_lock_t write_lock; @@ -218,7 +218,7 @@ struct tcp_connection{ #ifdef TCP_ASYNC struct tcp_wbuffer_queue wbuf_q; #endif -}; +} tcp_connection_t; /* helper macros */

1 0

[kamailio/kamailio] Dispatcher set_state "all" (#1399)
by Timmo Verlaan 15 Jan '18

15 Jan '18

#### 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  Adds a new option to RPC command `dispatcher.set_state` to bulk update all destinations as part of a dispatcher set. The way we use dispatcher sets this comes in handy in a few cases. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1399 -- Commit Summary -- * dispatcher: add method to reinit state for all destinations in group * dispatcher: allow 'all' to update all destinations in group via RPC -- File Changes -- M src/modules/dispatcher/dispatch.c (33) M src/modules/dispatcher/dispatch.h (1) M src/modules/dispatcher/dispatcher.c (10) M src/modules/dispatcher/doc/dispatcher_admin.xml (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1399.patch https://github.com/kamailio/kamailio/pull/1399.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/1399

2 3

git:master:0997892b: modules: readme files regenerated - dispatcher ... [skip ci]
by Kamailio Dev 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 0997892bc9fe93fbd78d2ce239e71c15ba6a7e9f URL: https://github.com/kamailio/kamailio/commit/0997892bc9fe93fbd78d2ce239e71c1… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-15T09:02:09+01:00 modules: readme files regenerated - dispatcher ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/0997892bc9fe93fbd78d2ce239e71c1… Patch: https://github.com/kamailio/kamailio/commit/0997892bc9fe93fbd78d2ce239e71c1… --- diff --git a/src/modules/dispatcher/README b/src/modules/dispatcher/README index faef52547c..058aa29379 100644 --- a/src/modules/dispatcher/README +++ b/src/modules/dispatcher/README @@ -1238,12 +1238,14 @@ onreply_route { The states “a”, “i” or “t” can be followed by “p” to set probing mode (e.g. 'ap', 'ip' or 'tp'). * _group_: destination group id - * _address_: address of the destination in the _group_ + * _address_: address of the destination in the _group_ or 'all' to + update all destinations in the group Example: ... # prototype: kamcmd dispatcher.set_state _state_ _group_ _address_ kamcmd dispatcher.set_state ip 2 sip:127.0.0.1:5080 +kamcmd dispatcher.set_state ip 3 all ... 5.2. dispatcher.list

1 0

git:master:27fdee6b: dispatcher: test len for matching all token in setting the state via rpc
by Daniel-Constantin Mierla 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 27fdee6b47ce609ee5913f9aa9355a2c01ec0458 URL: https://github.com/kamailio/kamailio/commit/27fdee6b47ce609ee5913f9aa9355a2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-15T08:54:44+01:00 dispatcher: test len for matching all token in setting the state via rpc --- Modified: src/modules/dispatcher/dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/27fdee6b47ce609ee5913f9aa9355a2… Patch: https://github.com/kamailio/kamailio/commit/27fdee6b47ce609ee5913f9aa9355a2… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 40c47c3e1f..efb3a18001 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1360,7 +1360,7 @@ static void dispatcher_rpc_set_state(rpc_t *rpc, void *ctx) return; } - if(strcmp(dest.s, "all") == 0) { + if(dest.len == 3 && strncmp(dest.s, "all", 3) == 0) { ds_reinit_state_all(group, stval); } else { if(ds_reinit_state(group, &dest, stval) < 0) {

1 0

git:master:9c6436bd: Merge pull request #1399 from tverlaan/dispatcher_update_state_all
by GitHub 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: 9c6436bd52a6a4af322b908c2ceb80cd8e1dd4a9 URL: https://github.com/kamailio/kamailio/commit/9c6436bd52a6a4af322b908c2ceb80c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-15T08:52:11+01:00 Merge pull request #1399 from tverlaan/dispatcher_update_state_all Dispatcher set_state "all" --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9c6436bd52a6a4af322b908c2ceb80c… Patch: https://github.com/kamailio/kamailio/commit/9c6436bd52a6a4af322b908c2ceb80c… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d2d9d1c806..28b305352c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2605,6 +2605,39 @@ int ds_reinit_state(int group, str *address, int state) return -1; } +/** + * + */ +int ds_reinit_state_all(int group, int state) +{ + int i = 0; + ds_set_t *idx = NULL; + + if(_ds_list == NULL || _ds_list_nr <= 0) { + LM_ERR("the list is null\n"); + return -1; + } + + /* get the index of the set */ + if(ds_get_index(group, *crt_idx, &idx) != 0) { + LM_ERR("destination set [%d] not found\n", group); + return -1; + } + + for(i = 0; i < idx->nr; i++) { + int old_state = idx->dlist[i].flags; + /* reset the bits used for states */ + idx->dlist[i].flags &= ~(DS_STATES_ALL); + /* set the new states */ + idx->dlist[i].flags |= state; + if(idx->dlist[i].attrs.rweight > 0) { + ds_reinit_rweight_on_state_change( + old_state, idx->dlist[i].flags, idx); + } + } + return 0; +} + /** * */ diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 419e7dcc5d..2ebaa4b3d5 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -115,6 +115,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode); int ds_next_dst(struct sip_msg *msg, int mode); int ds_update_state(sip_msg_t *msg, int group, str *address, int state); int ds_reinit_state(int group, str *address, int state); +int ds_reinit_state_all(int group, int state); int ds_mark_dst(struct sip_msg *msg, int mode); int ds_print_list(FILE *fout); int ds_log_sets(void); diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 82fd0dd650..40c47c3e1f 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1360,9 +1360,13 @@ static void dispatcher_rpc_set_state(rpc_t *rpc, void *ctx) return; } - if(ds_reinit_state(group, &dest, stval) < 0) { - rpc->fault(ctx, 500, "State Update Failed"); - return; + if(strcmp(dest.s, "all") == 0) { + ds_reinit_state_all(group, stval); + } else { + if(ds_reinit_state(group, &dest, stval) < 0) { + rpc->fault(ctx, 500, "State Update Failed"); + return; + } } return; diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index c62385279c..9c6cdd9200 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1511,7 +1511,8 @@ onreply_route { <listitem><para>_group_: destination group id</para></listitem> - <listitem><para>_address_: address of the destination in the _group_</para></listitem> + <listitem><para>_address_: address of the destination in the _group_ + or 'all' to update all destinations in the group</para></listitem> </itemizedlist> <para> Example: @@ -1520,6 +1521,7 @@ onreply_route { ... # prototype: &sercmd; dispatcher.set_state _state_ _group_ _address_ &sercmd; dispatcher.set_state ip 2 sip:127.0.0.1:5080 +&sercmd; dispatcher.set_state ip 3 all ... </programlisting> </section>

1 0

git:master:d4003b91: dispatcher: allow 'all' to update all destinations in group via RPC
by Timmo Verlaan 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: d4003b91ec04741041b4aa2bdc5926f5aeb6f945 URL: https://github.com/kamailio/kamailio/commit/d4003b91ec04741041b4aa2bdc5926f… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-14T17:04:07+01:00 dispatcher: allow 'all' to update all destinations in group via RPC --- Modified: src/modules/dispatcher/dispatcher.c Modified: src/modules/dispatcher/doc/dispatcher_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/d4003b91ec04741041b4aa2bdc5926f… Patch: https://github.com/kamailio/kamailio/commit/d4003b91ec04741041b4aa2bdc5926f… --- diff --git a/src/modules/dispatcher/dispatcher.c b/src/modules/dispatcher/dispatcher.c index 82fd0dd650..40c47c3e1f 100644 --- a/src/modules/dispatcher/dispatcher.c +++ b/src/modules/dispatcher/dispatcher.c @@ -1360,9 +1360,13 @@ static void dispatcher_rpc_set_state(rpc_t *rpc, void *ctx) return; } - if(ds_reinit_state(group, &dest, stval) < 0) { - rpc->fault(ctx, 500, "State Update Failed"); - return; + if(strcmp(dest.s, "all") == 0) { + ds_reinit_state_all(group, stval); + } else { + if(ds_reinit_state(group, &dest, stval) < 0) { + rpc->fault(ctx, 500, "State Update Failed"); + return; + } } return; diff --git a/src/modules/dispatcher/doc/dispatcher_admin.xml b/src/modules/dispatcher/doc/dispatcher_admin.xml index c62385279c..9c6cdd9200 100644 --- a/src/modules/dispatcher/doc/dispatcher_admin.xml +++ b/src/modules/dispatcher/doc/dispatcher_admin.xml @@ -1511,7 +1511,8 @@ onreply_route { <listitem><para>_group_: destination group id</para></listitem> - <listitem><para>_address_: address of the destination in the _group_</para></listitem> + <listitem><para>_address_: address of the destination in the _group_ + or 'all' to update all destinations in the group</para></listitem> </itemizedlist> <para> Example: @@ -1520,6 +1521,7 @@ onreply_route { ... # prototype: &sercmd; dispatcher.set_state _state_ _group_ _address_ &sercmd; dispatcher.set_state ip 2 sip:127.0.0.1:5080 +&sercmd; dispatcher.set_state ip 3 all ... </programlisting> </section>

1 0

git:master:d8cc8626: dispatcher: add method to reinit state for all destinations in group
by Timmo Verlaan 15 Jan '18

15 Jan '18

Module: kamailio Branch: master Commit: d8cc86263b85be448e1f5c1fe1372fd08d26434a URL: https://github.com/kamailio/kamailio/commit/d8cc86263b85be448e1f5c1fe1372fd… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-14T16:37:00+01:00 dispatcher: add method to reinit state for all destinations in group --- Modified: src/modules/dispatcher/dispatch.c Modified: src/modules/dispatcher/dispatch.h --- Diff: https://github.com/kamailio/kamailio/commit/d8cc86263b85be448e1f5c1fe1372fd… Patch: https://github.com/kamailio/kamailio/commit/d8cc86263b85be448e1f5c1fe1372fd… --- diff --git a/src/modules/dispatcher/dispatch.c b/src/modules/dispatcher/dispatch.c index d2d9d1c806..28b305352c 100644 --- a/src/modules/dispatcher/dispatch.c +++ b/src/modules/dispatcher/dispatch.c @@ -2605,6 +2605,39 @@ int ds_reinit_state(int group, str *address, int state) return -1; } +/** + * + */ +int ds_reinit_state_all(int group, int state) +{ + int i = 0; + ds_set_t *idx = NULL; + + if(_ds_list == NULL || _ds_list_nr <= 0) { + LM_ERR("the list is null\n"); + return -1; + } + + /* get the index of the set */ + if(ds_get_index(group, *crt_idx, &idx) != 0) { + LM_ERR("destination set [%d] not found\n", group); + return -1; + } + + for(i = 0; i < idx->nr; i++) { + int old_state = idx->dlist[i].flags; + /* reset the bits used for states */ + idx->dlist[i].flags &= ~(DS_STATES_ALL); + /* set the new states */ + idx->dlist[i].flags |= state; + if(idx->dlist[i].attrs.rweight > 0) { + ds_reinit_rweight_on_state_change( + old_state, idx->dlist[i].flags, idx); + } + } + return 0; +} + /** * */ diff --git a/src/modules/dispatcher/dispatch.h b/src/modules/dispatcher/dispatch.h index 419e7dcc5d..2ebaa4b3d5 100644 --- a/src/modules/dispatcher/dispatch.h +++ b/src/modules/dispatcher/dispatch.h @@ -115,6 +115,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode); int ds_next_dst(struct sip_msg *msg, int mode); int ds_update_state(sip_msg_t *msg, int group, str *address, int state); int ds_reinit_state(int group, str *address, int state); +int ds_reinit_state_all(int group, int state); int ds_mark_dst(struct sip_msg *msg, int mode); int ds_print_list(FILE *fout); int ds_log_sets(void);

1 0

[kamailio/kamailio] [ci skip] Get more Open Source Helpers (#1389)
by Richard Schneeman 14 Jan '18

14 Jan '18

[CodeTriage](https://www.codetriage.com/) is an app I have maintained for the past 4-5 years with the goal of getting people involved in Open Source projects like this one. The app sends subscribers a random open issue for them to help "triage". For some languages you can also suggested areas to add documentation. The initial approach was inspired by seeing the work of the small core team spending countless hours asking "what version was this in" and "can you give us an example app". The idea is to outsource these small interactions to a huge team of volunteers and let the core team focus on their work. I want to add a badge to the README of this project. The idea is to provide an easy link for people to get started contributing to this project. A badge indicates the number of people currently subscribed to help the repo. The color is based off of open issues in the project. Here are some examples of other projects that have a badge in their README: - https://github.com/crystal-lang/crystal - https://github.com/rails/rails - https://github.com/codetriage/codetriage Thanks for building open source software, I would love to help you find some helpers. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1389 -- Commit Summary -- * [ci skip] Get more Open Source Helpers -- File Changes -- M README.md (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1389.patch https://github.com/kamailio/kamailio/pull/1389.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/1389

3 7

git:master:86d9c4f3: Merge pull request #1398 from sergey-safarov/docker
by GitHub 14 Jan '18

14 Jan '18

Module: kamailio Branch: master Commit: 86d9c4f3ca643f0e9469628883e902ee766c737a URL: https://github.com/kamailio/kamailio/commit/86d9c4f3ca643f0e9469628883e902e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-14T23:16:55+01:00 Merge pull request #1398 from sergey-safarov/docker Updated reference to kamailio-ci (dockerfiles) repo --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/86d9c4f3ca643f0e9469628883e902e… Patch: https://github.com/kamailio/kamailio/commit/86d9c4f3ca643f0e9469628883e902e… --- diff --git a/pkg/docker b/pkg/docker index 1368cea8a4..d5eef889b8 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 1368cea8a47edae754ded68ff61e263fcad29fee +Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060

1 0

git:master:efcf941d: pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo
by Sergey Safarov 14 Jan '18

14 Jan '18

Module: kamailio Branch: master Commit: efcf941d87f5ee95df9974e328e371d04ab5e173 URL: https://github.com/kamailio/kamailio/commit/efcf941d87f5ee95df9974e328e371d… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Sergey Safarov <s.safarov(a)gmail.com> Date: 2018-01-14T15:07:09-05:00 pkg/docker: Updated reference to kamailio-ci (dockerfiles) repo --- Modified: pkg/docker --- Diff: https://github.com/kamailio/kamailio/commit/efcf941d87f5ee95df9974e328e371d… Patch: https://github.com/kamailio/kamailio/commit/efcf941d87f5ee95df9974e328e371d… --- diff --git a/pkg/docker b/pkg/docker index 1368cea8a4..d5eef889b8 160000 --- a/pkg/docker +++ b/pkg/docker @@ -1 +1 @@ -Subproject commit 1368cea8a47edae754ded68ff61e263fcad29fee +Subproject commit d5eef889b8be77c90a4ab1eac29e240132499060

1 0

[kamailio/kamailio] Updated reference to kamailio-ci (dockerfiles) repo (#1398)
by sergey-safarov 14 Jan '18

14 Jan '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1398 -- Commit Summary -- * Updated reference to kamailio-ci (dockerfiles) repo -- File Changes -- M pkg/docker (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1398.patch https://github.com/kamailio/kamailio/pull/1398.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/1398

2 4

git:master:6af1a011: README.md: added code triage badge link [skip ci]
by Daniel-Constantin Mierla 14 Jan '18

14 Jan '18

Module: kamailio Branch: master Commit: 6af1a0110083ba98c7f4695410f9c71f225ca1a9 URL: https://github.com/kamailio/kamailio/commit/6af1a0110083ba98c7f4695410f9c71… Author: Richard Schneeman <richard.schneeman(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-14T17:55:53+01:00 README.md: added code triage badge link [skip ci] - codetriage is an app with the goal of getting people involved in open source projects, sending to subscribers a random open issue for them to help "triage" - more at: https://www.codetriage.com - based on PR #1389 --- Modified: README.md --- Diff: https://github.com/kamailio/kamailio/commit/6af1a0110083ba98c7f4695410f9c71… Patch: https://github.com/kamailio/kamailio/commit/6af1a0110083ba98c7f4695410f9c71… --- diff --git a/README.md b/README.md index d3513d9a84..6cc093737d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # Kamailio - The Open Source SIP Server [![Build Status](https://travis-ci.org/kamailio/kamailio.svg?branch=master)](https:/… +[![Code Triage Badge](https://www.codetriage.com/kamailio/kamailio/badges/users.svg)](http… Project Website:

1 0

git:master:1f9366ab: db2_ops: proper check for memory allocation pointer
by Daniel-Constantin Mierla 14 Jan '18

14 Jan '18

Module: kamailio Branch: master Commit: 1f9366ab5978ee4aa8fd3cefea0393c94889c26e URL: https://github.com/kamailio/kamailio/commit/1f9366ab5978ee4aa8fd3cefea0393c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-14T09:52:25+01:00 db2_ops: proper check for memory allocation pointer - check result codes for registering script callbacks --- Modified: src/modules/db2_ops/db2_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/1f9366ab5978ee4aa8fd3cefea0393c… Patch: https://github.com/kamailio/kamailio/commit/1f9366ab5978ee4aa8fd3cefea0393c… --- diff --git a/src/modules/db2_ops/db2_ops.c b/src/modules/db2_ops/db2_ops.c index dca2c81a1c..433d5293fc 100644 --- a/src/modules/db2_ops/db2_ops.c +++ b/src/modules/db2_ops/db2_ops.c @@ -201,7 +201,7 @@ static int split_fields(char *part, int *n, struct xlstr **strs) { int i, res; char *c, *fld; - if(part==NULL || *part=='\0') + if(part==NULL || *part=='\0' || strs==NULL) return -1; *n = 0; @@ -213,7 +213,7 @@ static int split_fields(char *part, int *n, struct xlstr **strs) { (*n)++; } *strs = pkg_malloc( (*n)*sizeof(**strs)); - if (!strs) { + if (*strs==NULL) { ERR(MODULE_NAME": split_fields: not enough pkg memory\n"); return E_OUT_OF_MEM; } @@ -1043,12 +1043,27 @@ static int mod_init(void) { for (p=dbops_actions; p; p=p->next) { int res; res = init_action(p); - if (res < 0) + if (res < 0) { + pkg_free(xlbuf); + xlbuf = NULL; return res; + } } - register_script_cb(dbops_pre_script_cb, REQUEST_CB | ONREPLY_CB | PRE_SCRIPT_CB, 0); - register_script_cb(dbops_post_script_cb, REQUEST_CB | ONREPLY_CB | POST_SCRIPT_CB, 0); + if(register_script_cb(dbops_pre_script_cb, + REQUEST_CB | ONREPLY_CB | PRE_SCRIPT_CB, 0)<0) { + LM_ERR("failed to register pre script callback\n"); + pkg_free(xlbuf); + xlbuf = NULL; + return -1; + } + if(register_script_cb(dbops_post_script_cb, + REQUEST_CB | ONREPLY_CB | POST_SCRIPT_CB, 0)<0) { + LM_ERR("failed to register post script callback\n"); + pkg_free(xlbuf); + xlbuf = NULL; + return -1; + } register_select_table(sel_declaration); return 0;

1 0

git:master:554a7dbb: modules: readme files regenerated - pipelimit ... [skip ci]
by Kamailio Dev 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 554a7dbb77730efdfe56f279e98b6c0d4b4be314 URL: https://github.com/kamailio/kamailio/commit/554a7dbb77730efdfe56f279e98b6c0… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-13T19:31:46+01:00 modules: readme files regenerated - pipelimit ... [skip ci] --- Modified: src/modules/pipelimit/README --- Diff: https://github.com/kamailio/kamailio/commit/554a7dbb77730efdfe56f279e98b6c0… Patch: https://github.com/kamailio/kamailio/commit/554a7dbb77730efdfe56f279e98b6c0…

1 0

[kamailio/kamailio] Pipelimit timer doesn't seem to be working (#1390)
by jcpriotti 13 Jan '18

13 Jan '18

### Description Timer on pipelimit doesn't seem to be working. When changing the time interval the limit gets changed in a way that it's multiplied by the time interval. For example if I use a time interval of 1 second and a limit of 20 (if (!pl_check("$si", "TAILDROP", "20"))) the module start limiting right after the traffic gets over 20 CPS. But if I change the time interval to 3 seconds, the module starts limiting the traffic right after 60 CPS. This is my configuration: # ----- pipelimit params----- modparam("pipelimit", "timer_interval", 3) modparam("pipelimit", "hash_size", 10) modparam("pipelimit", "db_url", DBURL) modparam("pipelimit", "reply_code", 503) modparam("pipelimit", "reply_reason", "Limiting") ... ... ... request_route { ... ... if(is_method("INVITE")) { $var(limit) = 20; if (!pl_check("$si", "TAILDROP", "$var(limit)")) { xlog("L_INFO", "[$ci] $si - Limiting INVITE using pipe $var(limit) req/sec\n"); pl_drop(); exit; } ..... ..... ..... } } Checking the source for pipelimit module (https://github.com/kamailio/kamailio/blob/master/src/modules/pipelimit/pipe…) I see that for taildrop it's checking for the limit times the time_interval: case PIPE_ALGO_TAILDROP: ret = (pipe->counter <= pipe->limit * timer_interval) ? 1 : -1; break; I've made a change eliminating the time_interval (set it to 1) from that check and after that I've got the limit working OK, and the traffic gets drop right after it's over the limit (20 cps) using any time_interval. Is there some issue with the timer for the check not being updated by the module settings (timer_interval)? I'm using kamailio 4.4 and I've also tested it in kamailio 4.3 and 5.1 with same results. ### Troubleshooting #### Reproduction #### Debugging Data ### Additional Information version: kamailio 4.4.6 (x86_64/linux) 212b33 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: 212b33 compiled on 13:02:03 Dec 15 2017 with gcc 4.9.2 * **Operating System**: Linux sjc-lb-test-cps.telnyx.com 3.16.0-4-amd64 #1 SMP Debian 3.16.39-1+deb8u2 (2017-03-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/1390

2 2

git:master:93cfd4e8: pipelimit: docs - more details about timer interval and limit values
by Daniel-Constantin Mierla 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 93cfd4e8581fed04d4e596ed7f3d284c53fc5501 URL: https://github.com/kamailio/kamailio/commit/93cfd4e8581fed04d4e596ed7f3d284… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-13T19:29:00+01:00 pipelimit: docs - more details about timer interval and limit values --- Modified: src/modules/pipelimit/doc/pipelimit_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/93cfd4e8581fed04d4e596ed7f3d284… Patch: https://github.com/kamailio/kamailio/commit/93cfd4e8581fed04d4e596ed7f3d284…

1 0

git:master:1880f1f8: pipelimit: remove mutiplying the limit with timer interval for TAILDROP alg
by Daniel-Constantin Mierla 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 1880f1f8be4b51cec2a0567580828e9ac449947d URL: https://github.com/kamailio/kamailio/commit/1880f1f8be4b51cec2a0567580828e9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-13T19:29:00+01:00 pipelimit: remove mutiplying the limit with timer interval for TAILDROP alg - the limit is documented as per interval, not per second (closes GH #1390) - renamed macro for default limit to use module specific prefix --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/1880f1f8be4b51cec2a0567580828e9… Patch: https://github.com/kamailio/kamailio/commit/1880f1f8be4b51cec2a0567580828e9… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index 9025623435..a15e2ca696 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -64,7 +64,7 @@ MODULE_VERSION /* * timer interval length in seconds, tunable via modparam */ -#define RL_TIMER_INTERVAL 10 +#define PL_TIMER_INTERVAL 10 /** SL API structure */ sl_api_t slb; @@ -107,7 +107,7 @@ static int load_source_mp = LOAD_SOURCE_CPU; static int * load_source; /* these only change in the mod_init() process -- no locking needed */ -static int timer_interval = RL_TIMER_INTERVAL; +static int timer_interval = PL_TIMER_INTERVAL; int _pl_cfg_setpoint; /* desired load, used when reading modparams */ /* === */ @@ -565,7 +565,7 @@ static int pipe_push_direct(pl_pipe_t *pipe) ret = 2; break; case PIPE_ALGO_TAILDROP: - ret = (pipe->counter <= pipe->limit * timer_interval) ? 1 : -1; + ret = (pipe->counter <= pipe->limit) ? 1 : -1; break; case PIPE_ALGO_RED: if (pipe->load == 0) @@ -869,4 +869,4 @@ int mod_register(char *path, int *dlflags, void *p1, void *p2) { sr_kemi_modules_add(sr_kemi_pipelimit_exports); return 0; -} \ No newline at end of file +}

1 0

git:master:5e7330cd: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 5e7330cd419d8d149cc4a4ca6105d1bfa11996be URL: https://github.com/kamailio/kamailio/commit/5e7330cd419d8d149cc4a4ca6105d1b… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-13T18:32:27+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/5e7330cd419d8d149cc4a4ca6105d1b… Patch: https://github.com/kamailio/kamailio/commit/5e7330cd419d8d149cc4a4ca6105d1b… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 55a1245053..102a639ea0 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -249,15 +249,14 @@ Chapter 1. Admin Guide 4.1. force_socket (string) - Socket to be used when sending NAT pings for UDP communication. - It uses the first socket it finds based on the IP address. If - no one specified, the OS will choose a socket. + Socket to be used when sending NAT pings for UDP communication. If no + one specified, the OS will choose a socket. Default value is “NULL”. Example 1.1. Set force_socket parameter ... -modparam("nathelper", "force_socket", "127.0.0.1") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... 4.2. natping_interval (integer)

1 0

git:5.0:bc93a218: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 Jan '18

13 Jan '18

Module: kamailio Branch: 5.0 Commit: bc93a218ae02f35e230cdef6db390424c1383748 URL: https://github.com/kamailio/kamailio/commit/bc93a218ae02f35e230cdef6db39042… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-13T18:31:23+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/bc93a218ae02f35e230cdef6db39042… Patch: https://github.com/kamailio/kamailio/commit/bc93a218ae02f35e230cdef6db39042… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 3918f479ba..38d00646e3 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -256,7 +256,7 @@ Chapter 1. Admin Guide Example 1.1. Set force_socket parameter ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... 4.2. natping_interval (integer)

1 0

git:5.1:94e88ae4: nathelper: fix force_socket documentation
by Daniel-Constantin Mierla 13 Jan '18

13 Jan '18

Module: kamailio Branch: 5.1 Commit: 94e88ae464f7463a95fd89987e930c6b0c52285d URL: https://github.com/kamailio/kamailio/commit/94e88ae464f7463a95fd89987e930c6… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-13T18:24:50+01:00 nathelper: fix force_socket documentation (cherry picked from commit bfdb6ae670464ca9ff5dbb2d4d9cf5a02afd36f6) --- Modified: src/modules/nathelper/README Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/94e88ae464f7463a95fd89987e930c6… Patch: https://github.com/kamailio/kamailio/commit/94e88ae464f7463a95fd89987e930c6… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 2b12e8c67c..7649b95528 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -249,14 +249,15 @@ Chapter 1. Admin Guide 4.1. force_socket (string) - Socket to be used when sending NAT pings for UDP communication. If no - one specified, the OS will choose a socket. + Socket to be used when sending NAT pings for UDP communication. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. Default value is “NULL”. Example 1.1. Set force_socket parameter ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... 4.2. natping_interval (integer) diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index c032fc3a84..feb5b5cbe4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,7 +128,8 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - If no one specified, the OS will choose a socket. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -139,7 +140,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... </programlisting> </example>

1 0

git:5.1:b4339484: nathelper: allow port to be specified in force_socket, fixes #1298
by Daniel-Constantin Mierla 13 Jan '18

13 Jan '18

Module: kamailio Branch: 5.1 Commit: b433948421f94258c636fcef88601e35360f0102 URL: https://github.com/kamailio/kamailio/commit/b433948421f94258c636fcef88601e3… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-13T18:25:09+01:00 nathelper: allow port to be specified in force_socket, fixes #1298 (cherry picked from commit 64cf6ee50f569cd398f66ad8d7921acf2e5627bc) --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/b433948421f94258c636fcef88601e3… Patch: https://github.com/kamailio/kamailio/commit/b433948421f94258c636fcef88601e3… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index feb5b5cbe4..513c48400e 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,8 +128,7 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - It uses the first socket it finds based on the IP address. If - no one specified, the OS will choose a socket. + If no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -140,7 +139,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "127.0.0.1") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 440033db1a..5eb7f6a12f 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -417,6 +417,8 @@ static int mod_init(void) struct in_addr addr; pv_spec_t avp_spec; str s; + int port, proto; + str host; if(nathelper_rpc_init() < 0) { LM_ERR("failed to register RPC commands\n"); @@ -442,7 +444,12 @@ static int mod_init(void) } if(force_socket_str.s && force_socket_str.len > 0) { - force_socket = grep_sock_info(&force_socket_str, 0, 0); + if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) { + force_socket = grep_sock_info(&host, port, proto); + if(force_socket == 0) { + LM_ERR("non-local force_socket <%s>\n", force_socket_str.s); + } + } } /* create raw socket? */

1 0

git:5.0:817dd9c9: Merge pull request #1397 from tverlaan/5.0_nathelper_force_socket_respect_port
by GitHub 13 Jan '18

13 Jan '18

Module: kamailio Branch: 5.0 Commit: 817dd9c973fec84b960e0325eeb75a7b269d5b8d URL: https://github.com/kamailio/kamailio/commit/817dd9c973fec84b960e0325eeb75a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-13T18:21:22+01:00 Merge pull request #1397 from tverlaan/5.0_nathelper_force_socket_respect_port nathelper: allow port to be specified in force_socket, fixes #1298 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/817dd9c973fec84b960e0325eeb75a7… Patch: https://github.com/kamailio/kamailio/commit/817dd9c973fec84b960e0325eeb75a7… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d7ea668e02..76def0b1cf 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -139,7 +139,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 642318d52b..8af1b7a828 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -428,6 +428,8 @@ mod_init(void) struct in_addr addr; pv_spec_t avp_spec; str s; + int port, proto; + str host; if(nathelper_rpc_init()<0) { @@ -453,8 +455,13 @@ mod_init(void) rcv_avp_type = 0; } - if (force_socket_str.s && force_socket_str.len>0) { - force_socket=grep_sock_info(&force_socket_str,0,0); + if(force_socket_str.s && force_socket_str.len > 0) { + if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) { + force_socket = grep_sock_info(&host, port, proto); + if(force_socket == 0) { + LM_ERR("non-local force_socket <%s>\n", force_socket_str.s); + } + } } /* create raw socket? */

1 0

git:5.0:bebf08e2: nathelper: allow port to be specified in force_socket, fixes #1298
by Timmo Verlaan 13 Jan '18

13 Jan '18

Module: kamailio Branch: 5.0 Commit: bebf08e2cb8fd87141e686af5cb37947f0720a33 URL: https://github.com/kamailio/kamailio/commit/bebf08e2cb8fd87141e686af5cb3794… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-13T10:49:55+01:00 nathelper: allow port to be specified in force_socket, fixes #1298 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/bebf08e2cb8fd87141e686af5cb3794… Patch: https://github.com/kamailio/kamailio/commit/bebf08e2cb8fd87141e686af5cb3794… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index d7ea668e02..76def0b1cf 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -139,7 +139,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 642318d52b..8af1b7a828 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -428,6 +428,8 @@ mod_init(void) struct in_addr addr; pv_spec_t avp_spec; str s; + int port, proto; + str host; if(nathelper_rpc_init()<0) { @@ -453,8 +455,13 @@ mod_init(void) rcv_avp_type = 0; } - if (force_socket_str.s && force_socket_str.len>0) { - force_socket=grep_sock_info(&force_socket_str,0,0); + if(force_socket_str.s && force_socket_str.len > 0) { + if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) { + force_socket = grep_sock_info(&host, port, proto); + if(force_socket == 0) { + LM_ERR("non-local force_socket <%s>\n", force_socket_str.s); + } + } } /* create raw socket? */

1 0

[kamailio/kamailio] nathelper: allow port to be specified in force_socket, fixes #1298 (#1397)
by Timmo Verlaan 13 Jan '18

13 Jan '18

cherry-picked to be part of next 5.0.x release You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1397 -- Commit Summary -- * nathelper: allow port to be specified in force_socket, fixes #1298 -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (2) M src/modules/nathelper/nathelper.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1397.patch https://github.com/kamailio/kamailio/pull/1397.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/1397

2 1

git:master:64b535f9: Merge pull request #1396 from tverlaan/nathelper_force_socket_respect_port
by GitHub 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 64b535f9ff7ae52548a57d0736a55007c7106f53 URL: https://github.com/kamailio/kamailio/commit/64b535f9ff7ae52548a57d0736a5500… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-13T18:20:59+01:00 Merge pull request #1396 from tverlaan/nathelper_force_socket_respect_port nathelper: allow port to be specified in force_socket, fixes #1298 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/64b535f9ff7ae52548a57d0736a5500… Patch: https://github.com/kamailio/kamailio/commit/64b535f9ff7ae52548a57d0736a5500… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index feb5b5cbe4..513c48400e 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,8 +128,7 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - It uses the first socket it finds based on the IP address. If - no one specified, the OS will choose a socket. + If no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -140,7 +139,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "127.0.0.1") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 440033db1a..5eb7f6a12f 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -417,6 +417,8 @@ static int mod_init(void) struct in_addr addr; pv_spec_t avp_spec; str s; + int port, proto; + str host; if(nathelper_rpc_init() < 0) { LM_ERR("failed to register RPC commands\n"); @@ -442,7 +444,12 @@ static int mod_init(void) } if(force_socket_str.s && force_socket_str.len > 0) { - force_socket = grep_sock_info(&force_socket_str, 0, 0); + if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) { + force_socket = grep_sock_info(&host, port, proto); + if(force_socket == 0) { + LM_ERR("non-local force_socket <%s>\n", force_socket_str.s); + } + } } /* create raw socket? */

1 0

git:master:64cf6ee5: nathelper: allow port to be specified in force_socket, fixes #1298
by Timmo Verlaan 13 Jan '18

13 Jan '18

Module: kamailio Branch: master Commit: 64cf6ee50f569cd398f66ad8d7921acf2e5627bc URL: https://github.com/kamailio/kamailio/commit/64cf6ee50f569cd398f66ad8d7921ac… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-13T10:43:06+01:00 nathelper: allow port to be specified in force_socket, fixes #1298 --- Modified: src/modules/nathelper/doc/nathelper_admin.xml Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/64cf6ee50f569cd398f66ad8d7921ac… Patch: https://github.com/kamailio/kamailio/commit/64cf6ee50f569cd398f66ad8d7921ac… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index feb5b5cbe4..513c48400e 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,8 +128,7 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - It uses the first socket it finds based on the IP address. If - no one specified, the OS will choose a socket. + If no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -140,7 +139,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "127.0.0.1") +modparam("nathelper", "force_socket", "127.0.0.1:5060") ... </programlisting> </example> diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 440033db1a..5eb7f6a12f 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -417,6 +417,8 @@ static int mod_init(void) struct in_addr addr; pv_spec_t avp_spec; str s; + int port, proto; + str host; if(nathelper_rpc_init() < 0) { LM_ERR("failed to register RPC commands\n"); @@ -442,7 +444,12 @@ static int mod_init(void) } if(force_socket_str.s && force_socket_str.len > 0) { - force_socket = grep_sock_info(&force_socket_str, 0, 0); + if(parse_phostport(force_socket_str.s, &host.s, &host.len, &port, &proto) == 0) { + force_socket = grep_sock_info(&host, port, proto); + if(force_socket == 0) { + LM_ERR("non-local force_socket <%s>\n", force_socket_str.s); + } + } } /* create raw socket? */

1 0

[kamailio/kamailio] nathelper: allow port to be specified in force_socket, fixes #1298 (#1396)
by Timmo Verlaan 13 Jan '18

13 Jan '18

With regards to your comment on ticket #1298 that the nathelper force_socket should be parsed correctly. Plus I found the time to work on it :-) You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1396 -- Commit Summary -- * nathelper: allow port to be specified in force_socket, fixes #1298 -- File Changes -- M src/modules/nathelper/doc/nathelper_admin.xml (5) M src/modules/nathelper/nathelper.c (9) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1396.patch https://github.com/kamailio/kamailio/pull/1396.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/1396

2 2

git:master:788f81af: siptrace: simplified internal sip_trace() function using now formatted print
by Daniel-Constantin Mierla 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: 788f81af006f481b23606451d225a86b6b02aac8 URL: https://github.com/kamailio/kamailio/commit/788f81af006f481b23606451d225a86… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-12T14:23:45+01:00 siptrace: simplified internal sip_trace() function using now formatted print --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/788f81af006f481b23606451d225a86… Patch: https://github.com/kamailio/kamailio/commit/788f81af006f481b23606451d225a86… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index aaed65b702..3636a0929e 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -879,24 +879,32 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, && strncmp(sto.dir, "out", 3) == 0) { sto.fromip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&msg->rcv.src_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(msg->rcv.src_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), + ip_addr2a(&msg->rcv.src_ip), (int)msg->rcv.src_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.fromip.s = sto.fromip_buff; + } } if(trace_local_ip.s && trace_local_ip.len > 0 && strncmp(sto.dir, "in", 2) == 0) { sto.toip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&msg->rcv.dst_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, int2str(msg->rcv.dst_port, NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(msg->rcv.proto), ip_addr2a(&msg->rcv.dst_ip), + (int)msg->rcv.dst_port); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } } } else { sto.body.s = snd_inf->buf; @@ -905,18 +913,29 @@ static int sip_trace(sip_msg_t *msg, dest_info_t *dst, if(trace_local_ip.s && trace_local_ip.len > 0) { sto.fromip = trace_local_ip; } else { - strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, - snd_inf->send_sock->sock_str.len); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + if(snd_inf->send_sock->sock_str.len>=SIPTRACE_ADDR_MAX-1) { + LM_WARN("local socket address is too large\n"); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + strncpy(sto.fromip_buff, snd_inf->send_sock->sock_str.s, + snd_inf->send_sock->sock_str.len); + sto.fromip.s = sto.fromip_buff; + sto.fromip.len = snd_inf->send_sock->sock_str.len; + } } - siptrace_copy_proto(snd_inf->send_sock->proto, sto.toip_buff); - strcat(sto.toip_buff, suip2a(snd_inf->to, sizeof(*snd_inf->to))); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, int2str((int)su_getport(snd_inf->to), NULL)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(snd_inf->send_sock->proto), + suip2a(snd_inf->to, sizeof(*snd_inf->to)), + (int)su_getport(snd_inf->to)); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.toip.s = sto.toip_buff; + } sto.dir = "out"; }

1 0

git:master:bc88adfd: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: bc88adfd52651a20a44e90c6d07fe641b6d3be39 URL: https://github.com/kamailio/kamailio/commit/bc88adfd52651a20a44e90c6d07fe64… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-12T13:01:41+01:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/bc88adfd52651a20a44e90c6d07fe64… Patch: https://github.com/kamailio/kamailio/commit/bc88adfd52651a20a44e90c6d07fe64…

1 0

git:master:cb6df953: rtpengine: adding aggressive_redetection param
by Lucian Balaceanu 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: cb6df95387186fab8670d17cfd8040de1b7f641e URL: https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040d… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2018-01-12T13:36:34+02:00 rtpengine: adding aggressive_redetection param --- Modified: src/modules/rtpengine/config.c Modified: src/modules/rtpengine/config.h Modified: src/modules/rtpengine/doc/rtpengine_admin.xml Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040d… Patch: https://github.com/kamailio/kamailio/commit/cb6df95387186fab8670d17cfd8040d… --- diff --git a/src/modules/rtpengine/config.c b/src/modules/rtpengine/config.c index f2aa4efc0a..946df8a30c 100644 --- a/src/modules/rtpengine/config.c +++ b/src/modules/rtpengine/config.c @@ -32,6 +32,7 @@ struct cfg_group_rtpengine default_rtpengine_cfg = { 60, /* default disable timeout in seconds */ + 1, /* default aggressive_redetection enabled */ 1000, /* default wait timeout in milliseconds */ MAX_RTPP_TRIED_NODES, 5, /* rtprengine retries */ @@ -42,6 +43,8 @@ void *rtpengine_cfg = &default_rtpengine_cfg; cfg_def_t rtpengine_cfg_def[] = { {"rtpengine_disable_tout", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "The time after which rtpengine will try to communicate to an RTP proxy after it has been marked disabled automatically. "}, + {"aggressive_redetection", CFG_VAR_INT | CFG_ATOMIC, 0, 1, 0, 0, + "Determines if the sip proxy should force a query of all nodes when all RTP proxies seem unavailable."}, {"rtpengine_tout_ms", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "The total number of nodes inside a set to be queried before giving up establishing a session"}, {"queried_nodes_limit", CFG_VAR_INT | CFG_ATOMIC, 0, MAX_RTPP_TRIED_NODES, 0, 0, diff --git a/src/modules/rtpengine/config.h b/src/modules/rtpengine/config.h index ab383bc69b..d6c35b71ac 100644 --- a/src/modules/rtpengine/config.h +++ b/src/modules/rtpengine/config.h @@ -28,6 +28,7 @@ struct cfg_group_rtpengine { unsigned int rtpengine_disable_tout; + unsigned int aggressive_redetection; unsigned int rtpengine_tout_ms; unsigned int queried_nodes_limit; unsigned int rtpengine_retr; diff --git a/src/modules/rtpengine/doc/rtpengine_admin.xml b/src/modules/rtpengine/doc/rtpengine_admin.xml index 4133eb93c2..bc31168f63 100644 --- a/src/modules/rtpengine/doc/rtpengine_admin.xml +++ b/src/modules/rtpengine/doc/rtpengine_admin.xml @@ -194,6 +194,33 @@ modparam("rtpengine", "rtpengine_sock", ... modparam("rtpengine", "rtpengine_disable_tout", 20) ... +</programlisting> + </example> + </section> + <section id="rtpengine.p.aggressive_redetection"> + <title><varname>aggressive_redetection</varname> (integer)</title> + <para> + This parameter determines what happens when all potential rtpengines are found + to be unreachable. If enabled, the sip server will send pings to all rtpengines, + else no rtpengine will pe queried until its rtpengine_disable_tout timeout passes. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <para> + Can be set at runtime, e.g.: + <programlisting> + $ &sercmd; cfg.set_now_int rtpengine aggressive_redetection 0 + </programlisting> + </para> + <example> + <title>Set <varname>aggressive_redetection</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("rtpengine", "aggressive_redetection", 0) +... </programlisting> </example> </section> diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 5b82988229..6ad0c16d7e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -336,6 +336,7 @@ static param_export_t params[] = { {"rtpengine_sock", PARAM_STRING|USE_FUNC_PARAM, (void*)rtpengine_set_store }, {"rtpengine_disable_tout",INT_PARAM, &default_rtpengine_cfg.rtpengine_disable_tout }, + {"aggressive_redetection",INT_PARAM, &default_rtpengine_cfg.aggressive_redetection }, {"rtpengine_retr", INT_PARAM, &default_rtpengine_cfg.rtpengine_retr }, {"queried_nodes_limit", INT_PARAM, &default_rtpengine_cfg.queried_nodes_limit }, {"rtpengine_tout_ms", INT_PARAM, &default_rtpengine_cfg.rtpengine_tout_ms }, @@ -2610,6 +2611,10 @@ select_rtpp_node_new(str callid, str viabranch, int do_test, struct rtpp_node ** /* No proxies? Force all to be redetected, if not yet */ if (weight_sum == 0) { + if (!cfg_get(rtpengine,rtpengine_cfg,aggressive_redetection)) { + return NULL; + } + if (was_forced) { return NULL; }

1 0

git:master:b3e14fc9: drouting: option to use a static structure for computing ac max val
by Daniel-Constantin Mierla 12 Jan '18

12 Jan '18

Module: kamailio Branch: master Commit: b3e14fc9bd379ad77c13ade0bc60dc32f1d55ade URL: https://github.com/kamailio/kamailio/commit/b3e14fc9bd379ad77c13ade0bc60dc3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-12T09:50:36+01:00 drouting: option to use a static structure for computing ac max val --- Modified: src/modules/drouting/dr_time.c Modified: src/modules/drouting/dr_time.h --- Diff: https://github.com/kamailio/kamailio/commit/b3e14fc9bd379ad77c13ade0bc60dc3… Patch: https://github.com/kamailio/kamailio/commit/b3e14fc9bd379ad77c13ade0bc60dc3… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 879665a07d..0af2e51326 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -203,17 +203,22 @@ int ac_tm_free(ac_tm_p _atp) return 0; } -ac_maxval_p ac_get_maxval(ac_tm_p _atp) +ac_maxval_p ac_get_maxval(ac_tm_p _atp, int mode) { struct tm _tm; int _v; ac_maxval_p _amp = NULL; + static ac_maxval_t _amv; if(!_atp) return NULL; - _amp = (ac_maxval_p)shm_malloc(sizeof(ac_maxval_t)); - if(!_amp) - return NULL; + if(mode==1) { + _amp = (ac_maxval_p)shm_malloc(sizeof(ac_maxval_t)); + if(!_amp) + return NULL; + } else { + _amp = &_amv; + } memset(_amp, 0, sizeof(ac_maxval_t)); /* the number of the days in the year */ @@ -270,11 +275,13 @@ ac_maxval_p ac_get_maxval(ac_tm_p _atp) + 1; #endif - if(_atp->mv!=NULL) { - shm_free(_atp->mv); - } + if(mode==1) { + if(_atp->mv!=NULL) { + shm_free(_atp->mv); + } - _atp->mv = _amp; + _atp->mv = _amp; + } return _amp; } @@ -1050,7 +1057,7 @@ int check_byxxx(tmrec_p _trp, ac_tm_p _atp) && !_trp->byweekno) return REC_MATCH; - _amp = ac_get_maxval(_atp); + _amp = ac_get_maxval(_atp, 0); if(!_amp) return REC_NOMATCH; diff --git a/src/modules/drouting/dr_time.h b/src/modules/drouting/dr_time.h index 86c041a646..67638e2358 100644 --- a/src/modules/drouting/dr_time.h +++ b/src/modules/drouting/dr_time.h @@ -76,7 +76,7 @@ int ac_tm_free(ac_tm_p); int ac_get_mweek(struct tm *); int ac_get_yweek(struct tm *); -ac_maxval_p ac_get_maxval(ac_tm_p); +ac_maxval_p ac_get_maxval(ac_tm_p, int); int ac_get_wkst(); int ac_print(ac_tm_p);

1 0

git:master:e0f95ea7: drouting: free max val for time recurrence struct on update if already set
by Daniel-Constantin Mierla 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: e0f95ea7fc691f976564b07436848673c633195d URL: https://github.com/kamailio/kamailio/commit/e0f95ea7fc691f976564b0743684867… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-11T12:16:47+01:00 drouting: free max val for time recurrence struct on update if already set - reported by Uri Shacked --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/e0f95ea7fc691f976564b0743684867… Patch: https://github.com/kamailio/kamailio/commit/e0f95ea7fc691f976564b0743684867… --- diff --git a/src/modules/drouting/dr_time.c b/src/modules/drouting/dr_time.c index 5482df7e7c..879665a07d 100644 --- a/src/modules/drouting/dr_time.c +++ b/src/modules/drouting/dr_time.c @@ -214,6 +214,7 @@ ac_maxval_p ac_get_maxval(ac_tm_p _atp) _amp = (ac_maxval_p)shm_malloc(sizeof(ac_maxval_t)); if(!_amp) return NULL; + memset(_amp, 0, sizeof(ac_maxval_t)); /* the number of the days in the year */ _amp->yday = 365 + is_leap_year(_atp->t.tm_year + 1900); @@ -269,6 +270,10 @@ ac_maxval_p ac_get_maxval(ac_tm_p _atp) + 1; #endif + if(_atp->mv!=NULL) { + shm_free(_atp->mv); + } + _atp->mv = _amp; return _amp; }

1 0

P-Server Exiting whenever Registered one user (Jitsi SIP Client)
by Prasannakumar Merugu 11 Jan '18

11 Jan '18

Hello All, We are able to registered user and make calls with Kamailio-5.0.4 version but, When we are trying register with Kamailio-5.1 version P-Server is exiting, Jitsi client getting registered I mentioned the below P-server error logs. 4(5562) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31b6@0:0:0:0:0:0:0:0) 4(5562) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 4(5562) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 4(5562) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 4(5562) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 4(5562) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 5(5563) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31 b6@0:0:0:0:0:0:0:0) 5(5563) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 5(5563) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 5(5563) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 5(5563) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 5(5563) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 9(5567) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, afcbb763f0f93a0352c619b5c99ae6 70@0:0:0:0:0:0:0:0) 9(5567) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 9(5567) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BF1500007900000000; icid-generated-at=192.168.99.170 8(5566) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1 f3@0:0:0:0:0:0:0:0) 8(5566) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 8(5566) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BE1500007900000000; icid-generated-at=192.168.99.170 12(5570) ERROR: <script>: OPTIONS (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, e6aa5e89244dc5c9c8d3368914df87d8@0:0:0:0:0:0:0:0) 12(5570) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 12(5570) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101C21500007900000000; icid-generated-at=192.168.99.170 1(5559) ERROR: <script>: PUBLISH (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 2a295e80bfd808d48ee4e20e9cd93869@0:0:0:0:0:0:0:0) 1(5559) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 1(5559) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101B71500007900000000; icid-generated-at=192.168.99.170 11(5569) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.170:6060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1f3@0:0:0:0:0:0:0:0) 0(5556) ALERT: <core> [main.c:745]: handle_sigs(): child process 5621 exited by a signal 11 0(5556) ALERT: <core> [main.c:748]: handle_sigs(): core was generated 0(5556) INFO: <core> [main.c:771]: handle_sigs(): terminating due to SIGCHLD -- *Thanks,Prasannakumar Merugu9010028290*

2 1

git:master:2e460814: siptrace: replaced sequeces of string concatenations with safer formatted print
by Daniel-Constantin Mierla 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: 2e46081424240dfb3767da74b0818249dff46802 URL: https://github.com/kamailio/kamailio/commit/2e46081424240dfb3767da74b081824… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-11T11:53:35+01:00 siptrace: replaced sequeces of string concatenations with safer formatted print - used to build proxy-like addresses --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_send.c Modified: src/modules/siptrace/siptrace_send.h --- Diff: https://github.com/kamailio/kamailio/commit/2e46081424240dfb3767da74b081824… Patch: https://github.com/kamailio/kamailio/commit/2e46081424240dfb3767da74b081824… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 0df1e959fb..d8b5da399b 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1339,12 +1339,16 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) if(trace_local_ip.len > 0) { sto.fromip = trace_local_ip; } else { - siptrace_copy_proto(msg->rcv.proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&req->rcv.dst_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(req->rcv.dst_port, NULL)); - sto.fromip.s = sto.fromip_buff; - sto.fromip.len = strlen(sto.fromip_buff); + sto.fromip.len = snprintf(sto.fromip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(req->rcv.proto), + ip_addr2a(&req->rcv.dst_ip), req->rcv.dst_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = "any:255.255.255.255"; + sto.fromip.len = 19; + } else { + sto.fromip.s = sto.fromip_buff; + } } strcpy(statusbuf, int2str(slcbp->code, &sto.status.len)); @@ -1356,13 +1360,16 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) sto.toip.len = 19; } else { su2ip_addr(&to_ip, &slcbp->dst->to); - siptrace_copy_proto(req->rcv.proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&to_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, - int2str((unsigned long)su_getport(&slcbp->dst->to), &len)); - sto.toip.s = sto.toip_buff; - sto.toip.len = strlen(sto.toip_buff); + sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", + siptrace_proto_name(req->rcv.proto), ip_addr2a(&to_ip), + (int)su_getport(&slcbp->dst->to)); + if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); + sto.toip.s = "any:255.255.255.255"; + sto.toip.len = 19; + } else { + sto.toip.s = sto.toip_buff; + } } sto.dir = "out"; diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index eeb91c20c7..6e7718b933 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -318,3 +318,24 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2) } return -1; } + +/** + * + */ +char* siptrace_proto_name(int vproto) +{ + switch(vproto) { + case PROTO_TCP: + return "tcp"; + case PROTO_TLS: + return "tls"; + case PROTO_SCTP: + return "sctp"; + case PROTO_WS: + return "ws"; + case PROTO_WSS: + return "wss"; + default: + return "udp"; + } +} diff --git a/src/modules/siptrace/siptrace_send.h b/src/modules/siptrace/siptrace_send.h index a83eebad22..30c33e53b5 100644 --- a/src/modules/siptrace/siptrace_send.h +++ b/src/modules/siptrace/siptrace_send.h @@ -70,4 +70,6 @@ int trace_send_duplicate(char *buf, int len, struct dest_info *dst2); siptrace_copy_proto_olen(vproto, vbuf, __olen); \ } while(0) -#endif +char* siptrace_proto_name(int vproto); + +#endif \ No newline at end of file

1 0

git:master:2ae4d19a: siptrace: use same value for "any" address
by Daniel-Constantin Mierla 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: 2ae4d19a5948d771980853bf38aeef8c1553faec URL: https://github.com/kamailio/kamailio/commit/2ae4d19a5948d771980853bf38aeef8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-11T11:53:35+01:00 siptrace: use same value for "any" address - two variants were used: any:255.255.255.255:5060 and any:255.255.255.255, now any:255.255.255.255:5060 is used everywhere through a define --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/2ae4d19a5948d771980853bf38aeef8… Patch: https://github.com/kamailio/kamailio/commit/2ae4d19a5948d771980853bf38aeef8… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index d8b5da399b..aaed65b702 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -59,6 +59,8 @@ MODULE_VERSION +#define SIPTRACE_ANYADDR "any:255.255.255.255:5060" +#define SIPTRACE_ANYADDR_LEN (sizeof(SIPTRACE_ANYADDR) - 1) struct tm_binds tmb; @@ -1084,8 +1086,8 @@ static void trace_onreq_out(struct cell *t, int type, struct tmcb_params *ps) } if(dst == 0) { - sto.toip.s = "any:255.255.255.255"; - sto.toip.len = 19; + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { su2ip_addr(&to_ip, &dst->to); siptrace_copy_proto(dst->proto, sto.toip_buff); @@ -1267,8 +1269,8 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) memset(&to_ip, 0, sizeof(struct ip_addr)); dst = ps->dst; if(dst == 0) { - sto.toip.s = "any:255.255.255.255"; - sto.toip.len = 19; + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { su2ip_addr(&to_ip, &dst->to); siptrace_copy_proto(dst->proto, sto.toip_buff); @@ -1344,8 +1346,8 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) ip_addr2a(&req->rcv.dst_ip), req->rcv.dst_port); if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.fromip.len); - sto.fromip.s = "any:255.255.255.255"; - sto.fromip.len = 19; + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; } else { sto.fromip.s = sto.fromip_buff; } @@ -1356,8 +1358,8 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) memset(&to_ip, 0, sizeof(struct ip_addr)); if(slcbp->dst == 0) { - sto.toip.s = "any:255.255.255.255"; - sto.toip.len = 19; + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { su2ip_addr(&to_ip, &slcbp->dst->to); sto.toip.len = snprintf(sto.toip_buff, SIPTRACE_ADDR_MAX, "%s:%s:%d", @@ -1365,8 +1367,8 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) (int)su_getport(&slcbp->dst->to)); if(sto.toip.len<0 || sto.toip.len>=SIPTRACE_ADDR_MAX) { LM_ERR("failed to format toip buffer (%d)\n", sto.toip.len); - sto.toip.s = "any:255.255.255.255"; - sto.toip.len = 19; + sto.toip.s = SIPTRACE_ANYADDR; + sto.toip.len = SIPTRACE_ANYADDR_LEN; } else { sto.toip.s = sto.toip_buff; } @@ -1503,8 +1505,8 @@ int siptrace_net_data_send(sr_event_param_t *evp) if(unlikely(new_dst.send_sock == 0)) { LM_WARN("no sending socket found\n"); - strcpy(sto.fromip_buff, "any:255.255.255.255:5060"); - sto.fromip.len = 24; + strcpy(sto.fromip_buff, SIPTRACE_ANYADDR); + sto.fromip.len = SIPTRACE_ANYADDR_LEN; } else { if(new_dst.send_sock->sock_str.len>=SIPTRACE_ADDR_MAX-1) { LM_ERR("socket string is too large: %d\n",

1 0

git:master:74560dcd: Merge pull request #1394 from tverlaan/nathelper_fix_documentation
by GitHub 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: 74560dcd9bd4f7a00a9f82caded66f79a22940aa URL: https://github.com/kamailio/kamailio/commit/74560dcd9bd4f7a00a9f82caded66f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-11T11:25:51+01:00 Merge pull request #1394 from tverlaan/nathelper_fix_documentation nathelper: fix force_socket documentation --- Modified: src/modules/nathelper/README Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/74560dcd9bd4f7a00a9f82caded66f7… Patch: https://github.com/kamailio/kamailio/commit/74560dcd9bd4f7a00a9f82caded66f7… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 867e7aad88..55a1245053 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -249,14 +249,15 @@ Chapter 1. Admin Guide 4.1. force_socket (string) - Socket to be used when sending NAT pings for UDP communication. If no - one specified, the OS will choose a socket. + Socket to be used when sending NAT pings for UDP communication. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. Default value is “NULL”. Example 1.1. Set force_socket parameter ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... 4.2. natping_interval (integer) diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index c032fc3a84..feb5b5cbe4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,7 +128,8 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - If no one specified, the OS will choose a socket. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -139,7 +140,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... </programlisting> </example>

1 0

git:master:bfdb6ae6: nathelper: fix force_socket documentation
by Timmo Verlaan 11 Jan '18

11 Jan '18

Module: kamailio Branch: master Commit: bfdb6ae670464ca9ff5dbb2d4d9cf5a02afd36f6 URL: https://github.com/kamailio/kamailio/commit/bfdb6ae670464ca9ff5dbb2d4d9cf5a… Author: Timmo Verlaan <tverlaan(a)gmail.com> Committer: Timmo Verlaan <tverlaan(a)gmail.com> Date: 2018-01-10T16:30:04+01:00 nathelper: fix force_socket documentation --- Modified: src/modules/nathelper/README Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/bfdb6ae670464ca9ff5dbb2d4d9cf5a… Patch: https://github.com/kamailio/kamailio/commit/bfdb6ae670464ca9ff5dbb2d4d9cf5a… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 867e7aad88..55a1245053 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -249,14 +249,15 @@ Chapter 1. Admin Guide 4.1. force_socket (string) - Socket to be used when sending NAT pings for UDP communication. If no - one specified, the OS will choose a socket. + Socket to be used when sending NAT pings for UDP communication. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. Default value is “NULL”. Example 1.1. Set force_socket parameter ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... 4.2. natping_interval (integer) diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index c032fc3a84..feb5b5cbe4 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -128,7 +128,8 @@ <title><varname>force_socket</varname> (string)</title> <para> Socket to be used when sending NAT pings for UDP communication. - If no one specified, the OS will choose a socket. + It uses the first socket it finds based on the IP address. If + no one specified, the OS will choose a socket. </para> <para> <emphasis> @@ -139,7 +140,7 @@ <title>Set <varname>force_socket</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("nathelper", "force_socket", "localhost:33333") +modparam("nathelper", "force_socket", "127.0.0.1") ... </programlisting> </example>

1 0

[kamailio/kamailio] v5.0.4: nathelper: force_socket not being honoured (#1298)
by 00Asgaroth00 11 Jan '18

11 Jan '18

### Description The force_socket parameter is not always used when set. If I understand the module documentation correctly, when setting the force_socket parameter, then all nathelper udp traffic will be forced to use this socket definition. The issue here is a result of another issue first described [here](http://sip-router.1086192.n5.nabble.com/NatHelper-ignoring-force-sock… in 2015 but is still present in current stable kamailio v5.0.4. We have 3 registrars running in "memory only" mode, using dmq_usrloc to replicate registrations to the remaining two nodes. On the remaining two nodes there is no socket parameter set for the AOR, but nathelper still wants to ping these AOR's. It is on these two systems where this issue exhibits itself. I will open another ticket for this scenario and try to reference it here as they are related. Each registrar has two interfaces, one is our "admin" lan, the other is our "voice" lan. The default route is set on these hosts and is a gateway on our "admin" lan. See issue #1297 When the registrars that are replicated to receive the AOR, they attempt to ping the endpoint (ideally they should not ping them). nathelper seems to think that the best interface to send them over is the "admin" lan even though force_socket is defined. I would have expected that the message should have been sent via the socket defined in the "force_socket" parameter. ### Troubleshooting Module definitions registrar ``` modparam("registrar", "method_filtering", 1) modparam("registrar", "case_sensitive", 1) modparam("registrar", "append_branches", 0) modparam("registrar", "use_path", 1) modparam("registrar", "path_mode", 0) modparam("registrar", "path_use_received", 1) modparam("registrar", "path_check_local", 1) modparam("registrar", "max_contacts", 1) ``` usrloc ``` modparam("usrloc", "db_mode", 0) modparam("usrloc", "use_domain", 1) modparam("usrloc", "timer_interval", 60) modparam("usrloc", "timer_procs", 4) modparam("usrloc", "nat_bflag", 6) ``` nathelper ``` modparam("nathelper", "natping_interval", 20) modparam("nathelper", "natping_processes", 4) modparam("nathelper", "ping_nated_only", 0) modparam("nathelper", "sipping_from", "sip:keepalive@example.com") modparam("nathelper", "sipping_method", "OPTIONS") modparam("nathelper", "sipping_bflag", 6) modparam("nathelper", "force_socket", "10.7.0.189:5060") modparam("nathelper", "udpping_from_path", 1) ``` Kamailio is listening on the same socket that is defined for the "force_socket" parameter above ``` listen=udp:10.6.0.189:5060 listen=udp:10.7.0.189:5060 listen=tcp:10.6.0.189:80 ``` dmq ``` modparam("dmq", "server_address", DMQ_ADDRESS) modparam("dmq", "notification_address", DMQ_NOTIFY_ADDRESS) modparam("dmq", "multi_notify", 1) modparam("dmq", "num_workers", 4) ``` dmq_usrloc ``` modparam("dmq_usrloc", "enable", 1) ``` #### Reproduction Using the above settings register a user and once they are replicated to the registrar that did not service the request, the options pings on the nodes that were replicated to will exhibit this issue. Example AOR where the registration was serviced (options pings should come from this host, and do, and flow as expected) ``` { "jsonrpc": "2.0", "result": { "Domain": "location", "Size": 1024, "AoRs": [{ "Info": { "AoR": "example_user(a)example.com", "HashID": -1389656423, "Contacts": [{ "Contact": { "Address": "sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP", "Expires": 66, "Q": -1, "Call-ID": "wE-GD4GzkrtuDAJUBJf1Jg..", "CSeq": 58, "User-Agent": "Z 3.15.40006 rv2.8.20", "Received": "sip:212.2.172.228:39808", "Path": "<sip:10.7.0.186:5062;lr;received=sip:212.2.172.228:39808>", "State": "CS_NEW", "Flags": 0, "CFlags": 64, "Socket": "udp:10.7.0.190:5060", "Methods": -1, "Ruid": "uloc-2-59fa1f9d-714-17", "Instance": "[not set]", "Reg-Id": 0, "Last-Keepalive": 1509615136, "Last-Modified": 1509615136 } }] } } ], "Stats": { "Records": 1, "Max-Slots": 1 } }, "id": 4836 } ``` example AOR of the above registration on a registrar that was replicated to by dmq/dmq_usrloc, ideally these AOR's should not be pinged at all, but, currently they do, but, in this case, when they do get ping'd, they do not use the socket as defined in the "force_socket" parameter. ``` { "jsonrpc": "2.0", "result": { "Domain": "location", "Size": 1024, "AoRs": [{ "Info": { "AoR": "example_user(a)example.com", "HashID": -1389656423, "Contacts": [{ "Contact": { "Address": "sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP", "Expires": 69, "Q": -1, "Call-ID": "wE-GD4GzkrtuDAJUBJf1Jg..", "CSeq": 91, "User-Agent": "Z 3.15.40006 rv2.8.20", "Received": "sip:212.2.172.228:39808", "Path": "<sip:10.7.0.186:5062;lr;received=sip:212.2.172.228:39808>", "State": "CS_NEW", "Flags": 2, "CFlags": 64, "Socket": "[not set]", "Methods": -1, "Ruid": "uloc-2-59fa1f9d-714-17", "Instance": "[not set]", "Reg-Id": 0, "Last-Keepalive": 1509617664, "Last-Modified": 1509617664 } }] } } ], "Stats": { "Records": 1, "Max-Slots": 1 } }, "id": 4571 } ``` #### Log Messages There are no apparent error messages in the logs relating to this that I can see. #### SIP Traffic Here you can clearly see that the OPTIONS message is being sent over the "10.6.0.189" interface when the modules "force_socket" parameter is set to "10.7.0.189:5060" ``` U 2017/11/02 08:37:59.426608 10.6.0.189:5060 -> 10.7.0.186:5062 OPTIONS sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP SIP/2.0. Via: SIP/2.0/UDP 10.6.0.189:5060;branch=z9hG4bK8416926. Route: <sip:10.7.0.186:5062;lr;received=sip:212.2.172.228:39808>. From: sip:keepalive@example.com;tag=uloc-2-59fa1f9d-714-17-9968b2da-13812ff4. To: sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP. Call-ID: c0cec5f7-555ac383-68bb313(a)10.6.0.189. CSeq: 1 OPTIONS. Content-Length: 0. . U 2017/11/02 08:38:19.431937 10.6.0.189:5060 -> 10.7.0.186:5062 OPTIONS sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP SIP/2.0. Via: SIP/2.0/UDP 10.6.0.189:5060;branch=z9hG4bK8345318. Route: <sip:10.7.0.186:5062;lr;received=sip:212.2.172.228:39808>. From: sip:keepalive@example.com;tag=uloc-2-59fa1f9d-714-17-9968b2da-23812ff4. To: sip:example_user@212.2.172.228:39808;rinstance=ed8aa63e90f53e97;transport=UDP. Call-ID: c0cec5f7-655ac383-a9bb313(a)10.6.0.189. CSeq: 1 OPTIONS. Content-Length: 0. . ``` ### Possible Solutions Unknown ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.4 (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 on 10:57:22 Oct 26 2017 with gcc 4.8.5 ``` * **Operating System**: ``` CentOS Linux release 7.4.1708 (Core) Linux localhost 3.10.0-693.5.2.el7.x86_64 #1 SMP Fri Oct 20 20:32:50 UTC 2017 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/1298

3 8

[kamailio/kamailio] nathelper: fix force_socket documentation (#1394)
by Timmo Verlaan 11 Jan '18

11 Jan '18

fixes #1298 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1394 -- Commit Summary -- * nathelper: fix force_socket documentation -- File Changes -- M src/modules/nathelper/README (7) M src/modules/nathelper/doc/nathelper_admin.xml (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1394.patch https://github.com/kamailio/kamailio/pull/1394.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/1394

2 2

Re: [sr-dev] [kamailio/kamailio] kamctl: expose db root password variable used by kamdbctl.mysql in kamctlrc (3138051)
by Daniel-Constantin Mierla 11 Jan '18

11 Jan '18

The purpose was exactly this one, to make visible as configuration option something that was not only in the functional code, but useful in various situation. Of course, it is bash and any variable can be set via environment, but it seemed not right to dig in the code to find internal stuff and see how one can overwrite it -- better make it explicit in the config file (and I also aligned it to the naming pattern for the rest of db vars). It would be good from people/community to propose changes/enhancements when they need something and it is not a configuration option, otherwise a developer may not have an idea who is using some _hidden internal_ stuff. Not really like that given is shell, but this would sound like: **in a C code blaming that a dev did a rename of a variable because someone does a sed to replace the old one before compilation with something else**. Then I do not even remember when kamdbctl version was bumped, but was nothing like done periodically or on changes, but I agree could have been something good to do. -- 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/commit/313805136d22ed79d1c490075324703…

1 0

Re: [sr-dev] [kamailio/kamailio] kamctl: expose db root password variable used by kamdbctl.mysql in kamctlrc (3138051)
by Josh Nankin 11 Jan '18

11 Jan '18

we have chef scripts that set PW and run kamdbctl create on instance start up. This broke our build. How is this documented? There is not even a bump in the kamdbctl version number? -- 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/commit/313805136d22ed79d1c490075324703…

1 0

git:master:2bb33a88: pua: safety check on tuple_id len
by Daniel-Constantin Mierla 10 Jan '18

10 Jan '18

Module: kamailio Branch: master Commit: 2bb33a88881eacb94e2af54d564cdffc00478cea URL: https://github.com/kamailio/kamailio/commit/2bb33a88881eacb94e2af54d564cdff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-10T12:52:27+01:00 pua: safety check on tuple_id len --- Modified: src/modules/pua/add_events.c --- Diff: https://github.com/kamailio/kamailio/commit/2bb33a88881eacb94e2af54d564cdff… Patch: https://github.com/kamailio/kamailio/commit/2bb33a88881eacb94e2af54d564cdff… --- diff --git a/src/modules/pua/add_events.c b/src/modules/pua/add_events.c index ce94d5a842..79d3aeaedb 100644 --- a/src/modules/pua/add_events.c +++ b/src/modules/pua/add_events.c @@ -183,6 +183,10 @@ int pres_process_body(publ_info_t* publ, str** fin_body, int ver, str** tuple_pa { if(tuple== NULL) { + if(strlen(tuple_id)>=50) { + LM_ERR("tuple id is too long: %s\n", tuple_id); + goto error; + } strcpy(buf, tuple_id); xmlFree(tuple_id); tuple_id= buf;

1 0

git:master:49949603: core/parser: more strict parsing of sip uri host
by Juha Heinanen 10 Jan '18

10 Jan '18

Module: kamailio Branch: master Commit: 4994960324d5353222b3de08515bed07802ab7bc URL: https://github.com/kamailio/kamailio/commit/4994960324d5353222b3de08515bed0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2018-01-10T08:39:48+02:00 core/parser: more strict parsing of sip uri host --- Modified: src/core/parser/parse_uri.c --- Diff: https://github.com/kamailio/kamailio/commit/4994960324d5353222b3de08515bed0… Patch: https://github.com/kamailio/kamailio/commit/4994960324d5353222b3de08515bed0… --- diff --git a/src/core/parser/parse_uri.c b/src/core/parser/parse_uri.c index af03b92f0d..dbf5a7f9f7 100644 --- a/src/core/parser/parse_uri.c +++ b/src/core/parser/parse_uri.c @@ -528,23 +528,23 @@ int parse_uri(char* buf, int len, struct sip_uri* uri) } break; case URI_HOST: - switch(*p){ - case '[': - state=URI_HOST6_P; - break; - case ':': - case ';': - case '?': /* null host name ->invalid */ - case '&': - case '@': /*chars not allowed in hosts names */ + if(*p == '[') { + state = URI_HOST6_P; + } else { + if(isalnum(*p)) { + state = URI_HOST_P; + } else { goto error_bad_host; - default: - state=URI_HOST_P; + } } break; case URI_HOST_P: - switch(*p){ + switch(*p) { check_host_end; + default: + if(!isalnum(*p) && (*p != '.') && (*p != '-')) { + goto error_bad_host; + } } break; case URI_HOST6_END:

1 0

P-Server Exiting whenever Registered one user (Jitsi SIP Client)
by Prasannakumar Merugu 10 Jan '18

10 Jan '18

Hello All, We are able to registered user and make calls with Kamailio-5.0.4 version but, When we are trying register with Kamailio-5.1 version P-Server is exiting, Jitsi client getting registered I mentioned the below P-server error logs. 4(5562) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31b6@0:0:0:0:0:0:0:0) 4(5562) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 4(5562) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 4(5562) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 4(5562) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 4(5562) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 5(5563) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31 b6@0:0:0:0:0:0:0:0) 5(5563) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 5(5563) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 5(5563) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 5(5563) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 5(5563) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 9(5567) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, afcbb763f0f93a0352c619b5c99ae6 70@0:0:0:0:0:0:0:0) 9(5567) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 9(5567) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BF1500007900000000; icid-generated-at=192.168.99.170 8(5566) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1 f3@0:0:0:0:0:0:0:0) 8(5566) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 8(5566) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BE1500007900000000; icid-generated-at=192.168.99.170 12(5570) ERROR: <script>: OPTIONS (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, e6aa5e89244dc5c9c8d3368914df87d8@0:0:0:0:0:0:0:0) 12(5570) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 12(5570) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101C21500007900000000; icid-generated-at=192.168.99.170 1(5559) ERROR: <script>: PUBLISH (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 2a295e80bfd808d48ee4e20e9cd93869@0:0:0:0:0:0:0:0) 1(5559) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 1(5559) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101B71500007900000000; icid-generated-at=192.168.99.170 11(5569) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.170:6060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1f3@0:0:0:0:0:0:0:0) 0(5556) ALERT: <core> [main.c:745]: handle_sigs(): child process 5621 exited by a signal 11 0(5556) ALERT: <core> [main.c:748]: handle_sigs(): core was generated 0(5556) INFO: <core> [main.c:771]: handle_sigs(): terminating due to SIGCHLD -- *Thanks,* *Prasannakumar Merugu9010028290*

1 0

P-Server Exiting whenever Registered one user
by Prasannakumar Merugu 09 Jan '18

09 Jan '18

Hello All, We are able to registered user and make calls with Kamailio-5.0.4 version but, When we are trying register with Kamailio-5.0.5 version P-Server is exiting, Jitsi client getting registered I mentioned the below P-server error logs. 4(5562) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31b6@0:0:0:0:0:0:0:0) 4(5562) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 4(5562) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 4(5562) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 4(5562) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 4(5562) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 5(5563) ERROR: <script>: REGISTER (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 202f32922a316edc997683eee34f31b6@0:0:0:0:0:0:0:0) 5(5563) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 5(5563) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 5(5563) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 5(5563) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 5(5563) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 9(5567) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, afcbb763f0f93a0352c619b5c99ae670@0:0:0:0:0:0:0:0) 9(5567) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 9(5567) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BF1500007900000000; icid-generated-at=192.168.99.170 8(5566) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.52:5060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1f3@0:0:0:0:0:0:0:0) 8(5566) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 8(5566) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101BE1500007900000000; icid-generated-at=192.168.99.170 12(5570) ERROR: <script>: OPTIONS (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, e6aa5e89244dc5c9c8d3368914df87d8@0:0:0:0:0:0:0:0) 12(5570) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 12(5570) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101C21500007900000000; icid-generated-at=192.168.99.170 1(5559) ERROR: <script>: PUBLISH (sip:bob@koffee-ims.in (192.168.99.52:5060) to sip:bob@koffee-ims.in, 2a295e80bfd808d48ee4e20e9cd93869@0:0:0:0:0:0:0:0) 1(5559) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 1(5559) INFO: siputils [chargingvector.c:432]: sip_handle_pcv(): Generated PCV header P-Charging-Vector: icid-value=4956537F000101B71500007900000000; icid-generated-at=192.168.99.170 11(5569) ERROR: <script>: SUBSCRIBE (sip:bob@koffee-ims.in ( 192.168.99.170:6060) to sip:bob@koffee-ims.in, 20e14c49f28938df0bca28302e95c1f3@0:0:0:0:0:0:0:0) 0(5556) ALERT: <core> [main.c:745]: handle_sigs(): child process 5621 exited by a signal 11 0(5556) ALERT: <core> [main.c:748]: handle_sigs(): core was generated 0(5556) INFO: <core> [main.c:771]: handle_sigs(): terminating due to SIGCHLD -- *Thanks,* *Prasannakumar Merugu9010028290*

1 1

git:master:8f51d6b1: siptrace: retrieve and use the len of proto when building the address
by Daniel-Constantin Mierla 09 Jan '18

09 Jan '18

Module: kamailio Branch: master Commit: 8f51d6b1624ebca08e71061e0c18c68101595201 URL: https://github.com/kamailio/kamailio/commit/8f51d6b1624ebca08e71061e0c18c68… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-09T10:06:34+01:00 siptrace: retrieve and use the len of proto when building the address --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h --- Diff: https://github.com/kamailio/kamailio/commit/8f51d6b1624ebca08e71061e0c18c68… Patch: https://github.com/kamailio/kamailio/commit/8f51d6b1624ebca08e71061e0c18c68…

1 0

git:master:aaf3b2e3: siptrace: siptrace_copy_proto() converted to macro
by Daniel-Constantin Mierla 09 Jan '18

09 Jan '18

Module: kamailio Branch: master Commit: aaf3b2e35bf58ad19b2b375f26909b102b7d512f URL: https://github.com/kamailio/kamailio/commit/aaf3b2e35bf58ad19b2b375f26909b1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-09T10:00:31+01:00 siptrace: siptrace_copy_proto() converted to macro --- Modified: src/modules/siptrace/siptrace_send.c Modified: src/modules/siptrace/siptrace_send.h --- Diff: https://github.com/kamailio/kamailio/commit/aaf3b2e35bf58ad19b2b375f26909b1… Patch: https://github.com/kamailio/kamailio/commit/aaf3b2e35bf58ad19b2b375f26909b1… --- diff --git a/src/modules/siptrace/siptrace_send.c b/src/modules/siptrace/siptrace_send.c index 0a57d3b1f7..eeb91c20c7 100644 --- a/src/modules/siptrace/siptrace_send.c +++ b/src/modules/siptrace/siptrace_send.c @@ -41,29 +41,6 @@ extern int *xheaders_read_flag; extern str dup_uri_str; extern sip_uri_t *dup_uri; -/** - * - */ -int siptrace_copy_proto(int proto, char *buf) -{ - if(buf == 0) - return -1; - if(proto == PROTO_TCP) { - strcpy(buf, "tcp:"); - } else if(proto == PROTO_TLS) { - strcpy(buf, "tls:"); - } else if(proto == PROTO_SCTP) { - strcpy(buf, "sctp:"); - } else if(proto == PROTO_WS) { - strcpy(buf, "ws:"); - } else if(proto == PROTO_WSS) { - strcpy(buf, "wss:"); - } else { - strcpy(buf, "udp:"); - } - return 0; -} - /** * */ diff --git a/src/modules/siptrace/siptrace_send.h b/src/modules/siptrace/siptrace_send.h index 288566b75a..a83eebad22 100644 --- a/src/modules/siptrace/siptrace_send.h +++ b/src/modules/siptrace/siptrace_send.h @@ -28,11 +28,46 @@ #include "../../core/ip_addr.h" #include "siptrace_data.h" -int siptrace_copy_proto(int proto, char *buf); int sip_trace_prepare(sip_msg_t *msg); int sip_trace_xheaders_write(struct _siptrace_data *sto); int sip_trace_xheaders_read(struct _siptrace_data *sto); int sip_trace_xheaders_free(struct _siptrace_data *sto); int trace_send_duplicate(char *buf, int len, struct dest_info *dst2); +/** + * + */ +#define siptrace_copy_proto_olen(vproto, vbuf, vlen) do { \ + switch(vproto) { \ + case PROTO_TCP: \ + strcpy(vbuf, "tcp:"); \ + vlen = 4; \ + break; \ + case PROTO_TLS: \ + strcpy(vbuf, "tls:"); \ + vlen = 4; \ + break; \ + case PROTO_SCTP: \ + strcpy(vbuf, "sctp:"); \ + vlen = 5; \ + break; \ + case PROTO_WS: \ + strcpy(vbuf, "ws:"); \ + vlen = 3; \ + break; \ + case PROTO_WSS: \ + strcpy(vbuf, "wss:"); \ + vlen = 4; \ + break; \ + default: \ + strcpy(vbuf, "udp:"); \ + vlen = 4; \ + } \ + } while(0) + +#define siptrace_copy_proto(vproto, vbuf) do { \ + int __olen; \ + siptrace_copy_proto_olen(vproto, vbuf, __olen); \ + } while(0) + #endif

1 0

P-Server Exiting whenever Registered one user
by Prasannakumar Merugu 09 Jan '18

09 Jan '18

Hello All, We are able to registered user and make calls with Kamailio-5.0.4 version but, When we are trying register with Kamailio-5.0.5 version P-Server is exiting, Jitsi client getting registered I'm attached the below P-server logs file. -- *Thanks,* *Prasannakumar Merugu9010028290*

1 0

git:master:ed4a2bc4: siptrace: use safety macros to copy values building address buffers
by Daniel-Constantin Mierla 08 Jan '18

08 Jan '18

Module: kamailio Branch: master Commit: ed4a2bc477ebaf60d2fa82a3993dd5a61b54d9d3 URL: https://github.com/kamailio/kamailio/commit/ed4a2bc477ebaf60d2fa82a3993dd5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-08T12:33:57+01:00 siptrace: use safety macros to copy values building address buffers --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/ed4a2bc477ebaf60d2fa82a3993dd5a… Patch: https://github.com/kamailio/kamailio/commit/ed4a2bc477ebaf60d2fa82a3993dd5a… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 3fcda5846e..59d41551a8 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1377,6 +1377,44 @@ static void trace_sl_onreply_out(sl_cbp_t *slcbp) return; } +#define st_bufcopy_uint(_dbuf, _dsize, _dp, _sival) do { \ + str _ls; \ + _ls.s = int2str(_sival, &_ls.len); \ + if(_ls.s == NULL || _dp + _ls.len >= _dbuf + _dsize) { \ + LM_ERR("conversion error or out of bound (%p:%d/%p:%d\n", \ + _dbuf, _dsize, _dp, _ls.len); \ + goto error; \ + } \ + memcpy(_dp, _ls.s, _ls.len); \ + _dp += _ls.len; \ + } while(0) + +#define st_bufcopy_ipaddr(_dbuf, _dsize, _dp, _sipaddr) do { \ + str _ls; \ + _ls.s = ip_addr2a(_sipaddr); \ + if(_ls.s == NULL) { \ + LM_ERR("conversion error\n"); \ + goto error; \ + } \ + _ls.len = strlen(_ls.s); \ + if(_dp + _ls.len >= _dbuf + _dsize) { \ + LM_ERR("out of bound (%p:%d/%p:%d\n", \ + _dbuf, _dsize, _dp, _ls.len); \ + goto error; \ + } \ + memcpy(_dp, _ls.s, _ls.len); \ + _dp += _ls.len; \ + } while(0) + +#define st_bufcopy_char(_dbuf, _dsize, _dp, _scval) do { \ + if(_dp + 1 >= _dbuf + _dsize) { \ + LM_ERR("out of bound (%p:%d/%p:1\n", _dbuf, _dsize, _dp); \ + goto error; \ + } \ + *_dp = _scval; \ + _dp += 1; \ + } while(0) + /** * */ @@ -1384,6 +1422,7 @@ int siptrace_net_data_recv(sr_event_param_t *evp) { sr_net_info_t *nd; siptrace_data_t sto; + char *cp; if(evp->data == 0) return -1; @@ -1398,16 +1437,22 @@ int siptrace_net_data_recv(sr_event_param_t *evp) sto.body.len = nd->data.len; siptrace_copy_proto(nd->rcv->proto, sto.fromip_buff); - strcat(sto.fromip_buff, ip_addr2a(&nd->rcv->src_ip)); - strcat(sto.fromip_buff, ":"); - strcat(sto.fromip_buff, int2str(nd->rcv->src_port, NULL)); + cp = sto.fromip_buff + strlen(sto.fromip_buff); + st_bufcopy_ipaddr(sto.fromip_buff, SIPTRACE_IP_ADDR_MAX, cp, + &nd->rcv->src_ip); + st_bufcopy_char(sto.fromip_buff, SIPTRACE_IP_ADDR_MAX, cp, ':'); + st_bufcopy_uint(sto.fromip_buff, SIPTRACE_IP_ADDR_MAX, cp, + nd->rcv->src_port); sto.fromip.s = sto.fromip_buff; sto.fromip.len = strlen(sto.fromip_buff); siptrace_copy_proto(nd->rcv->proto, sto.toip_buff); - strcat(sto.toip_buff, ip_addr2a(&nd->rcv->dst_ip)); - strcat(sto.toip_buff, ":"); - strcat(sto.toip_buff, int2str(nd->rcv->dst_port, NULL)); + cp = sto.toip_buff + strlen(sto.fromip_buff); + st_bufcopy_ipaddr(sto.toip_buff, SIPTRACE_IP_ADDR_MAX, cp, + &nd->rcv->dst_ip); + st_bufcopy_char(sto.toip_buff, SIPTRACE_IP_ADDR_MAX, cp, ':'); + st_bufcopy_uint(sto.toip_buff, SIPTRACE_IP_ADDR_MAX, cp, + nd->rcv->dst_port); sto.toip.s = sto.toip_buff; sto.toip.len = strlen(sto.toip_buff); @@ -1415,6 +1460,9 @@ int siptrace_net_data_recv(sr_event_param_t *evp) trace_send_hep_duplicate(&sto.body, &sto.fromip, &sto.toip, NULL, NULL); return 0; + +error: + return -1; } /**

1 0

git:master:f9b98c64: siptrace: define max size for address buffers
by Daniel-Constantin Mierla 08 Jan '18

08 Jan '18

Module: kamailio Branch: master Commit: f9b98c647d2de1c279d370a5fb5b49201c117d8a URL: https://github.com/kamailio/kamailio/commit/f9b98c647d2de1c279d370a5fb5b492… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-08T11:35:19+01:00 siptrace: define max size for address buffers - use struct types --- Modified: src/modules/siptrace/siptrace.c Modified: src/modules/siptrace/siptrace_data.h --- Diff: https://github.com/kamailio/kamailio/commit/f9b98c647d2de1c279d370a5fb5b492… Patch: https://github.com/kamailio/kamailio/commit/f9b98c647d2de1c279d370a5fb5b492…

1 0

git:master:697c19b0: core: typedefed struct onsend_info to onsend_info_t
by Daniel-Constantin Mierla 08 Jan '18

08 Jan '18

Module: kamailio Branch: master Commit: 697c19b016fb1b0f7678716f31462d3f54d60719 URL: https://github.com/kamailio/kamailio/commit/697c19b016fb1b0f7678716f31462d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-08T11:35:19+01:00 core: typedefed struct onsend_info to onsend_info_t --- Modified: src/core/onsend.h --- Diff: https://github.com/kamailio/kamailio/commit/697c19b016fb1b0f7678716f31462d3… Patch: https://github.com/kamailio/kamailio/commit/697c19b016fb1b0f7678716f31462d3… --- diff --git a/src/core/onsend.h b/src/core/onsend.h index 8360ff241d..a2e8f569fd 100644 --- a/src/core/onsend.h +++ b/src/core/onsend.h @@ -36,15 +36,15 @@ #include "sr_compat.h" #include "kemi.h" -struct onsend_info{ +typedef struct onsend_info{ union sockaddr_union* to; /* dest info */ struct socket_info* send_sock; /* local send socket */ char* buf; /* outgoing buffer */ int len; /* outgoing buffer len */ sip_msg_t *msg; /* original sip msg struct */ -}; +} onsend_info_t; -extern struct onsend_info* p_onsend; +extern onsend_info_t* p_onsend; #define get_onsend_info() (p_onsend) @@ -53,13 +53,13 @@ extern struct onsend_info* p_onsend; * returns: 0 drop the message, >= ok, <0 error (but forward the message) * it also migh change dst->send_flags! * WARNING: buf must be 0 terminated (to allow regex matches on it) */ -static inline int run_onsend(struct sip_msg* orig_msg, struct dest_info* dst, +static inline int run_onsend(sip_msg_t* orig_msg, dest_info_t* dst, char* buf, int len) { - struct onsend_info onsnd_info = {0}; + onsend_info_t onsnd_info = {0}; int ret; - struct run_act_ctx ra_ctx; - struct run_act_ctx *bctx; + run_act_ctx_t ra_ctx; + run_act_ctx_t *bctx; int backup_route_type; snd_flags_t fwd_snd_flags_bak; snd_flags_t rpl_snd_flags_bak;

1 0

git:master:a41db4b0: core: typedefed struct proxy_l to proxy_l_t
by Daniel-Constantin Mierla 08 Jan '18

08 Jan '18

Module: kamailio Branch: master Commit: a41db4b0f56eccb8fb12c3c8257fd677d6c62537 URL: https://github.com/kamailio/kamailio/commit/a41db4b0f56eccb8fb12c3c8257fd67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-08T11:35:19+01:00 core: typedefed struct proxy_l to proxy_l_t --- Modified: src/core/proxy.h --- Diff: https://github.com/kamailio/kamailio/commit/a41db4b0f56eccb8fb12c3c8257fd67… Patch: https://github.com/kamailio/kamailio/commit/a41db4b0f56eccb8fb12c3c8257fd67… --- diff --git a/src/core/proxy.h b/src/core/proxy.h index d6ed0f8308..c7f88c6ec1 100644 --- a/src/core/proxy.h +++ b/src/core/proxy.h @@ -33,7 +33,7 @@ #include "str.h" #include "config.h" -struct proxy_l{ +typedef struct proxy_l{ struct proxy_l* next; str name; /* original name */ struct hostent host; /* addresses */ @@ -49,7 +49,7 @@ struct proxy_l{ int tx; int tx_bytes; int errors; -}; +} proxy_l_t; extern struct proxy_l* proxies; @@ -90,5 +90,4 @@ inline static void proxy_mark(struct proxy_l* p, int err) } -#endif - +#endif \ No newline at end of file

1 0

OT: question about codetriage
by Daniel-Constantin Mierla 08 Jan '18

08 Jan '18

Hello, anyone here familiar with codetriage service? We got a pull request to refer to it from Kamailio readme.md file: - https://github.com/kamailio/kamailio/pull/1389 The link is to: - https://www.codetriage.com/kamailio/kamailio Which I guess is created by the one who did the pull request. The pull request comments has few references to other projects, including Rails, but as I am not familiar with the service, I thought of asking here and see if others had to deal with and what's the experience. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - March 5-7, 2018, Berlin - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 0

Kamailio World 2018 - Call for Presentations
by Daniel-Constantin Mierla 08 Jan '18

08 Jan '18

Hello, I would like to announce that Call for Presentations at Kamailio World 2018 is now open. You can submit your proposal or see more details at: - https://www.kamailioworld.com/k06/call-for-speakers/ The 6th edition of the event takes place again in Berlin, Germany, during May 14-16, 2018. Expect over 150 participants, developers and community members as well as representatives from other popular open source VoIP projects such as Asterisk or FreeSwitch. Looking forward to meeting many of you there! Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

1 1

git:master:26e09730: Merge pull request #1392 from que273/master
by GitHub 08 Jan '18

08 Jan '18

Module: kamailio Branch: master Commit: 26e09730ff8821313f1ee6a6f57669197e353148 URL: https://github.com/kamailio/kamailio/commit/26e09730ff8821313f1ee6a6f576691… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-08T09:45:17+01:00 Merge pull request #1392 from que273/master Minor improvements to RPM packaging --- Modified: pkg/kamailio/obs/kamailio.init Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/26e09730ff8821313f1ee6a6f576691… Patch: https://github.com/kamailio/kamailio/commit/26e09730ff8821313f1ee6a6f576691… --- diff --git a/pkg/kamailio/obs/kamailio.init b/pkg/kamailio/obs/kamailio.init index 2cdae7a87d..0d7823637a 100644 --- a/pkg/kamailio/obs/kamailio.init +++ b/pkg/kamailio/obs/kamailio.init @@ -36,7 +36,7 @@ RUN_KAMAILIO=no check_fork () { if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" $KAMCFG; then - echo "Not starting $DESC: fork=no specified in config file; run /etc/init.d/kamailio debug instead" + echo "Not starting $PROG: fork=no specified in config file; run /etc/init.d/kamailio debug instead" exit 1 fi } @@ -44,10 +44,10 @@ check_fork () check_kamailio_config () { # Check if kamailio configuration is valid before starting the server - out=$($KAM -c 2>&1 > /dev/null) + out=$($KAM -c $OPTIONS 2>&1 > /dev/null) retcode=$? if [ "$retcode" != '0' ]; then - echo "Not starting $DESC: invalid configuration file!" + echo "Not starting $PROG: invalid configuration file!" echo -e "\n$out\n" exit 1 fi @@ -69,7 +69,7 @@ start() { stop() { echo -n $"Stopping $PROG: " - killproc $KAM + killproc -p $PID_FILE RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $LOCK_FILE $PID_FILE @@ -81,7 +81,7 @@ if [ -f $DEFAULTS ]; then fi if [ "$RUN_KAMAILIO" != "yes" ]; then - echo "Kamailio not yet configured. Edit /etc/default/kamailio first." + echo "Kamailio not yet configured. Edit $DEFAULTS first." exit 0 fi @@ -108,7 +108,7 @@ if [ ! -d $HOMEDIR ]; then chown ${USER}:${GROUP} $HOMEDIR fi -OPTIONS="-P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" +OPTIONS="-f $KAMCFG -P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" # See how we were called. diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5c98924046..ba802c83ad 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1188,7 +1188,6 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc -%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1336,7 +1335,6 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so -%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -1553,6 +1551,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_diameter_server %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf @@ -1570,6 +1569,7 @@ fi %{_libdir}/kamailio/modules/ims_diameter_server.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so

1 0

git:master:6a7ea3d4: pkg/kamailio/obs: Move ims_ocs module to ims RPM
by Hugh Waite 08 Jan '18

08 Jan '18

Module: kamailio Branch: master Commit: 6a7ea3d489175659cbfcca4088a8cd26b9352273 URL: https://github.com/kamailio/kamailio/commit/6a7ea3d489175659cbfcca4088a8cd2… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2018-01-04T21:16:08Z pkg/kamailio/obs: Move ims_ocs module to ims RPM This module has a dependancy on libkamailio_ims.so so it belongs within the IMS RPM. --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/commit/6a7ea3d489175659cbfcca4088a8cd2… Patch: https://github.com/kamailio/kamailio/commit/6a7ea3d489175659cbfcca4088a8cd2… --- diff --git a/pkg/kamailio/obs/kamailio.spec b/pkg/kamailio/obs/kamailio.spec index 5c98924046..ba802c83ad 100644 --- a/pkg/kamailio/obs/kamailio.spec +++ b/pkg/kamailio/obs/kamailio.spec @@ -1188,7 +1188,6 @@ fi %doc %{_docdir}/kamailio/modules/README.group %doc %{_docdir}/kamailio/modules/README.htable %doc %{_docdir}/kamailio/modules/README.imc -%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ipops %doc %{_docdir}/kamailio/modules/README.kex %doc %{_docdir}/kamailio/modules/README.malloc_test @@ -1336,7 +1335,6 @@ fi %{_libdir}/kamailio/modules/group.so %{_libdir}/kamailio/modules/htable.so %{_libdir}/kamailio/modules/imc.so -%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ipops.so %{_libdir}/kamailio/modules/kex.so %{_libdir}/kamailio/modules/malloc_test.so @@ -1553,6 +1551,7 @@ fi %doc %{_docdir}/kamailio/modules/README.ims_diameter_server %doc %{_docdir}/kamailio/modules/README.ims_icscf %doc %{_docdir}/kamailio/modules/README.ims_isc +%doc %{_docdir}/kamailio/modules/README.ims_ocs %doc %{_docdir}/kamailio/modules/README.ims_qos %doc %{_docdir}/kamailio/modules/README.ims_registrar_pcscf %doc %{_docdir}/kamailio/modules/README.ims_registrar_scscf @@ -1570,6 +1569,7 @@ fi %{_libdir}/kamailio/modules/ims_diameter_server.so %{_libdir}/kamailio/modules/ims_icscf.so %{_libdir}/kamailio/modules/ims_isc.so +%{_libdir}/kamailio/modules/ims_ocs.so %{_libdir}/kamailio/modules/ims_qos.so %{_libdir}/kamailio/modules/ims_registrar_pcscf.so %{_libdir}/kamailio/modules/ims_registrar_scscf.so

1 0

git:master:f06cad16: pkg/kamailio/obs: Minor improvements to kamailio.init file
by Hugh Waite 08 Jan '18

08 Jan '18

Module: kamailio Branch: master Commit: f06cad16ddd38771f29bfba29161bfa3ec76354f URL: https://github.com/kamailio/kamailio/commit/f06cad16ddd38771f29bfba29161bfa… Author: Hugh Waite <hughw273(a)gmail.com> Committer: Hugh Waite <hughw273(a)gmail.com> Date: 2018-01-04T21:01:08Z pkg/kamailio/obs: Minor improvements to kamailio.init file Use $PROG instead of uninitialised $DESC Pass the .cfg file name as a parameter when starting and checking config Use the pidfile when stopping to allow parallel instances --- Modified: pkg/kamailio/obs/kamailio.init --- Diff: https://github.com/kamailio/kamailio/commit/f06cad16ddd38771f29bfba29161bfa… Patch: https://github.com/kamailio/kamailio/commit/f06cad16ddd38771f29bfba29161bfa… --- diff --git a/pkg/kamailio/obs/kamailio.init b/pkg/kamailio/obs/kamailio.init index 2cdae7a87d..0d7823637a 100644 --- a/pkg/kamailio/obs/kamailio.init +++ b/pkg/kamailio/obs/kamailio.init @@ -36,7 +36,7 @@ RUN_KAMAILIO=no check_fork () { if grep -q "^[[:space:]]*fork[[:space:]]*=[[:space:]]*no.*" $KAMCFG; then - echo "Not starting $DESC: fork=no specified in config file; run /etc/init.d/kamailio debug instead" + echo "Not starting $PROG: fork=no specified in config file; run /etc/init.d/kamailio debug instead" exit 1 fi } @@ -44,10 +44,10 @@ check_fork () check_kamailio_config () { # Check if kamailio configuration is valid before starting the server - out=$($KAM -c 2>&1 > /dev/null) + out=$($KAM -c $OPTIONS 2>&1 > /dev/null) retcode=$? if [ "$retcode" != '0' ]; then - echo "Not starting $DESC: invalid configuration file!" + echo "Not starting $PROG: invalid configuration file!" echo -e "\n$out\n" exit 1 fi @@ -69,7 +69,7 @@ start() { stop() { echo -n $"Stopping $PROG: " - killproc $KAM + killproc -p $PID_FILE RETVAL=$? echo [ $RETVAL = 0 ] && rm -f $LOCK_FILE $PID_FILE @@ -81,7 +81,7 @@ if [ -f $DEFAULTS ]; then fi if [ "$RUN_KAMAILIO" != "yes" ]; then - echo "Kamailio not yet configured. Edit /etc/default/kamailio first." + echo "Kamailio not yet configured. Edit $DEFAULTS first." exit 0 fi @@ -108,7 +108,7 @@ if [ ! -d $HOMEDIR ]; then chown ${USER}:${GROUP} $HOMEDIR fi -OPTIONS="-P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" +OPTIONS="-f $KAMCFG -P $PID_FILE -m $SHM_MEMORY -M $PKG_MEMORY -u $USER -g $GROUP $EXTRA_OPTIONS" # See how we were called.

1 0

[kamailio/kamailio] Minor improvements to RPM packaging (#1392)
by Hugh Waite 08 Jan '18

08 Jan '18

### Description kamailio.spec: Move the ims_ocs module into the ims RPM. It has a dependancy on libkamailio_ims.so kamailio.init: Pass the .cfg file as a parameter when starting or syntax checking. Use the pidfile to kill only the relevant instance. This makes it easier to reuse the same script when running multiple kamailio instances on the same server. Only the environment vars at the top need to be changed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1392 -- Commit Summary -- * pkg/kamailio/obs: Minor improvements to kamailio.init file * pkg/kamailio/obs: Move ims_ocs module to ims RPM -- File Changes -- M pkg/kamailio/obs/kamailio.init (12) M pkg/kamailio/obs/kamailio.spec (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1392.patch https://github.com/kamailio/kamailio/pull/1392.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/1392

2 2

git:master:74c02fdb: snmpstats: safety checks on hdr variable
by Daniel-Constantin Mierla 05 Jan '18

05 Jan '18

Module: kamailio Branch: master Commit: 74c02fdb1cd04d674046c38bc2f5193f91da4edf URL: https://github.com/kamailio/kamailio/commit/74c02fdb1cd04d674046c38bc2f5193… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-05T09:08:56+01:00 snmpstats: safety checks on hdr variable --- Modified: src/modules/snmpstats/snmpSIPRegUserLookupTable.c Modified: src/modules/snmpstats/snmpSIPStatusCodesTable.c --- Diff: https://github.com/kamailio/kamailio/commit/74c02fdb1cd04d674046c38bc2f5193… Patch: https://github.com/kamailio/kamailio/commit/74c02fdb1cd04d674046c38bc2f5193…

1 0

git:master:5b00ef8b: snmpstats: check the return code when registering statistics
by Daniel-Constantin Mierla 05 Jan '18

05 Jan '18

Module: kamailio Branch: master Commit: 5b00ef8bb31fb029b2d4dedae40e2c7a54841fe6 URL: https://github.com/kamailio/kamailio/commit/5b00ef8bb31fb029b2d4dedae40e2c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-05T09:08:56+01:00 snmpstats: check the return code when registering statistics --- Modified: src/modules/snmpstats/snmpstats.c --- Diff: https://github.com/kamailio/kamailio/commit/5b00ef8bb31fb029b2d4dedae40e2c7… Patch: https://github.com/kamailio/kamailio/commit/5b00ef8bb31fb029b2d4dedae40e2c7… --- diff --git a/src/modules/snmpstats/snmpstats.c b/src/modules/snmpstats/snmpstats.c index 4bd11c98d2..9a8acea270 100644 --- a/src/modules/snmpstats/snmpstats.c +++ b/src/modules/snmpstats/snmpstats.c @@ -302,10 +302,14 @@ static int register_message_code_statistics(void) sizeof(stat_var *) * number_of_message_codes); for(i = 0; i < number_of_message_codes; i++) { - register_stat(SNMPSTATS_MODULE_NAME, in_message_code_names[i], - &in_message_code_stats[i], 0); - register_stat(SNMPSTATS_MODULE_NAME, out_message_code_names[i], - &out_message_code_stats[i], 0); + if(register_stat(SNMPSTATS_MODULE_NAME, in_message_code_names[i], + &in_message_code_stats[i], 0)!=0) { + LM_ERR("failed to register in_message_code_names[%d]\n", i); + } + if(register_stat(SNMPSTATS_MODULE_NAME, out_message_code_names[i], + &out_message_code_stats[i], 0)!=0) { + LM_ERR("failed to register out_message_code_names[%d]\n", i); + } } return 0;

1 0

git:master:bab289f3: http_client: cast parameter to curl function to avoid warnings
by Daniel-Constantin Mierla 05 Jan '18

05 Jan '18

Module: kamailio Branch: master Commit: bab289f36b189a2836ef51acc9e26aed422a7dad URL: https://github.com/kamailio/kamailio/commit/bab289f36b189a2836ef51acc9e26ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-05T09:08:56+01:00 http_client: cast parameter to curl function to avoid warnings --- Modified: src/modules/http_client/functions.c --- Diff: https://github.com/kamailio/kamailio/commit/bab289f36b189a2836ef51acc9e26ae… Patch: https://github.com/kamailio/kamailio/commit/bab289f36b189a2836ef51acc9e26ae… --- diff --git a/src/modules/http_client/functions.c b/src/modules/http_client/functions.c index 68ed33b248..695324bf43 100644 --- a/src/modules/http_client/functions.c +++ b/src/modules/http_client/functions.c @@ -252,7 +252,7 @@ static int curL_query_url(struct sip_msg *_m, const char *_url, str *_dst, res |= curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, write_function); - res |= curl_easy_setopt(curl, CURLOPT_WRITEDATA, &stream); + res |= curl_easy_setopt(curl, CURLOPT_WRITEDATA, (void*)(&stream)); if(params->useragent) res |= curl_easy_setopt(curl, CURLOPT_USERAGENT, params->useragent);

1 0

git:5.0:447d49f7: erlang: fix missing to free memory used for param specification
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: 447d49f75c69621473fccd0c0fe3b6c4d6679ffc URL: https://github.com/kamailio/kamailio/commit/447d49f75c69621473fccd0c0fe3b6c… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T23:00:32+01:00 erlang: fix missing to free memory used for param specification - ensure to destroy fixup param specification when send erlang message (cherry picked from commit 90ee13d21db9a57a9d4a855b857dd152f645500d) --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/447d49f75c69621473fccd0c0fe3b6c… Patch: https://github.com/kamailio/kamailio/commit/447d49f75c69621473fccd0c0fe3b6c… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 54d2fa1733..83d007aa68 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -697,6 +697,7 @@ static int fixup_rpc(void** param, int param_no) if (psp->setf != pv_list_set && psp->setf != pv_xbuff_set) { LM_ERR("wrong parameter #%d: accepted types are list or xbuff\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -915,6 +916,7 @@ static int fixup_reg(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1109,6 +1111,7 @@ static int fixup_reply(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1354,6 +1357,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1363,6 +1367,7 @@ static int fixup_send(void** param, int param_no) else { if (erl_param->value.sp.type == PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1373,6 +1378,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1392,6 +1398,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1400,6 +1407,7 @@ static int fixup_send(void** param, int param_no) } else { if (erl_param->value.sp.type ==PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1415,7 +1423,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; }

1 0

git:5.1:860dc286: erlang: fix missing to free memory used for param specification
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: 860dc28675993bc22644d7d2547747714066c02b URL: https://github.com/kamailio/kamailio/commit/860dc28675993bc22644d7d25477477… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T22:59:25+01:00 erlang: fix missing to free memory used for param specification - ensure to destroy fixup param specification when send erlang message (cherry picked from commit 90ee13d21db9a57a9d4a855b857dd152f645500d) --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/860dc28675993bc22644d7d25477477… Patch: https://github.com/kamailio/kamailio/commit/860dc28675993bc22644d7d25477477… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 54d2fa1733..83d007aa68 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -697,6 +697,7 @@ static int fixup_rpc(void** param, int param_no) if (psp->setf != pv_list_set && psp->setf != pv_xbuff_set) { LM_ERR("wrong parameter #%d: accepted types are list or xbuff\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -915,6 +916,7 @@ static int fixup_reg(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1109,6 +1111,7 @@ static int fixup_reply(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1354,6 +1357,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1363,6 +1367,7 @@ static int fixup_send(void** param, int param_no) else { if (erl_param->value.sp.type == PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1373,6 +1378,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1392,6 +1398,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1400,6 +1407,7 @@ static int fixup_send(void** param, int param_no) } else { if (erl_param->value.sp.type ==PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1415,7 +1423,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; }

1 0

git:master:90ee13d2: erlang: fix missing to free memory used for param specification
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: master Commit: 90ee13d21db9a57a9d4a855b857dd152f645500d URL: https://github.com/kamailio/kamailio/commit/90ee13d21db9a57a9d4a855b857dd15… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T22:56:15+01:00 erlang: fix missing to free memory used for param specification - ensure to destroy fixup param specification when send erlang message --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/90ee13d21db9a57a9d4a855b857dd15… Patch: https://github.com/kamailio/kamailio/commit/90ee13d21db9a57a9d4a855b857dd15… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 54d2fa1733..83d007aa68 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -697,6 +697,7 @@ static int fixup_rpc(void** param, int param_no) if (psp->setf != pv_list_set && psp->setf != pv_xbuff_set) { LM_ERR("wrong parameter #%d: accepted types are list or xbuff\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -915,6 +916,7 @@ static int fixup_reg(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1109,6 +1111,7 @@ static int fixup_reply(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1354,6 +1357,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1363,6 +1367,7 @@ static int fixup_send(void** param, int param_no) else { if (erl_param->value.sp.type == PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1373,6 +1378,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1392,6 +1398,7 @@ static int fixup_send(void** param, int param_no) if (erl_param->value.sp.pvp.pvn.type == PV_NAME_INTSTR) { if (fix_param_types(FPARAM_STR|FPARAM_STRING,param)) { LM_ERR("wrong parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1400,6 +1407,7 @@ static int fixup_send(void** param, int param_no) } else { if (erl_param->value.sp.type ==PVT_XAVP) { LM_ERR("XAVP not acceptable for parameter #%d\n",param_no); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1415,7 +1423,7 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); + pv_spec_destroy(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; }

1 0

[kamailio/kamailio] http_async_client: fix initialization of tls_client_* and tls_ca_path (#1386)
by Victor Seva 04 Jan '18

04 Jan '18

set_query_params() was checking if those variables had a value to copy them. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1386 -- Commit Summary -- * http_async_client: fix initialization of tls_client_* and tls_ca_path module parameters -- File Changes -- M src/modules/http_async_client/http_async_client_mod.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1386.patch https://github.com/kamailio/kamailio/pull/1386.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/1386

2 3

git:master:aad751ab: presence: pass dbf structure by pointer instead of value to function param
by Daniel-Constantin Mierla 04 Jan '18

04 Jan '18

Module: kamailio Branch: master Commit: aad751ab54f37f3482641488929133296974025e URL: https://github.com/kamailio/kamailio/commit/aad751ab54f37f34826414889291332… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-04T09:39:31+01:00 presence: pass dbf structure by pointer instead of value to function param - passing large values is not optimal --- Modified: src/modules/presence/subscribe.c Modified: src/modules/presence/subscribe.h --- Diff: https://github.com/kamailio/kamailio/commit/aad751ab54f37f34826414889291332… Patch: https://github.com/kamailio/kamailio/commit/aad751ab54f37f34826414889291332… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 36329ab198..3c6e4458d4 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -2222,7 +2222,7 @@ void update_db_subs_timer_dbnone(int no_lock) -void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +void update_db_subs_timer(db1_con_t *db,db_func_t *dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func) { db_key_t query_cols[25], update_cols[8]; @@ -2468,7 +2468,7 @@ void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, update_vals[u_contact_col].val.str_val = s->contact; update_vals[u_record_route_col].val.str_val = s->record_route; - if(dbf.update(db, query_cols, 0, query_vals, update_cols, + if(dbf->update(db, query_cols, 0, query_vals, update_cols, update_vals, n_query_update, n_update_cols)< 0) { LM_ERR("updating in database\n"); @@ -2507,7 +2507,7 @@ void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, query_vals[user_agent_col].val.str_val = s->user_agent; - if(dbf.insert(db,query_cols,query_vals,n_query_cols )<0) + if(dbf->insert(db,query_cols,query_vals,n_query_cols )<0) { LM_ERR("unsuccessful sql insert\n"); } else { @@ -2524,7 +2524,7 @@ void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, update_vals[0].val.int_val= (int)time(NULL) - expires_offset; update_ops[0]= OP_LT; - if(dbf.delete(db, update_cols, update_ops, update_vals, 1) < 0) + if(dbf->delete(db, update_cols, update_ops, update_vals, 1) < 0) { LM_ERR("deleting expired information from database\n"); } @@ -2561,7 +2561,7 @@ void timer_db_update(unsigned int ticks,void *param) LM_ERR("sql use table failed\n"); return; } - update_db_subs_timer(pa_db, pa_dbf, subs_htable, shtable_size, + update_db_subs_timer(pa_db, &pa_dbf, subs_htable, shtable_size, no_lock, handle_expired_subs); } } diff --git a/src/modules/presence/subscribe.h b/src/modules/presence/subscribe.h index e71b062367..6f3cd637d8 100644 --- a/src/modules/presence/subscribe.h +++ b/src/modules/presence/subscribe.h @@ -109,10 +109,10 @@ int restore_db_subs(void); typedef int (*handle_expired_func_t)(subs_t* ); -void update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +void update_db_subs_timer(db1_con_t *db,db_func_t *dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func); -typedef void (*update_db_subs_t)(db1_con_t * ,db_func_t ,shtable_t ,int ,int , +typedef void (*update_db_subs_t)(db1_con_t* ,db_func_t* ,shtable_t ,int ,int , handle_expired_func_t); int extract_sdialog_info_ex(subs_t* subs,struct sip_msg* msg, uint32_t min_expire,

1 0

git:master:5097954c: rls: pass dbf structure by pointer instead of value to function param
by Daniel-Constantin Mierla 04 Jan '18

04 Jan '18

Module: kamailio Branch: master Commit: 5097954ce5dbbd1094a022f3ae014c77e389aecb URL: https://github.com/kamailio/kamailio/commit/5097954ce5dbbd1094a022f3ae014c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-04T09:40:54+01:00 rls: pass dbf structure by pointer instead of value to function param --- Modified: src/modules/rls/rls.c Modified: src/modules/rls/rls_db.c --- Diff: https://github.com/kamailio/kamailio/commit/5097954ce5dbbd1094a022f3ae014c7… Patch: https://github.com/kamailio/kamailio/commit/5097954ce5dbbd1094a022f3ae014c7… --- diff --git a/src/modules/rls/rls.c b/src/modules/rls/rls.c index 83e86173d7..cda6085bac 100644 --- a/src/modules/rls/rls.c +++ b/src/modules/rls/rls.c @@ -119,7 +119,7 @@ extern subs_t* rls_search_shtable(shtable_t htable,str callid,str to_tag, extern int rls_delete_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs); extern int rls_update_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs, int type); -extern void rls_update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +extern void rls_update_db_subs_timer(db1_con_t *db,db_func_t *dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func); static int rls_rpc_init(void); @@ -837,7 +837,7 @@ void rlsubs_table_update(unsigned int ticks,void *param) LM_ERR("sql use table failed\n"); return; } - pres_update_db_subs_timer(rls_db, rls_dbf, rls_table, hash_size, + pres_update_db_subs_timer(rls_db, &rls_dbf, rls_table, hash_size, no_lock, handle_expired_record); } diff --git a/src/modules/rls/rls_db.c b/src/modules/rls/rls_db.c index 5e88dea6cb..fe10092b69 100644 --- a/src/modules/rls/rls_db.c +++ b/src/modules/rls/rls_db.c @@ -100,7 +100,7 @@ int rls_update_shtable(shtable_t htable,unsigned int hash_code, /******************************************************************************/ -void rls_update_db_subs_timer(db1_con_t *db,db_func_t dbf, shtable_t hash_table, +void rls_update_db_subs_timer(db1_con_t *db,db_func_t *dbf, shtable_t hash_table, int htable_size, int no_lock, handle_expired_func_t handle_expired_func) { LM_ERR( "rls_update_db_subs_timer shouldn't be called in RLS_DB_ONLY mode\n" );

1 0

git:5.0:c973e3eb: erlang: fix restore index of parsed tuple
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: c973e3ebbc02f420d462165d979b3599640a2cb7 URL: https://github.com/kamailio/kamailio/commit/c973e3ebbc02f420d462165d979b359… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:27:52+01:00 erlang: fix restore index of parsed tuple Avoid to change origin index while parsing tuple. (cherry picked from commit 74778f3ac75432d475e9d54dc56f9c3b95c178a5) --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/c973e3ebbc02f420d462165d979b359… Patch: https://github.com/kamailio/kamailio/commit/c973e3ebbc02f420d462165d979b359… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index b852892d9d..d45351bcc2 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -486,10 +486,10 @@ int erl_rpc_struct_scan(erl_rpc_ctx_t* ctx, char* fmt, ...) va_list ap; - /* save index */ + /* preserve index */ index = ctx->request_index; - if(ei_decode_tuple_header(ctx->request->buff,&ctx->request_index, &arity)) + if(ei_decode_tuple_header(ctx->request->buff,&index, &arity)) { erl_rpc_fault(ctx,400,"Bad tuple"); return -1; @@ -561,9 +561,6 @@ int erl_rpc_struct_scan(erl_rpc_ctx_t* ctx, char* fmt, ...) fmt++; } - /* restore index */ - ctx->request_index = index; - va_end(ap); return reads-modifiers;

1 0

git:5.0:e1b30f13: erlang: fix never used value assigned to a variable
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: e1b30f138765eef051b1e5cd11a29d44cdb09209 URL: https://github.com/kamailio/kamailio/commit/e1b30f138765eef051b1e5cd11a29d4… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:27:08+01:00 erlang: fix never used value assigned to a variable (cherry picked from commit 6542a367638ec5f8a2b62994f8c309e7a2533962) --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/e1b30f138765eef051b1e5cd11a29d4… Patch: https://github.com/kamailio/kamailio/commit/e1b30f138765eef051b1e5cd11a29d4… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 1682e52f3b..ce6e2bd2eb 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -87,10 +87,10 @@ sr_xavp_t *xbuff_new(str *name) if(!xbuffs_root) { xbuff = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); + } else { + xbuff = xavp_get_child(&xbuff_list, name); } - xbuff=xavp_get_child(&xbuff_list, name); - if (!xbuff) { xbuff_val.type = SR_XTYPE_NULL;

1 0

git:5.0:8f2d55e2: erlang: fix possible memory corruption
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: 8f2d55e21e1faeff43f6e48c2e8a6cd7c3450424 URL: https://github.com/kamailio/kamailio/commit/8f2d55e21e1faeff43f6e48c2e8a6cd… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:27:16+01:00 erlang: fix possible memory corruption Allocate sufficient memory for the terminating null of the string. (cherry picked from commit 13c71a14bfe4d2ee650521086bbae9920f95fcaa) --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/8f2d55e21e1faeff43f6e48c2e8a6cd… Patch: https://github.com/kamailio/kamailio/commit/8f2d55e21e1faeff43f6e48c2e8a6cd… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index 5fe3c1f978..b852892d9d 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -223,7 +223,7 @@ int erl_rpc_add(erl_rpc_ctx_t* ctx, char* fmt, ...) param->type = ERL_STRING_EXT; param->value.S.len = strlen(char_ptr); - param->value.S.s = (char*)pkg_malloc(param->value.S.len); + param->value.S.s = (char*)pkg_malloc(param->value.S.len+1); if (!param->value.S.s) { @@ -696,7 +696,7 @@ int erl_rpc_struct_add(erl_rpc_ctx_t* ctx, char* fmt, ...) param->type = ERL_STRING_EXT; param->value.S.len = strlen(char_ptr); - param->value.S.s = (char*)pkg_malloc(param->value.S.len); + param->value.S.s = (char*)pkg_malloc(param->value.S.len+1); if (!param->value.S.s) { @@ -847,7 +847,7 @@ int erl_rpc_array_add(erl_rpc_ctx_t* ctx, char* fmt, ...) param->type = ERL_STRING_EXT; param->value.S.len = strlen(char_ptr); - param->value.S.s = (char*)pkg_malloc(param->value.S.len); + param->value.S.s = (char*)pkg_malloc(param->value.S.len+1); if (!param->value.S.s) {

1 0

git:5.0:db00ca14: erlang: fix unreachable code
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: db00ca14a3d94e736a1e4bd87af3b23ce93dc037 URL: https://github.com/kamailio/kamailio/commit/db00ca14a3d94e736a1e4bd87af3b23… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:27:00+01:00 erlang: fix unreachable code (cherry picked from commit c061d6688c505544aecfc39a43e8c60d48875790) --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/db00ca14a3d94e736a1e4bd87af3b23… Patch: https://github.com/kamailio/kamailio/commit/db00ca14a3d94e736a1e4bd87af3b23… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index fccec06680..5fe3c1f978 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -1418,15 +1418,13 @@ static int find_member(erl_rpc_ctx_t *ctx, int arity, const char* member_name) erl_rpc_fault(ctx,400,"Unexpected end of struct tuple"); goto error; } - continue; + i++; } else { /* return at current position */ return 0; } - - i++; } erl_rpc_fault(ctx,400, "Member %s not found",member_name);

1 0

git:5.0:6ae5f704: erlang: improve error handling
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: 6ae5f7048ad26cb1e7bdb0cb56b02bd8590f8f73 URL: https://github.com/kamailio/kamailio/commit/6ae5f7048ad26cb1e7bdb0cb56b02bd… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:26:53+01:00 erlang: improve error handling Ensure check value returned from function and log error. (cherry picked from commit b43609dec2c4089e02b11fd23099ab01b2ebc956) --- Modified: src/modules/erlang/handle_emsg.c Modified: src/modules/erlang/pv_xbuff.c Modified: src/modules/erlang/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/6ae5f7048ad26cb1e7bdb0cb56b02bd… Patch: https://github.com/kamailio/kamailio/commit/6ae5f7048ad26cb1e7bdb0cb56b02bd… --- diff --git a/src/modules/erlang/handle_emsg.c b/src/modules/erlang/handle_emsg.c index 1e36be5cb6..96de5e01d8 100644 --- a/src/modules/erlang/handle_emsg.c +++ b/src/modules/erlang/handle_emsg.c @@ -437,7 +437,11 @@ int erlang_whereis(cnode_handler_t *phandler,erlang_ref_ex_t *ref, erlang_pid *p return 0; } - ei_decode_atom(request->buff,&request->index,route+sizeof("erlang:")-1); + if(ei_decode_atom(request->buff,&request->index,route+sizeof("erlang:")-1)) { + LM_ERR("error: badarg\n"); + ei_x_encode_atom(response,"badarg"); + return 0; + } rt = route_get(&event_rt, route); if (rt < 0 || event_rt.rlist[rt] == NULL) { @@ -820,7 +824,9 @@ int handle_erlang_msg(cnode_handler_t *phandler, erlang_msg * msg) ret = handle_req_ref_tuple(phandler, msg); break; case ERL_PID_EXT: - ei_decode_pid(request->buff,&tmpindex,&from); + if(ei_decode_pid(request->buff,&tmpindex,&from)) { + LM_ERR("failed to decode pid\n"); + } ret = handle_send(phandler, msg); break; default: diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index e8d26cdb9a..1682e52f3b 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -988,7 +988,10 @@ int xavp_decode(ei_x_buff *xbuff, int *index, sr_xavp_t **xavp,int level) return -1; } - ei_decode_atom(xbuff->buff,index,pbuf); + if (ei_decode_atom(xbuff->buff,index,pbuf)) { + LM_ERR("failed to decode atom\n"); + goto err; + } val.type = SR_XTYPE_STR; val.v.s.s = pbuf; diff --git a/src/modules/erlang/worker.c b/src/modules/erlang/worker.c index 2a02e51df6..71af3b0298 100644 --- a/src/modules/erlang/worker.c +++ b/src/modules/erlang/worker.c @@ -59,7 +59,10 @@ int handle_worker(handler_common_t *phandler) int rc; /* ensure be connected */ - enode_connect(); + if (enode_connect()){ + LM_ERR("failed to connect!\n"); + return -1; + } memset((void*)&msg,0,sizeof(msg));

1 0

git:5.0:732680dd: erlang: fix memory leaks
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: 732680dd622a115de4dd2a93f5065d22ff5d5896 URL: https://github.com/kamailio/kamailio/commit/732680dd622a115de4dd2a93f5065d2… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:26:36+01:00 erlang: fix memory leaks Ensure free used memory if parse of params failed. (cherry picked from commit 074eda76b3c2cb418832fd4b24436bf7f109b89e) --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/732680dd622a115de4dd2a93f5065d2… Patch: https://github.com/kamailio/kamailio/commit/732680dd622a115de4dd2a93f5065d2… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 2753842967..1c3c12efeb 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -666,6 +666,7 @@ static int fixup_rpc(void** param, int param_no) if(param_no==1 || param_no==2) { if (fix_param_types(FPARAM_STR|FPARAM_STRING|FPARAM_AVP|FPARAM_PVS|FPARAM_PVE,param)){ LM_ERR("wrong parameter #%d\n",param_no); + pkg_free((void*)erl_param); return -1; } erl_param->type = ERL_PARAM_FPARAM; @@ -873,6 +874,7 @@ static int fixup_reg(void** param, int param_no) if(param_no==1) { if (fix_param_types(FPARAM_STR|FPARAM_STRING|FPARAM_AVP|FPARAM_PVS|FPARAM_PVE|FPARAM_INT,param)){ LM_ERR("wrong parameter #%d\n",param_no); + pkg_free((void*)erl_param); return -1; } erl_param->type = ERL_PARAM_FPARAM;

1 0

git:5.0:9d016366: erlang: fix bad free
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: 9d01636609a7cb7d187ade97953fa6e49f62413d URL: https://github.com/kamailio/kamailio/commit/9d01636609a7cb7d187ade97953fa6e… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:26:44+01:00 erlang: fix bad free Avoid to free non-pointer, likely causing a crash later. (cherry picked from commit 3680a1a6ec6971e79deb76daafc89cf2fe206c60) --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9d01636609a7cb7d187ade97953fa6e… Patch: https://github.com/kamailio/kamailio/commit/9d01636609a7cb7d187ade97953fa6e… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 1c3c12efeb..54d2fa1733 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -697,7 +697,6 @@ static int fixup_rpc(void** param, int param_no) if (psp->setf != pv_list_set && psp->setf != pv_xbuff_set) { LM_ERR("wrong parameter #%d: accepted types are list or xbuff\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -916,7 +915,6 @@ static int fixup_reg(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1111,7 +1109,6 @@ static int fixup_reply(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1376,7 +1373,6 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; }

1 0

git:5.0:bc8d9926: erlang: fix use of an uninitialized variable
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: bc8d9926d4d13515623ac5ae33af78db9b68cd0c URL: https://github.com/kamailio/kamailio/commit/bc8d9926d4d13515623ac5ae33af78d… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:26:27+01:00 erlang: fix use of an uninitialized variable Ensure to initialize variable before use. (cherry picked from commit a379ef730bc129b630325672c9a39aa8c59139b9) --- Modified: src/modules/erlang/erl_helpers.c Modified: src/modules/erlang/handle_emsg.c Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/bc8d9926d4d13515623ac5ae33af78d… Patch: https://github.com/kamailio/kamailio/commit/bc8d9926d4d13515623ac5ae33af78d… --- diff --git a/src/modules/erlang/erl_helpers.c b/src/modules/erlang/erl_helpers.c index ddc0abc952..8c7a391830 100644 --- a/src/modules/erlang/erl_helpers.c +++ b/src/modules/erlang/erl_helpers.c @@ -73,7 +73,6 @@ int erl_passive_socket(const char *hostname, int qlen, int port; struct addrinfo *ai; struct addrinfo hints; - struct ip_addr ip; socklen_t addrlen = sizeof(struct sockaddr); memset(&hints, 0, sizeof(struct addrinfo)); @@ -103,8 +102,7 @@ int erl_passive_socket(const char *hostname, int qlen, /* initialize TCP */ #if !defined(TCP_DONT_REUSEADDR) if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(int))) { - LM_ERR("failed to enable SO_REUSEADDR for socket on %s %s, %s\n", - hostname, ip_addr2strz(&ip), strerror(errno)); + LM_ERR("failed to enable SO_REUSEADDR: %s\n", strerror(errno)); } #endif /* tos */ @@ -118,8 +116,8 @@ int erl_passive_socket(const char *hostname, int qlen, if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) { port=sockaddr_port(ai->ai_addr); - LM_CRIT("failed to bind socket on %s %s:%u. %s.\n", hostname, - ip_addr2strz(&ip), port, strerror(errno)); + LM_CRIT("failed to bind socket on %s:%u. %s.\n", hostname, + port, strerror(errno)); erl_close_socket(sockfd); freeaddrinfo(ai); @@ -128,8 +126,8 @@ int erl_passive_socket(const char *hostname, int qlen, if (ai->ai_socktype == SOCK_STREAM && listen(sockfd, qlen) < 0) { - LM_CRIT("failed to listen socket on %s, %s. %s.\n", hostname, - ip_addr2strz(&ip), strerror(errno)); + LM_CRIT("failed to listen socket on %s: %s.\n", hostname, + strerror(errno)); erl_close_socket(sockfd); freeaddrinfo(ai); diff --git a/src/modules/erlang/handle_emsg.c b/src/modules/erlang/handle_emsg.c index fe30b8d2ee..1e36be5cb6 100644 --- a/src/modules/erlang/handle_emsg.c +++ b/src/modules/erlang/handle_emsg.c @@ -640,6 +640,8 @@ int handle_rex_msg(cnode_handler_t *phandler, erlang_msg * msg) ei_x_buff *request = &phandler->request; ei_x_buff *response = &phandler->response; + memset((void*)&ref,0,sizeof(erlang_ref_ex_t)); + /* start from first arg */ request->index = 0; ei_decode_version(request->buff, &request->index, &version); diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index 5ca9ef21af..fccec06680 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -1138,6 +1138,8 @@ static int get_int(int *int_ptr,erl_rpc_ctx_t *ctx, int reads, int autoconvert) return -1; } + ei_decode_string(ctx->request->buff, &ctx->request_index, p); + *int_ptr = strtol(p,&endptr,10); if (p == endptr) { @@ -1217,6 +1219,8 @@ static int get_double(double *double_prt,erl_rpc_ctx_t *ctx, int reads, int auto return -1; } + ei_decode_string(ctx->request->buff, &ctx->request_index, p); + *double_prt = strtod(p,&endptr); if (p == endptr) {

1 0

git:5.0:99f3b4c6: erlang: fix copy into fixed size buffer of node name
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.0 Commit: 99f3b4c687b12eeff4f45359404886dd1ce29537 URL: https://github.com/kamailio/kamailio/commit/99f3b4c687b12eeff4f45359404886d… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:26:19+01:00 erlang: fix copy into fixed size buffer of node name Use length of node name string to avoid write past the end of the fixed-size destination buffer. (cherry picked from commit 53a76a4ae828cf08fbdebe08918706bd7d7d76d2) --- Modified: src/modules/erlang/cnode.c --- Diff: https://github.com/kamailio/kamailio/commit/99f3b4c687b12eeff4f45359404886d… Patch: https://github.com/kamailio/kamailio/commit/99f3b4c687b12eeff4f45359404886d… --- diff --git a/src/modules/erlang/cnode.c b/src/modules/erlang/cnode.c index 0eae7a716c..ce24c1dff4 100644 --- a/src/modules/erlang/cnode.c +++ b/src/modules/erlang/cnode.c @@ -111,7 +111,8 @@ int cnode_connect_to(cnode_handler_t *phandler, ei_cnode *ec, const str *nodenam LM_DBG("... connected to %.*s %s:%u\n", STR_FMT(nodename), ip_addr2strz(&ip), port); } - strcpy(phandler->conn.nodename, nodename->s); + strncpy(phandler->conn.nodename, nodename->s, nodename->len); + phandler->conn.nodename[nodename->len] = 0; /* for #Pid */ phandler->ec.self.num = phandler->sockfd;

1 0

git:5.1:a6480c2b: erlang: fix restore index of parsed tuple
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: a6480c2b8f63ed02aebc13152b8c36149acaf92b URL: https://github.com/kamailio/kamailio/commit/a6480c2b8f63ed02aebc13152b8c361… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:28:01+01:00 erlang: fix restore index of parsed tuple Avoid to change origin index while parsing tuple. (cherry picked from commit 74778f3ac75432d475e9d54dc56f9c3b95c178a5) --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/a6480c2b8f63ed02aebc13152b8c361… Patch: https://github.com/kamailio/kamailio/commit/a6480c2b8f63ed02aebc13152b8c361… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index b852892d9d..d45351bcc2 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -486,10 +486,10 @@ int erl_rpc_struct_scan(erl_rpc_ctx_t* ctx, char* fmt, ...) va_list ap; - /* save index */ + /* preserve index */ index = ctx->request_index; - if(ei_decode_tuple_header(ctx->request->buff,&ctx->request_index, &arity)) + if(ei_decode_tuple_header(ctx->request->buff,&index, &arity)) { erl_rpc_fault(ctx,400,"Bad tuple"); return -1; @@ -561,9 +561,6 @@ int erl_rpc_struct_scan(erl_rpc_ctx_t* ctx, char* fmt, ...) fmt++; } - /* restore index */ - ctx->request_index = index; - va_end(ap); return reads-modifiers;

1 0

git:5.1:867f8d18: erlang: fix possible memory corruption
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: 867f8d18ed2a1c8c2af4e382942ca0d15789e8cb URL: https://github.com/kamailio/kamailio/commit/867f8d18ed2a1c8c2af4e382942ca0d… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:24:43+01:00 erlang: fix possible memory corruption Allocate sufficient memory for the terminating null of the string. (cherry picked from commit 13c71a14bfe4d2ee650521086bbae9920f95fcaa) --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/867f8d18ed2a1c8c2af4e382942ca0d… Patch: https://github.com/kamailio/kamailio/commit/867f8d18ed2a1c8c2af4e382942ca0d… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index 5fe3c1f978..b852892d9d 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -223,7 +223,7 @@ int erl_rpc_add(erl_rpc_ctx_t* ctx, char* fmt, ...) param->type = ERL_STRING_EXT; param->value.S.len = strlen(char_ptr); - param->value.S.s = (char*)pkg_malloc(param->value.S.len); + param->value.S.s = (char*)pkg_malloc(param->value.S.len+1); if (!param->value.S.s) { @@ -696,7 +696,7 @@ int erl_rpc_struct_add(erl_rpc_ctx_t* ctx, char* fmt, ...) param->type = ERL_STRING_EXT; param->value.S.len = strlen(char_ptr); - param->value.S.s = (char*)pkg_malloc(param->value.S.len); + param->value.S.s = (char*)pkg_malloc(param->value.S.len+1); if (!param->value.S.s) { @@ -847,7 +847,7 @@ int erl_rpc_array_add(erl_rpc_ctx_t* ctx, char* fmt, ...) param->type = ERL_STRING_EXT; param->value.S.len = strlen(char_ptr); - param->value.S.s = (char*)pkg_malloc(param->value.S.len); + param->value.S.s = (char*)pkg_malloc(param->value.S.len+1); if (!param->value.S.s) {

1 0

git:5.1:f85f1033: erlang: fix unreachable code
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: f85f1033c5a30bc1b62758358da74254140de9f4 URL: https://github.com/kamailio/kamailio/commit/f85f1033c5a30bc1b62758358da7425… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:24:27+01:00 erlang: fix unreachable code (cherry picked from commit c061d6688c505544aecfc39a43e8c60d48875790) --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/f85f1033c5a30bc1b62758358da7425… Patch: https://github.com/kamailio/kamailio/commit/f85f1033c5a30bc1b62758358da7425… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index fccec06680..5fe3c1f978 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -1418,15 +1418,13 @@ static int find_member(erl_rpc_ctx_t *ctx, int arity, const char* member_name) erl_rpc_fault(ctx,400,"Unexpected end of struct tuple"); goto error; } - continue; + i++; } else { /* return at current position */ return 0; } - - i++; } erl_rpc_fault(ctx,400, "Member %s not found",member_name);

1 0

git:5.1:cb5d201b: erlang: fix never used value assigned to a variable
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: cb5d201bf313955305e66c976bf77d87c7295ba9 URL: https://github.com/kamailio/kamailio/commit/cb5d201bf313955305e66c976bf77d8… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:24:34+01:00 erlang: fix never used value assigned to a variable (cherry picked from commit 6542a367638ec5f8a2b62994f8c309e7a2533962) --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/cb5d201bf313955305e66c976bf77d8… Patch: https://github.com/kamailio/kamailio/commit/cb5d201bf313955305e66c976bf77d8… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 1682e52f3b..ce6e2bd2eb 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -87,10 +87,10 @@ sr_xavp_t *xbuff_new(str *name) if(!xbuffs_root) { xbuff = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); + } else { + xbuff = xavp_get_child(&xbuff_list, name); } - xbuff=xavp_get_child(&xbuff_list, name); - if (!xbuff) { xbuff_val.type = SR_XTYPE_NULL;

1 0

git:5.1:b8558289: erlang: improve error handling
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: b8558289d363ac7591a63be136f013171542a655 URL: https://github.com/kamailio/kamailio/commit/b8558289d363ac7591a63be136f0131… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:23:51+01:00 erlang: improve error handling Ensure check value returned from function and log error. (cherry picked from commit b43609dec2c4089e02b11fd23099ab01b2ebc956) --- Modified: src/modules/erlang/handle_emsg.c Modified: src/modules/erlang/pv_xbuff.c Modified: src/modules/erlang/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/b8558289d363ac7591a63be136f0131… Patch: https://github.com/kamailio/kamailio/commit/b8558289d363ac7591a63be136f0131… --- diff --git a/src/modules/erlang/handle_emsg.c b/src/modules/erlang/handle_emsg.c index 1e36be5cb6..96de5e01d8 100644 --- a/src/modules/erlang/handle_emsg.c +++ b/src/modules/erlang/handle_emsg.c @@ -437,7 +437,11 @@ int erlang_whereis(cnode_handler_t *phandler,erlang_ref_ex_t *ref, erlang_pid *p return 0; } - ei_decode_atom(request->buff,&request->index,route+sizeof("erlang:")-1); + if(ei_decode_atom(request->buff,&request->index,route+sizeof("erlang:")-1)) { + LM_ERR("error: badarg\n"); + ei_x_encode_atom(response,"badarg"); + return 0; + } rt = route_get(&event_rt, route); if (rt < 0 || event_rt.rlist[rt] == NULL) { @@ -820,7 +824,9 @@ int handle_erlang_msg(cnode_handler_t *phandler, erlang_msg * msg) ret = handle_req_ref_tuple(phandler, msg); break; case ERL_PID_EXT: - ei_decode_pid(request->buff,&tmpindex,&from); + if(ei_decode_pid(request->buff,&tmpindex,&from)) { + LM_ERR("failed to decode pid\n"); + } ret = handle_send(phandler, msg); break; default: diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index e8d26cdb9a..1682e52f3b 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -988,7 +988,10 @@ int xavp_decode(ei_x_buff *xbuff, int *index, sr_xavp_t **xavp,int level) return -1; } - ei_decode_atom(xbuff->buff,index,pbuf); + if (ei_decode_atom(xbuff->buff,index,pbuf)) { + LM_ERR("failed to decode atom\n"); + goto err; + } val.type = SR_XTYPE_STR; val.v.s.s = pbuf; diff --git a/src/modules/erlang/worker.c b/src/modules/erlang/worker.c index 2a02e51df6..71af3b0298 100644 --- a/src/modules/erlang/worker.c +++ b/src/modules/erlang/worker.c @@ -59,7 +59,10 @@ int handle_worker(handler_common_t *phandler) int rc; /* ensure be connected */ - enode_connect(); + if (enode_connect()){ + LM_ERR("failed to connect!\n"); + return -1; + } memset((void*)&msg,0,sizeof(msg));

1 0

git:5.1:1bf7918a: erlang: fix bad free
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: 1bf7918a01bd0e7528a7706421935d10bd11198d URL: https://github.com/kamailio/kamailio/commit/1bf7918a01bd0e7528a7706421935d1… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:23:39+01:00 erlang: fix bad free Avoid to free non-pointer, likely causing a crash later. (cherry picked from commit 3680a1a6ec6971e79deb76daafc89cf2fe206c60) --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/1bf7918a01bd0e7528a7706421935d1… Patch: https://github.com/kamailio/kamailio/commit/1bf7918a01bd0e7528a7706421935d1… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 1c3c12efeb..54d2fa1733 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -697,7 +697,6 @@ static int fixup_rpc(void** param, int param_no) if (psp->setf != pv_list_set && psp->setf != pv_xbuff_set) { LM_ERR("wrong parameter #%d: accepted types are list or xbuff\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -916,7 +915,6 @@ static int fixup_reg(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1111,7 +1109,6 @@ static int fixup_reply(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1376,7 +1373,6 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; }

1 0

git:5.1:a262553c: erlang: fix use of an uninitialized variable
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: a262553c9fe89f1543c9bf4275da3f9b07efada5 URL: https://github.com/kamailio/kamailio/commit/a262553c9fe89f1543c9bf4275da3f9… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:23:21+01:00 erlang: fix use of an uninitialized variable Ensure to initialize variable before use. (cherry picked from commit a379ef730bc129b630325672c9a39aa8c59139b9) --- Modified: src/modules/erlang/erl_helpers.c Modified: src/modules/erlang/handle_emsg.c Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/a262553c9fe89f1543c9bf4275da3f9… Patch: https://github.com/kamailio/kamailio/commit/a262553c9fe89f1543c9bf4275da3f9… --- diff --git a/src/modules/erlang/erl_helpers.c b/src/modules/erlang/erl_helpers.c index ddc0abc952..8c7a391830 100644 --- a/src/modules/erlang/erl_helpers.c +++ b/src/modules/erlang/erl_helpers.c @@ -73,7 +73,6 @@ int erl_passive_socket(const char *hostname, int qlen, int port; struct addrinfo *ai; struct addrinfo hints; - struct ip_addr ip; socklen_t addrlen = sizeof(struct sockaddr); memset(&hints, 0, sizeof(struct addrinfo)); @@ -103,8 +102,7 @@ int erl_passive_socket(const char *hostname, int qlen, /* initialize TCP */ #if !defined(TCP_DONT_REUSEADDR) if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(int))) { - LM_ERR("failed to enable SO_REUSEADDR for socket on %s %s, %s\n", - hostname, ip_addr2strz(&ip), strerror(errno)); + LM_ERR("failed to enable SO_REUSEADDR: %s\n", strerror(errno)); } #endif /* tos */ @@ -118,8 +116,8 @@ int erl_passive_socket(const char *hostname, int qlen, if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) { port=sockaddr_port(ai->ai_addr); - LM_CRIT("failed to bind socket on %s %s:%u. %s.\n", hostname, - ip_addr2strz(&ip), port, strerror(errno)); + LM_CRIT("failed to bind socket on %s:%u. %s.\n", hostname, + port, strerror(errno)); erl_close_socket(sockfd); freeaddrinfo(ai); @@ -128,8 +126,8 @@ int erl_passive_socket(const char *hostname, int qlen, if (ai->ai_socktype == SOCK_STREAM && listen(sockfd, qlen) < 0) { - LM_CRIT("failed to listen socket on %s, %s. %s.\n", hostname, - ip_addr2strz(&ip), strerror(errno)); + LM_CRIT("failed to listen socket on %s: %s.\n", hostname, + strerror(errno)); erl_close_socket(sockfd); freeaddrinfo(ai); diff --git a/src/modules/erlang/handle_emsg.c b/src/modules/erlang/handle_emsg.c index fe30b8d2ee..1e36be5cb6 100644 --- a/src/modules/erlang/handle_emsg.c +++ b/src/modules/erlang/handle_emsg.c @@ -640,6 +640,8 @@ int handle_rex_msg(cnode_handler_t *phandler, erlang_msg * msg) ei_x_buff *request = &phandler->request; ei_x_buff *response = &phandler->response; + memset((void*)&ref,0,sizeof(erlang_ref_ex_t)); + /* start from first arg */ request->index = 0; ei_decode_version(request->buff, &request->index, &version); diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index 5ca9ef21af..fccec06680 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -1138,6 +1138,8 @@ static int get_int(int *int_ptr,erl_rpc_ctx_t *ctx, int reads, int autoconvert) return -1; } + ei_decode_string(ctx->request->buff, &ctx->request_index, p); + *int_ptr = strtol(p,&endptr,10); if (p == endptr) { @@ -1217,6 +1219,8 @@ static int get_double(double *double_prt,erl_rpc_ctx_t *ctx, int reads, int auto return -1; } + ei_decode_string(ctx->request->buff, &ctx->request_index, p); + *double_prt = strtod(p,&endptr); if (p == endptr) {

1 0

git:5.1:4d8e0755: erlang: fix memory leaks
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: 4d8e0755ba8169e8d5655d5b571a02d6c8ac6afb URL: https://github.com/kamailio/kamailio/commit/4d8e0755ba8169e8d5655d5b571a02d… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:23:30+01:00 erlang: fix memory leaks Ensure free used memory if parse of params failed. (cherry picked from commit 074eda76b3c2cb418832fd4b24436bf7f109b89e) --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/4d8e0755ba8169e8d5655d5b571a02d… Patch: https://github.com/kamailio/kamailio/commit/4d8e0755ba8169e8d5655d5b571a02d… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 2753842967..1c3c12efeb 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -666,6 +666,7 @@ static int fixup_rpc(void** param, int param_no) if(param_no==1 || param_no==2) { if (fix_param_types(FPARAM_STR|FPARAM_STRING|FPARAM_AVP|FPARAM_PVS|FPARAM_PVE,param)){ LM_ERR("wrong parameter #%d\n",param_no); + pkg_free((void*)erl_param); return -1; } erl_param->type = ERL_PARAM_FPARAM; @@ -873,6 +874,7 @@ static int fixup_reg(void** param, int param_no) if(param_no==1) { if (fix_param_types(FPARAM_STR|FPARAM_STRING|FPARAM_AVP|FPARAM_PVS|FPARAM_PVE|FPARAM_INT,param)){ LM_ERR("wrong parameter #%d\n",param_no); + pkg_free((void*)erl_param); return -1; } erl_param->type = ERL_PARAM_FPARAM;

1 0

git:5.1:aac37ac2: erlang: fix copy into fixed size buffer of node name
by Seudin Kasumovic 04 Jan '18

04 Jan '18

Module: kamailio Branch: 5.1 Commit: aac37ac2aed455da79c406cc597ccc74d9138322 URL: https://github.com/kamailio/kamailio/commit/aac37ac2aed455da79c406cc597ccc7… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-04T09:22:39+01:00 erlang: fix copy into fixed size buffer of node name Use length of node name string to avoid write past the end of the fixed-size destination buffer. (cherry picked from commit 53a76a4ae828cf08fbdebe08918706bd7d7d76d2) --- Modified: src/modules/erlang/cnode.c --- Diff: https://github.com/kamailio/kamailio/commit/aac37ac2aed455da79c406cc597ccc7… Patch: https://github.com/kamailio/kamailio/commit/aac37ac2aed455da79c406cc597ccc7… --- diff --git a/src/modules/erlang/cnode.c b/src/modules/erlang/cnode.c index 0eae7a716c..ce24c1dff4 100644 --- a/src/modules/erlang/cnode.c +++ b/src/modules/erlang/cnode.c @@ -111,7 +111,8 @@ int cnode_connect_to(cnode_handler_t *phandler, ei_cnode *ec, const str *nodenam LM_DBG("... connected to %.*s %s:%u\n", STR_FMT(nodename), ip_addr2strz(&ip), port); } - strcpy(phandler->conn.nodename, nodename->s); + strncpy(phandler->conn.nodename, nodename->s, nodename->len); + phandler->conn.nodename[nodename->len] = 0; /* for #Pid */ phandler->ec.self.num = phandler->sockfd;

1 0

git:master:74778f3a: erlang: fix restore index of parsed tuple
by Seudin Kasumovic 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: 74778f3ac75432d475e9d54dc56f9c3b95c178a5 URL: https://github.com/kamailio/kamailio/commit/74778f3ac75432d475e9d54dc56f9c3… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-03T23:21:41+01:00 erlang: fix restore index of parsed tuple Avoid to change origin index while parsing tuple. --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/74778f3ac75432d475e9d54dc56f9c3… Patch: https://github.com/kamailio/kamailio/commit/74778f3ac75432d475e9d54dc56f9c3… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index b852892d9d..d45351bcc2 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -486,10 +486,10 @@ int erl_rpc_struct_scan(erl_rpc_ctx_t* ctx, char* fmt, ...) va_list ap; - /* save index */ + /* preserve index */ index = ctx->request_index; - if(ei_decode_tuple_header(ctx->request->buff,&ctx->request_index, &arity)) + if(ei_decode_tuple_header(ctx->request->buff,&index, &arity)) { erl_rpc_fault(ctx,400,"Bad tuple"); return -1; @@ -561,9 +561,6 @@ int erl_rpc_struct_scan(erl_rpc_ctx_t* ctx, char* fmt, ...) fmt++; } - /* restore index */ - ctx->request_index = index; - va_end(ap); return reads-modifiers;

1 0

git:master:6542a367: erlang: fix never used value assigned to a variable
by Seudin Kasumovic 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: 6542a367638ec5f8a2b62994f8c309e7a2533962 URL: https://github.com/kamailio/kamailio/commit/6542a367638ec5f8a2b62994f8c309e… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-03T23:21:41+01:00 erlang: fix never used value assigned to a variable --- Modified: src/modules/erlang/pv_xbuff.c --- Diff: https://github.com/kamailio/kamailio/commit/6542a367638ec5f8a2b62994f8c309e… Patch: https://github.com/kamailio/kamailio/commit/6542a367638ec5f8a2b62994f8c309e… --- diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index 1682e52f3b..ce6e2bd2eb 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -87,10 +87,10 @@ sr_xavp_t *xbuff_new(str *name) if(!xbuffs_root) { xbuff = xavp_add_xavp_value(&xbuff_list,name,&xbuff_val,xavp_get_crt_list()); + } else { + xbuff = xavp_get_child(&xbuff_list, name); } - xbuff=xavp_get_child(&xbuff_list, name); - if (!xbuff) { xbuff_val.type = SR_XTYPE_NULL;

1 0

git:master:13c71a14: erlang: fix possible memory corruption
by Seudin Kasumovic 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: 13c71a14bfe4d2ee650521086bbae9920f95fcaa URL: https://github.com/kamailio/kamailio/commit/13c71a14bfe4d2ee650521086bbae99… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-03T23:21:41+01:00 erlang: fix possible memory corruption Allocate sufficient memory for the terminating null of the string. --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/13c71a14bfe4d2ee650521086bbae99… Patch: https://github.com/kamailio/kamailio/commit/13c71a14bfe4d2ee650521086bbae99… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index 5fe3c1f978..b852892d9d 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -223,7 +223,7 @@ int erl_rpc_add(erl_rpc_ctx_t* ctx, char* fmt, ...) param->type = ERL_STRING_EXT; param->value.S.len = strlen(char_ptr); - param->value.S.s = (char*)pkg_malloc(param->value.S.len); + param->value.S.s = (char*)pkg_malloc(param->value.S.len+1); if (!param->value.S.s) { @@ -696,7 +696,7 @@ int erl_rpc_struct_add(erl_rpc_ctx_t* ctx, char* fmt, ...) param->type = ERL_STRING_EXT; param->value.S.len = strlen(char_ptr); - param->value.S.s = (char*)pkg_malloc(param->value.S.len); + param->value.S.s = (char*)pkg_malloc(param->value.S.len+1); if (!param->value.S.s) { @@ -847,7 +847,7 @@ int erl_rpc_array_add(erl_rpc_ctx_t* ctx, char* fmt, ...) param->type = ERL_STRING_EXT; param->value.S.len = strlen(char_ptr); - param->value.S.s = (char*)pkg_malloc(param->value.S.len); + param->value.S.s = (char*)pkg_malloc(param->value.S.len+1); if (!param->value.S.s) {

1 0

git:master:c061d668: erlang: fix unreachable code
by Seudin Kasumovic 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: c061d6688c505544aecfc39a43e8c60d48875790 URL: https://github.com/kamailio/kamailio/commit/c061d6688c505544aecfc39a43e8c60… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-03T23:21:41+01:00 erlang: fix unreachable code --- Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/c061d6688c505544aecfc39a43e8c60… Patch: https://github.com/kamailio/kamailio/commit/c061d6688c505544aecfc39a43e8c60… --- diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index fccec06680..5fe3c1f978 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -1418,15 +1418,13 @@ static int find_member(erl_rpc_ctx_t *ctx, int arity, const char* member_name) erl_rpc_fault(ctx,400,"Unexpected end of struct tuple"); goto error; } - continue; + i++; } else { /* return at current position */ return 0; } - - i++; } erl_rpc_fault(ctx,400, "Member %s not found",member_name);

1 0

git:master:3680a1a6: erlang: fix bad free
by Seudin Kasumovic 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: 3680a1a6ec6971e79deb76daafc89cf2fe206c60 URL: https://github.com/kamailio/kamailio/commit/3680a1a6ec6971e79deb76daafc89cf… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-03T23:21:41+01:00 erlang: fix bad free Avoid to free non-pointer, likely causing a crash later. --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/3680a1a6ec6971e79deb76daafc89cf… Patch: https://github.com/kamailio/kamailio/commit/3680a1a6ec6971e79deb76daafc89cf… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 1c3c12efeb..54d2fa1733 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -697,7 +697,6 @@ static int fixup_rpc(void** param, int param_no) if (psp->setf != pv_list_set && psp->setf != pv_xbuff_set) { LM_ERR("wrong parameter #%d: accepted types are list or xbuff\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -916,7 +915,6 @@ static int fixup_reg(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1111,7 +1109,6 @@ static int fixup_reply(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; } @@ -1376,7 +1373,6 @@ static int fixup_send(void** param, int param_no) erl_param->type = ERL_PARAM_XBUFF_SPEC; } else { LM_ERR("wrong parameter #%d\n",param_no); - pv_spec_free(&erl_param->value.sp); pkg_free((void*)erl_param); return E_UNSPEC; }

1 0

git:master:b43609de: erlang: improve error handling
by Seudin Kasumovic 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: b43609dec2c4089e02b11fd23099ab01b2ebc956 URL: https://github.com/kamailio/kamailio/commit/b43609dec2c4089e02b11fd23099ab0… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-03T23:21:41+01:00 erlang: improve error handling Ensure check value returned from function and log error. --- Modified: src/modules/erlang/handle_emsg.c Modified: src/modules/erlang/pv_xbuff.c Modified: src/modules/erlang/worker.c --- Diff: https://github.com/kamailio/kamailio/commit/b43609dec2c4089e02b11fd23099ab0… Patch: https://github.com/kamailio/kamailio/commit/b43609dec2c4089e02b11fd23099ab0… --- diff --git a/src/modules/erlang/handle_emsg.c b/src/modules/erlang/handle_emsg.c index 1e36be5cb6..96de5e01d8 100644 --- a/src/modules/erlang/handle_emsg.c +++ b/src/modules/erlang/handle_emsg.c @@ -437,7 +437,11 @@ int erlang_whereis(cnode_handler_t *phandler,erlang_ref_ex_t *ref, erlang_pid *p return 0; } - ei_decode_atom(request->buff,&request->index,route+sizeof("erlang:")-1); + if(ei_decode_atom(request->buff,&request->index,route+sizeof("erlang:")-1)) { + LM_ERR("error: badarg\n"); + ei_x_encode_atom(response,"badarg"); + return 0; + } rt = route_get(&event_rt, route); if (rt < 0 || event_rt.rlist[rt] == NULL) { @@ -820,7 +824,9 @@ int handle_erlang_msg(cnode_handler_t *phandler, erlang_msg * msg) ret = handle_req_ref_tuple(phandler, msg); break; case ERL_PID_EXT: - ei_decode_pid(request->buff,&tmpindex,&from); + if(ei_decode_pid(request->buff,&tmpindex,&from)) { + LM_ERR("failed to decode pid\n"); + } ret = handle_send(phandler, msg); break; default: diff --git a/src/modules/erlang/pv_xbuff.c b/src/modules/erlang/pv_xbuff.c index e8d26cdb9a..1682e52f3b 100644 --- a/src/modules/erlang/pv_xbuff.c +++ b/src/modules/erlang/pv_xbuff.c @@ -988,7 +988,10 @@ int xavp_decode(ei_x_buff *xbuff, int *index, sr_xavp_t **xavp,int level) return -1; } - ei_decode_atom(xbuff->buff,index,pbuf); + if (ei_decode_atom(xbuff->buff,index,pbuf)) { + LM_ERR("failed to decode atom\n"); + goto err; + } val.type = SR_XTYPE_STR; val.v.s.s = pbuf; diff --git a/src/modules/erlang/worker.c b/src/modules/erlang/worker.c index 2a02e51df6..71af3b0298 100644 --- a/src/modules/erlang/worker.c +++ b/src/modules/erlang/worker.c @@ -59,7 +59,10 @@ int handle_worker(handler_common_t *phandler) int rc; /* ensure be connected */ - enode_connect(); + if (enode_connect()){ + LM_ERR("failed to connect!\n"); + return -1; + } memset((void*)&msg,0,sizeof(msg));

1 0

git:master:074eda76: erlang: fix memory leaks
by Seudin Kasumovic 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: 074eda76b3c2cb418832fd4b24436bf7f109b89e URL: https://github.com/kamailio/kamailio/commit/074eda76b3c2cb418832fd4b24436bf… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-03T23:21:41+01:00 erlang: fix memory leaks Ensure free used memory if parse of params failed. --- Modified: src/modules/erlang/erlang_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/074eda76b3c2cb418832fd4b24436bf… Patch: https://github.com/kamailio/kamailio/commit/074eda76b3c2cb418832fd4b24436bf… --- diff --git a/src/modules/erlang/erlang_mod.c b/src/modules/erlang/erlang_mod.c index 2753842967..1c3c12efeb 100644 --- a/src/modules/erlang/erlang_mod.c +++ b/src/modules/erlang/erlang_mod.c @@ -666,6 +666,7 @@ static int fixup_rpc(void** param, int param_no) if(param_no==1 || param_no==2) { if (fix_param_types(FPARAM_STR|FPARAM_STRING|FPARAM_AVP|FPARAM_PVS|FPARAM_PVE,param)){ LM_ERR("wrong parameter #%d\n",param_no); + pkg_free((void*)erl_param); return -1; } erl_param->type = ERL_PARAM_FPARAM; @@ -873,6 +874,7 @@ static int fixup_reg(void** param, int param_no) if(param_no==1) { if (fix_param_types(FPARAM_STR|FPARAM_STRING|FPARAM_AVP|FPARAM_PVS|FPARAM_PVE|FPARAM_INT,param)){ LM_ERR("wrong parameter #%d\n",param_no); + pkg_free((void*)erl_param); return -1; } erl_param->type = ERL_PARAM_FPARAM;

1 0

git:master:53a76a4a: erlang: fix copy into fixed size buffer of node name
by Seudin Kasumovic 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: 53a76a4ae828cf08fbdebe08918706bd7d7d76d2 URL: https://github.com/kamailio/kamailio/commit/53a76a4ae828cf08fbdebe08918706b… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-03T23:21:41+01:00 erlang: fix copy into fixed size buffer of node name Use length of node name string to avoid write past the end of the fixed-size destination buffer. --- Modified: src/modules/erlang/cnode.c --- Diff: https://github.com/kamailio/kamailio/commit/53a76a4ae828cf08fbdebe08918706b… Patch: https://github.com/kamailio/kamailio/commit/53a76a4ae828cf08fbdebe08918706b… --- diff --git a/src/modules/erlang/cnode.c b/src/modules/erlang/cnode.c index 0eae7a716c..ce24c1dff4 100644 --- a/src/modules/erlang/cnode.c +++ b/src/modules/erlang/cnode.c @@ -111,7 +111,8 @@ int cnode_connect_to(cnode_handler_t *phandler, ei_cnode *ec, const str *nodenam LM_DBG("... connected to %.*s %s:%u\n", STR_FMT(nodename), ip_addr2strz(&ip), port); } - strcpy(phandler->conn.nodename, nodename->s); + strncpy(phandler->conn.nodename, nodename->s, nodename->len); + phandler->conn.nodename[nodename->len] = 0; /* for #Pid */ phandler->ec.self.num = phandler->sockfd;

1 0

git:master:a379ef73: erlang: fix use of an uninitialized variable
by Seudin Kasumovic 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: a379ef730bc129b630325672c9a39aa8c59139b9 URL: https://github.com/kamailio/kamailio/commit/a379ef730bc129b630325672c9a39aa… Author: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Committer: Seudin Kasumovic <seudin.kasumovic(a)gmail.com> Date: 2018-01-03T23:21:41+01:00 erlang: fix use of an uninitialized variable Ensure to initialize variable before use. --- Modified: src/modules/erlang/erl_helpers.c Modified: src/modules/erlang/handle_emsg.c Modified: src/modules/erlang/handle_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/a379ef730bc129b630325672c9a39aa… Patch: https://github.com/kamailio/kamailio/commit/a379ef730bc129b630325672c9a39aa… --- diff --git a/src/modules/erlang/erl_helpers.c b/src/modules/erlang/erl_helpers.c index ddc0abc952..8c7a391830 100644 --- a/src/modules/erlang/erl_helpers.c +++ b/src/modules/erlang/erl_helpers.c @@ -73,7 +73,6 @@ int erl_passive_socket(const char *hostname, int qlen, int port; struct addrinfo *ai; struct addrinfo hints; - struct ip_addr ip; socklen_t addrlen = sizeof(struct sockaddr); memset(&hints, 0, sizeof(struct addrinfo)); @@ -103,8 +102,7 @@ int erl_passive_socket(const char *hostname, int qlen, /* initialize TCP */ #if !defined(TCP_DONT_REUSEADDR) if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, &on, sizeof(int))) { - LM_ERR("failed to enable SO_REUSEADDR for socket on %s %s, %s\n", - hostname, ip_addr2strz(&ip), strerror(errno)); + LM_ERR("failed to enable SO_REUSEADDR: %s\n", strerror(errno)); } #endif /* tos */ @@ -118,8 +116,8 @@ int erl_passive_socket(const char *hostname, int qlen, if (bind(sockfd, ai->ai_addr, ai->ai_addrlen) < 0) { port=sockaddr_port(ai->ai_addr); - LM_CRIT("failed to bind socket on %s %s:%u. %s.\n", hostname, - ip_addr2strz(&ip), port, strerror(errno)); + LM_CRIT("failed to bind socket on %s:%u. %s.\n", hostname, + port, strerror(errno)); erl_close_socket(sockfd); freeaddrinfo(ai); @@ -128,8 +126,8 @@ int erl_passive_socket(const char *hostname, int qlen, if (ai->ai_socktype == SOCK_STREAM && listen(sockfd, qlen) < 0) { - LM_CRIT("failed to listen socket on %s, %s. %s.\n", hostname, - ip_addr2strz(&ip), strerror(errno)); + LM_CRIT("failed to listen socket on %s: %s.\n", hostname, + strerror(errno)); erl_close_socket(sockfd); freeaddrinfo(ai); diff --git a/src/modules/erlang/handle_emsg.c b/src/modules/erlang/handle_emsg.c index fe30b8d2ee..1e36be5cb6 100644 --- a/src/modules/erlang/handle_emsg.c +++ b/src/modules/erlang/handle_emsg.c @@ -640,6 +640,8 @@ int handle_rex_msg(cnode_handler_t *phandler, erlang_msg * msg) ei_x_buff *request = &phandler->request; ei_x_buff *response = &phandler->response; + memset((void*)&ref,0,sizeof(erlang_ref_ex_t)); + /* start from first arg */ request->index = 0; ei_decode_version(request->buff, &request->index, &version); diff --git a/src/modules/erlang/handle_rpc.c b/src/modules/erlang/handle_rpc.c index 5ca9ef21af..fccec06680 100644 --- a/src/modules/erlang/handle_rpc.c +++ b/src/modules/erlang/handle_rpc.c @@ -1138,6 +1138,8 @@ static int get_int(int *int_ptr,erl_rpc_ctx_t *ctx, int reads, int autoconvert) return -1; } + ei_decode_string(ctx->request->buff, &ctx->request_index, p); + *int_ptr = strtol(p,&endptr,10); if (p == endptr) { @@ -1217,6 +1219,8 @@ static int get_double(double *double_prt,erl_rpc_ctx_t *ctx, int reads, int auto return -1; } + ei_decode_string(ctx->request->buff, &ctx->request_index, p); + *double_prt = strtod(p,&endptr); if (p == endptr) {

1 0

[kamailio/kamailio] topos: retry initial INVITE - no Contact (#1356)
by sergey-vb 03 Jan '18

03 Jan '18

### Description When callee device not reachable kamailio tries to reach it, I have profile with 3 retries with 1second interval. But Contact header present only in 1-st Invite. Next Invites are send without Contact header... With topoh module - Contact normal in all INVITES. ### Troubleshooting #### Reproduction Load and configure topos module Create permanent location record which is unreachable. Make call to it. make sure that you have profile with retries. #### Log Messages [kamailio.tar.gz](https://github.com/kamailio/kamailio/files/1542939/kamaili… #### SIP Traffic [retry-Invite-on-not-reach.tar.gz](https://github.com/kamailio/kamailio/file… ### Additional Information * **Kamailio Version** version: kamailio 5.2.0-dev1 (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 14:50:56 Dec 8 2017 with gcc 4.8.5 * **Operating System**: Red Hat Enterprise Linux Server 7.3 3.10.0-514.el7.x86_64 #1 SMP Wed Oct 19 11:24:13 EDT 2016 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/1356

2 3

[kamailio/kamailio] acc: set cdr_extra values to NULL (#1378)
by Carlos Cruz Luengo 03 Jan '18

03 Jan '18

### Description ACC module [cdr_extra modparam](http://kamailio.org/docs/modules/devel/modules/acc.html#acc.p.cdr… allows saving additional custom values in cdr entries using dlg_vars. When you define a new value to be saved: `modparam("acc", "cdr_extra", "c1=$dlg_var(caller)")` and you set a $dlg_var(c1) in the logic, everything works as expected. But if you set it to $null or you don't even define it, it is saved as '' (empty string). Would be nice that setting to $null would store the underlying null value (NULL in SQL database) and not defining it would lead to not even including it in the final INSERT? ### Troubleshooting #### Reproduction Define a new value to be saved: `modparam("acc", "cdr_extra", "c1=$dlg_var(caller)")` And in the kamailio.cfg logic: - If you set $dlg_var(c1) to any string ('', 'foo', '2'), it is saved as expected ('', 'foo', '2'). - If you set $dlg_var(c1) to an integer different from 0 (1, 2, 3), it is saved as a string containing that number ('1', '2', '3'). This seems normal as dlg_vars can only store strings. - If you set $dlg_var(c1) to 0, it is saved as an empty string (''). Seems normal too. - If you set $dlg_var(c1) to $null, it is saved as an empty string (''). - If you don't define $dlg_var(c1) at all, it is saved as an empty string (''). #### Debugging Data Both [_extra2strar_](https://github.com/kamailio/kamailio/blob/e101f21c37238862a4… and [_extra2strar_dlg_only_](https://github.com/kamailio/kamailio/blob/e101f21c3… functions defined in [_acc_extra.c_](https://github.com/kamailio/kamailio/blob/master/src/modules… set _cdr_type_array_ entry to TYPE_NULL, but that array is not used in subsequent [for loop](https://github.com/kamailio/kamailio/blob/e101f21c37238862a474c50218d…. ### Possible Solutions Modify the logic in the [for loop](https://github.com/kamailio/kamailio/blob/e101f21c37238862a474c50218d… so that it invokes VAL_NULL macro for null values using _cdr_type_array_. With this change both $null values and undefined values would use underlying NULL value. I could try to make further changes to avoid the key in the insert for undefined values instead of setting it to NULL. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.6 (x86_64/linux) 0a8379-dirty 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: 0a8379 -dirty compiled on 12:23:36 Dec 20 2017 with gcc 6.3.0 ``` * **Operating System**: ``` Linux 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u3 (2017-08-06) x86_64 GNU/Linux ``` Is there any reason I missed for not doing this change ([this comment](https://github.com/kamailio/kamailio/blob/e101f21c37238862a474c502… makes me think so)? If not, I can try to provide a PR with these changes. Regards, -- 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/1378

2 3

[kamailio/kamailio] acc: save cdr entries in UTC (#1358)
by Carlos Cruz Luengo 03 Jan '18

03 Jan '18

### Description ACC module allows setting datetime fields in UTC via [time_mode param](http://kamailio.org/docs/modules/devel/modules/acc.html#acc.p.time_m…. However, this setting does not cause cdr entries to be saved in that format and I haven't found any equivalent parameter to achieve this. ### Troubleshooting Analyzing the code for MySQL database storage I have found that [_db_time2str_ex_ function defined in _db_ut.c_](https://github.com/kamailio/kamailio/blob/master/src/lib/srdb1/d… uses localtime(). ### Possible Solutions Changing localtime() to gmtime() cdrs are saved in UTC, but it would be desirable to add a new module param that makes this configurable. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 4.4.6 (x86_64/linux) 0a8379-dirty 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: 0a8379 -dirty compiled on 17:01:42 Dec 4 2017 with gcc 6.3.0 ``` * **Operating System**:  ``` Linux 4.9.0-3-amd64 #1 SMP Debian 4.9.30-2+deb9u3 (2017-08-06) x86_64 GNU/Linux ``` Should I proceed and try to get a working PR to add this new modparam or there is currently a way to get this that I have missed (apart from setting system time to UTC)? Thank you and regards, -- 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/1358

2 3

git:master:d1ad603a: core: aliased global param ip_free_bind to ip_nonlocal_bind
by Daniel-Constantin Mierla 03 Jan '18

03 Jan '18

Module: kamailio Branch: master Commit: d1ad603addca7175b97a37c8e981c11c30dc30cf URL: https://github.com/kamailio/kamailio/commit/d1ad603addca7175b97a37c8e981c11… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-03T11:34:13+01:00 core: aliased global param ip_free_bind to ip_nonlocal_bind - match better with linux system control option - removed ip_freebind --- Modified: src/core/cfg.lex --- Diff: https://github.com/kamailio/kamailio/commit/d1ad603addca7175b97a37c8e981c11… Patch: https://github.com/kamailio/kamailio/commit/d1ad603addca7175b97a37c8e981c11… --- diff --git a/src/core/cfg.lex b/src/core/cfg.lex index db8f3af4ef..d66857e169 100644 --- a/src/core/cfg.lex +++ b/src/core/cfg.lex @@ -337,7 +337,7 @@ DST_BLST_TCP_IMASK dst_blacklist_tcp_imask DST_BLST_TLS_IMASK dst_blacklist_tls_imask DST_BLST_SCTP_IMASK dst_blacklist_sctp_imask -IP_FREE_BIND ip_free_bind|ip_freebind|ipfreebind +IP_FREE_BIND ip_free_bind|ipfreebind|ip_nonlocal_bind PORT port STAT statistics

1 0

git:5.1:edbfa1ea: usrloc: partion column name can be set via modparam
by Ãyvind Kolbu 03 Jan '18

03 Jan '18

Module: kamailio Branch: 5.1 Commit: edbfa1eae2df1b932dff0bf5b7182ef09592a37d URL: https://github.com/kamailio/kamailio/commit/edbfa1eae2df1b932dff0bf5b7182ef… Author: Oyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Ãyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Date: 2018-01-02T13:30:54+01:00 usrloc: partion column name can be set via modparam (cherry picked from commit b933b2a7bf631b157bf81b86afffe6b8a43a0308) --- Modified: src/modules/usrloc/doc/usrloc_admin.xml Modified: src/modules/usrloc/usrloc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/edbfa1eae2df1b932dff0bf5b7182ef… Patch: https://github.com/kamailio/kamailio/commit/edbfa1eae2df1b932dff0bf5b7182ef… --- diff --git a/src/modules/usrloc/doc/usrloc_admin.xml b/src/modules/usrloc/doc/usrloc_admin.xml index f7ac066c29..96ff750f97 100644 --- a/src/modules/usrloc/doc/usrloc_admin.xml +++ b/src/modules/usrloc/doc/usrloc_admin.xml @@ -516,6 +516,26 @@ modparam("usrloc", "keepalive_column", "kalive") </example> </section> + <section id="usrloc.p.partition_column"> + <title><varname>partition_column</varname> (string)</title> + <para> + Name of database table column containing the value for partition id. + </para> + <para> + <emphasis> + Default value is <quote>partition</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>partitioncolumn</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("usrloc", "partition_column", "part") +... +</programlisting> + </example> + </section> + <section id="usrloc.p.use_domain"> <title><varname>use_domain</varname> (integer)</title> <para> diff --git a/src/modules/usrloc/usrloc_mod.c b/src/modules/usrloc/usrloc_mod.c index 3191e1bb1e..2eb9037f24 100644 --- a/src/modules/usrloc/usrloc_mod.c +++ b/src/modules/usrloc/usrloc_mod.c @@ -218,6 +218,7 @@ static param_export_t params[] = { {"server_id_column", PARAM_STR, &srv_id_col }, {"connection_id_column",PARAM_STR, &con_id_col }, {"keepalive_column", PARAM_STR, &keepalive_col }, + {"partition_column", PARAM_STR, &partition_col }, {"matching_mode", INT_PARAM, &matching_mode }, {"cseq_delay", INT_PARAM, &cseq_delay }, {"fetch_rows", INT_PARAM, &ul_fetch_rows },

3 2

P-Server Exiting whenever Registered one user
by Prasannakumar Merugu 03 Jan '18

03 Jan '18

Hello All, We are able to registered user and make calls with Kamailio-5.0.4 version but, When we are trying register with Kamailio-5.0.5 version P-Server is exiting, Jitsi client getting registered I'm attached the below P-server logs file. -- *Thanks,* *Prasannakumar Merugu9010028290*

1 0

Re: [sr-dev] [SR-Users] Happy New Year 2018!
by Angel Elena 02 Jan '18

02 Jan '18

happy new year and happy sip ;) ----------------------------------------------- Ángel Elena Medina _o) craem(a)craem.net / \ http://blog.craem.net _(___V @craem_ ----------------------------------------------- Zarafa / Zpush Mobile. -------- Mensaje original -------- De: voipspace voipspace <voipspace(a)yandex.com> Fecha: 2/1/18 20:35 (GMT+01:00) Para: miconda(a)gmail.com, "Kamailio (SER) - Users Mailing List" <sr-users(a)lists.kamailio.org>, "Kamailio (SER) - Devel Mailing List" <sr-dev(a)lists.kamailio.org>, business(a)lists.kamailio.org Asunto: Re: [SR-Users] Happy New Year 2018! Happy New Year, Every One. Hope you had great time off with family and friends. May 2018 be prosperous and happy for you all. On to bigger and greater thing in the new year. bw Kamailio is awesome! 01.01.2018, 11:09, "Daniel-Constantin Mierla" <miconda(a)gmail.com>: > A Happy And Prosperous Year 2018 to everyone using Kamailio and helping > to improve the project! > > Looking forward to meeting many of you around this world during 2018 and > collaborate online in a friendly environment! > > Daniel > > -- > Daniel-Constantin Mierla > www.twitter.com/miconda -- www.linkedin.com/in/miconda > Kamailio Advanced Training - www.asipto.com > Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com > > _______________________________________________ > Kamailio (SER) - Users Mailing List > sr-users(a)lists.kamailio.org > https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users _______________________________________________ Kamailio (SER) - Users Mailing List sr-users(a)lists.kamailio.org https://lists.kamailio.org/cgi-bin/mailman/listinfo/sr-users

1 0

Happy New Year 2018!
by Daniel-Constantin Mierla 02 Jan '18

02 Jan '18

A Happy And Prosperous Year 2018 to everyone using Kamailio and helping to improve the project! Looking forward to meeting many of you around this world during 2018 and collaborate online in a friendly environment! Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - www.asipto.com Kamailio World Conference - May 14-16, 2018 - www.kamailioworld.com

2 1

git:master:42b29a59: modules: readme files regenerated - acc ... [skip ci]
by Kamailio Dev 02 Jan '18

02 Jan '18

Module: kamailio Branch: master Commit: 42b29a5989671aa1e9383fbf395fa09184a3ae02 URL: https://github.com/kamailio/kamailio/commit/42b29a5989671aa1e9383fbf395fa09… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-02T18:31:32+01:00 modules: readme files regenerated - acc ... [skip ci] --- Modified: src/modules/acc/README --- Diff: https://github.com/kamailio/kamailio/commit/42b29a5989671aa1e9383fbf395fa09… Patch: https://github.com/kamailio/kamailio/commit/42b29a5989671aa1e9383fbf395fa09…

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev