- sr-dev - kamailio.org

git:5.1:cc638e4c: topos: revert "topos: set uuid fields before checking contact/rr fields"
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: 5.1 Commit: cc638e4cd6d6f4ff9aca0bf6c9d6c940a3e64e59 URL: https://github.com/kamailio/kamailio/commit/cc638e4cd6d6f4ff9aca0bf6c9d6c94… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T09:14:26+01:00 topos: revert "topos: set uuid fields before checking contact/rr fields" This reverts commit 97532ca18f595d89edf9b0b6e6688847aa38dd44. (cherry picked from commit be6a419a5b0d6fe3922219a30788ad527a313fd6) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/cc638e4cd6d6f4ff9aca0bf6c9d6c94… Patch: https://github.com/kamailio/kamailio/commit/cc638e4cd6d6f4ff9aca0bf6c9d6c94… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 95f1097bd6..950d1982f4 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -214,10 +214,19 @@ 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'; @@ -225,6 +234,8 @@ 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'; @@ -232,20 +243,7 @@ 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

git:master:be6a419a: topos: revert "topos: set uuid fields before checking contact/rr fields"
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: master Commit: be6a419a5b0d6fe3922219a30788ad527a313fd6 URL: https://github.com/kamailio/kamailio/commit/be6a419a5b0d6fe3922219a30788ad5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T09:12:26+01:00 topos: revert "topos: set uuid fields before checking contact/rr fields" This reverts commit 97532ca18f595d89edf9b0b6e6688847aa38dd44. --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/be6a419a5b0d6fe3922219a30788ad5… Patch: https://github.com/kamailio/kamailio/commit/be6a419a5b0d6fe3922219a30788ad5… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 95f1097bd6..950d1982f4 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -214,10 +214,19 @@ 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'; @@ -225,6 +234,8 @@ 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'; @@ -232,20 +243,7 @@ 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] rtpengine: rtpengine_offer is stripping all INVITE multipart bodies except application/sdp (#1434)
by foucse 12 Feb '18

12 Feb '18

### Description  When processing a multipart INVITE using the rtpengine module. The rtpengine_offer configuration function (called with default arguments) is stripping all bodies except the application/sdp MIME type body. ### Troubleshooting #### Reproduction  A client is sending an INVITE through a kamailio proxy paired with a rtpengine. ``` Client Proxy Server x INVITE (SDP) x x x x qqqqqqqqqqqqqqqqqqqqqqqqqq> x x x x 100 Trying x x x x <qqqqqqqqqqqqqqqqqqqqqqqqqq x x x x x x INVITE (SDP) x x x x qqqqqqqqqqqqqqqqqqqqqqqqqq> x x x x 100 Trying x x x x <qqqqqqqqqqqqqqqqqqqqqqqqqq x x x x x x x x x x x x x x x x x x x x x x x x x x x x 200 OK (SDP) x x x x <qqqqqqqqqqqqqqqqqqqqqqqqqq x x 200 OK (SDP) x x x x <qqqqqqqqqqqqqqqqqqqqqqqqqq x x x ``` The INVITE contains a application/sdp body and one or several other bodies of different MIME types. When the INVITE is going out of the proxy, all other bodies except the application/sdp MIME are filtered out. While The INVITE "Content-Type" header is still fixed to : `Content-Type: multipart/mixed;boundary="[boundary value]"` RTP Engine receives only the SDP body on its socket and is rewritting well the RTP ports. #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  This issue has been introduced by the following commit : 36cb753441a78bd13ded119cd468f32623f09fbf. rtpengine.c : ``` diff @@ -3328,6 +3328,7 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) str body, newbody; struct lump *anchor; pv_value_t pv_val; + str cur_body = {0, 0}; dict = rtpp_function_call_ok(&bencbuf, msg, op, flags, &body); if (!dict) @@ -3357,7 +3358,12 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + /* get the body from the message as body ptr may have changed */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free; ``` If this commit is removed, the previous behavior is restored. This commit fixes a segfault: "rtpengine: fixed segfault when using read_sdp_pv", so it appears to me that this may be useful. For, now I am not seeing why this is happening. ### Additional Information * **Kamailio Version** - output of `kamailio -v` seen on: ``` version: kamailio 5.1.0 (x86_64/linux) flags: STATS: Off, EXTRA_DEBUG, 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 15:29:43 Feb 8 2018 with gcc 4.8.4 ``` but I think that the same behavior will be seen on master. * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1434

3 5

git:5.0:749dd5c5: rtpengine: get again body pointer only when read_sdp_pv is set
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: 5.0 Commit: 749dd5c55ed100e9a57ece18e82fab2d1eaaab8e URL: https://github.com/kamailio/kamailio/commit/749dd5c55ed100e9a57ece18e82fab2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T09:00:07+01:00 rtpengine: get again body pointer only when read_sdp_pv is set - reported by GH #1434 (cherry picked from commit 75c4ca0bb69bd4f1ba42c6d964697737813fa81e) (cherry picked from commit 8794d6d60549683120e22b3b150674e686a29ba0) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/749dd5c55ed100e9a57ece18e82fab2… Patch: https://github.com/kamailio/kamailio/commit/749dd5c55ed100e9a57ece18e82fab2… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index ab1c088d5d..95a4ba4bd1 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -2883,12 +2883,17 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - /* get the body from the message as body ptr may have changed */ - cur_body.len = 0; - cur_body.s = get_body(msg); - cur_body.len = msg->buf + msg->len - cur_body.s; - - anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); + if (read_sdp_pvar_str.len > 0) { + /* get the body from the message as body ptr may have changed + * when using read_sdp_pv */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); + } else { + anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + } if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

git:5.1:8794d6d6: rtpengine: get again body pointer only when read_sdp_pv is set
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: 5.1 Commit: 8794d6d60549683120e22b3b150674e686a29ba0 URL: https://github.com/kamailio/kamailio/commit/8794d6d60549683120e22b3b150674e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T08:58:30+01:00 rtpengine: get again body pointer only when read_sdp_pv is set - reported by GH #1434 (cherry picked from commit 75c4ca0bb69bd4f1ba42c6d964697737813fa81e) --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/8794d6d60549683120e22b3b150674e… Patch: https://github.com/kamailio/kamailio/commit/8794d6d60549683120e22b3b150674e… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 5b82988229..666cfb32ba 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3358,12 +3358,17 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - /* get the body from the message as body ptr may have changed */ - cur_body.len = 0; - cur_body.s = get_body(msg); - cur_body.len = msg->buf + msg->len - cur_body.s; - - anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); + if (read_sdp_pvar_str.len > 0) { + /* get the body from the message as body ptr may have changed + * when using read_sdp_pv */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); + } else { + anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + } if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

[kamailio/kamailio] app_lua // crash // realloc(): invalid next size: (#1433)
by amoizard 12 Feb '18

12 Feb '18

### Description When starting my kamailio with my complete kamailio.cfg, I have crash reporting *** Error in `/usr/sbin/kamailio': realloc(): invalid next size: 0x0000000001060980 *** The issue looks to be related to using "app_lua" module. However, the issue don't always show up. If I remove ONE modules, it won't crash. I've been trying to get a simple config to crash, but I have to keep many modules to reproduce the crash. The crash is happening line 228 of app_lua_api.c: if(luaL_dostring(L, "sr.probe()")!=0) ### Troubleshooting Can't start kamailio. #### Reproduction I have attached my minimal kamailio4.cfg file to reproduce the crash. I have removed my DBURL credentials. [kamailio4.cfg.txt](https://github.com/kamailio/kamailio/files/1707085/kamai… I'm starting kamailio with: /usr/sbin/kamailio -D -f kamailio4.cfg -e -E -ddd #### Debugging Data Core was generated by `/usr/sbin/kamailio -D -f kamailio4.cfg -e -E -ddd'. Program terminated with signal SIGABRT, Aborted. #0 0x00007f8ecfb62067 in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 56 ../nptl/sysdeps/unix/sysv/linux/raise.c: No such file or directory. (gdb) bt #0 0x00007f8ecfb62067 in __GI_raise (sig=sig@entry=6) at ../nptl/sysdeps/unix/sysv/linux/raise.c:56 #1 0x00007f8ecfb63448 in __GI_abort () at abort.c:89 #2 0x00007f8ecfba01b4 in __libc_message (do_abort=do_abort@entry=1, fmt=fmt@entry=0x7f8ecfc95210 "*** Error in `%s': %s: 0x%s ***\n") at ../sysdeps/posix/libc_fatal.c:175 #3 0x00007f8ecfba598e in malloc_printerr (action=1, str=0x7f8ecfc9142a "realloc(): invalid next size", ptr=<optimized out>) at malloc.c:4996 #4 0x00007f8ecfba876b in _int_realloc (av=av@entry=0x7f8ecfed2620 <main_arena>, oldp=oldp@entry=0x1060970, oldsize=oldsize@entry=736, nb=nb@entry=1552) at malloc.c:4234 #5 0x00007f8ecfba9769 in __GI___libc_realloc (oldmem=0x1060980, bytes=1536) at malloc.c:3029 #6 0x00007f8ec324acae in luaM_realloc_ (L=L@entry=0x10605c0, block=block@entry=0x1060980, osize=720, nsize=nsize@entry=1536) at lmem.c:79 #7 0x00007f8ec32469aa in luaD_reallocstack (L=0x10605c0, newsize=90) at ldo.c:145 #8 0x00007f8ec324b66d in open_func (ls=ls@entry=0x7ffe459b9720, fs=fs@entry=0x7ffe459b9780) at lparser.c:350 #9 0x00007f8ec324e0b3 in luaY_parser (L=0x10605c0, z=0x7ffe459b9bf0, buff=<optimized out>, name=<optimized out>) at lparser.c:388 #10 0x00007f8ec3246cd1 in f_parser (L=L@entry=0x10605c0, ud=ud@entry=0x7ffe459b9ba0) at ldo.c:498 #11 0x00007f8ec324692e in luaD_rawrunprotected (L=L@entry=0x10605c0, f=f@entry=0x7f8ec3246c80 <f_parser>, ud=ud@entry=0x7ffe459b9ba0) at ldo.c:116 #12 0x00007f8ec32477bb in luaD_pcall (L=L@entry=0x10605c0, func=func@entry=0x7f8ec3246c80 <f_parser>, u=u@entry=0x7ffe459b9ba0, old_top=672, ef=<optimized out>) at ldo.c:464 #13 0x00007f8ec32478c2 in luaD_protectedparser (L=L@entry=0x10605c0, z=z@entry=0x7ffe459b9bf0, name=name@entry=0x7f8ec350547e "sr.probe()") at ldo.c:514 #14 0x00007f8ec3243528 in lua_load (L=0x10605c0, reader=reader@entry=0x7f8ec3252940 <getS>, data=data@entry=0x7ffe459b9c40, chunkname=0x7f8ec350547e "sr.probe()") at lapi.c:869 #15 0x00007f8ec3253d8c in luaL_loadbuffer (L=<optimized out>, buff=<optimized out>, size=<optimized out>, name=<optimized out>) at lauxlib.c:614 #16 0x00007f8ec34e87d7 in lua_sr_init_probe () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_lua.so #17 0x00007f8ec347497d in ?? () from /usr/lib/x86_64-linux-gnu/kamailio/modules/app_lua.so #18 0x0000000000549a00 in ?? () #19 0x0000000000549d92 in init_child () #20 0x00000000004214c8 in main_loop () #21 0x000000000042aae9 in main () (gdb) (gdb) info locals resultvar = 0 pid = 23353 selftid = 23353 #### Log Messages I'm copy/pasting a few logs from the app_lua module. If you wish more, let me know. 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.hdr (hdr) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.jsonrpcs (jsonrpcs) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.kex (kex) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.tm (tm) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.tmx (tmx) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.sl (sl) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.tsilo (tsilo) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.rr (rr) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.pvx (pvx) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.maxfwd (maxfwd) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.registrar (registrar) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.textops (textops) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.siputils (siputils) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.sanity (sanity) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.acc (acc) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.uri_db (uri_db) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.auth (auth) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.auth_db (auth_db) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.permissions (permissions) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.alias_db (alias_db) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.domain (domain) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.presence (presence) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.presence_xml (presence_xml) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.nathelper (nathelper) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.rtpproxy (rtpproxy) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.tls (tls) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.pike (pike) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.htable (htable) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.xhttp (xhttp) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.websocket (websocket) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.sqlops (sqlops) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.cfgutils (cfgutils) 0(23353) DEBUG: app_lua [app_lua_sr.c:1975]: lua_sr_kemi_register_libs(): initializing kemi sub-module: KSR.app_lua (app_lua) 0(23353) DEBUG: app_lua [app_lua_sr.c:1978]: lua_sr_kemi_register_libs(): module 'KSR' has been initialized #### SIP Traffic Not applicable. The proxy crash before starting. ### Possible Solutions I haven't been able to find any clue. ### Additional Information I'm using a debian running jessie with debian package from http://deb.kamailio.org/kamailio51 I have installed liblua5.1-0-dbg to have more backtrace from the core dump. $ /usr/sbin/kamailio -v version: kamailio 5.1.1 (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**: $ uname -a Linux sip.antisip.com 3.16.0-5-amd64 #1 SMP Debian 3.16.51-3+deb8u1 (2018-01-08) x86_64 GNU/Linux Tks for looking at this! Ay -- 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/1433

2 2

git:5.0:43c9ad6f: lcr: fixed checking if there is more uris available for next_gw
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: 5.0 Commit: 43c9ad6f4dc2e20dd40a2d3dfa6b03f3dd79e3d4 URL: https://github.com/kamailio/kamailio/commit/43c9ad6f4dc2e20dd40a2d3dfa6b03f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T08:50:54+01:00 lcr: fixed checking if there is more uris available for next_gw - manual backport for 732a3153a0a41d5f951fff85de607f0b46ae73da --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/43c9ad6f4dc2e20dd40a2d3dfa6b03f… Patch: https://github.com/kamailio/kamailio/commit/43c9ad6f4dc2e20dd40a2d3dfa6b03f… --- diff --git a/src/modules/lcr/lcr_mod.c b/src/modules/lcr/lcr_mod.c index 3644dacee5..20af1d5c7e 100644 --- a/src/modules/lcr/lcr_mod.c +++ b/src/modules/lcr/lcr_mod.c @@ -2512,8 +2512,8 @@ static int next_gw(struct sip_msg* _m, char* _s1, char* _s2) * Take Request-URI user from ruri_user_avp and generate Request * and Destination URIs. */ - if (!generate_uris(_m, r_uri, &(ruri_user_val.s), &r_uri_len, dst_uri, - &dst_uri_len, &addr, &gw_index, &flags, &tag_str)) { + if (generate_uris(_m, r_uri, &(ruri_user_val.s), &r_uri_len, dst_uri, + &dst_uri_len, &addr, &gw_index, &flags, &tag_str) <= 0) { return -1; } }

1 0

git:5.0:be5579ed: core: kemi - eol for debug message
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: 5.0 Commit: be5579eddc9cd43302e918cf12dcdd353043644a URL: https://github.com/kamailio/kamailio/commit/be5579eddc9cd43302e918cf12dcdd3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T08:47:17+01:00 core: kemi - eol for debug message (cherry picked from commit 0476993b7c341bcc7a994ab52986b89f240bd3b0) (cherry picked from commit 0e1fdeea9cc5f6948f8b3e19c1350718288278ba) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/be5579eddc9cd43302e918cf12dcdd3… Patch: https://github.com/kamailio/kamailio/commit/be5579eddc9cd43302e918cf12dcdd3… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 145cb9a926..99fcc34f1f 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -895,7 +895,7 @@ int sr_kemi_eng_register(str *ename, sr_kemi_eng_route_f froute) _sr_kemi_eng_list[_sr_kemi_eng_list_size].froute = froute; _sr_kemi_eng_list_size++; - LM_DBG("registered config routing enginge [%.*s]", + LM_DBG("registered config routing enginge [%.*s]\n", ename->len, ename->s); return 0;

1 0

git:5.0:a03a6ab7: app_lua: do lua_checkstack() to ensure enough capacity on Lua stack
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: 5.0 Commit: a03a6ab7d7a1ab6e688ad3aeb7089803a695202c URL: https://github.com/kamailio/kamailio/commit/a03a6ab7d7a1ab6e688ad3aeb708980… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T08:47:00+01:00 app_lua: do lua_checkstack() to ensure enough capacity on Lua stack - Lua doesn't do automatic management of the stack * http://www.lua.org/manual/5.1/manual.html#3.2 - do exit on insufficient capacity - based on the report by GH #1433 (cherry picked from commit f6d69d87abdc48df22135c79ee2309248248ca8e) (cherry picked from commit df9389a613e16f15b860af60222abe43ca367d09) --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/a03a6ab7d7a1ab6e688ad3aeb708980… Patch: https://github.com/kamailio/kamailio/commit/a03a6ab7d7a1ab6e688ad3aeb708980… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 86380ec6ad..64ebafae40 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1970,10 +1970,14 @@ void lua_sr_kemi_register_libs(lua_State *L) } n++; } + if(!lua_checkstack(L, i+8)) { + LM_ERR("not enough Lua stack capacity\n"); + exit(-1); + } luaL_openlib(L, mname, _sr_crt_KSRMethods, 0); - LM_DBG("initializing kemi sub-module: %s (%s)\n", mname, - emods[k].kexp[0].mname.s); + LM_DBG("initializing kemi sub-module: %s (%s) (%d/%d/%d)\n", mname, + emods[k].kexp[0].mname.s, i, k, n); } } - LM_DBG("module 'KSR' has been initialized\n"); + LM_DBG("module 'KSR' has been initialized (%d/%d)\n", emods_size, n); }

1 0

git:5.1:0e1fdeea: core: kemi - eol for debug message
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: 5.1 Commit: 0e1fdeea9cc5f6948f8b3e19c1350718288278ba URL: https://github.com/kamailio/kamailio/commit/0e1fdeea9cc5f6948f8b3e19c135071… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T08:42:47+01:00 core: kemi - eol for debug message (cherry picked from commit 0476993b7c341bcc7a994ab52986b89f240bd3b0) --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/0e1fdeea9cc5f6948f8b3e19c135071… Patch: https://github.com/kamailio/kamailio/commit/0e1fdeea9cc5f6948f8b3e19c135071… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 55630c28f5..5631f4b909 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1342,7 +1342,7 @@ int sr_kemi_eng_register(str *ename, sr_kemi_eng_route_f froute) _sr_kemi_eng_list[_sr_kemi_eng_list_size].froute = froute; _sr_kemi_eng_list_size++; - LM_DBG("registered config routing enginge [%.*s]", + LM_DBG("registered config routing enginge [%.*s]\n", ename->len, ename->s); return 0;

1 0

git:5.1:df9389a6: app_lua: do lua_checkstack() to ensure enough capacity on Lua stack
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: 5.1 Commit: df9389a613e16f15b860af60222abe43ca367d09 URL: https://github.com/kamailio/kamailio/commit/df9389a613e16f15b860af60222abe4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T08:42:38+01:00 app_lua: do lua_checkstack() to ensure enough capacity on Lua stack - Lua doesn't do automatic management of the stack * http://www.lua.org/manual/5.1/manual.html#3.2 - do exit on insufficient capacity - based on the report by GH #1433 (cherry picked from commit f6d69d87abdc48df22135c79ee2309248248ca8e) --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/df9389a613e16f15b860af60222abe4… Patch: https://github.com/kamailio/kamailio/commit/df9389a613e16f15b860af60222abe4… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 86380ec6ad..64ebafae40 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1970,10 +1970,14 @@ void lua_sr_kemi_register_libs(lua_State *L) } n++; } + if(!lua_checkstack(L, i+8)) { + LM_ERR("not enough Lua stack capacity\n"); + exit(-1); + } luaL_openlib(L, mname, _sr_crt_KSRMethods, 0); - LM_DBG("initializing kemi sub-module: %s (%s)\n", mname, - emods[k].kexp[0].mname.s); + LM_DBG("initializing kemi sub-module: %s (%s) (%d/%d/%d)\n", mname, + emods[k].kexp[0].mname.s, i, k, n); } } - LM_DBG("module 'KSR' has been initialized\n"); + LM_DBG("module 'KSR' has been initialized (%d/%d)\n", emods_size, n); }

1 0

git:master:0476993b: core: kemi - eol for debug message
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: master Commit: 0476993b7c341bcc7a994ab52986b89f240bd3b0 URL: https://github.com/kamailio/kamailio/commit/0476993b7c341bcc7a994ab52986b89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T08:25:18+01:00 core: kemi - eol for debug message --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/0476993b7c341bcc7a994ab52986b89… Patch: https://github.com/kamailio/kamailio/commit/0476993b7c341bcc7a994ab52986b89… --- diff --git a/src/core/kemi.c b/src/core/kemi.c index 55630c28f5..5631f4b909 100644 --- a/src/core/kemi.c +++ b/src/core/kemi.c @@ -1342,7 +1342,7 @@ int sr_kemi_eng_register(str *ename, sr_kemi_eng_route_f froute) _sr_kemi_eng_list[_sr_kemi_eng_list_size].froute = froute; _sr_kemi_eng_list_size++; - LM_DBG("registered config routing enginge [%.*s]", + LM_DBG("registered config routing enginge [%.*s]\n", ename->len, ename->s); return 0;

1 0

git:master:f6d69d87: app_lua: do lua_checkstack() to ensure enough capacity on Lua stack
by Daniel-Constantin Mierla 12 Feb '18

12 Feb '18

Module: kamailio Branch: master Commit: f6d69d87abdc48df22135c79ee2309248248ca8e URL: https://github.com/kamailio/kamailio/commit/f6d69d87abdc48df22135c79ee23092… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-12T08:24:28+01:00 app_lua: do lua_checkstack() to ensure enough capacity on Lua stack - Lua doesn't do automatic management of the stack * http://www.lua.org/manual/5.1/manual.html#3.2 - do exit on insufficient capacity - based on the report by GH #1433 --- Modified: src/modules/app_lua/app_lua_sr.c --- Diff: https://github.com/kamailio/kamailio/commit/f6d69d87abdc48df22135c79ee23092… Patch: https://github.com/kamailio/kamailio/commit/f6d69d87abdc48df22135c79ee23092… --- diff --git a/src/modules/app_lua/app_lua_sr.c b/src/modules/app_lua/app_lua_sr.c index 86380ec6ad..64ebafae40 100644 --- a/src/modules/app_lua/app_lua_sr.c +++ b/src/modules/app_lua/app_lua_sr.c @@ -1970,10 +1970,14 @@ void lua_sr_kemi_register_libs(lua_State *L) } n++; } + if(!lua_checkstack(L, i+8)) { + LM_ERR("not enough Lua stack capacity\n"); + exit(-1); + } luaL_openlib(L, mname, _sr_crt_KSRMethods, 0); - LM_DBG("initializing kemi sub-module: %s (%s)\n", mname, - emods[k].kexp[0].mname.s); + LM_DBG("initializing kemi sub-module: %s (%s) (%d/%d/%d)\n", mname, + emods[k].kexp[0].mname.s, i, k, n); } } - LM_DBG("module 'KSR' has been initialized\n"); + LM_DBG("module 'KSR' has been initialized (%d/%d)\n", emods_size, n); }

1 0

[kamailio/kamailio] schema: allow null value for active_watchers user-agent column (#1431)
by lazedo 11 Feb '18

11 Feb '18

some UAs not sending User-Agent header on SUBSCRIBE causes insert error needs backport to 5.0/5.1 You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1431 -- Commit Summary -- * schema: allow null value for active_watchers user-agent column -- File Changes -- M src/lib/srdb1/schema/pr_active_watchers.xml (4) M utils/kamctl/db_berkeley/kamailio/active_watchers (2) M utils/kamctl/db_berkeley/kamailio/version (2) M utils/kamctl/db_sqlite/presence-create.sql (4) M utils/kamctl/dbtext/kamailio/active_watchers (2) M utils/kamctl/dbtext/kamailio/version (2) M utils/kamctl/mongodb/kamailio/active_watchers.json (6) M utils/kamctl/mongodb/kamailio/version-create.mongo (2) M utils/kamctl/mysql/presence-create.sql (4) M utils/kamctl/oracle/presence-create.sql (4) M utils/kamctl/postgres/presence-create.sql (4) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1431.patch https://github.com/kamailio/kamailio/pull/1431.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/1431

2 8

git:5.0:648cc189: presence: set user agent db field to empty string if no value is found
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: 5.0 Commit: 648cc1894e87ea6e3d254c83592fc385810740c0 URL: https://github.com/kamailio/kamailio/commit/648cc1894e87ea6e3d254c83592fc38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T09:46:30+01:00 presence: set user agent db field to empty string if no value is found (cherry picked from commit 4654f8b4f341a6c9f8cf4daafc7d618871c95e1b) (cherry picked from commit c1ec6b02139475abe7da276cd36de4ebb9709ea2) --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/648cc1894e87ea6e3d254c83592fc38… Patch: https://github.com/kamailio/kamailio/commit/648cc1894e87ea6e3d254c83592fc38… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 18bb2b1a70..8b53500c18 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -191,6 +191,7 @@ int insert_subs_db(subs_t* s, int type) contact_col, local_contact_col, version_col,socket_info_col,reason_col, watcher_user_col, watcher_domain_col, updated_col, updated_winfo_col, user_agent_col, flags_col; + str sval_empty = str_init(""); if(pa_dbf.use_table(pa_db, &active_watchers_table)< 0) { @@ -353,7 +354,8 @@ int insert_subs_db(subs_t* s, int type) query_vals[updated_col].val.int_val = s->updated; query_vals[updated_winfo_col].val.int_val = s->updated_winfo; query_vals[flags_col].val.int_val = s->flags; - query_vals[user_agent_col].val.str_val= s->user_agent; + query_vals[user_agent_col].val.str_val= + (s->user_agent.s && s->user_agent.len>0)?s->user_agent:sval_empty; if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0) {

1 0

git:5.1:c1ec6b02: presence: set user agent db field to empty string if no value is found
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: 5.1 Commit: c1ec6b02139475abe7da276cd36de4ebb9709ea2 URL: https://github.com/kamailio/kamailio/commit/c1ec6b02139475abe7da276cd36de4e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T09:43:39+01:00 presence: set user agent db field to empty string if no value is found (cherry picked from commit 4654f8b4f341a6c9f8cf4daafc7d618871c95e1b) --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/c1ec6b02139475abe7da276cd36de4e… Patch: https://github.com/kamailio/kamailio/commit/c1ec6b02139475abe7da276cd36de4e… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 3c6e4458d4..4c74ac7980 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -191,6 +191,7 @@ int insert_subs_db(subs_t* s, int type) contact_col, local_contact_col, version_col,socket_info_col,reason_col, watcher_user_col, watcher_domain_col, updated_col, updated_winfo_col, user_agent_col, flags_col; + str sval_empty = str_init(""); if(pa_dbf.use_table(pa_db, &active_watchers_table)< 0) { @@ -353,7 +354,8 @@ int insert_subs_db(subs_t* s, int type) query_vals[updated_col].val.int_val = s->updated; query_vals[updated_winfo_col].val.int_val = s->updated_winfo; query_vals[flags_col].val.int_val = s->flags; - query_vals[user_agent_col].val.str_val= s->user_agent; + query_vals[user_agent_col].val.str_val= + (s->user_agent.s && s->user_agent.len>0)?s->user_agent:sval_empty; if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0) {

1 0

git:master:78e3ca66: Merge pull request #1431 from kamailio/active-watcher-null-user-agent
by GitHub 11 Feb '18

11 Feb '18

Module: kamailio Branch: master Commit: 78e3ca663ed73c6d3eb81e6e5a970d928e2a9310 URL: https://github.com/kamailio/kamailio/commit/78e3ca663ed73c6d3eb81e6e5a970d9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-02-11T09:42:38+01:00 Merge pull request #1431 from kamailio/active-watcher-null-user-agent schema: allow null value for active_watchers user-agent column --- Modified: src/lib/srdb1/schema/pr_active_watchers.xml Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/dbtext/kamailio/active_watchers Modified: utils/kamctl/mongodb/kamailio/active_watchers.json Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/78e3ca663ed73c6d3eb81e6e5a970d9… Patch: https://github.com/kamailio/kamailio/commit/78e3ca663ed73c6d3eb81e6e5a970d9… --- diff --git a/src/lib/srdb1/schema/pr_active_watchers.xml b/src/lib/srdb1/schema/pr_active_watchers.xml index 8e4fd0604d..3d53eaf46d 100644 --- a/src/lib/srdb1/schema/pr_active_watchers.xml +++ b/src/lib/srdb1/schema/pr_active_watchers.xml @@ -220,6 +220,7 @@ <type>string</type> <size>&hf_len;</size> <default/> + <null/> <description>User-Agent header field contains information about the UAC originating the request.</description> </column> diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index 637ff14b62..df121b96d5 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -46,7 +46,7 @@ CREATE TABLE active_watchers ( updated INTEGER NOT NULL, updated_winfo INTEGER NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, - user_agent VARCHAR(255) DEFAULT '' NOT NULL, + user_agent VARCHAR(255) DEFAULT '', CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); diff --git a/utils/kamctl/dbtext/kamailio/active_watchers b/utils/kamctl/dbtext/kamailio/active_watchers index 19719b72d5..04e96b39bc 100644 --- a/utils/kamctl/dbtext/kamailio/active_watchers +++ b/utils/kamctl/dbtext/kamailio/active_watchers @@ -1 +1 @@ -id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string,null) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string) +id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string,null) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string,null) diff --git a/utils/kamctl/mongodb/kamailio/active_watchers.json b/utils/kamctl/mongodb/kamailio/active_watchers.json index 123692d988..5dc8df8256 100644 --- a/utils/kamctl/mongodb/kamailio/active_watchers.json +++ b/utils/kamctl/mongodb/kamailio/active_watchers.json @@ -135,7 +135,7 @@ "user_agent": { "type": "string", "default": "", - "null": false + "null": true } ] } \ No newline at end of file diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 9e7e71c138..d5fcc72770 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -46,7 +46,7 @@ CREATE TABLE `active_watchers` ( `updated` INT(11) NOT NULL, `updated_winfo` INT(11) NOT NULL, `flags` INT(11) DEFAULT 0 NOT NULL, - `user_agent` VARCHAR(255) DEFAULT '' NOT NULL, + `user_agent` VARCHAR(255) DEFAULT '', CONSTRAINT active_watchers_idx UNIQUE (`callid`, `to_tag`, `from_tag`) ); diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 2259c260a8..943aac0bd6 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -46,7 +46,7 @@ CREATE TABLE active_watchers ( updated INTEGER NOT NULL, updated_winfo INTEGER NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, - user_agent VARCHAR(255) DEFAULT '' NOT NULL, + user_agent VARCHAR(255) DEFAULT '', CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) );

1 0

git:master:7653124c: schema: allow null value for active_watchers user-agent column
by lazedo 11 Feb '18

11 Feb '18

Module: kamailio Branch: master Commit: 7653124c2d3615e4f6229f12b699063f65b7afea URL: https://github.com/kamailio/kamailio/commit/7653124c2d3615e4f6229f12b699063… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2018-02-09T11:28:05Z schema: allow null value for active_watchers user-agent column some UAs not sending Userg-Agent header on SUBSCRIBE --- Modified: src/lib/srdb1/schema/pr_active_watchers.xml Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/dbtext/kamailio/active_watchers Modified: utils/kamctl/mongodb/kamailio/active_watchers.json Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/7653124c2d3615e4f6229f12b699063… Patch: https://github.com/kamailio/kamailio/commit/7653124c2d3615e4f6229f12b699063… --- diff --git a/src/lib/srdb1/schema/pr_active_watchers.xml b/src/lib/srdb1/schema/pr_active_watchers.xml index 8e4fd0604d..3d53eaf46d 100644 --- a/src/lib/srdb1/schema/pr_active_watchers.xml +++ b/src/lib/srdb1/schema/pr_active_watchers.xml @@ -220,6 +220,7 @@ <type>string</type> <size>&hf_len;</size> <default/> + <null/> <description>User-Agent header field contains information about the UAC originating the request.</description> </column> diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index 637ff14b62..df121b96d5 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -46,7 +46,7 @@ CREATE TABLE active_watchers ( updated INTEGER NOT NULL, updated_winfo INTEGER NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, - user_agent VARCHAR(255) DEFAULT '' NOT NULL, + user_agent VARCHAR(255) DEFAULT '', CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) ); diff --git a/utils/kamctl/dbtext/kamailio/active_watchers b/utils/kamctl/dbtext/kamailio/active_watchers index 19719b72d5..04e96b39bc 100644 --- a/utils/kamctl/dbtext/kamailio/active_watchers +++ b/utils/kamctl/dbtext/kamailio/active_watchers @@ -1 +1 @@ -id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string,null) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string) +id(int,auto) presentity_uri(string) watcher_username(string) watcher_domain(string) to_user(string) to_domain(string) event(string) event_id(string,null) to_tag(string) from_tag(string) callid(string) local_cseq(int) remote_cseq(int) contact(string) record_route(string,null) expires(int) status(int) reason(string,null) version(int) socket_info(string) local_contact(string) from_user(string) from_domain(string) updated(int) updated_winfo(int) flags(int) user_agent(string,null) diff --git a/utils/kamctl/mongodb/kamailio/active_watchers.json b/utils/kamctl/mongodb/kamailio/active_watchers.json index 123692d988..5dc8df8256 100644 --- a/utils/kamctl/mongodb/kamailio/active_watchers.json +++ b/utils/kamctl/mongodb/kamailio/active_watchers.json @@ -135,7 +135,7 @@ "user_agent": { "type": "string", "default": "", - "null": false + "null": true } ] } \ No newline at end of file diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 9e7e71c138..d5fcc72770 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -46,7 +46,7 @@ CREATE TABLE `active_watchers` ( `updated` INT(11) NOT NULL, `updated_winfo` INT(11) NOT NULL, `flags` INT(11) DEFAULT 0 NOT NULL, - `user_agent` VARCHAR(255) DEFAULT '' NOT NULL, + `user_agent` VARCHAR(255) DEFAULT '', CONSTRAINT active_watchers_idx UNIQUE (`callid`, `to_tag`, `from_tag`) ); diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 2259c260a8..943aac0bd6 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -46,7 +46,7 @@ CREATE TABLE active_watchers ( updated INTEGER NOT NULL, updated_winfo INTEGER NOT NULL, flags INTEGER DEFAULT 0 NOT NULL, - user_agent VARCHAR(255) DEFAULT '' NOT NULL, + user_agent VARCHAR(255) DEFAULT '', CONSTRAINT active_watchers_active_watchers_idx UNIQUE (callid, to_tag, from_tag) );

1 0

git:master:4654f8b4: presence: set user agent db field to empty string if no value is found
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: master Commit: 4654f8b4f341a6c9f8cf4daafc7d618871c95e1b URL: https://github.com/kamailio/kamailio/commit/4654f8b4f341a6c9f8cf4daafc7d618… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T09:37:05+01:00 presence: set user agent db field to empty string if no value is found --- Modified: src/modules/presence/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/4654f8b4f341a6c9f8cf4daafc7d618… Patch: https://github.com/kamailio/kamailio/commit/4654f8b4f341a6c9f8cf4daafc7d618… --- diff --git a/src/modules/presence/subscribe.c b/src/modules/presence/subscribe.c index 3c6e4458d4..4c74ac7980 100644 --- a/src/modules/presence/subscribe.c +++ b/src/modules/presence/subscribe.c @@ -191,6 +191,7 @@ int insert_subs_db(subs_t* s, int type) contact_col, local_contact_col, version_col,socket_info_col,reason_col, watcher_user_col, watcher_domain_col, updated_col, updated_winfo_col, user_agent_col, flags_col; + str sval_empty = str_init(""); if(pa_dbf.use_table(pa_db, &active_watchers_table)< 0) { @@ -353,7 +354,8 @@ int insert_subs_db(subs_t* s, int type) query_vals[updated_col].val.int_val = s->updated; query_vals[updated_winfo_col].val.int_val = s->updated_winfo; query_vals[flags_col].val.int_val = s->flags; - query_vals[user_agent_col].val.str_val= s->user_agent; + query_vals[user_agent_col].val.str_val= + (s->user_agent.s && s->user_agent.len>0)?s->user_agent:sval_empty; if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0) {

1 0

git:master:8f9ddbf4: rr: removed unused variable after spliting code into a function
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: master Commit: 8f9ddbf43eb19c05efbb8a109b8151c023cc736a URL: https://github.com/kamailio/kamailio/commit/8f9ddbf43eb19c05efbb8a109b8151c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T09:27:38+01:00 rr: removed unused variable after spliting code into a function --- Modified: src/modules/rr/loose.c --- Diff: https://github.com/kamailio/kamailio/commit/8f9ddbf43eb19c05efbb8a109b8151c… Patch: https://github.com/kamailio/kamailio/commit/8f9ddbf43eb19c05efbb8a109b8151c… --- diff --git a/src/modules/rr/loose.c b/src/modules/rr/loose.c index f5164cd39b..6e9e888a2b 100644 --- a/src/modules/rr/loose.c +++ b/src/modules/rr/loose.c @@ -784,7 +784,6 @@ static inline int after_loose(struct sip_msg* _m, int preloaded) int res; int status = RR_DRIVEN; str uri; - struct socket_info *si; int uri_is_myself; int use_ob = 0; str rparams;

1 0

Errored: kamailio/kamailio#5519 (master - e1d8008)
by Travis CI 11 Feb '18

11 Feb '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5519 Status: Errored Duration: 10 minutes and 34 seconds Commit: e1d8008 (master) Author: Daniel-Constantin Mierla Message: tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci View the changeset: https://github.com/kamailio/kamailio/compare/00330db3864d...e1d8008a09d9 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/340060372?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:4.4:be854087: tmx: allocate space to store ending 0 for branch value
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: 4.4 Commit: be85408733333f20792de7f1144f987cf9f5b666 URL: https://github.com/kamailio/kamailio/commit/be85408733333f20792de7f1144f987… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T08:17:50+01:00 tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci (cherry picked from commit e1d8008a09d9390ebaf698abe8909e10dfec4097) (cherry picked from commit 7d783adc7de603972966f50106471c06a6be2fac) --- Modified: modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/be85408733333f20792de7f1144f987… Patch: https://github.com/kamailio/kamailio/commit/be85408733333f20792de7f1144f987… --- diff --git a/modules/tmx/tmx_pretran.c b/modules/tmx/tmx_pretran.c index 00f571bb4a..b92f28befb 100644 --- a/modules/tmx/tmx_pretran.c +++ b/modules/tmx/tmx_pretran.c @@ -260,7 +260,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(likely(vbr!=NULL)) { svbranch = vbr->value; trim(&svbranch); - dsize += svbranch.len; + dsize += svbranch.len + 1; } if(dsize<256) dsize = 256;

1 0

git:5.1:5cd6530e: tmx: allocate space to store ending 0 for branch value
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: 5.1 Commit: 5cd6530e68ef311a59acbec180588a498f2a32dc URL: https://github.com/kamailio/kamailio/commit/5cd6530e68ef311a59acbec180588a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T08:15:12+01:00 tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci (cherry picked from commit e1d8008a09d9390ebaf698abe8909e10dfec4097) --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/5cd6530e68ef311a59acbec180588a4… Patch: https://github.com/kamailio/kamailio/commit/5cd6530e68ef311a59acbec180588a4… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 494bdffe3e..67c4f7f4af 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -260,7 +260,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(likely(vbr!=NULL)) { svbranch = vbr->value; trim(&svbranch); - dsize += svbranch.len; + dsize += svbranch.len + 1; } if(dsize<256) dsize = 256;

1 0

git:5.0:7d783adc: tmx: allocate space to store ending 0 for branch value
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: 5.0 Commit: 7d783adc7de603972966f50106471c06a6be2fac URL: https://github.com/kamailio/kamailio/commit/7d783adc7de603972966f50106471c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-11T08:10:49+01:00 tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci (cherry picked from commit e1d8008a09d9390ebaf698abe8909e10dfec4097) --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/7d783adc7de603972966f50106471c0… Patch: https://github.com/kamailio/kamailio/commit/7d783adc7de603972966f50106471c0… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 494bdffe3e..67c4f7f4af 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -260,7 +260,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(likely(vbr!=NULL)) { svbranch = vbr->value; trim(&svbranch); - dsize += svbranch.len; + dsize += svbranch.len + 1; } if(dsize<256) dsize = 256;

1 0

git:master:e1d8008a: tmx: allocate space to store ending 0 for branch value
by Daniel-Constantin Mierla 11 Feb '18

11 Feb '18

Module: kamailio Branch: master Commit: e1d8008a09d9390ebaf698abe8909e10dfec4097 URL: https://github.com/kamailio/kamailio/commit/e1d8008a09d9390ebaf698abe8909e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-10T22:05:42+01:00 tmx: allocate space to store ending 0 for branch value - reported by Alfred Farrugia and Sandro Gauci --- Modified: src/modules/tmx/tmx_pretran.c --- Diff: https://github.com/kamailio/kamailio/commit/e1d8008a09d9390ebaf698abe8909e1… Patch: https://github.com/kamailio/kamailio/commit/e1d8008a09d9390ebaf698abe8909e1… --- diff --git a/src/modules/tmx/tmx_pretran.c b/src/modules/tmx/tmx_pretran.c index 494bdffe3e..67c4f7f4af 100644 --- a/src/modules/tmx/tmx_pretran.c +++ b/src/modules/tmx/tmx_pretran.c @@ -260,7 +260,7 @@ int tmx_check_pretran(sip_msg_t *msg) if(likely(vbr!=NULL)) { svbranch = vbr->value; trim(&svbranch); - dsize += svbranch.len; + dsize += svbranch.len + 1; } if(dsize<256) dsize = 256;

1 0

git:5.0:5a67316c: kazoo: verify timer
by Luis Azedo 09 Feb '18

09 Feb '18

Module: kamailio Branch: 5.0 Commit: 5a67316c102649e42f92256c18eb00c97d254f3a URL: https://github.com/kamailio/kamailio/commit/5a67316c102649e42f92256c18eb00c… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-02-09T23:21:29Z kazoo: verify timer (cherry picked from commit 00330db3864dbc7df20c76f413beb73a6d60189c) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/5a67316c102649e42f92256c18eb00c… Patch: https://github.com/kamailio/kamailio/commit/5a67316c102649e42f92256c18eb00c… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 0dbf96158c..e04bdd3179 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2659,10 +2659,10 @@ void kz_amqp_reconnect_cb(int fd, short event, void *arg) kz_amqp_timer_destroy(&connection->reconnect); -// if (connection->state == KZ_AMQP_CONNECTION_OPEN) { -// LM_WARN("trying to connect an already connected server.\n"); -// return; -// } + if (connection->state == KZ_AMQP_CONNECTION_OPEN) { + LM_WARN("trying to connect an already connected server.\n"); + return; + } kz_amqp_connect(connection); } @@ -3223,6 +3223,8 @@ int kz_amqp_consumer_worker_proc(int cmd_pipe) void kz_amqp_timer_destroy(kz_amqp_timer_ptr* pTimer) { + if(!pTimer) + return; kz_amqp_timer_ptr timer = *pTimer; if (timer->ev != NULL) { event_del(timer->ev); @@ -3316,7 +3318,6 @@ void kz_amqp_heartbeat_proc(int fd, short event, void *arg) LM_DBG("sending heartbeat to zone : %s , connection id : %d\n", connection->server->zone->zone, connection->server->id); if (connection->state != KZ_AMQP_CONNECTION_OPEN) { kz_amqp_timer_destroy(&connection->heartbeat); - kz_amqp_handle_server_failure(connection); return; } heartbeat.channel = 0;

1 0

git:5.1:358f63a7: kazoo: verify timer
by Luis Azedo 09 Feb '18

09 Feb '18

Module: kamailio Branch: 5.1 Commit: 358f63a7a452923a28f7d5ea682c4dc9cde10d25 URL: https://github.com/kamailio/kamailio/commit/358f63a7a452923a28f7d5ea682c4dc… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-02-09T23:20:58Z kazoo: verify timer (cherry picked from commit 00330db3864dbc7df20c76f413beb73a6d60189c) --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/358f63a7a452923a28f7d5ea682c4dc… Patch: https://github.com/kamailio/kamailio/commit/358f63a7a452923a28f7d5ea682c4dc… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 5bc327be1d..affaad4eda 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2659,10 +2659,10 @@ void kz_amqp_reconnect_cb(int fd, short event, void *arg) kz_amqp_timer_destroy(&connection->reconnect); -// if (connection->state == KZ_AMQP_CONNECTION_OPEN) { -// LM_WARN("trying to connect an already connected server.\n"); -// return; -// } + if (connection->state == KZ_AMQP_CONNECTION_OPEN) { + LM_WARN("trying to connect an already connected server.\n"); + return; + } kz_amqp_connect(connection); } @@ -3235,6 +3235,8 @@ int kz_amqp_consumer_worker_proc(int cmd_pipe) void kz_amqp_timer_destroy(kz_amqp_timer_ptr* pTimer) { + if(!pTimer) + return; kz_amqp_timer_ptr timer = *pTimer; if (timer->ev != NULL) { event_del(timer->ev); @@ -3328,7 +3330,6 @@ void kz_amqp_heartbeat_proc(int fd, short event, void *arg) LM_DBG("sending heartbeat to zone : %s , connection id : %d\n", connection->server->zone->zone, connection->server->id); if (connection->state != KZ_AMQP_CONNECTION_OPEN) { kz_amqp_timer_destroy(&connection->heartbeat); - kz_amqp_handle_server_failure(connection); return; } heartbeat.channel = 0;

1 0

git:master:00330db3: kazoo: verify timer
by lazedo 09 Feb '18

09 Feb '18

Module: kamailio Branch: master Commit: 00330db3864dbc7df20c76f413beb73a6d60189c URL: https://github.com/kamailio/kamailio/commit/00330db3864dbc7df20c76f413beb73… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2018-02-09T23:19:40Z kazoo: verify timer --- Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/00330db3864dbc7df20c76f413beb73… Patch: https://github.com/kamailio/kamailio/commit/00330db3864dbc7df20c76f413beb73… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 5bc327be1d..affaad4eda 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -2659,10 +2659,10 @@ void kz_amqp_reconnect_cb(int fd, short event, void *arg) kz_amqp_timer_destroy(&connection->reconnect); -// if (connection->state == KZ_AMQP_CONNECTION_OPEN) { -// LM_WARN("trying to connect an already connected server.\n"); -// return; -// } + if (connection->state == KZ_AMQP_CONNECTION_OPEN) { + LM_WARN("trying to connect an already connected server.\n"); + return; + } kz_amqp_connect(connection); } @@ -3235,6 +3235,8 @@ int kz_amqp_consumer_worker_proc(int cmd_pipe) void kz_amqp_timer_destroy(kz_amqp_timer_ptr* pTimer) { + if(!pTimer) + return; kz_amqp_timer_ptr timer = *pTimer; if (timer->ev != NULL) { event_del(timer->ev); @@ -3328,7 +3330,6 @@ void kz_amqp_heartbeat_proc(int fd, short event, void *arg) LM_DBG("sending heartbeat to zone : %s , connection id : %d\n", connection->server->zone->zone, connection->server->id); if (connection->state != KZ_AMQP_CONNECTION_OPEN) { kz_amqp_timer_destroy(&connection->heartbeat); - kz_amqp_handle_server_failure(connection); return; } heartbeat.channel = 0;

1 0

git:5.0:7107d3e7: kazoo: fix blocked sockets & zones
by Luis Azedo 09 Feb '18

09 Feb '18

Module: kamailio Branch: 5.0 Commit: 7107d3e7f7895563b7ea8567ff2e734553554866 URL: https://github.com/kamailio/kamailio/commit/7107d3e7f7895563b7ea8567ff2e734… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-02-09T21:42:57Z kazoo: fix blocked sockets & zones (cherry picked from commit a5212922c9bdf9560b45cdf6c0786a1fa651a232) --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/7107d3e7f7895563b7ea8567ff2e734… Patch: https://github.com/kamailio/kamailio/commit/7107d3e7f7895563b7ea8567ff2e734…

1 0

git:5.1:72e9c0d0: kazoo: fix blocked sockets & zones
by Luis Azedo 09 Feb '18

09 Feb '18

Module: kamailio Branch: 5.1 Commit: 72e9c0d00b78cccca79cd6547628d914a8fbb03c URL: https://github.com/kamailio/kamailio/commit/72e9c0d00b78cccca79cd6547628d91… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: Luis Azedo <luis(a)2600hz.com> Date: 2018-02-09T21:41:35Z kazoo: fix blocked sockets & zones (cherry picked from commit a5212922c9bdf9560b45cdf6c0786a1fa651a232) --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/72e9c0d00b78cccca79cd6547628d91… Patch: https://github.com/kamailio/kamailio/commit/72e9c0d00b78cccca79cd6547628d91…

1 0

git:master:a5212922: kazoo: fix blocked sockets & zones
by lazedo 09 Feb '18

09 Feb '18

Module: kamailio Branch: master Commit: a5212922c9bdf9560b45cdf6c0786a1fa651a232 URL: https://github.com/kamailio/kamailio/commit/a5212922c9bdf9560b45cdf6c0786a1… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: lazedo <luis.azedo(a)factorlusitano.com> Date: 2018-02-09T21:38:03Z kazoo: fix blocked sockets & zones --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/a5212922c9bdf9560b45cdf6c0786a1… Patch: https://github.com/kamailio/kamailio/commit/a5212922c9bdf9560b45cdf6c0786a1…

1 0

git:master:3ca68d12: Merge pull request #1435 from kamailio/cchance/presence
by GitHub 09 Feb '18

09 Feb '18

Module: kamailio Branch: master Commit: 3ca68d1246b801f37054c965eac8a24bda89b325 URL: https://github.com/kamailio/kamailio/commit/3ca68d1246b801f37054c965eac8a24… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2018-02-09T15:02:42Z Merge pull request #1435 from kamailio/cchance/presence presence: delay freeing generated etag string --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/3ca68d1246b801f37054c965eac8a24… Patch: https://github.com/kamailio/kamailio/commit/3ca68d1246b801f37054c965eac8a24… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 1c7c4240b9..514e89036c 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1100,10 +1100,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - goto done; } } @@ -1232,10 +1228,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - if(!body) goto done; } @@ -1266,6 +1258,10 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, pres_dmq_replicate_presentity(presentity, body, new_t, &cur_etag, sphere, &p_ruid, NULL); } + if(etag.s) + pkg_free(etag.s); + etag.s= NULL; + if(cur_ruid.s) pkg_free(cur_ruid.s); cur_ruid.s= NULL;

1 0

git:master:fab3f881: presence: delay freeing generated etag string
by Charles Chance 09 Feb '18

09 Feb '18

Module: kamailio Branch: master Commit: fab3f881634b1233e6c5446ffafbd30ab07c0bc6 URL: https://github.com/kamailio/kamailio/commit/fab3f881634b1233e6c5446ffafbd30… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-02-09T09:37:24Z presence: delay freeing generated etag string - it may still be needed for replication --- Modified: src/modules/presence/presentity.c --- Diff: https://github.com/kamailio/kamailio/commit/fab3f881634b1233e6c5446ffafbd30… Patch: https://github.com/kamailio/kamailio/commit/fab3f881634b1233e6c5446ffafbd30… --- diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index 1c7c4240b9..514e89036c 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -1100,10 +1100,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - goto done; } } @@ -1232,10 +1228,6 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, } if (sent_reply) *sent_reply= 1; - if(etag.s) - pkg_free(etag.s); - etag.s= NULL; - if(!body) goto done; } @@ -1266,6 +1258,10 @@ int update_presentity(struct sip_msg* msg, presentity_t* presentity, str* body, pres_dmq_replicate_presentity(presentity, body, new_t, &cur_etag, sphere, &p_ruid, NULL); } + if(etag.s) + pkg_free(etag.s); + etag.s= NULL; + if(cur_ruid.s) pkg_free(cur_ruid.s); cur_ruid.s= NULL;

1 0

[kamailio/kamailio] presence: delay freeing generated etag string (#1435)
by Charles Chance 09 Feb '18

09 Feb '18

This is a minor bugfix for earlier commit (b7a5016). You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1435 -- Commit Summary -- * presence: delay freeing generated etag string -- File Changes -- M src/modules/presence/presentity.c (12) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1435.patch https://github.com/kamailio/kamailio/pull/1435.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/1435

2 2

git:master:32564156: CONTRIBUTING.md: note about formatting the code
by Daniel-Constantin Mierla 09 Feb '18

09 Feb '18

Module: kamailio Branch: master Commit: 32564156a4ad3efd93099d7ae2c98758cf4ec9b0 URL: https://github.com/kamailio/kamailio/commit/32564156a4ad3efd93099d7ae2c9875… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-09T13:52:58+01:00 CONTRIBUTING.md: note about formatting the code - use clang-format or match the style of the existing component --- Modified: .github/CONTRIBUTING.md --- Diff: https://github.com/kamailio/kamailio/commit/32564156a4ad3efd93099d7ae2c9875… Patch: https://github.com/kamailio/kamailio/commit/32564156a4ad3efd93099d7ae2c9875… --- diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index e74babc78f..1705611aaa 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -31,6 +31,7 @@ In order to be easily able to track the changes and have a coherent ChangLog and commit history, there are several *rules* required for each contribution. ## Contributing Code Or Content ## + ### Basic Rules ### * github pull requests are the favourited mechanism to submit contributions @@ -47,7 +48,7 @@ and commit history, there are several *rules* required for each contribution. * a module (code inside subfolder modules/) * a tool (code inside subfolder utils/) * an example or main configs (files inside subfolders etc/ or examples/) - * commit messages **should** be formatted as specified in the next section + * commit messages **has to be formatted** as specified in the next section * commit message must describe the changes done by the patch * other details (e.g., how to reproduce, backtrace, sip packets, ...) belong to content (comments) of the pull request @@ -73,6 +74,9 @@ and commit history, there are several *rules* required for each contribution. likely to rise merge conflicts. With separate commit, that won't be backported, only the commit to xml doc file, then README will be manually regenerated in the corresponding branch. + * code **should** be formatted with **clang-format** or to match the style of + the component that the commit applies to. The `.clang-format` file is part of + Kamailio source code tree, in the root folder. ### Commit Message Format ### @@ -89,12 +93,12 @@ as "Subject" in the generated commit emails and it will also be used when generating the Changelog (e.g. git log --pretty=oneline). Please start always with the prefix of the component (subsystem) that is modified by the commit, for example: - * core: typo fixes to log messages - * tcp: stun fixes - * mem: added faster malloc - * module_name: support for foo rfc extension - * lib_name: critical bug fix for abc case - * kamctl: added support for management of module xyz + * `core`: typo fixes to log messages + * `tcp`: stun fixes + * `mem`: added faster malloc + * `module_name`: support for foo rfc extension + * `lib_name`: critical bug fix for abc case + * `kamctl`: added support for management of module xyz #### Examples Of Commit Messages ####

1 0

git:master:92bd7a31: Makefile.groups: pua_json added to json group
by Daniel-Constantin Mierla 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 92bd7a3161e3f8d9ae5b3ddd983424f8e6e96618 URL: https://github.com/kamailio/kamailio/commit/92bd7a3161e3f8d9ae5b3ddd983424f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-08T19:33:46+01:00 Makefile.groups: pua_json added to json group - depends on libjson-c --- Modified: src/Makefile.groups --- Diff: https://github.com/kamailio/kamailio/commit/92bd7a3161e3f8d9ae5b3ddd983424f… Patch: https://github.com/kamailio/kamailio/commit/92bd7a3161e3f8d9ae5b3ddd983424f… --- diff --git a/src/Makefile.groups b/src/Makefile.groups index 52bad0b12f..b3d8045040 100644 --- a/src/Makefile.groups +++ b/src/Makefile.groups @@ -141,7 +141,7 @@ mod_list_sqlite=db_sqlite mod_list_oracle=db_oracle # - modules depending on json library -mod_list_json=json +mod_list_json=json pua_json # - modules depending on json (+libevent) library mod_list_json_event=jsonrpcc

1 0

git:master:f6346e93: pua_json: better detection of paths for json-c library
by Daniel-Constantin Mierla 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: f6346e93d27ee1eb6f06ec1c9e7247440f433ab9 URL: https://github.com/kamailio/kamailio/commit/f6346e93d27ee1eb6f06ec1c9e72474… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-08T19:19:29+01:00 pua_json: better detection of paths for json-c library --- Modified: src/modules/pua_json/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/f6346e93d27ee1eb6f06ec1c9e72474… Patch: https://github.com/kamailio/kamailio/commit/f6346e93d27ee1eb6f06ec1c9e72474… --- diff --git a/src/modules/pua_json/Makefile b/src/modules/pua_json/Makefile index cfbd69d6b5..a496b62584 100644 --- a/src/modules/pua_json/Makefile +++ b/src/modules/pua_json/Makefile @@ -8,9 +8,28 @@ include ../../Makefile.defs auto_gen= NAME=pua_json.so +LIBS= +JLIB=json -LIBS=-ljson-c -DEFS+=-I$(LOCALBASE)/include -I/usr/local/include $(shell pkg-config --cflags json-c) +BUILDER = $(shell which pkg-config) +ifeq ($(BUILDER),) + JSONC=$(shell ls $(SYSBASE)/include/lib/libjson*.so $(LOCALBASE)/lib/libjson*.so 2>/dev/null | grep json-c) +else + JSONC=$(shell pkg-config --libs json-c 2>/dev/null | grep json-c) +endif + +ifneq ($(JSONC),) + JLIB=json-c +endif + +ifeq ($(BUILDER),) + DEFS+=-I/usr/include/$(JLIB) -I$(LOCALBASE)/include/$(JLIB) \ + -I$(LOCALBASE)/include + LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -l$(JLIB) +else + DEFS+= $(shell pkg-config --cflags $(JLIB)) + LIBS+= $(shell pkg-config --libs $(JLIB)) +endif DEFS+=-DKAMAILIO_MOD_INTERFACE

1 0

git:master:75c4ca0b: rtpengine: get again body pointer only when read_sdp_pv is set
by Daniel-Constantin Mierla 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 75c4ca0bb69bd4f1ba42c6d964697737813fa81e URL: https://github.com/kamailio/kamailio/commit/75c4ca0bb69bd4f1ba42c6d96469773… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-08T19:14:02+01:00 rtpengine: get again body pointer only when read_sdp_pv is set - reported by GH #1434 --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/75c4ca0bb69bd4f1ba42c6d96469773… Patch: https://github.com/kamailio/kamailio/commit/75c4ca0bb69bd4f1ba42c6d96469773… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index f9e630f60e..3b41789bbf 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -3351,12 +3351,17 @@ rtpengine_offer_answer(struct sip_msg *msg, const char *flags, int op, int more) pkg_free(newbody.s); } else { - /* get the body from the message as body ptr may have changed */ - cur_body.len = 0; - cur_body.s = get_body(msg); - cur_body.len = msg->buf + msg->len - cur_body.s; - - anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); + if (read_sdp_pvar_str.len > 0) { + /* get the body from the message as body ptr may have changed + * when using read_sdp_pv */ + cur_body.len = 0; + cur_body.s = get_body(msg); + cur_body.len = msg->buf + msg->len - cur_body.s; + + anchor = del_lump(msg, cur_body.s - msg->buf, cur_body.len, 0); + } else { + anchor = del_lump(msg, body.s - msg->buf, body.len, 0); + } if (!anchor) { LM_ERR("del_lump failed\n"); goto error_free;

1 0

Broacasting calls using Kamailio
by Ranadeep Mukherjee 08 Feb '18

08 Feb '18

Hi All, I am looking for a SPI SDK Server which can help to solve the following requirements: 1. Broadcast calls/(recorded | customized) messages to multiple numbers 2. Automated IVR during Inbound/Outbound calling 3. Record voice and IVR options selected 4. Recorded information should reach the client or its answering machine and not get played during an automated IVR/answering machine message, should be able to detect human voice 5. Should be able to connect to any SIP provider of our choice [cid:image002.jpg@01D3A0CB.0A026250] I am an employee of IXTROM Group Inc.<https://www.ixtrom.com/> which specializes in software engineering and the development of intelligent solutions for Situational Awareness Command and Control Systems (C4ISR). We want to use SIP SDK to broadcast calls to 100+ connections at one time. Regards, Ranadeep

1 0

git:master:4244ccd3: pua_json: remove contributors from source
by Emmanuel Schmidbauer 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 4244ccd34f525a2dbabfd7734747aaac2caa9318 URL: https://github.com/kamailio/kamailio/commit/4244ccd34f525a2dbabfd7734747aaa… Author: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Committer: Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> Date: 2018-02-08T09:29:47-05:00 pua_json: remove contributors from source --- Modified: src/modules/pua_json/defs.h Modified: src/modules/pua_json/pua_json_publish.c Modified: src/modules/pua_json/pua_json_publish.h --- Diff: https://github.com/kamailio/kamailio/commit/4244ccd34f525a2dbabfd7734747aaa… Patch: https://github.com/kamailio/kamailio/commit/4244ccd34f525a2dbabfd7734747aaa… --- diff --git a/src/modules/pua_json/defs.h b/src/modules/pua_json/defs.h index 47db1434b8..f8c3b6a209 100644 --- a/src/modules/pua_json/defs.h +++ b/src/modules/pua_json/defs.h @@ -19,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Contributor(s): - * 2600Hz Team - * Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> * */ diff --git a/src/modules/pua_json/pua_json_publish.c b/src/modules/pua_json/pua_json_publish.c index e601337476..dd2334bd3d 100644 --- a/src/modules/pua_json/pua_json_publish.c +++ b/src/modules/pua_json/pua_json_publish.c @@ -19,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Contributor(s): - * 2600Hz Team - * Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> * */ diff --git a/src/modules/pua_json/pua_json_publish.h b/src/modules/pua_json/pua_json_publish.h index 2379247089..749e35ca3a 100644 --- a/src/modules/pua_json/pua_json_publish.h +++ b/src/modules/pua_json/pua_json_publish.h @@ -19,9 +19,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * - * Contributor(s): - * 2600Hz Team - * Emmanuel Schmidbauer <eschmidbauer(a)gmail.com> * */

1 0

git:master:02cb90c9: Merge pull request #1424 from kamailio/eschmidbauer/pua_json
by GitHub 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 02cb90c978bde896e541d69ac2c9b64ef49dada7 URL: https://github.com/kamailio/kamailio/commit/02cb90c978bde896e541d69ac2c9b64… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2018-02-08T09:27:42-05:00 Merge pull request #1424 from kamailio/eschmidbauer/pua_json pua_json: new module to update presence using JSON data objects --- Added: src/modules/pua_json/Makefile Added: src/modules/pua_json/README Added: src/modules/pua_json/defs.h Added: src/modules/pua_json/doc/Makefile Added: src/modules/pua_json/doc/pua_json.xml Added: src/modules/pua_json/doc/pua_json_admin.xml Added: src/modules/pua_json/pua_json_mod.c Added: src/modules/pua_json/pua_json_mod.h Added: src/modules/pua_json/pua_json_publish.c Added: src/modules/pua_json/pua_json_publish.h Modified: src/modules/presence/bind_presence.h Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/02cb90c978bde896e541d69ac2c9b64… Patch: https://github.com/kamailio/kamailio/commit/02cb90c978bde896e541d69ac2c9b64…

1 0

git:master:81aa7c1f: pua_json: new module to update presence using JSON data objects
by Emmanuel Schmidbauer 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 81aa7c1f56a2d8842001b6a0ddb255bc757e2100 URL: https://github.com/kamailio/kamailio/commit/81aa7c1f56a2d8842001b6a0ddb255b… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-02-01T10:14:21-07:00 pua_json: new module to update presence using JSON data objects --- Added: src/modules/pua_json/Makefile Added: src/modules/pua_json/README Added: src/modules/pua_json/defs.h Added: src/modules/pua_json/doc/Makefile Added: src/modules/pua_json/doc/pua_json.xml Added: src/modules/pua_json/doc/pua_json_admin.xml Added: src/modules/pua_json/pua_json_mod.c Added: src/modules/pua_json/pua_json_mod.h Added: src/modules/pua_json/pua_json_publish.c Added: src/modules/pua_json/pua_json_publish.h --- Diff: https://github.com/kamailio/kamailio/commit/81aa7c1f56a2d8842001b6a0ddb255b… Patch: https://github.com/kamailio/kamailio/commit/81aa7c1f56a2d8842001b6a0ddb255b…

1 0

[kamailio/kamailio] pua_json: new module to update presence using JSON data objects (#1424)
by Emmanuel Schmidbauer 08 Feb '18

08 Feb '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1424 -- Commit Summary -- * presence: print message at INFO loglevel in check_if_dialog() since not all presentity updates will be dialog events * pua_json: new module to update presence using json objects -- File Changes -- M src/modules/presence/presentity.c (2) A src/modules/pua_json/Makefile (17) A src/modules/pua_json/README (0) A src/modules/pua_json/defs.h (133) A src/modules/pua_json/doc/Makefile (4) A src/modules/pua_json/doc/pua_json.xml (37) A src/modules/pua_json/doc/pua_json_admin.xml (105) A src/modules/pua_json/pua_json_mod.c (70) A src/modules/pua_json/pua_json_mod.h (39) A src/modules/pua_json/pua_json_publish.c (405) A src/modules/pua_json/pua_json_publish.h (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1424.patch https://github.com/kamailio/kamailio/pull/1424.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/1424

3 4

git:master:407d85be: presence: pass `replace` parameter to force hard presentity update
by Emmanuel Schmidbauer 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 407d85be91b16035d01fb357d8a26de51c4018d0 URL: https://github.com/kamailio/kamailio/commit/407d85be91b16035d01fb357d8a26de… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-02-01T10:13:49-07:00 presence: pass `replace` parameter to force hard presentity update --- Modified: src/modules/presence/bind_presence.h Modified: src/modules/presence/presence_dmq.c Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/407d85be91b16035d01fb357d8a26de… Patch: https://github.com/kamailio/kamailio/commit/407d85be91b16035d01fb357d8a26de…

1 0

git:master:09291d8b: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 09291d8b956336db20caa39a1a6fa83cf91cf1fe URL: https://github.com/kamailio/kamailio/commit/09291d8b956336db20caa39a1a6fa83… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-02-08T13:46:35+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/09291d8b956336db20caa39a1a6fa83… Patch: https://github.com/kamailio/kamailio/commit/09291d8b956336db20caa39a1a6fa83…

1 0

git:master:751c6765: textops: function in_list_prefix
by Vicente Hernando 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 751c67652cb09614f2f2d430885b7b6c7422b1cd URL: https://github.com/kamailio/kamailio/commit/751c67652cb09614f2f2d430885b7b6… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-02-01T11:26:30+01:00 textops: function in_list_prefix --- Modified: src/modules/textops/doc/textops_admin.xml Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/751c67652cb09614f2f2d430885b7b6… Patch: https://github.com/kamailio/kamailio/commit/751c67652cb09614f2f2d430885b7b6…

1 0

git:master:2d7e24b6: Merge pull request #1423 from kamailio/textops_in_list_prefix_function
by GitHub 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 2d7e24b60a9c79b97ed106ce46111f6aabf34ad4 URL: https://github.com/kamailio/kamailio/commit/2d7e24b60a9c79b97ed106ce46111f6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-02-08T13:41:31+01:00 Merge pull request #1423 from kamailio/textops_in_list_prefix_function Textops in list prefix function --- Modified: src/modules/textops/doc/textops_admin.xml Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/2d7e24b60a9c79b97ed106ce46111f6… Patch: https://github.com/kamailio/kamailio/commit/2d7e24b60a9c79b97ed106ce46111f6…

1 0

git:master:508befcb: textops: mismatch parenthesis in doc
by Vicente Hernando 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 508befcbddc7b88b6a68b188d881b52943682cc8 URL: https://github.com/kamailio/kamailio/commit/508befcbddc7b88b6a68b188d881b52… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: 2018-02-01T11:23:42+01:00 textops: mismatch parenthesis in doc --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/508befcbddc7b88b6a68b188d881b52… Patch: https://github.com/kamailio/kamailio/commit/508befcbddc7b88b6a68b188d881b52… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index f94183dabf..44b72a0265 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1323,7 +1323,7 @@ if(is_privacy("id")) ... $var(subject) = "fi"; $var(list) = "dk,fi,no,se"; -if (in_list("$var(subject)", "$var(list)", ",") { +if (in_list("$var(subject)", "$var(list)", ",")) { xlog("L_INFO", "subject is found in list\n"); } ...

1 0

[kamailio/kamailio] Textops in list prefix function (#1423)
by vhernando 08 Feb '18

08 Feb '18

#### 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 - [x] 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  Fix a mismatched parenthesis in doc for textops module. New function in_list_prefix based on in_list one but it checks if element in list is prefix for subject instead of an exact match. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1423 -- Commit Summary -- * textops: mismatch parenthesis in doc * textops: function in_list_prefix -- File Changes -- M src/modules/textops/doc/textops_admin.xml (26) M src/modules/textops/textops.c (153) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1423.patch https://github.com/kamailio/kamailio/pull/1423.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/1423

2 2

git:master:1dfab04c: modules: readme files regenerated - uac ... [skip ci]
by Kamailio Dev 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 1dfab04c128f26cfd82b5db85666e805e794610f URL: https://github.com/kamailio/kamailio/commit/1dfab04c128f26cfd82b5db85666e80… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-02-08T10:01:49+01:00 modules: readme files regenerated - uac ... [skip ci] --- Modified: src/modules/uac/README --- Diff: https://github.com/kamailio/kamailio/commit/1dfab04c128f26cfd82b5db85666e80… Patch: https://github.com/kamailio/kamailio/commit/1dfab04c128f26cfd82b5db85666e80… --- diff --git a/src/modules/uac/README b/src/modules/uac/README index 848279a2c2..5ac08ebbb3 100644 --- a/src/modules/uac/README +++ b/src/modules/uac/README @@ -811,7 +811,7 @@ event_route[uac:reply] { * regtotal: Total number of registrations * regactive: Total number of active registrations (successfully - registred with service) + registered with service) * regdisabled: Total number of disabled registrations (no longer active)

1 0

git:master:f68eb2b6: core: fix typos
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: f68eb2b6074336804bce04427bb6abf0cba4771a URL: https://github.com/kamailio/kamailio/commit/f68eb2b6074336804bce04427bb6abf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:53:43+01:00 core: fix typos Thanks, lintian > I: kamailio: spelling-error-in-binary usr/sbin/kamailio lenght length > I: kamailio: spelling-error-in-binary usr/sbin/kamailio orderd ordered > I: kamailio: spelling-error-in-binary usr/sbin/kamailio uknown unknown --- Modified: src/core/basex.c Modified: src/core/basex.h Modified: src/core/dns_cache.c Modified: src/core/dns_cache.h Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp_helpr_funcs.c Modified: src/core/tcp_read.c --- Diff: https://github.com/kamailio/kamailio/commit/f68eb2b6074336804bce04427bb6abf… Patch: https://github.com/kamailio/kamailio/commit/f68eb2b6074336804bce04427bb6abf…

1 0

git:master:70b153df: uid_gflags: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 70b153df3a78cb83fea2a295d7043f20f30d54ae URL: https://github.com/kamailio/kamailio/commit/70b153df3a78cb83fea2a295d7043f2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:47:35+01:00 uid_gflags: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/uid_gflags.so successfuly successfully --- Modified: src/modules/uid_gflags/uid_gflags.c --- Diff: https://github.com/kamailio/kamailio/commit/70b153df3a78cb83fea2a295d7043f2… Patch: https://github.com/kamailio/kamailio/commit/70b153df3a78cb83fea2a295d7043f2… --- diff --git a/src/modules/uid_gflags/uid_gflags.c b/src/modules/uid_gflags/uid_gflags.c index af02697c57..4e35a939f4 100644 --- a/src/modules/uid_gflags/uid_gflags.c +++ b/src/modules/uid_gflags/uid_gflags.c @@ -361,7 +361,7 @@ int save_gflags(unsigned int flags) return -1; } - LM_DBG("successfuly stored in database\n"); + LM_DBG("successfully stored in database\n"); return 0; }

1 0

git:master:00789c60: uac: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 00789c6067e17fbed185e5e1e6043247d26d9af4 URL: https://github.com/kamailio/kamailio/commit/00789c6067e17fbed185e5e1e604324… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:46:42+01:00 uac: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/uac.so registred registered --- Modified: src/modules/uac/doc/uac_admin.xml Modified: src/modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/00789c6067e17fbed185e5e1e604324… Patch: https://github.com/kamailio/kamailio/commit/00789c6067e17fbed185e5e1e604324… --- diff --git a/src/modules/uac/doc/uac_admin.xml b/src/modules/uac/doc/uac_admin.xml index 052bc2dc7a..7b7fbf95d8 100644 --- a/src/modules/uac/doc/uac_admin.xml +++ b/src/modules/uac/doc/uac_admin.xml @@ -953,7 +953,7 @@ event_route[uac:reply] { <emphasis>regtotal</emphasis>: Total number of registrations </para></listitem> <listitem><para> - <emphasis>regactive</emphasis>: Total number of active registrations (successfully registred with service) + <emphasis>regactive</emphasis>: Total number of active registrations (successfully registered with service) </para></listitem> <listitem><para> <emphasis>regdisabled</emphasis>: Total number of disabled registrations (no longer active) diff --git a/src/modules/uac/uac_reg.c b/src/modules/uac/uac_reg.c index 4b636a5891..f9ecef7eae 100644 --- a/src/modules/uac/uac_reg.c +++ b/src/modules/uac/uac_reg.c @@ -172,7 +172,7 @@ static void uac_reg_counter_init() { LM_DBG("*** Initializing UAC reg counters\n"); counter_register(&regtotal, "uac", "regtotal", 0, 0, 0, "Total number of registration accounts in memory", 0); - counter_register(&regactive, "uac", "regactive", 0, 0, 0, "Number of successfully registred accounts (200 OK)", 0); + counter_register(&regactive, "uac", "regactive", 0, 0, 0, "Number of successfully registered accounts (200 OK)", 0); counter_register(&regdisabled, "uac", "regdisabled", 0, 0, 0, "Counter of failed registrations (not 200 OK)", 0); }

1 0

git:master:bd680f78: sipcapture: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: bd680f78958e038de950931c82079d4d85a328bd URL: https://github.com/kamailio/kamailio/commit/bd680f78958e038de950931c82079d4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:44:08+01:00 sipcapture: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/sipcapture.so skiping skipping --- Modified: src/modules/sipcapture/sipcapture.c --- Diff: https://github.com/kamailio/kamailio/commit/bd680f78958e038de950931c82079d4… Patch: https://github.com/kamailio/kamailio/commit/bd680f78958e038de950931c82079d4… --- diff --git a/src/modules/sipcapture/sipcapture.c b/src/modules/sipcapture/sipcapture.c index 6e6faa1ad4..53735000f1 100644 --- a/src/modules/sipcapture/sipcapture.c +++ b/src/modules/sipcapture/sipcapture.c @@ -2351,7 +2351,7 @@ int raw_capture_rcv_loop(int rsock, int port1, int port2, int ipip) /* if the message has not alpha */ if(!isalnum((buf + offset)[0])) { - DBG("not alpha and not digit... skiping...\n"); + DBG("not alpha and not digit... skipping...\n"); continue; }

1 0

git:master:5ef5ddda: tsilo: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 5ef5ddda58bbb6376c11ac75bba6793ce6b73378 URL: https://github.com/kamailio/kamailio/commit/5ef5ddda58bbb6376c11ac75bba6793… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:44:56+01:00 tsilo: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/tsilo.so uknown unknown --- Modified: src/modules/tsilo/ts_handlers.c --- Diff: https://github.com/kamailio/kamailio/commit/5ef5ddda58bbb6376c11ac75bba6793… Patch: https://github.com/kamailio/kamailio/commit/5ef5ddda58bbb6376c11ac75bba6793… --- diff --git a/src/modules/tsilo/ts_handlers.c b/src/modules/tsilo/ts_handlers.c index 9015fcaa36..d50c3d1586 100644 --- a/src/modules/tsilo/ts_handlers.c +++ b/src/modules/tsilo/ts_handlers.c @@ -95,7 +95,7 @@ void ts_onreply(struct cell* t, int type, struct tmcb_params *param) LM_DBG("transaction %u:%u not found\n",cb_ptr->tindex, cb_ptr->tlabel); unlock_entry(_e); } else { - LM_DBG("called with uknown type %d\n", type); + LM_DBG("called with unknown type %d\n", type); } return;

1 0

git:master:3d68ecbb: seas: fix typos
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 3d68ecbb73886cfe31066f37386ea3ec31824b61 URL: https://github.com/kamailio/kamailio/commit/3d68ecbb73886cfe31066f37386ea3e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:42:57+01:00 seas: fix typos Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/seas.so didnt didn't > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/seas.so Uncomplete Incomplete --- Modified: src/modules/seas/encode_content_type.c Modified: src/modules/seas/event_dispatcher.c --- Diff: https://github.com/kamailio/kamailio/commit/3d68ecbb73886cfe31066f37386ea3e… Patch: https://github.com/kamailio/kamailio/commit/3d68ecbb73886cfe31066f37386ea3e… --- diff --git a/src/modules/seas/encode_content_type.c b/src/modules/seas/encode_content_type.c index 4a2bb5db5a..33d415b33c 100644 --- a/src/modules/seas/encode_content_type.c +++ b/src/modules/seas/encode_content_type.c @@ -165,7 +165,7 @@ int print_encoded_mime_type(FILE *fd,char *hdr,int hdrlen,unsigned int* payload, chsubtype="SUBTYPE_UNKNOWN"; break; default: - chsubtype="(didnt know this subtype existed)"; + chsubtype="(didn't know this subtype existed)"; } fprintf(fd,"%sTYPE:[%s]\n",prefix,chtype); diff --git a/src/modules/seas/event_dispatcher.c b/src/modules/seas/event_dispatcher.c index b9c720f7c4..e371601a19 100644 --- a/src/modules/seas/event_dispatcher.c +++ b/src/modules/seas/event_dispatcher.c @@ -183,7 +183,7 @@ int dispatcher_main_loop(void) sig_flag=0; clean_index=0; LM_INFO("polling [2 ServSock] [1 pipe] [%d App Servers]" - " [%d Uncomplete AS]\n",as_nr,unc_as_nr); + " [%d Incomplete AS]\n",as_nr,unc_as_nr); poll_events = poll(poll_fds,3+unc_as_nr+as_nr,-1); if (poll_events == -1) { if(errno==EINTR){

1 0

git:master:a2c77805: rtjson: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: a2c77805f1ef5e2b264da69ecb9f591c4cff203c URL: https://github.com/kamailio/kamailio/commit/a2c77805f1ef5e2b264da69ecb9f591… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:41:37+01:00 rtjson: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/rtjson.so diabled disabled --- Modified: src/modules/rtjson/rtjson_routing.c --- Diff: https://github.com/kamailio/kamailio/commit/a2c77805f1ef5e2b264da69ecb9f591… Patch: https://github.com/kamailio/kamailio/commit/a2c77805f1ef5e2b264da69ecb9f591… --- diff --git a/src/modules/rtjson/rtjson_routing.c b/src/modules/rtjson/rtjson_routing.c index 6a44b822f2..9ffff9e80b 100644 --- a/src/modules/rtjson/rtjson_routing.c +++ b/src/modules/rtjson/rtjson_routing.c @@ -54,11 +54,11 @@ static uac_api_t uacb; int rtjson_init(void) { if (load_tm_api( &tmb ) == -1) { - LM_NOTICE("cannot load the TM API - some features are diabled\n"); + LM_NOTICE("cannot load the TM API - some features are disabled\n"); memset(&tmb, 0, sizeof(struct tm_binds)); } if (load_uac_api(&uacb) < 0) { - LM_NOTICE("cannot bind to UAC API - some features are diabled\n"); + LM_NOTICE("cannot bind to UAC API - some features are disabled\n"); memset(&uacb, 0, sizeof(uac_api_t)); } return 0;

1 0

git:master:cdc96895: pipelimit: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: cdc96895b2998d329f725a9445068b4fc1ad9ca0 URL: https://github.com/kamailio/kamailio/commit/cdc96895b2998d329f725a9445068b4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:40:50+01:00 pipelimit: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/pipelimit.so algoritm algorithm --- Modified: src/modules/pipelimit/pipelimit.c --- Diff: https://github.com/kamailio/kamailio/commit/cdc96895b2998d329f725a9445068b4… Patch: https://github.com/kamailio/kamailio/commit/cdc96895b2998d329f725a9445068b4… --- diff --git a/src/modules/pipelimit/pipelimit.c b/src/modules/pipelimit/pipelimit.c index a15e2ca696..da30bcbd31 100644 --- a/src/modules/pipelimit/pipelimit.c +++ b/src/modules/pipelimit/pipelimit.c @@ -700,7 +700,7 @@ static int w_pl_check3(struct sip_msg* msg, char *p1pipe, char *p2alg, if(fixup_get_svalue(msg, (gparam_t*)p2alg, &alg)!=0 || alg.s == 0) { - LM_ERR("invalid algoritm parameter"); + LM_ERR("invalid algorithm parameter"); return -1; }

1 0

git:master:f3948157: permissions: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: f394815724590f3e5f78583aa71329601b66c78e URL: https://github.com/kamailio/kamailio/commit/f394815724590f3e5f78583aa713296… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:39:56+01:00 permissions: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/permissions.so Colums Columns --- Modified: src/modules/permissions/address.c --- Diff: https://github.com/kamailio/kamailio/commit/f394815724590f3e5f78583aa713296… Patch: https://github.com/kamailio/kamailio/commit/f394815724590f3e5f78583aa713296… --- diff --git a/src/modules/permissions/address.c b/src/modules/permissions/address.c index 46d135bf6d..42418b96f8 100644 --- a/src/modules/permissions/address.c +++ b/src/modules/permissions/address.c @@ -146,7 +146,7 @@ int reload_address_table(void) /* basic checks to db values */ if (ROW_N(row + i) != 5) { - LM_DBG("failure during checks of db address table: Colums %d - expected 5\n", ROW_N(row + i)); + LM_DBG("failure during checks of db address table: Columns %d - expected 5\n", ROW_N(row + i)); goto dberror; } if ((VAL_TYPE(val) != DB1_INT) || VAL_NULL(val) || (VAL_INT(val) <= 0))

1 0

git:master:d9d50378: p_usrloc: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: d9d50378a7aa08387855942357991f1492f1fb0b URL: https://github.com/kamailio/kamailio/commit/d9d50378a7aa08387855942357991f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:37:56+01:00 p_usrloc: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/p_usrloc.so could't couldn't --- Modified: src/modules/p_usrloc/ul_db_handle.c --- Diff: https://github.com/kamailio/kamailio/commit/d9d50378a7aa08387855942357991f1… Patch: https://github.com/kamailio/kamailio/commit/d9d50378a7aa08387855942357991f1… --- diff --git a/src/modules/p_usrloc/ul_db_handle.c b/src/modules/p_usrloc/ul_db_handle.c index 3b8549be03..d309ffa39a 100644 --- a/src/modules/p_usrloc/ul_db_handle.c +++ b/src/modules/p_usrloc/ul_db_handle.c @@ -523,7 +523,7 @@ int load_data(db_func_t * dbf, db1_con_t * dbh, ul_db_handle_t * handle, int id) key_vals[0].val.int_val = id; if(dbf->use_table(dbh, &reg_table) < 0){ - LM_ERR("could't use table.\n"); + LM_ERR("couldn't use table.\n"); return -1; } if(dbf->query(dbh, keys, op, key_vals, cols, 1, 7, order, &res) < 0){

1 0

git:master:3541d0f2: path: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 3541d0f2c8cf8cf28476f614a009d7b6890b8b74 URL: https://github.com/kamailio/kamailio/commit/3541d0f2c8cf8cf28476f614a009d7b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:38:54+01:00 path: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/path.so spearators separators --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/3541d0f2c8cf8cf28476f614a009d7b… Patch: https://github.com/kamailio/kamailio/commit/3541d0f2c8cf8cf28476f614a009d7b… --- diff --git a/src/modules/path/path.c b/src/modules/path/path.c index 54be69f694..5b29a33527 100644 --- a/src/modules/path/path.c +++ b/src/modules/path/path.c @@ -442,7 +442,7 @@ void path_rr_callback(struct sip_msg *_m, str *r_param, void *cb_param) break; } } else { - LM_ERR("invalid number of spearators (%d)\n", n); + LM_ERR("invalid number of separators (%d)\n", n); goto done; } }

1 0

git:master:db18d4a3: msrp: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: db18d4a31df29561dfa1563886e891450d0dde0f URL: https://github.com/kamailio/kamailio/commit/db18d4a31df29561dfa1563886e8914… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:33:42+01:00 msrp: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/msrp.so lenght length --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/db18d4a31df29561dfa1563886e8914… Patch: https://github.com/kamailio/kamailio/commit/db18d4a31df29561dfa1563886e8914… --- diff --git a/src/modules/msrp/msrp_cmap.c b/src/modules/msrp/msrp_cmap.c index bdcccbd6fe..73ce96c35a 100644 --- a/src/modules/msrp/msrp_cmap.c +++ b/src/modules/msrp/msrp_cmap.c @@ -215,7 +215,7 @@ int msrp_cmap_save(msrp_frame_t *mf) ip_addr2a(&mf->tcpinfo->rcv->src_ip), (int)mf->tcpinfo->rcv->src_port); if(srcaddr.len<0 || srcaddr.len>=MSRP_SBUF_SIZE) { - LM_ERR("failure or address lenght too big (%d)\n", srcaddr.len); + LM_ERR("failure or address length too big (%d)\n", srcaddr.len); return -1; } srcaddr.s = sbuf;

1 0

git:master:74157701: jsonrpcs: fix typos
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: 741577013fba2689de93cb587c4b750c15f9c29e URL: https://github.com/kamailio/kamailio/commit/741577013fba2689de93cb587c4b750… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:32:30+01:00 jsonrpcs: fix typos Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/jsonrpcs.so existance existence > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/jsonrpcs.so lenght length --- Modified: src/modules/jsonrpcs/jsonrpcs_sock.c --- Diff: https://github.com/kamailio/kamailio/commit/741577013fba2689de93cb587c4b750… Patch: https://github.com/kamailio/kamailio/commit/741577013fba2689de93cb587c4b750… --- diff --git a/src/modules/jsonrpcs/jsonrpcs_sock.c b/src/modules/jsonrpcs/jsonrpcs_sock.c index 3529941f1d..dd20902879 100644 --- a/src/modules/jsonrpcs/jsonrpcs_sock.c +++ b/src/modules/jsonrpcs/jsonrpcs_sock.c @@ -106,7 +106,7 @@ int jsonrpc_dgram_mod_init(void) int sep; /* checking the mi_socket module param */ - LM_DBG("testing socket existance...\n"); + LM_DBG("testing socket existence...\n"); if( jsonrpc_dgram_socket==NULL || *jsonrpc_dgram_socket == 0) { LM_ERR("no DATAGRAM_ socket configured\n"); @@ -118,7 +118,7 @@ int jsonrpc_dgram_mod_init(void) memset( &jsonrpc_dgram_addr, 0, sizeof(jsonrpc_dgram_sockaddr_t) ); if(strlen(jsonrpc_dgram_socket)<6) { - LM_ERR("lenght of socket address is too short: %s\n", + LM_ERR("length of socket address is too short: %s\n", jsonrpc_dgram_socket); return -1; }

1 0

git:master:dac801f5: drouting: fix typo
by Victor Seva 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: dac801f5b1b4903eb4dd4668fb449bf9e4c1171d URL: https://github.com/kamailio/kamailio/commit/dac801f5b1b4903eb4dd4668fb449bf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-08T09:30:17+01:00 drouting: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/drouting.so colum column --- Modified: src/modules/drouting/dr_load.c --- Diff: https://github.com/kamailio/kamailio/commit/dac801f5b1b4903eb4dd4668fb449bf… Patch: https://github.com/kamailio/kamailio/commit/dac801f5b1b4903eb4dd4668fb449bf… --- diff --git a/src/modules/drouting/dr_load.c b/src/modules/drouting/dr_load.c index e849944940..768392f957 100644 --- a/src/modules/drouting/dr_load.c +++ b/src/modules/drouting/dr_load.c @@ -87,7 +87,7 @@ static struct dr_gwl_tmp *dr_gw_lists = NULL; #define check_val(_val, _type, _not_null, _is_empty_str) \ do { \ if((_val)->type != _type) { \ - LM_ERR("bad colum type\n"); \ + LM_ERR("bad column type\n"); \ goto error; \ } \ if(_not_null && (_val)->nul) { \

1 0

git:master:b450a769: Updated P-CSCF example with additional Rx_AAR params
by Richard Good 08 Feb '18

08 Feb '18

Module: kamailio Branch: master Commit: b450a769cff3b5c8ea0962299f6b087da089cd59 URL: https://github.com/kamailio/kamailio/commit/b450a769cff3b5c8ea0962299f6b087… Author: Richard Good <richard.good(a)smilecoms.com> Committer: Richard Good <richard.good(a)smilecoms.com> Date: 2014-12-17T10:58:00+02:00 Updated P-CSCF example with additional Rx_AAR params --- Modified: examples/pcscf/kamailio.cfg --- Diff: https://github.com/kamailio/kamailio/commit/b450a769cff3b5c8ea0962299f6b087… Patch: https://github.com/kamailio/kamailio/commit/b450a769cff3b5c8ea0962299f6b087… --- diff --git a/examples/pcscf/kamailio.cfg b/examples/pcscf/kamailio.cfg index c09cdc9..c2d5f55 100644 --- a/examples/pcscf/kamailio.cfg +++ b/examples/pcscf/kamailio.cfg @@ -983,7 +983,7 @@ route[Orig_Initial] #!ifdef WITH_RX xlog("L_DBG","Diameter: Orig authorizing media via Rx\n"); - if(Rx_AAR("ORIG_SESSION_AAR","orig")==0){ + if(Rx_AAR("ORIG_SESSION_AAR","orig","",-1)==0){ exit; } } @@ -1035,7 +1035,7 @@ onreply_route[Orig_Initial_reply] #!ifdef WITH_RX if (t_check_status("180|183|200")){ xlog("L_DBG","Diameter: Orig authorizing media via Rx\n"); - if(Rx_AAR("ORIG_SESSION_AAR_REPLY","orig")==0){ + if(Rx_AAR("ORIG_SESSION_AAR_REPLY","orig","",-1)==0){ exit; } } @@ -1089,7 +1089,7 @@ route[Term_Initial] #!ifdef WITH_RX xlog("L_DBG","Diameter: Term authorizing media via Rx\n"); - if(Rx_AAR("TERM_SESSION_AAR","term")==0){ + if(Rx_AAR("TERM_SESSION_AAR","term","",-1)==0){ exit; } } @@ -1138,7 +1138,7 @@ onreply_route[Term_Initial_reply] #!ifdef WITH_RX if (t_check_status("180|183|200")){ xlog("L_DBG","Diameter: Orig authorizing media via Rx\n"); - if(Rx_AAR("TERM_SESSION_AAR_REPLY","term")==0){ + if(Rx_AAR("TERM_SESSION_AAR_REPLY","term","",-1)==0){ exit; } }

2 1

git:master:23ae1997: domain: fix typo
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 23ae1997201a6207b7cc2746ee3a132cc6f06670 URL: https://github.com/kamailio/kamailio/commit/23ae1997201a6207b7cc2746ee3a132… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T17:53:08+01:00 domain: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/domain.so paramter parameter --- Modified: src/modules/domain/domain.c --- Diff: https://github.com/kamailio/kamailio/commit/23ae1997201a6207b7cc2746ee3a132… Patch: https://github.com/kamailio/kamailio/commit/23ae1997201a6207b7cc2746ee3a132… --- diff --git a/src/modules/domain/domain.c b/src/modules/domain/domain.c index 1dbdd2f5d5..a986bba332 100644 --- a/src/modules/domain/domain.c +++ b/src/modules/domain/domain.c @@ -188,7 +188,7 @@ int w_is_domain_local(struct sip_msg *_msg, char *_sp, char *_s2) str sdomain; if(fixup_get_svalue(_msg, (gparam_t *)_sp, &sdomain) < 0) { - LM_ERR("cannot get domain paramter\n"); + LM_ERR("cannot get domain parameter\n"); return -1; } @@ -206,7 +206,7 @@ int ki_lookup_domain_prefix(struct sip_msg *_msg, str *_sdomain, str *_sprefix) unsigned short flags; if(_sdomain==NULL || _sdomain->s==NULL) { - LM_ERR("invalid domain paramter\n"); + LM_ERR("invalid domain parameter\n"); return -1; } if(hash_table_lookup(_sdomain, &did, &attrs) != 1) { @@ -286,12 +286,12 @@ int w_lookup_domain(struct sip_msg *_msg, char *_sp, char *_prefix) str sprefix; if(fixup_get_svalue(_msg, (gparam_t *)_sp, &sdomain) < 0) { - LM_ERR("cannot get domain paramter\n"); + LM_ERR("cannot get domain parameter\n"); return -1; } if(_prefix) { if(fixup_get_svalue(_msg, (gparam_t *)_prefix, &sprefix) < 0) { - LM_ERR("cannot get prefix paramter\n"); + LM_ERR("cannot get prefix parameter\n"); return -1; } }

1 0

git:master:2b9ad2a6: db2_ops: fix typo
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 2b9ad2a628c17d73412e09aad7723b1e01eab871 URL: https://github.com/kamailio/kamailio/commit/2b9ad2a628c17d73412e09aad7723b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T17:51:36+01:00 db2_ops: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/db2_ops.so formating formatting --- Modified: src/modules/db2_ops/db2_ops.c --- Diff: https://github.com/kamailio/kamailio/commit/2b9ad2a628c17d73412e09aad7723b1… Patch: https://github.com/kamailio/kamailio/commit/2b9ad2a628c17d73412e09aad7723b1… --- diff --git a/src/modules/db2_ops/db2_ops.c b/src/modules/db2_ops/db2_ops.c index 433d5293fc..61c152c7cf 100644 --- a/src/modules/db2_ops/db2_ops.c +++ b/src/modules/db2_ops/db2_ops.c @@ -488,7 +488,7 @@ static int parse_xlstr(struct xlstr* s) { if (!s->s) return 0; if (!strchr(s->s, '%')) return 0; - /* probably xl_log formating */ + /* probably xl_log formatting */ if (!xl_print) { xl_print=(xl_print_log_f*)find_export("xprint", NO_SCRIPT, 0); @@ -535,7 +535,7 @@ static int eval_xlstr(struct sip_msg* msg, struct xlstr* s) { if (s->xlfmt) { len = xlbuf_size - (xlbuf_tail-xlbuf); if (xl_print(msg, s->xlfmt, xlbuf_tail, &len) < 0) { - ERR(MODULE_NAME": eval_xlstr: Error while formating result\n"); + ERR(MODULE_NAME": eval_xlstr: Error while formatting result\n"); return E_UNSPEC; }

1 0

git:master:22ba499f: ctl: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 22ba499fa8bcd87fab5b718f7a011d1be047b858 URL: https://github.com/kamailio/kamailio/commit/22ba499fa8bcd87fab5b718f7a011d1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T17:47:29+01:00 ctl: fix typos Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ctl.so emtpy empty > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ctl.so errror error --- Modified: src/modules/ctl/binrpc_run.c Modified: src/modules/ctl/fifo_server.c Modified: src/modules/ctl/io_listener.c --- Diff: https://github.com/kamailio/kamailio/commit/22ba499fa8bcd87fab5b718f7a011d1… Patch: https://github.com/kamailio/kamailio/commit/22ba499fa8bcd87fab5b718f7a011d1… --- diff --git a/src/modules/ctl/binrpc_run.c b/src/modules/ctl/binrpc_run.c index efff292081..064b32b487 100644 --- a/src/modules/ctl/binrpc_run.c +++ b/src/modules/ctl/binrpc_run.c @@ -700,7 +700,7 @@ int process_rpc_req(unsigned char* buf, int size, int* bytes_needed, error: if (f_ctx.replied==0){ rpc_fault(&f_ctx, 500, "internal server error"); - LOG(L_ERR, "ERROR: unknown rpc errror\n"); + LOG(L_ERR, "ERROR: unknown rpc error\n"); } *bytes_needed=0; /* we don't need anymore crap */ destroy_binrpc_ctx(&f_ctx); diff --git a/src/modules/ctl/fifo_server.c b/src/modules/ctl/fifo_server.c index b37aa47f00..e057148059 100644 --- a/src/modules/ctl/fifo_server.c +++ b/src/modules/ctl/fifo_server.c @@ -819,7 +819,7 @@ int init_fifo_fd(char* fifo, int fifo_mode, int fifo_uid, int fifo_gid, return -1; } if (strlen(fifo) == 0) { - ERR("emtpy fifo: fifo disabled\n"); + ERR("empty fifo: fifo disabled\n"); return -1; } diff --git a/src/modules/ctl/io_listener.c b/src/modules/ctl/io_listener.c index 8da2ba2933..5d8a22e880 100644 --- a/src/modules/ctl/io_listener.c +++ b/src/modules/ctl/io_listener.c @@ -711,7 +711,7 @@ inline static int handle_io(struct fd_map* fm, short events, int idx) break; #endif case F_T_RESERVED: - LOG(L_CRIT, "BUG: io listen handle_io: emtpy fd map\n"); + LOG(L_CRIT, "BUG: io listen handle_io: empty fd map\n"); goto error; default: LOG(L_CRIT, "BUG: io listen handle_io: unknown fd type %d\n",

1 0

git:master:1512771f: avpops: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 1512771ff78c8e52934fb805e837ee46ee163745 URL: https://github.com/kamailio/kamailio/commit/1512771ff78c8e52934fb805e837ee4… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T17:43:03+01:00 avpops: fix typos Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/avpops.so arround around > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/avpops.so complet complete --- Modified: src/modules/avpops/avpops_impl.c Modified: src/modules/avpops/avpops_parse.c --- Diff: https://github.com/kamailio/kamailio/commit/1512771ff78c8e52934fb805e837ee4… Patch: https://github.com/kamailio/kamailio/commit/1512771ff78c8e52934fb805e837ee4… --- diff --git a/src/modules/avpops/avpops_impl.c b/src/modules/avpops/avpops_impl.c index 235929046a..c760becb43 100644 --- a/src/modules/avpops/avpops_impl.c +++ b/src/modules/avpops/avpops_impl.c @@ -327,7 +327,7 @@ int ops_dbload_avps (struct sip_msg* msg, struct fis_param *sp, /* check uri */ if(!uri.user.s|| !uri.user.len|| !uri.host.len|| !uri.host.s) { - LM_ERR("incomplet uri <%.*s>\n", uuid.len, uuid.s); + LM_ERR("incomplete uri <%.*s>\n", uuid.len, uuid.s); goto error; } if((sp->opd&AVPOPS_FLAG_URI0)||(sp->opd&AVPOPS_FLAG_USER0)) @@ -468,7 +468,7 @@ int ops_dbdelete_avps (struct sip_msg* msg, struct fis_param *sp, /* check uri */ if(!uri.user.s|| !uri.user.len|| !uri.host.len|| !uri.host.s) { - LM_ERR("incomplet uri <%.*s>\n", uuid.len, uuid.s); + LM_ERR("incomplete uri <%.*s>\n", uuid.len, uuid.s); goto error; } if((sp->opd&AVPOPS_FLAG_URI0)||(sp->opd&AVPOPS_FLAG_USER0)) @@ -588,7 +588,7 @@ int ops_dbstore_avps (struct sip_msg* msg, struct fis_param *sp, /* check uri */ if(!uri.user.s|| !uri.user.len|| !uri.host.len|| !uri.host.s) { - LM_ERR("incomplet uri <%.*s>\n", uuid.len, uuid.s); + LM_ERR("incomplete uri <%.*s>\n", uuid.len, uuid.s); goto error; } if((sp->opd&AVPOPS_FLAG_URI0)||(sp->opd&AVPOPS_FLAG_USER0)) diff --git a/src/modules/avpops/avpops_parse.c b/src/modules/avpops/avpops_parse.c index a5fc02c013..7877eefd4f 100644 --- a/src/modules/avpops/avpops_parse.c +++ b/src/modules/avpops/avpops_parse.c @@ -196,7 +196,7 @@ int parse_avp_db(char *s, struct db_param *dbp, int allow_scheme) if (dbp->a.opd&AVPOPS_VAL_NONE) { LM_ERR("inconsistent usage of " - "DB scheme without complet specification of AVP name\n"); + "DB scheme without complete specification of AVP name\n"); goto error; } have_scheme = 1; @@ -260,7 +260,7 @@ struct fis_param* parse_intstr_value(char *p, int len) len -= 2; if (*p==0 || len<=0 ) { - LM_ERR("parse error arround <%.*s>\n",len,p); + LM_ERR("parse error around <%.*s>\n",len,p); goto error; } } else {

1 0

git:master:bbb7920c: cfg_rpc: fix typo
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: bbb7920c8d7d06e00dc4a3e1fb8e46842bfbee30 URL: https://github.com/kamailio/kamailio/commit/bbb7920c8d7d06e00dc4a3e1fb8e468… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T17:44:47+01:00 cfg_rpc: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/cfg_rpc.so Delte Delete --- Modified: src/modules/cfg_rpc/cfg_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/bbb7920c8d7d06e00dc4a3e1fb8e468… Patch: https://github.com/kamailio/kamailio/commit/bbb7920c8d7d06e00dc4a3e1fb8e468… --- diff --git a/src/modules/cfg_rpc/cfg_rpc.c b/src/modules/cfg_rpc/cfg_rpc.c index d865eae561..43ea61acc0 100644 --- a/src/modules/cfg_rpc/cfg_rpc.c +++ b/src/modules/cfg_rpc/cfg_rpc.c @@ -642,7 +642,7 @@ static void rpc_add_group_inst(rpc_t* rpc, void* c) } static const char* rpc_del_group_inst_doc[2] = { - "Delte an instance of a configuration group", + "Delete an instance of a configuration group", 0 };

1 0

git:master:f907e19e: avp: fix typo
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: f907e19e0bcdb530b298df7230b780dd99047683 URL: https://github.com/kamailio/kamailio/commit/f907e19e0bcdb530b298df7230b780d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T17:36:41+01:00 avp: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/avp.so formating formatting --- Modified: src/modules/avp/avp.c --- Diff: https://github.com/kamailio/kamailio/commit/f907e19e0bcdb530b298df7230b780d… Patch: https://github.com/kamailio/kamailio/commit/f907e19e0bcdb530b298df7230b780d… --- diff --git a/src/modules/avp/avp.c b/src/modules/avp/avp.c index 1b13dd492b..f9956a39bd 100644 --- a/src/modules/avp/avp.c +++ b/src/modules/avp/avp.c @@ -701,7 +701,7 @@ static int xl_printstr(struct sip_msg* msg, xl_elog_t* format, char** res, int* len = xlbuf_size; if (xl_print(msg, format, xlbuf, &len)<0) { - LOG(L_ERR, "xl_printstr: Error while formating result\n"); + LOG(L_ERR, "xl_printstr: Error while formatting result\n"); return -1; }

1 0

git:master:900d9fd0: auth_xkeys: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 900d9fd0dbc489221cf3516f03399f8ac4980f15 URL: https://github.com/kamailio/kamailio/commit/900d9fd0dbc489221cf3516f03399f8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T17:35:36+01:00 auth_xkeys: fix typos Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/auth_xkeys.so maching matching --- Modified: src/modules/auth_xkeys/auth_xkeys.c --- Diff: https://github.com/kamailio/kamailio/commit/900d9fd0dbc489221cf3516f03399f8… Patch: https://github.com/kamailio/kamailio/commit/900d9fd0dbc489221cf3516f03399f8… --- diff --git a/src/modules/auth_xkeys/auth_xkeys.c b/src/modules/auth_xkeys/auth_xkeys.c index ad3bed70d6..980260988e 100644 --- a/src/modules/auth_xkeys/auth_xkeys.c +++ b/src/modules/auth_xkeys/auth_xkeys.c @@ -311,7 +311,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, if(hbody.len!=SHA256_DIGEST_STRING_LENGTH-1 && hbody.len!=SHA384_DIGEST_STRING_LENGTH-1 && hbody.len!=SHA512_DIGEST_STRING_LENGTH-1) { - LM_DBG("not maching digest size for [%.*s]\n", + LM_DBG("not matching digest size for [%.*s]\n", hf->body.len, hf->body.s); return -1; } @@ -337,7 +337,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, strncpy(xdata.s + itc->kvalue.len + 1, data->s, data->len); if(alg->len==6 && strncasecmp(alg->s, "sha256", 6)==0) { if(hbody.len!=SHA256_DIGEST_STRING_LENGTH-1) { - LM_DBG("not maching sha256 digest size for [%.*s]\n", + LM_DBG("not matching sha256 digest size for [%.*s]\n", hf->body.len, hf->body.s); return -1; } @@ -349,7 +349,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, } } else if(alg->len==6 && strncasecmp(alg->s, "sha384", 6)==0) { if(hbody.len!=SHA384_DIGEST_STRING_LENGTH-1) { - LM_DBG("not maching sha384 digest size for [%.*s]\n", + LM_DBG("not matching sha384 digest size for [%.*s]\n", hf->body.len, hf->body.s); return -1; } @@ -361,7 +361,7 @@ int auth_xkeys_check(sip_msg_t* msg, str *hdr, str *key, } } else if(alg->len==6 && strncasecmp(alg->s, "sha512", 6)==0) { if(hbody.len!=SHA512_DIGEST_STRING_LENGTH-1) { - LM_DBG("not maching sha512 digest size for [%.*s]\n", + LM_DBG("not matching sha512 digest size for [%.*s]\n", hf->body.len, hf->body.s); return -1; }

1 0

git:master:a61bd0f7: acc_diameter: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: a61bd0f7f67c3e87bfc021d350ba4f145023c31f URL: https://github.com/kamailio/kamailio/commit/a61bd0f7f67c3e87bfc021d350ba4f1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T17:31:14+01:00 acc_diameter: fix typos Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/acc_diameter.so droped dropped --- Modified: src/modules/acc_diameter/diam_message.c --- Diff: https://github.com/kamailio/kamailio/commit/a61bd0f7f67c3e87bfc021d350ba4f1… Patch: https://github.com/kamailio/kamailio/commit/a61bd0f7f67c3e87bfc021d350ba4f1… --- diff --git a/src/modules/acc_diameter/diam_message.c b/src/modules/acc_diameter/diam_message.c index 614318b26d..841dfe16a5 100644 --- a/src/modules/acc_diameter/diam_message.c +++ b/src/modules/acc_diameter/diam_message.c @@ -315,7 +315,7 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, //AAAPrintMessage( msg ); return msg; error: - LM_ERR("message conversion droped!!\n"); + LM_ERR("message conversion dropped!!\n"); AAAFreeMessage(&msg); return 0; }

1 0

git:master:0efef480: auth_diameter: fix typo
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 0efef4800cfa5c7572adbc2fde69b91acaa4c22e URL: https://github.com/kamailio/kamailio/commit/0efef4800cfa5c7572adbc2fde69b91… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T17:34:13+01:00 auth_diameter: fix typo Thanks, lintian > I: kamailio: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/auth_diameter.so droped dropped --- Modified: src/modules/auth_diameter/message.c --- Diff: https://github.com/kamailio/kamailio/commit/0efef4800cfa5c7572adbc2fde69b91… Patch: https://github.com/kamailio/kamailio/commit/0efef4800cfa5c7572adbc2fde69b91… --- diff --git a/src/modules/auth_diameter/message.c b/src/modules/auth_diameter/message.c index 43d27737c5..ad81816a42 100644 --- a/src/modules/auth_diameter/message.c +++ b/src/modules/auth_diameter/message.c @@ -309,7 +309,7 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, //AAAPrintMessage( msg ); return msg; error: - LM_ERR(" message conversion droped!!\n"); + LM_ERR(" message conversion dropped!!\n"); AAAFreeMessage(&msg); return 0; }

1 0

git:master:60b64f5a: pua_rpc: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 60b64f5a9b61df88cd977fef8e929c2fc60e4953 URL: https://github.com/kamailio/kamailio/commit/60b64f5a9b61df88cd977fef8e929c2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T16:59:34+01:00 pua_rpc: fix typos Thanks, lintian > I: kamailio-presence-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/pua_rpc.so pres press --- Modified: src/modules/pua_rpc/pua_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/60b64f5a9b61df88cd977fef8e929c2… Patch: https://github.com/kamailio/kamailio/commit/60b64f5a9b61df88cd977fef8e929c2… --- diff --git a/src/modules/pua_rpc/pua_rpc.c b/src/modules/pua_rpc/pua_rpc.c index 86bb231b4f..08c196d7c7 100644 --- a/src/modules/pua_rpc/pua_rpc.c +++ b/src/modules/pua_rpc/pua_rpc.c @@ -337,8 +337,8 @@ static void pua_rpc_subscribe(rpc_t* rpc, void* ctx) return; } if(parse_uri(pres_uri.s, pres_uri.len, &uri)<0) { - LM_ERR("bad pres uri\n"); - rpc->fault(ctx, 400, "Invalid pres URI"); + LM_ERR("bad presentity uri\n"); + rpc->fault(ctx, 400, "Invalid presentity URI"); return; } if(parse_uri(watcher_uri.s, watcher_uri.len, &uri)<0) {

1 0

git:master:911f81fc: presence: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 911f81fc5d8945aabb49c3dca176a73320b8d0de URL: https://github.com/kamailio/kamailio/commit/911f81fc5d8945aabb49c3dca176a73… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T16:54:57+01:00 presence: fix typos Thanks, lintian > I: kamailio-presence-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/presence.so pres press > I: kamailio-presence-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/presence.so stucture structure > I: kamailio-presence-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/presence.so unsuccessfull unsuccessful --- Modified: src/modules/presence/presence.c Modified: src/modules/presence/presentity.c Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/911f81fc5d8945aabb49c3dca176a73… Patch: https://github.com/kamailio/kamailio/commit/911f81fc5d8945aabb49c3dca176a73… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index 721506292b..8131720cc4 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -1396,7 +1396,7 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs cs= mem_copy_subs(s, PKG_MEM_TYPE); if(cs== NULL) { - LM_ERR( "copying subs_t stucture\n"); + LM_ERR( "copying subs_t structure\n"); lock_release(&subs_htable[hash_code].lock); return -1; } diff --git a/src/modules/presence/presentity.c b/src/modules/presence/presentity.c index a824bd0a20..231f9a8bd5 100644 --- a/src/modules/presence/presentity.c +++ b/src/modules/presence/presentity.c @@ -73,7 +73,7 @@ char* generate_ETag(int publ_count) size = snprintf (etag, ETAG_LEN, "%c.%d.%d.%d.%d",prefix, startup_time, pid, counter, publ_count); if( size <0 ) { - LM_ERR("unsuccessfull snprintf\n "); + LM_ERR("unsuccessful snprintf\n "); pkg_free(etag); return NULL; } diff --git a/src/modules/presence/publish.c b/src/modules/presence/publish.c index 69533b0e39..bf5a3bcd56 100644 --- a/src/modules/presence/publish.c +++ b/src/modules/presence/publish.c @@ -148,7 +148,7 @@ void msg_presentity_clean(unsigned int ticks,void *param) /* delete from hash table */ if(publ_cache_enabled && delete_phtable(&uri, pres.event->evp->type)< 0) { - LM_ERR("deleting from pres hash table\n"); + LM_ERR("deleting from presentity hash table\n"); goto error; }

1 0

git:master:2444e026: ims_registrar_scscf: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 2444e026895810c12e47f8dcd11162c7827ac903 URL: https://github.com/kamailio/kamailio/commit/2444e026895810c12e47f8dcd11162c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T16:48:02+01:00 ims_registrar_scscf: fix typos Thanks, lintian > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ims_registrar_scscf.so unsuccesful unsuccessful > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ims_registrar_scscf.so explit explicit > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ims_registrar_scscf.so pres press > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ims_registrar_scscf.so ceate create > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ims_registrar_scscf.so implicity implicitly --- Modified: src/modules/ims_registrar_scscf/registrar_notify.c Modified: src/modules/ims_registrar_scscf/save.c Modified: src/modules/ims_registrar_scscf/userdata_parser.c --- Diff: https://github.com/kamailio/kamailio/commit/2444e026895810c12e47f8dcd11162c… Patch: https://github.com/kamailio/kamailio/commit/2444e026895810c12e47f8dcd11162c…

1 0

git:master:f500e1d0: ims_charging: fix typo
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: f500e1d0372fe3ba55114e909fb05a187ee1a386 URL: https://github.com/kamailio/kamailio/commit/f500e1d0372fe3ba55114e909fb05a1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T16:38:38+01:00 ims_charging: fix typo Thanks, lintian > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ims_charging.so Reponse Response --- Modified: src/modules/ims_charging/diameter_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/f500e1d0372fe3ba55114e909fb05a1… Patch: https://github.com/kamailio/kamailio/commit/f500e1d0372fe3ba55114e909fb05a1… --- diff --git a/src/modules/ims_charging/diameter_ro.c b/src/modules/ims_charging/diameter_ro.c index 2261ba801d..52a3e1d1ed 100644 --- a/src/modules/ims_charging/diameter_ro.c +++ b/src/modules/ims_charging/diameter_ro.c @@ -31,7 +31,7 @@ void RoChargingResponseHandler(AAAMessage *response, void *param) { LM_ERR("DBG:"M_NAME":RoChargingResponseHandler(): - Received unknown response for app %d command %d\n", response->applicationId, response->commandCode); - LM_ERR("Reponse is [%s]", response->buf.s); + LM_ERR("Response is [%s]", response->buf.s); return; }

1 0

git:master:50859124: ims_dialog: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 50859124b767f20313501a7883b138c0b16c1607 URL: https://github.com/kamailio/kamailio/commit/50859124b767f20313501a7883b138c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T16:41:00+01:00 ims_dialog: fix typos Thanks, lintian > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ims_dialog.so Deleteing Deleting > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/ims_dialog.so regsiter register --- Modified: src/modules/ims_dialog/dlg_hash.c Modified: src/modules/ims_dialog/ims_dialog.c --- Diff: https://github.com/kamailio/kamailio/commit/50859124b767f20313501a7883b138c… Patch: https://github.com/kamailio/kamailio/commit/50859124b767f20313501a7883b138c… --- diff --git a/src/modules/ims_dialog/dlg_hash.c b/src/modules/ims_dialog/dlg_hash.c index a7afdbc432..9a07eb4fe7 100644 --- a/src/modules/ims_dialog/dlg_hash.c +++ b/src/modules/ims_dialog/dlg_hash.c @@ -680,7 +680,7 @@ void dlg_remove_dlg_out(struct dlg_cell_out *dlg_out_do_not_remove, struct dlg_c dlg->dlg_entry_out.first = dlg->dlg_entry_out.last = 0; } else { if (!only_mark) { - LM_DBG("Deleteing dlg out structure\n"); + LM_DBG("Deleting dlg out structure\n"); if (dlg_out->prev) { dlg_out->prev->next = dlg_out->next; } diff --git a/src/modules/ims_dialog/ims_dialog.c b/src/modules/ims_dialog/ims_dialog.c index 70f9f956f1..8430c86283 100644 --- a/src/modules/ims_dialog/ims_dialog.c +++ b/src/modules/ims_dialog/ims_dialog.c @@ -505,17 +505,17 @@ static int mod_init(void) { } if (register_script_cb(profile_cleanup, POST_SCRIPT_CB | REQUEST_CB, 0) < 0) { - LM_ERR("cannot regsiter script callback"); + LM_ERR("cannot register script callback"); return -1; } if (register_script_cb(dlg_cfg_cb, PRE_SCRIPT_CB | REQUEST_CB, 0) < 0) { - LM_ERR("cannot regsiter pre-script ctx callback\n"); + LM_ERR("cannot register pre-script ctx callback\n"); return -1; } if (register_script_cb(dlg_cfg_cb, POST_SCRIPT_CB | REQUEST_CB, 0) < 0) { - LM_ERR("cannot regsiter post-script ctx callback\n"); + LM_ERR("cannot register post-script ctx callback\n"); return -1; }

1 0

git:master:b2a479a5: cdp: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: b2a479a5a04d79f403d93c1f98d8178bcb345dca URL: https://github.com/kamailio/kamailio/commit/b2a479a5a04d79f403d93c1f98d8178… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T16:30:44+01:00 cdp: fix typos Thanks, lintian > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/cdp.so Recevied Received > I: kamailio-ims-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/cdp.so droped dropped --- Modified: src/modules/cdp/acctstatemachine.c Modified: src/modules/cdp/diameter_msg.c Modified: src/modules/cdp/receiver.c --- Diff: https://github.com/kamailio/kamailio/commit/b2a479a5a04d79f403d93c1f98d8178… Patch: https://github.com/kamailio/kamailio/commit/b2a479a5a04d79f403d93c1f98d8178… --- diff --git a/src/modules/cdp/acctstatemachine.c b/src/modules/cdp/acctstatemachine.c index 9d1a4510f1..4e9272980f 100644 --- a/src/modules/cdp/acctstatemachine.c +++ b/src/modules/cdp/acctstatemachine.c @@ -128,7 +128,7 @@ int cc_acc_client_stateful_sm_process(cdp_session_t* s, int event, AAAMessage* m break; default: - LM_ERR("Recevied unknown event [%d] in state [%d]\n", event, x->state); + LM_ERR("Received unknown event [%d] in state [%d]\n", event, x->state); break; } break; diff --git a/src/modules/cdp/diameter_msg.c b/src/modules/cdp/diameter_msg.c index 3630d40f1f..fb4257f52a 100644 --- a/src/modules/cdp/diameter_msg.c +++ b/src/modules/cdp/diameter_msg.c @@ -585,7 +585,7 @@ AAAMessage* AAATranslateMessage( unsigned char* source, unsigned int sourceLen, //AAAPrintMessage( msg ); return msg; error: - LM_ERR("AAATranslateMessage: message conversion droped!!\n"); + LM_ERR("AAATranslateMessage: message conversion dropped!!\n"); AAAFreeMessage(&msg); return 0; } diff --git a/src/modules/cdp/receiver.c b/src/modules/cdp/receiver.c index 0ff2fe15ae..2b4da266e3 100644 --- a/src/modules/cdp/receiver.c +++ b/src/modules/cdp/receiver.c @@ -751,7 +751,7 @@ int receive_loop(peer *original_peer) LM_DBG("select_recv(): There is something on the send pipe\n"); cnt = read(sp->send_pipe_fd,&msg,sizeof(AAAMessage *)); if (cnt==0){ - //This is very stupid and might not work well - droped messages... to be fixed + //This is very stupid and might not work well - dropped messages... to be fixed LM_INFO("select_recv(): ReOpening pipe for read. This should not happen...\n"); close(sp->send_pipe_fd); sp->send_pipe_fd = open(sp->send_pipe_name.s, O_RDONLY | O_NDELAY);

1 0

Errored: kamailio/kamailio#5492 (master - a154308)
by Travis CI 07 Feb '18

07 Feb '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5492 Status: Errored Duration: 8 minutes and 48 seconds Commit: a154308 (master) Author: Victor Seva Message: topos_redis: fix typos Thanks, lintian > I: kamailio-redis-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/topos_redis.so unuseful useless > I: kamailio-redis-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/topos_redis.so unknow unknown View the changeset: https://github.com/kamailio/kamailio/compare/f0ed817f33c3...a154308a26dd View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/338546039?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:a154308a: topos_redis: fix typos
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: a154308a26dd7f916775c9995e44abd44c50dc1b URL: https://github.com/kamailio/kamailio/commit/a154308a26dd7f916775c9995e44abd… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T16:17:46+01:00 topos_redis: fix typos Thanks, lintian > I: kamailio-redis-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/topos_redis.so unuseful useless > I: kamailio-redis-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/topos_redis.so unknow unknown --- Modified: src/modules/topos_redis/topos_redis_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/a154308a26dd7f916775c9995e44abd… Patch: https://github.com/kamailio/kamailio/commit/a154308a26dd7f916775c9995e44abd… --- diff --git a/src/modules/topos_redis/topos_redis_storage.c b/src/modules/topos_redis/topos_redis_storage.c index b0086478e2..50e33121ee 100644 --- a/src/modules/topos_redis/topos_redis_storage.c +++ b/src/modules/topos_redis/topos_redis_storage.c @@ -677,7 +677,7 @@ int tps_redis_load_invite_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) && strncmp(skey.s, tt_key_x_vbranch.s, skey.len)==0) { TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->x_vbranch1); } else { - LM_INFO("unuseful key[%.*s]\n", skey.len, skey.s); + LM_INFO("useless key[%.*s]\n", skey.len, skey.s); } } @@ -879,7 +879,7 @@ int tps_redis_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd, && 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); + LM_WARN("unknown key[%.*s]\n", skey.len, skey.s); } } @@ -1084,7 +1084,7 @@ int tps_redis_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) && strncmp(skey.s, td_key_s_cseq.s, skey.len)==0) { TPS_REDIS_DATA_APPEND(sd, &skey, &sval, &sd->s_cseq); } else { - LM_WARN("unknow key[%.*s]\n", skey.len, skey.s); + LM_WARN("unknown key[%.*s]\n", skey.len, skey.s); } }

1 0

git:master:f0ed817f: carrierroute: fix typo
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: f0ed817f33c3b48d6be8c9ec3d086b5885f8a37e URL: https://github.com/kamailio/kamailio/commit/f0ed817f33c3b48d6be8c9ec3d086b5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T16:10:04+01:00 carrierroute: fix typo Thanks, lintian > I: kamailio-carrierroute-modules: spelling-error-in-binary usr/lib/x86_64-linux-gnu/kamailio/modules/carrierroute.so Sucessfully Successfully --- Modified: src/modules/carrierroute/parser_carrierroute.c --- Diff: https://github.com/kamailio/kamailio/commit/f0ed817f33c3b48d6be8c9ec3d086b5… Patch: https://github.com/kamailio/kamailio/commit/f0ed817f33c3b48d6be8c9ec3d086b5… --- diff --git a/src/modules/carrierroute/parser_carrierroute.c b/src/modules/carrierroute/parser_carrierroute.c index c6fbf933f9..8aac5f501d 100644 --- a/src/modules/carrierroute/parser_carrierroute.c +++ b/src/modules/carrierroute/parser_carrierroute.c @@ -383,7 +383,7 @@ int parse_struct_header(FILE* file, char* expected_struct_type, str* struct_name } if ( SUCCESSFUL_PARSING == ret ){ - LM_DBG( "Sucessfully parsed struct %s - <%s> header\n", expected_struct_type, name); + LM_DBG( "Successfully parsed struct %s - <%s> header\n", expected_struct_type, name); struct_name->len = strlen(name); memcpy(struct_name->s, name, struct_name->len); struct_name->s[struct_name->len]='\0';

1 0

git:master:052520be: modules: readme files regenerated - rr ... [skip ci]
by Kamailio Dev 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 052520becf71b638f97652f010d8a27c7cabfc22 URL: https://github.com/kamailio/kamailio/commit/052520becf71b638f97652f010d8a27… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-02-07T13:31:34+01:00 modules: readme files regenerated - rr ... [skip ci] --- Modified: src/modules/rr/README --- Diff: https://github.com/kamailio/kamailio/commit/052520becf71b638f97652f010d8a27… Patch: https://github.com/kamailio/kamailio/commit/052520becf71b638f97652f010d8a27…

1 0

git:master:87787c2e: rr: documentation for force_send_socket parameter
by Daniel-Constantin Mierla 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 87787c2eccdb6c0ebfd8931a5acbebb25a40bbe8 URL: https://github.com/kamailio/kamailio/commit/87787c2eccdb6c0ebfd8931a5acbebb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-07T13:22:51+01:00 rr: documentation for force_send_socket parameter --- Modified: src/modules/rr/doc/rr_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/87787c2eccdb6c0ebfd8931a5acbebb… Patch: https://github.com/kamailio/kamailio/commit/87787c2eccdb6c0ebfd8931a5acbebb… --- diff --git a/src/modules/rr/doc/rr_admin.xml b/src/modules/rr/doc/rr_admin.xml index b64930a665..d8b9ce7adb 100644 --- a/src/modules/rr/doc/rr_admin.xml +++ b/src/modules/rr/doc/rr_admin.xml @@ -265,6 +265,31 @@ modparam("rr", "custom_user_avp", "$avp(RR_CUSTOMER_USER_AVP)") $avp(RR_CUSTOM_USER_AVP)="mo"; record_route(); ... +</programlisting> + </example> + </section> + <section id="rr.p.force_send_socket"> + <title><varname>force_send_socket</varname> (int)</title> + + <para> + If set to 1, local socket is forced even for single Record-Route, + otherwise is done on double Record-Route (should that be enabled). + </para> + + <para> + When use of <quote>outbound</quote> is enabled, the socket is not + forced. + </para> + + <para><emphasis>Default value is 0.</emphasis></para> + + <example> + <title>Set <varname>force_send_socket</varname> parameter</title> + + <programlisting format="linespecific"> +... +modparam("rr", "force_send_socket", 1) +... </programlisting> </example> </section>

1 0

git:master:93739c0b: rr: new parameter force_send_socket
by Daniel-Constantin Mierla 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 93739c0b8674a09f8364eac6f28bcc91b167843a URL: https://github.com/kamailio/kamailio/commit/93739c0b8674a09f8364eac6f28bcc9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-07T13:22:51+01:00 rr: new parameter force_send_socket - if set to 1, the socket is also forced for single rr - default is 0, socket is forced only for doubgle rr - if use outbound is set, socket is not forced --- Modified: src/modules/rr/loose.c Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/93739c0b8674a09f8364eac6f28bcc9… Patch: https://github.com/kamailio/kamailio/commit/93739c0b8674a09f8364eac6f28bcc9…

1 0

Errored: kamailio/kamailio#5487 (master - 4cc60ed)
by Travis CI 07 Feb '18

07 Feb '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5487 Status: Errored Duration: 10 minutes and 45 seconds Commit: 4cc60ed (master) Author: Guillem Jover Message: pkg/kamailio/deb: wait for kamailio to exit before returning on sysvinit stop action We should not return until the service has been fully terminated, otherwise a subsequent start might break as it can consider itself as already running. And once the old instance stops there's nothing left running. This also makes it possibe to remove a sleep in the restart action. View the changeset: https://github.com/kamailio/kamailio/compare/829759afd600...4cc60ede9615 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/338447148?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:5.1:df7c9486: pkg/kamailio/deb: wait for kamailio to exit before returning on sysvinit stop action
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: 5.1 Commit: df7c94863d9d75533a4430af84ba3647ac4decf6 URL: https://github.com/kamailio/kamailio/commit/df7c94863d9d75533a4430af84ba364… Author: Guillem Jover <gjover(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T12:16:47+01:00 pkg/kamailio/deb: wait for kamailio to exit before returning on sysvinit stop action We should not return until the service has been fully terminated, otherwise a subsequent start might break as it can consider itself as already running. And once the old instance stops there's nothing left running. This also makes it possibe to remove a sleep in the restart action. (cherry picked from commit 4cc60ede961554220cd265bd212407f42d5b8262) --- Modified: pkg/kamailio/deb/buster/kamailio.init Modified: pkg/kamailio/deb/debian/kamailio.init Modified: pkg/kamailio/deb/jessie/kamailio.init Modified: pkg/kamailio/deb/precise/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.init Modified: pkg/kamailio/deb/stretch/kamailio.init Modified: pkg/kamailio/deb/trusty/kamailio.init Modified: pkg/kamailio/deb/wheezy/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.init --- Diff: https://github.com/kamailio/kamailio/commit/df7c94863d9d75533a4430af84ba364… Patch: https://github.com/kamailio/kamailio/commit/df7c94863d9d75533a4430af84ba364…

1 0

git:master:4cc60ede: pkg/kamailio/deb: wait for kamailio to exit before returning on sysvinit stop action
by Victor Seva 07 Feb '18

07 Feb '18

Module: kamailio Branch: master Commit: 4cc60ede961554220cd265bd212407f42d5b8262 URL: https://github.com/kamailio/kamailio/commit/4cc60ede961554220cd265bd212407f… Author: Guillem Jover <gjover(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-02-07T12:11:42+01:00 pkg/kamailio/deb: wait for kamailio to exit before returning on sysvinit stop action We should not return until the service has been fully terminated, otherwise a subsequent start might break as it can consider itself as already running. And once the old instance stops there's nothing left running. This also makes it possibe to remove a sleep in the restart action. --- Modified: pkg/kamailio/deb/buster/kamailio.init Modified: pkg/kamailio/deb/debian/kamailio.init Modified: pkg/kamailio/deb/jessie/kamailio.init Modified: pkg/kamailio/deb/precise/kamailio.init Modified: pkg/kamailio/deb/sid/kamailio.init Modified: pkg/kamailio/deb/stretch/kamailio.init Modified: pkg/kamailio/deb/trusty/kamailio.init Modified: pkg/kamailio/deb/wheezy/kamailio.init Modified: pkg/kamailio/deb/xenial/kamailio.init --- Diff: https://github.com/kamailio/kamailio/commit/4cc60ede961554220cd265bd212407f… Patch: https://github.com/kamailio/kamailio/commit/4cc60ede961554220cd265bd212407f…

1 0

Info: Markus Monka replacing Marcus Hunger in management group
by Daniel-Constantin Mierla 07 Feb '18

07 Feb '18

Hello, Markus Monka has just replaced Marcus Hunger in Kamailio project management group. Marcus (still at sipgate) has moved to work more on frontend applications than backend, no longer interacting with Kamailio project. Markus Monka has managed the VoIP operations at sipgate for more than 15 years, helping the project over the years with various resources, mainly in respect of organizing events and testing infrastructure, sipgate being one of the oldest VoIP services using Kamailio (since first releases of SER). The change is reflected now on the website: * https://www.kamailio.org/w/management/ Warm welcome to Markus and many thanks to both of them for what they did so far for Kamailio project! 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

Info: Kamailio project administration updates
by Daniel-Constantin Mierla 07 Feb '18

07 Feb '18

Hello, after several discussions at some of the past IRC devel meetings, finally we started to build a team to be involved more actively in the administration of Kamailio. The project has grown steadily, not only in terms of code, but also packaging, continuous integration, social networking interactions as well as participation to events world wide. For a better coordination and ability to handle related tasks, I invited the most active developers and community members to join so called Kamailio Administration Team, the initial details about it are published as part of management page on kamailio.org: * https://www.kamailio.org/w/management/ Some more details about its rules and purpose: * https://www.kamailio.org/w/kadmin/ It will still take some time to get it properly rolling, more or less now looking to see if the community has suggestions/improvements on what can be done in these aspects. I wrote to all mailing lists for the initial announcement, but you can just reply to sr-users, if you are subscribed there, otherwise it's fine to write back to any of the lists. 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/kamailio] [master] jsonrpcs doesn't work on AARCH64 ?! (#1429)
by BroWater 07 Feb '18

07 Feb '18

### Description I upgraded from 4.2 to latest commit on master branch. During migrating, I found mi was replaced by RPC, (https://www.kamailio.org/wiki/install/upgrade/4.4.x-to-5.0.0) and when I tested with command like `sh kamctl ps`, it showed: ``` # sh kamctl ps awk: bad regex '^{.+"id"[ ]*:[ ]*[0-9]+[ ]*}$': Invalid preceding regular expression ``` I also tested it in standard configuration on my PC according to the following steps: ``` make cfg make all make install ``` and it works ``` # sh kamctl ps { "jsonrpc": "2.0", "result": [ { "IDX": 0, "PID": 30916, "DSC": "main process - attendant" }, { "IDX": 1, "PID": 30917, "DSC": "udp receiver child=0 sock=127.0.0.1:5060" }, { "IDX": 2, "PID": 30918, "DSC": "udp receiver child=1 sock=127.0.0.1:5060" }, { "IDX": 3, "PID": 30919, "DSC": "udp receiver child=2 sock=127.0.0.1:5060" .... ``` My configuration settings and install steps are like followings: CC=/opt/toolchains/aarch64-thunderx/bin/aarch64-thunderx-linux-gnu-gcc make cfg ARCH=aarch64 LOCALBASE=/mnt/test/kamailio/ make all make install Any suggestion?? ### Troubleshooting #### Reproduction  #### Debugging Data  ``` (paste your debugging data here) ``` #### Log Messages  ``` (paste your log messages here) ``` #### SIP Traffic  ``` (paste your sip traffic here) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # ./kamailio -v version: kamailio 5.2.0-dev3 (aarch64/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-NOSMP, 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:28:54 Feb 7 2018 with /opt/toolchains/aarch64-thunderx/bin/aarch64-thunderx-linux-gnu-gcc 5.3.0 ``` * **Operating System**:  ``` Linux XXX 4.4.13 #1 SMP PREEMPT Fri Mar 24 10:50:44 CST 2017 aarch64 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/1429

2 3

git:master:829759af: maxfwd: exported is_maxfw_lt() to kemi framework
by Daniel-Constantin Mierla 06 Feb '18

06 Feb '18

Module: kamailio Branch: master Commit: 829759afd6005b0f38a474ebc292404e9137c069 URL: https://github.com/kamailio/kamailio/commit/829759afd6005b0f38a474ebc292404… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-06T17:45:20+01:00 maxfwd: exported is_maxfw_lt() to kemi framework --- Modified: src/modules/maxfwd/maxfwd.c --- Diff: https://github.com/kamailio/kamailio/commit/829759afd6005b0f38a474ebc292404… Patch: https://github.com/kamailio/kamailio/commit/829759afd6005b0f38a474ebc292404… --- diff --git a/src/modules/maxfwd/maxfwd.c b/src/modules/maxfwd/maxfwd.c index e0812cd504..ac2342cd62 100644 --- a/src/modules/maxfwd/maxfwd.c +++ b/src/modules/maxfwd/maxfwd.c @@ -176,16 +176,11 @@ static int w_process_maxfwd_header(struct sip_msg *msg, char *str1, char *str2) /** * */ -static int is_maxfwd_lt(struct sip_msg *msg, char *slimit, char *foo) +static int ki_is_maxfwd_lt(sip_msg_t *msg, int limit) { str mf_value; - int limit = 70; int val; - if(get_int_fparam(&limit, msg, (fparam_t *)slimit) < 0) { - LM_ERR("could not get param value\n"); - return -1; - } if(limit < 0 || limit > 255) { LM_ERR("invalid param value: %d\n", limit); return -1; @@ -204,6 +199,21 @@ static int is_maxfwd_lt(struct sip_msg *msg, char *slimit, char *foo) return 1; } + +/** + * + */ +static int is_maxfwd_lt(struct sip_msg *msg, char *slimit, char *foo) +{ + int limit = 70; + + if(get_int_fparam(&limit, msg, (fparam_t *)slimit) < 0) { + LM_ERR("could not get param value\n"); + return -1; + } + return ki_is_maxfwd_lt(msg, limit); +} + /** * @brief bind functions to MAXFWD API structure */ @@ -222,13 +232,19 @@ int bind_maxfwd(maxfwd_api_t *api) * */ static sr_kemi_t sr_kemi_maxfwd_exports[] = { - { str_init("maxfwd"), str_init("process_maxfwd"), - SR_KEMIP_INT, process_maxfwd_header, - { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, - SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } - }, - - {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}}}; + { str_init("maxfwd"), str_init("process_maxfwd"), + SR_KEMIP_INT, process_maxfwd_header, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("maxfwd"), str_init("is_maxfwd_lt"), + SR_KEMIP_INT, ki_is_maxfwd_lt, + { SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + + {{0, 0}, {0, 0}, 0, NULL, {0, 0, 0, 0, 0, 0}} +}; /** *

1 0

git:master:adbdaabe: maxfwd: remove useless asign in is_maxfwd_lt()
by Daniel-Constantin Mierla 06 Feb '18

06 Feb '18

Module: kamailio Branch: master Commit: adbdaabeef2d24882185f21fa1399da6468e1301 URL: https://github.com/kamailio/kamailio/commit/adbdaabeef2d24882185f21fa1399da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-06T12:48:10+01:00 maxfwd: remove useless asign in is_maxfwd_lt() --- Modified: src/modules/maxfwd/maxfwd.c --- Diff: https://github.com/kamailio/kamailio/commit/adbdaabeef2d24882185f21fa1399da… Patch: https://github.com/kamailio/kamailio/commit/adbdaabeef2d24882185f21fa1399da… --- diff --git a/src/modules/maxfwd/maxfwd.c b/src/modules/maxfwd/maxfwd.c index 39344af919..e0812cd504 100644 --- a/src/modules/maxfwd/maxfwd.c +++ b/src/modules/maxfwd/maxfwd.c @@ -179,10 +179,9 @@ static int w_process_maxfwd_header(struct sip_msg *msg, char *str1, char *str2) static int is_maxfwd_lt(struct sip_msg *msg, char *slimit, char *foo) { str mf_value; - int limit; + int limit = 70; int val; - limit = (int)(long)slimit; if(get_int_fparam(&limit, msg, (fparam_t *)slimit) < 0) { LM_ERR("could not get param value\n"); return -1;

1 0

Errored: kamailio/kamailio#5484 (5.1 - 732a315)
by Travis CI 05 Feb '18

05 Feb '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5484 Status: Errored Duration: 11 minutes and 30 seconds Commit: 732a315 (5.1) Author: Juha Heinanen Message: lcr: fixed checking if there is more uris available for next_gw - plus some clang format changes - reported by Daniel (cherry picked from commit f73470163b081f5c877dddff9c08e94073b0cc4b) View the changeset: https://github.com/kamailio/kamailio/compare/45233bf5d736...732a3153a0a4 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/337717663?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

Errored: kamailio/kamailio#5483 (master - f734701)
by Travis CI 05 Feb '18

05 Feb '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5483 Status: Errored Duration: 15 minutes and 28 seconds Commit: f734701 (master) Author: Juha Heinanen Message: lcr: fixed checking if there is more uris available for next_gw - plus some clang format changes - reported by Daniel View the changeset: https://github.com/kamailio/kamailio/compare/536c5c36a2ef...f73470163b08 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/337715503?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:5.1:732a3153: lcr: fixed checking if there is more uris available for next_gw
by Juha Heinanen 05 Feb '18

05 Feb '18

Module: kamailio Branch: 5.1 Commit: 732a3153a0a41d5f951fff85de607f0b46ae73da URL: https://github.com/kamailio/kamailio/commit/732a3153a0a41d5f951fff85de607f0… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2018-02-05T22:05:58+02:00 lcr: fixed checking if there is more uris available for next_gw - plus some clang format changes - reported by Daniel (cherry picked from commit f73470163b081f5c877dddff9c08e94073b0cc4b) --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/732a3153a0a41d5f951fff85de607f0… Patch: https://github.com/kamailio/kamailio/commit/732a3153a0a41d5f951fff85de607f0…

1 0

git:master:f7347016: lcr: fixed checking if there is more uris available for next_gw
by Juha Heinanen 05 Feb '18

05 Feb '18

Module: kamailio Branch: master Commit: f73470163b081f5c877dddff9c08e94073b0cc4b URL: https://github.com/kamailio/kamailio/commit/f73470163b081f5c877dddff9c08e94… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: 2018-02-05T21:58:04+02:00 lcr: fixed checking if there is more uris available for next_gw - plus some clang format changes - reported by Daniel --- Modified: src/modules/lcr/lcr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/f73470163b081f5c877dddff9c08e94… Patch: https://github.com/kamailio/kamailio/commit/f73470163b081f5c877dddff9c08e94…

1 0

[kamailio/kamailio] s.substr transformation with negative offset and length greater than 1 not working (#1426)
by Anthony Messina 04 Feb '18

04 Feb '18

According to https://www.kamailio.org/wiki/cookbooks/5.1.x/transformations (and I'm using 5.1), I should be able to do something like `$var(num)=$(fU{s.substr,-1,10})` and `$var(num)` should be `123456789` if `$fU` is `0123456789` (only the last 10 characters are displayed). However, `$var(num)` ends up with only the last character of the substring, in this case, `9`. -- 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/1426

2 3

Fosdem dinner
by Daniel-Constantin Mierla 03 Feb '18

03 Feb '18

Hello, in the past 10 years or so, many of us met at Fosdem conference in Brussels (the edition this year happens during February 3-4) and had a dinner on Saturday evening. I know already couple of people from community that will go there, so the question is if there is any interest to organize again such event. If yes, it will be again on Saturday, on the evening of the 3rd of February. At the past editions, it turned into an all-RTC dinner, but we can consider to have it alone again (eventually with few other invited friends), if there are too many or people want a smaller meeting. Reply this week if you want to join, so we can estimate how many seats we need and have enough time to find a place that can accommodate us. More about Fosdem can be found at: - https://fosdem.org There is a devroom on Sunday with topics covering real time communications. I will have a presentation there. 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

7 10

[kamailio/kamailio] textops: Support RFC3264 for is_audio_on_hold() function (#1292)
by JuliaBoud 02 Feb '18

02 Feb '18

Function "is_audio_on_hold()" has support for rfc2543 only, where "hold" is indicated by setting the "c" destination addresses for the media streams to zero (0.0.0.0). Could you please add support for rfc3264 for this function, where "hold" is indicated by a=sendonly/inactive. -- 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/1292

2 2

git:master:536c5c36: modules: readme files regenerated - textops ... [skip ci]
by Kamailio Dev 02 Feb '18

02 Feb '18

Module: kamailio Branch: master Commit: 536c5c36a2ef56daf0d2e9adcc02594ae95a6cc6 URL: https://github.com/kamailio/kamailio/commit/536c5c36a2ef56daf0d2e9adcc02594… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-02-02T20:31:38+01:00 modules: readme files regenerated - textops ... [skip ci] --- Modified: src/modules/textops/README --- Diff: https://github.com/kamailio/kamailio/commit/536c5c36a2ef56daf0d2e9adcc02594… Patch: https://github.com/kamailio/kamailio/commit/536c5c36a2ef56daf0d2e9adcc02594… --- diff --git a/src/modules/textops/README b/src/modules/textops/README index 00875a04b0..775236a016 100644 --- a/src/modules/textops/README +++ b/src/modules/textops/README @@ -910,9 +910,10 @@ if(has_body("application/sdp")) 4.32. is_audio_on_hold() The function returns true if the SIP message has a body attached and at - least one audio stream in on hold. Only RFC2543 is supported - (c=0.0.0.0). Hold detection based on RFC3264 is not supported - (a=sendonly/inactive). + least one audio stream in on hold. The return code of the function + indicates the detected hold type: + * 1 - RFC2543 hold type: null connection IP detected + * 2 - RFC3264 hold type: inactive or sendonly attributes detected This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, FAILURE_ROUTE and BRANCH_ROUTE. @@ -921,7 +922,15 @@ if(has_body("application/sdp")) ... if(is_audio_on_hold()) { - # do interesting stuff here + switch ($rc) { + case 1: + # RFC2543 hold type + # do interesting stuff here + break; + case 2: + # RFC3264 hold type + # do interesting stuff here + break; } ...

1 0

git:master:fad36ca8: textops: documentation updated for is_audio_on_hold()
by Ovidiu Sas 02 Feb '18

02 Feb '18

Module: kamailio Branch: master Commit: fad36ca8bc3526f71f8bb3af46afe3bb2a0f1789 URL: https://github.com/kamailio/kamailio/commit/fad36ca8bc3526f71f8bb3af46afe3b… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2018-02-02T14:30:53-05:00 textops: documentation updated for is_audio_on_hold() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/fad36ca8bc3526f71f8bb3af46afe3b… Patch: https://github.com/kamailio/kamailio/commit/fad36ca8bc3526f71f8bb3af46afe3b… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index 4cb99d708e..d5884bfd20 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1258,6 +1258,19 @@ if(has_body("application/sdp")) <para> The function returns <emphasis>true</emphasis> if the SIP message has a body attached and at least one audio stream in on hold. + The return code of the function indicates the detected hold type: + <itemizedlist> + <listitem> + <para><emphasis>1</emphasis> - RFC2543 hold type: + null connection IP detected + </para> + </listitem> + <listitem> + <para><emphasis>2</emphasis> - RFC3264 hold type: + inactive or sendonly attributes detected + </para> + </listitem> + </itemizedlist> </para> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE, @@ -1269,7 +1282,15 @@ if(has_body("application/sdp")) ... if(is_audio_on_hold()) { - # do interesting stuff here + switch ($rc) { + case 1: + # RFC2543 hold type + # do interesting stuff here + break; + case 2: + # RFC3264 hold type + # do interesting stuff here + break; } ... </programlisting>

1 0

git:master:9f735ef8: textops: is_audio_on_hold() returns hold type
by Ovidiu Sas 02 Feb '18

02 Feb '18

Module: kamailio Branch: master Commit: 9f735ef803bfc8b6722f71a2bef00b071ab1ca1b URL: https://github.com/kamailio/kamailio/commit/9f735ef803bfc8b6722f71a2bef00b0… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2018-02-02T14:25:20-05:00 textops: is_audio_on_hold() returns hold type 1 - RFC2543 hold type (the connection IP is set to null IP) 2 - RFC3264 hold type (inactive or sendonly attr) --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/9f735ef803bfc8b6722f71a2bef00b0… Patch: https://github.com/kamailio/kamailio/commit/9f735ef803bfc8b6722f71a2bef00b0… --- diff --git a/src/modules/textops/textops.c b/src/modules/textops/textops.c index 97f1ecff12..7dbd07b03c 100644 --- a/src/modules/textops/textops.c +++ b/src/modules/textops/textops.c @@ -3368,7 +3368,7 @@ static int ki_is_audio_on_hold(sip_msg_t *msg) if(sdp_stream->media.len==AUDIO_STR_LEN && strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && sdp_stream->is_on_hold) - return 1; + return sdp_stream->is_on_hold; sdp_stream_num++; } sdp_session_num++;

1 0

git:master:51be5b7a: parser/sdp: distinguish between RFC2543 and RFC3264 media hold type
by Ovidiu Sas 02 Feb '18

02 Feb '18

Module: kamailio Branch: master Commit: 51be5b7a889e394927cce1009a09e1c2f52123ca URL: https://github.com/kamailio/kamailio/commit/51be5b7a889e394927cce1009a09e1c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2018-02-02T14:23:08-05:00 parser/sdp: distinguish between RFC2543 and RFC3264 media hold type --- Modified: src/core/parser/sdp/sdp.c Modified: src/core/parser/sdp/sdp.h Modified: src/core/parser/sdp/sdp_helpr_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/51be5b7a889e394927cce1009a09e1c… Patch: https://github.com/kamailio/kamailio/commit/51be5b7a889e394927cce1009a09e1c… --- diff --git a/src/core/parser/sdp/sdp.c b/src/core/parser/sdp/sdp.c index e6708d8188..32db4f1949 100644 --- a/src/core/parser/sdp/sdp.c +++ b/src/core/parser/sdp/sdp.c @@ -584,11 +584,11 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ if (stream->ip_addr.s && stream->ip_addr.len) { if (stream->ip_addr.len == HOLD_IP_LEN && strncmp(stream->ip_addr.s, HOLD_IP_STR, HOLD_IP_LEN)==0) - stream->is_on_hold = 1; + stream->is_on_hold = RFC2543_HOLD; } else if (session->ip_addr.s && session->ip_addr.len) { if (session->ip_addr.len == HOLD_IP_LEN && strncmp(session->ip_addr.s, HOLD_IP_STR, HOLD_IP_LEN)==0) - stream->is_on_hold = 1; + stream->is_on_hold = RFC2543_HOLD; } } ++stream_num; diff --git a/src/core/parser/sdp/sdp.h b/src/core/parser/sdp/sdp.h index 6b24030485..ab32d93d86 100644 --- a/src/core/parser/sdp/sdp.h +++ b/src/core/parser/sdp/sdp.h @@ -32,6 +32,10 @@ #include "../msg_parser.h" +#define NO_HOLD 0 +#define RFC2543_HOLD 1 +#define RFC3264_HOLD 2 + typedef struct sdp_payload_attr { struct sdp_payload_attr *next; int payload_num; /**< payload index inside stream */ diff --git a/src/core/parser/sdp/sdp_helpr_funcs.c b/src/core/parser/sdp/sdp_helpr_funcs.c index 52fe655612..5657cea4a1 100644 --- a/src/core/parser/sdp/sdp_helpr_funcs.c +++ b/src/core/parser/sdp/sdp_helpr_funcs.c @@ -386,7 +386,7 @@ int extract_sendrecv_mode(str *body, str *sendrecv_mode, int *is_on_hold) (strncasecmp(cp1, "a=recvonly", 10) == 0))) { if ((strncasecmp(cp1, "a=inactive", 10) == 0) || (strncasecmp(cp1, "a=sendonly", 10) == 0) ) { - *is_on_hold = 1; + *is_on_hold = RFC3264_HOLD; } else { return -1; }

1 0

[kamailio/kamailio] Feature/help android fcm and ios related push notification module (#1425)
by Dipen Patel 02 Feb '18

02 Feb '18

Hello.. Now most sip soft client in required push wakeup phone. So for that required android, ios push notifications module. I have seen some one have developed some module but it is old. So if possible so please write push notifications for wakeup phone module. Thanks -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1425

3 7

git:5.1:45233bf5: textops: update documentation for is_audio_on_hold()
by Ovidiu Sas 02 Feb '18

02 Feb '18

Module: kamailio Branch: 5.1 Commit: 45233bf5d736b7f47390d150d41511702212183b URL: https://github.com/kamailio/kamailio/commit/45233bf5d736b7f47390d150d415117… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2018-02-02T14:11:41-05:00 textops: update documentation for is_audio_on_hold() (cherry picked from commit def7be2a3a60039c21c0711153152533b8ceb836) --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/45233bf5d736b7f47390d150d415117… Patch: https://github.com/kamailio/kamailio/commit/45233bf5d736b7f47390d150d415117… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index f94183dabf..4cb99d708e 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1258,8 +1258,6 @@ if(has_body("application/sdp")) <para> The function returns <emphasis>true</emphasis> if the SIP message has a body attached and at least one audio stream in on hold. - Only RFC2543 is supported (c=0.0.0.0). - Hold detection based on RFC3264 is not supported (a=sendonly/inactive). </para> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,

1 0

git:master:def7be2a: textops: update documentation for is_audio_on_hold()
by Ovidiu Sas 02 Feb '18

02 Feb '18

Module: kamailio Branch: master Commit: def7be2a3a60039c21c0711153152533b8ceb836 URL: https://github.com/kamailio/kamailio/commit/def7be2a3a60039c21c071115315253… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2018-02-02T14:08:41-05:00 textops: update documentation for is_audio_on_hold() --- Modified: src/modules/textops/doc/textops_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/def7be2a3a60039c21c071115315253… Patch: https://github.com/kamailio/kamailio/commit/def7be2a3a60039c21c071115315253… --- diff --git a/src/modules/textops/doc/textops_admin.xml b/src/modules/textops/doc/textops_admin.xml index f94183dabf..4cb99d708e 100644 --- a/src/modules/textops/doc/textops_admin.xml +++ b/src/modules/textops/doc/textops_admin.xml @@ -1258,8 +1258,6 @@ if(has_body("application/sdp")) <para> The function returns <emphasis>true</emphasis> if the SIP message has a body attached and at least one audio stream in on hold. - Only RFC2543 is supported (c=0.0.0.0). - Hold detection based on RFC3264 is not supported (a=sendonly/inactive). </para> <para> This function can be used from REQUEST_ROUTE, ONREPLY_ROUTE,

1 0

git:master:8233e519: app_squirrel: imported last version of squirrel interpreter
by Daniel-Constantin Mierla 02 Feb '18

02 Feb '18

Module: kamailio Branch: master Commit: 8233e5191d23f64d879d81aa4bc4e5b17cf68ffe URL: https://github.com/kamailio/kamailio/commit/8233e5191d23f64d879d81aa4bc4e5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-02T18:11:10+01:00 app_squirrel: imported last version of squirrel interpreter - master branch --- Modified: src/modules/app_sqlang/squirrel/include/squirrel.h Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdblob.cpp Modified: src/modules/app_sqlang/squirrel/sqstdlib/sqstdblobimpl.h Modified: src/modules/app_sqlang/squirrel/squirrel/sqapi.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqbaselib.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqcompiler.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqfuncstate.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqlexer.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.cpp Modified: src/modules/app_sqlang/squirrel/squirrel/sqvm.h --- Diff: https://github.com/kamailio/kamailio/commit/8233e5191d23f64d879d81aa4bc4e5b… Patch: https://github.com/kamailio/kamailio/commit/8233e5191d23f64d879d81aa4bc4e5b…

1 0

git:master:7612f670: misc/examples/kemi: convert port to string in log messages
by Daniel-Constantin Mierla 01 Feb '18

01 Feb '18

Module: kamailio Branch: master Commit: 7612f67001c57d6adf339cd318e48ad828123213 URL: https://github.com/kamailio/kamailio/commit/7612f67001c57d6adf339cd318e48ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-02-01T15:06:51+01:00 misc/examples/kemi: convert port to string in log messages --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/7612f67001c57d6adf339cd318e48ad… Patch: https://github.com/kamailio/kamailio/commit/7612f67001c57d6adf339cd318e48ad… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index f692280959..7d952e413e 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -146,13 +146,13 @@ def ksr_route_reqinit(self, msg): # ip is already blocked KSR.dbg("request from blocked IP - " + KSR.pv.get("$rm") + " from " + KSR.pv.get("$fu") + " (IP:" - + KSR.pv.get("$si") + ":" + KSR.pv.get("$sp") + ")\n"); + + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) + ")\n"); return -255; if KSR.pike.pike_check_req()<0 : KSR.err("ALERT: pike blocking " + KSR.pv.get("$rm") + " from " + KSR.pv.get("$fu") + " (IP:" - + KSR.pv.get("$si") + ":" + KSR.pv.get("$sp") + ")\n"); + + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) + ")\n"); KSR.pv.seti("$sht(ipban=>$si)", 1); return -255; @@ -174,7 +174,7 @@ def ksr_route_reqinit(self, msg): if KSR.sanity.sanity_check(1511, 7)<0 : KSR.err("Malformed SIP message from " - + KSR.pv.get("$si") + ":" + KSR.pv.get("$sp") +"\n"); + + KSR.pv.get("$si") + ":" + str(KSR.pv.get("$sp")) +"\n"); return -255;

1 0

[kamailio/kamailio] presence: add API endpoints to update presentity and notify watchers (#1417)
by Emmanuel Schmidbauer 01 Feb '18

01 Feb '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1417 -- Commit Summary -- * presence: add API endpoints to update presentity and notify watchers -- File Changes -- M src/modules/presence/bind_presence.c (2) M src/modules/presence/bind_presence.h (5) M src/modules/presence/presence.c (16) M src/modules/presence/presence.h (1) M src/modules/presence/presentity.c (133) M src/modules/presence/presentity.h (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1417.patch https://github.com/kamailio/kamailio/pull/1417.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/1417

3 17

git:master:793a5663: Merge pull request #1417 from kamailio/presence-api
by GitHub 01 Feb '18

01 Feb '18

Module: kamailio Branch: master Commit: 793a5663518fcd03247bf87d33826339a8dbc04d URL: https://github.com/kamailio/kamailio/commit/793a5663518fcd03247bf87d3382633… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2018-02-01T06:14:23-05:00 Merge pull request #1417 from kamailio/presence-api presence: add API endpoints to update presentity and notify watchers --- Modified: src/modules/presence/bind_presence.c Modified: src/modules/presence/bind_presence.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h --- Diff: https://github.com/kamailio/kamailio/commit/793a5663518fcd03247bf87d3382633… Patch: https://github.com/kamailio/kamailio/commit/793a5663518fcd03247bf87d3382633…

1 0

git:master:4853c385: presence: add API endpoints to update presentity and notify watchers
by Emmanuel Schmidbauer 01 Feb '18

01 Feb '18

Module: kamailio Branch: master Commit: 4853c3854a7adb933311d51b352e6179845d3954 URL: https://github.com/kamailio/kamailio/commit/4853c3854a7adb933311d51b352e617… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-30T11:29:20-07:00 presence: add API endpoints to update presentity and notify watchers --- Modified: src/modules/presence/bind_presence.c Modified: src/modules/presence/bind_presence.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h --- Diff: https://github.com/kamailio/kamailio/commit/4853c3854a7adb933311d51b352e617… Patch: https://github.com/kamailio/kamailio/commit/4853c3854a7adb933311d51b352e617…

1 0

Errored: kamailio/kamailio#5464 (master - 5125506)
by Travis CI 01 Feb '18

01 Feb '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5464 Status: Errored Duration: 10 minutes and 54 seconds Commit: 5125506 (master) Author: Charles Chance Message: presence: presentity table version updated to 5 View the changeset: https://github.com/kamailio/kamailio/compare/7bb6fa179473...51255069963e View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/336024095?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:51255069: presence: presentity table version updated to 5
by Charles Chance 01 Feb '18

01 Feb '18

Module: kamailio Branch: master Commit: 51255069963e57ed5e49766ff41126e19b9f5cb8 URL: https://github.com/kamailio/kamailio/commit/51255069963e57ed5e49766ff41126e… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-02-01T09:52:06Z presence: presentity table version updated to 5 --- Modified: src/modules/presence/presence.c --- Diff: https://github.com/kamailio/kamailio/commit/51255069963e57ed5e49766ff41126e… Patch: https://github.com/kamailio/kamailio/commit/51255069963e57ed5e49766ff41126e… --- diff --git a/src/modules/presence/presence.c b/src/modules/presence/presence.c index adb0f909b5..4ba309d6b9 100644 --- a/src/modules/presence/presence.c +++ b/src/modules/presence/presence.c @@ -78,7 +78,7 @@ MODULE_VERSION #define S_TABLE_VERSION 3 -#define P_TABLE_VERSION 4 +#define P_TABLE_VERSION 5 #define ACTWATCH_TABLE_VERSION 12 char *log_buf = NULL;

1 0

git:master:7bb6fa17: modules: readme files regenerated - app_python ... [skip ci]
by Kamailio Dev 31 Jan '18

31 Jan '18

Module: kamailio Branch: master Commit: 7bb6fa1794735803668e077e80597b41533d0cca URL: https://github.com/kamailio/kamailio/commit/7bb6fa1794735803668e077e80597b4… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-31T21:31:24+01:00 modules: readme files regenerated - app_python ... [skip ci] --- Modified: src/modules/app_python/README --- Diff: https://github.com/kamailio/kamailio/commit/7bb6fa1794735803668e077e80597b4… Patch: https://github.com/kamailio/kamailio/commit/7bb6fa1794735803668e077e80597b4… --- diff --git a/src/modules/app_python/README b/src/modules/app_python/README index 8fcad886e9..54ea0697c7 100644 --- a/src/modules/app_python/README +++ b/src/modules/app_python/README @@ -167,7 +167,8 @@ python_exec("my_python_function", "$rU"); 5.1. app_python.reload - IMPORTANT: not implemented yet. + IMPORTANT: not functional yet (can crash a running instance, use it + only for testing). Marks the need to reload the js script. The actual reload is done by every working process when the next call to KEMI config is executed.

1 0

git:master:9e16ac86: app_python: adjusted the note about incomplete implementation for rpc reload
by Daniel-Constantin Mierla 31 Jan '18

31 Jan '18

Module: kamailio Branch: master Commit: 9e16ac869646ff62f648f9a822ffcc12a4614037 URL: https://github.com/kamailio/kamailio/commit/9e16ac869646ff62f648f9a822ffcc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-31T21:20:16+01:00 app_python: adjusted the note about incomplete implementation for rpc reload --- Modified: src/modules/app_python/doc/app_python_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9e16ac869646ff62f648f9a822ffcc1… Patch: https://github.com/kamailio/kamailio/commit/9e16ac869646ff62f648f9a822ffcc1… --- diff --git a/src/modules/app_python/doc/app_python_admin.xml b/src/modules/app_python/doc/app_python_admin.xml index 9afeffb03f..50191f562d 100644 --- a/src/modules/app_python/doc/app_python_admin.xml +++ b/src/modules/app_python/doc/app_python_admin.xml @@ -165,7 +165,8 @@ python_exec("my_python_function", "$rU"); <function moreinfo="none">app_python.reload</function> </title> <para> - IMPORTANT: not implemented yet. + IMPORTANT: not functional yet (can crash a running instance, + use it only for testing). </para> <para> Marks the need to reload the js script.

1 0

git:master:39d98127: rtpegnine: honour the 'setid_default' variable in all instances
by Richard Fuchs 31 Jan '18

31 Jan '18

Module: kamailio Branch: master Commit: 39d98127268afdfa841e7c80ce26185fe8d0673c URL: https://github.com/kamailio/kamailio/commit/39d98127268afdfa841e7c80ce26185… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2018-01-31T12:10:16-05:00 rtpegnine: honour the 'setid_default' variable in all instances --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/39d98127268afdfa841e7c80ce26185… Patch: https://github.com/kamailio/kamailio/commit/39d98127268afdfa841e7c80ce26185… --- diff --git a/src/modules/rtpengine/rtpengine.c b/src/modules/rtpengine/rtpengine.c index 6ad0c16d7e..f9e630f60e 100644 --- a/src/modules/rtpengine/rtpengine.c +++ b/src/modules/rtpengine/rtpengine.c @@ -734,14 +734,6 @@ struct rtpp_set *get_rtpp_set(unsigned int set_id) unsigned int my_current_id = 0; int new_list; -#if DEFAULT_RTPP_SET_ID > 0 - if (set_id < DEFAULT_RTPP_SET_ID ) - { - LM_ERR(" invalid rtpproxy set value [%u]\n", set_id); - return NULL; - } -#endif - my_current_id = set_id; /*search for the current_id*/ lock_get(rtpp_set_list->rset_head_lock); @@ -798,7 +790,7 @@ struct rtpp_set *get_rtpp_set(unsigned int set_id) rtpp_set_list->rset_last = rtpp_list; rtpp_set_count++; - if(my_current_id == DEFAULT_RTPP_SET_ID){ + if(my_current_id == setid_default){ default_rtpp_set = rtpp_list; } } @@ -1010,7 +1002,7 @@ static int rtpengine_add_rtpengine_set(char * rtp_proxies, unsigned int weight, rtp_proxies+=2; }else{ rtp_proxies = p; - my_current_id = DEFAULT_RTPP_SET_ID; + my_current_id = setid_default; } for(;*rtp_proxies && isspace(*rtp_proxies);rtp_proxies++); @@ -1490,10 +1482,6 @@ mod_init(void) } } - /* any rtpproxy configured? */ - if (rtpp_set_list) - default_rtpp_set = select_rtpp_set(DEFAULT_RTPP_SET_ID); - if (rtp_inst_pv_param.s) { rtp_inst_pv_param.len = strlen(rtp_inst_pv_param.s); rtp_inst_pvar = pv_cache_get(&rtp_inst_pv_param);

1 0

git:master:3430db51: siptrace: replaced use of copy defines with formated string functions
by Daniel-Constantin Mierla 30 Jan '18

30 Jan '18

Module: kamailio Branch: master Commit: 3430db51cabfca102109da582b355c0fd725523a URL: https://github.com/kamailio/kamailio/commit/3430db51cabfca102109da582b355c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-30T22:49:32+01:00 siptrace: replaced use of copy defines with formated string functions --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/3430db51cabfca102109da582b355c0… Patch: https://github.com/kamailio/kamailio/commit/3430db51cabfca102109da582b355c0…

1 0

[kamailio/kamailio] pua: removed null pointer access from subscribe_cbparam() (#1409)
by Christoph VALENTIN 30 Jan '18

30 Jan '18

A newly introduced condition in an if () statement leads to core dump in some scenarios. It is removed.   #### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Without this Change a core dump happens in the P-CSCF during handling the SIP REGISTER. Obviously a condition was added to an if() Statement, which itself created a null pointer Access. This additional Statement was removed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1409 -- Commit Summary -- * pua: removed null pointer access from subscribe_cbparam() -- File Changes -- M src/modules/pua/send_subscribe.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1409.patch https://github.com/kamailio/kamailio/pull/1409.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/1409

2 5

git:master:00da0530: Merge pull request #1418 from kamailio/json-update-api
by GitHub 30 Jan '18

30 Jan '18

Module: kamailio Branch: master Commit: 00da0530c7295b74b932307bad27580e14c3a987 URL: https://github.com/kamailio/kamailio/commit/00da0530c7295b74b932307bad27580… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-30T10:09:10-05:00 Merge pull request #1418 from kamailio/json-update-api json: pass str pointer to API --- Modified: src/modules/json/api.h Modified: src/modules/json/json_funcs.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/00da0530c7295b74b932307bad27580… Patch: https://github.com/kamailio/kamailio/commit/00da0530c7295b74b932307bad27580… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h index c900dd5c0d..0610eaffeb 100644 --- a/src/modules/json/api.h +++ b/src/modules/json/api.h @@ -26,7 +26,7 @@ typedef struct json_object *(*json_parse_f) (const char *str); typedef struct json_object *(*json_get_object_f) (struct json_object *json_obj, const char *str); -typedef str (*json_extract_field_f) (struct json_object *json_obj, char *json_name); +typedef int (*json_extract_field_f) (struct json_object *json_obj, char *json_name, str *var); typedef struct json_api { json_parse_f json_parse; diff --git a/src/modules/json/json_funcs.h b/src/modules/json/json_funcs.h index 331d1e3df8..747232efac 100644 --- a/src/modules/json/json_funcs.h +++ b/src/modules/json/json_funcs.h @@ -29,18 +29,18 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst); -#define json_extract_field(json_name, field) \ - do { \ +#define json_extract_field(json_name, field) \ + do { \ struct json_object *obj = json_get_object(json_obj, json_name); \ - field.s = (char *)json_object_get_string(obj); \ - if(field.s == NULL) { \ - LM_DBG("Json-c error - failed to extract field [%s]\n", \ - json_name); \ - field.s = ""; \ - } else { \ - field.len = strlen(field.s); \ - } \ - LM_DBG("%s: [%s]\n", json_name, field.s ? field.s : "Empty"); \ + field->s = (char *)json_object_get_string(obj); \ + if(field->s == NULL) { \ + LM_DBG("Json-c error - failed to extract field [%s]\n", \ + json_name); \ + field->s = ""; \ + } else { \ + field->len = strlen(field->s); \ + } \ + LM_DBG("%s: [%s]\n", json_name, field->s ? field->s : "Empty"); \ } while(0); diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 051da4dd59..f5de53d692 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -65,10 +65,9 @@ struct module_exports exports = { 0 /* per-child init function */ }; -str _json_extract_field(struct json_object *json_obj, char *json_name) { - str val = {0, 0}; +int _json_extract_field(struct json_object *json_obj, char *json_name, str *val) { json_extract_field(json_name, val); - return val; + return 0; } /**

1 0

[kamailio/kamailio] json: pass str pointer to API (#1418)
by Emmanuel Schmidbauer 30 Jan '18

30 Jan '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1418 -- Commit Summary -- * json: pass str pointer to API -- File Changes -- M src/modules/json/api.h (2) M src/modules/json/json_funcs.h (22) M src/modules/json/json_mod.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1418.patch https://github.com/kamailio/kamailio/pull/1418.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/1418

1 1

git:master:26b09ae0: json: pass str pointer to API
by Emmanuel Schmidbauer 30 Jan '18

30 Jan '18

Module: kamailio Branch: master Commit: 26b09ae0d9b36dfed9688536e7f8cd6ff22d89fd URL: https://github.com/kamailio/kamailio/commit/26b09ae0d9b36dfed9688536e7f8cd6… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-29T12:42:29-07:00 json: pass str pointer to API --- Modified: src/modules/json/api.h Modified: src/modules/json/json_funcs.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/26b09ae0d9b36dfed9688536e7f8cd6… Patch: https://github.com/kamailio/kamailio/commit/26b09ae0d9b36dfed9688536e7f8cd6… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h index c900dd5c0d..0610eaffeb 100644 --- a/src/modules/json/api.h +++ b/src/modules/json/api.h @@ -26,7 +26,7 @@ typedef struct json_object *(*json_parse_f) (const char *str); typedef struct json_object *(*json_get_object_f) (struct json_object *json_obj, const char *str); -typedef str (*json_extract_field_f) (struct json_object *json_obj, char *json_name); +typedef int (*json_extract_field_f) (struct json_object *json_obj, char *json_name, str *var); typedef struct json_api { json_parse_f json_parse; diff --git a/src/modules/json/json_funcs.h b/src/modules/json/json_funcs.h index 331d1e3df8..747232efac 100644 --- a/src/modules/json/json_funcs.h +++ b/src/modules/json/json_funcs.h @@ -29,18 +29,18 @@ int json_get_field(struct sip_msg* msg, char* json, char* field, char* dst); -#define json_extract_field(json_name, field) \ - do { \ +#define json_extract_field(json_name, field) \ + do { \ struct json_object *obj = json_get_object(json_obj, json_name); \ - field.s = (char *)json_object_get_string(obj); \ - if(field.s == NULL) { \ - LM_DBG("Json-c error - failed to extract field [%s]\n", \ - json_name); \ - field.s = ""; \ - } else { \ - field.len = strlen(field.s); \ - } \ - LM_DBG("%s: [%s]\n", json_name, field.s ? field.s : "Empty"); \ + field->s = (char *)json_object_get_string(obj); \ + if(field->s == NULL) { \ + LM_DBG("Json-c error - failed to extract field [%s]\n", \ + json_name); \ + field->s = ""; \ + } else { \ + field->len = strlen(field->s); \ + } \ + LM_DBG("%s: [%s]\n", json_name, field->s ? field->s : "Empty"); \ } while(0); diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 051da4dd59..f5de53d692 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -65,10 +65,9 @@ struct module_exports exports = { 0 /* per-child init function */ }; -str _json_extract_field(struct json_object *json_obj, char *json_name) { - str val = {0, 0}; +int _json_extract_field(struct json_object *json_obj, char *json_name, str *val) { json_extract_field(json_name, val); - return val; + return 0; } /**

1 0

git:5.1:f17dd0d8: Merge pull request #1415 from christoph-v/wrong_query_buffer_assignment_5.1
by GitHub 29 Jan '18

29 Jan '18

Module: kamailio Branch: 5.1 Commit: f17dd0d8c884f0264a1bfb64124caa69e119ca23 URL: https://github.com/kamailio/kamailio/commit/f17dd0d8c884f0264a1bfb64124caa6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-29T20:17:26+01:00 Merge pull request #1415 from christoph-v/wrong_query_buffer_assignment_5.1 ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() - 5.1 --- Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/f17dd0d8c884f0264a1bfb64124caa6… Patch: https://github.com/kamailio/kamailio/commit/f17dd0d8c884f0264a1bfb64124caa6… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index e1a7d4287e..b5301e0a3b 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -1079,7 +1079,7 @@ int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) { } - query_buffer_len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); + query_buffer.len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); LM_DBG("QUERY IS [%.*s] and len is %d\n", query_buffer.len, query_buffer.s, query_buffer.len); if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) {

1 0

[kamailio/kamailio] ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() - 5.1 (#1415)
by Christoph VALENTIN 29 Jan '18

29 Jan '18

When writing to query_buffer with the help of the snprintf() function, the result of the functio is written to variable query_buffer_len instead of to the query_buffer.len itself. This leads to core dump in some cases. Replaced "_" by "." in "query_buffer_len =" (cherry picked from commit 11c179ab232222f1c78f19557032afd49bef7324)   #### 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) - [ ] 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  Created by cherry-pick from master You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1415 -- Commit Summary -- * ims_usrloc_scscf: assignment of length missing for query_buffer in -- File Changes -- M src/modules/ims_usrloc_scscf/usrloc_db.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1415.patch https://github.com/kamailio/kamailio/pull/1415.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/1415

2 1

git:5.1:df97c48f: ims_usrloc_scscf: assignment of length missing for query_buffer in
by Christoph Valentin 29 Jan '18

29 Jan '18

Module: kamailio Branch: 5.1 Commit: df97c48f94e8c8ce28ca0624bc3cfe4a86c89259 URL: https://github.com/kamailio/kamailio/commit/df97c48f94e8c8ce28ca0624bc3cfe4… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-01-26T10:20:14+01:00 ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() When writing to query_buffer with the help of the snprintf() function, the result of the functio is written to variable query_buffer_len instead of to the query_buffer.len itself. This leads to core dump in some cases. Replaced "_" by "." in "query_buffer_len =" (cherry picked from commit 11c179ab232222f1c78f19557032afd49bef7324) --- Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/df97c48f94e8c8ce28ca0624bc3cfe4… Patch: https://github.com/kamailio/kamailio/commit/df97c48f94e8c8ce28ca0624bc3cfe4… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index e1a7d4287e..b5301e0a3b 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -1079,7 +1079,7 @@ int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) { } - query_buffer_len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); + query_buffer.len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); LM_DBG("QUERY IS [%.*s] and len is %d\n", query_buffer.len, query_buffer.s, query_buffer.len); if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) {

1 0

git:5.1:9ec46e94: Merge pull request #1414 from christoph-v/missing_record_route_assignment_5.1
by GitHub 29 Jan '18

29 Jan '18

Module: kamailio Branch: 5.1 Commit: 9ec46e94915294f2824abe828c0a1ec66e82c808 URL: https://github.com/kamailio/kamailio/commit/9ec46e94915294f2824abe828c0a1ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-29T20:17:10+01:00 Merge pull request #1414 from christoph-v/missing_record_route_assignment_5.1 ims_usrloc_scscf: missing assignment of record_route (5.1) --- Modified: src/modules/ims_usrloc_scscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/9ec46e94915294f2824abe828c0a1ec… Patch: https://github.com/kamailio/kamailio/commit/9ec46e94915294f2824abe828c0a1ec… --- diff --git a/src/modules/ims_usrloc_scscf/subscribe.c b/src/modules/ims_usrloc_scscf/subscribe.c index 227d06d51a..a5bdf699d5 100644 --- a/src/modules/ims_usrloc_scscf/subscribe.c +++ b/src/modules/ims_usrloc_scscf/subscribe.c @@ -346,6 +346,7 @@ int update_subscriber(impurecord_t* urec, reg_subscriber** _reg_subscriber, int subs.callid = rs->call_id; subs.expires = rs->expires - act_time; subs.contact = rs->watcher_contact; + subs.record_route = rs->record_route; hash_code = core_hash(&subs.callid, &subs.to_tag, sub_dialog_hash_size);

1 0

git:5.1:acbc230e: ims_usrloc_scscf: missing assignment of record_route
by Christoph Valentin 29 Jan '18

29 Jan '18

Module: kamailio Branch: 5.1 Commit: acbc230e8f24ac838598631d9366f23d05218d73 URL: https://github.com/kamailio/kamailio/commit/acbc230e8f24ac838598631d9366f23… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-01-26T10:11:46+01:00 ims_usrloc_scscf: missing assignment of record_route In update_subscriber() function, when the rs is assigned to the subs, it is missing the record_route component, which leads to core dump in some scenarios. (cherry picked from commit 595b8fe06165328366865328e43c14a9ca23c386) --- Modified: src/modules/ims_usrloc_scscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/acbc230e8f24ac838598631d9366f23… Patch: https://github.com/kamailio/kamailio/commit/acbc230e8f24ac838598631d9366f23… --- diff --git a/src/modules/ims_usrloc_scscf/subscribe.c b/src/modules/ims_usrloc_scscf/subscribe.c index 227d06d51a..a5bdf699d5 100644 --- a/src/modules/ims_usrloc_scscf/subscribe.c +++ b/src/modules/ims_usrloc_scscf/subscribe.c @@ -346,6 +346,7 @@ int update_subscriber(impurecord_t* urec, reg_subscriber** _reg_subscriber, int subs.callid = rs->call_id; subs.expires = rs->expires - act_time; subs.contact = rs->watcher_contact; + subs.record_route = rs->record_route; hash_code = core_hash(&subs.callid, &subs.to_tag, sub_dialog_hash_size);

1 0

[kamailio/kamailio] ims_usrloc_scscf: missing assignment of record_route (5.1) (#1414)
by Christoph VALENTIN 29 Jan '18

29 Jan '18

In update_subscriber() function, when the rs is assigned to the subs, it is missing the record_route component, which leads to core dump in some scenarios. (cherry picked from commit 595b8fe06165328366865328e43c14a9ca23c386)   #### 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) - [ ] 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  Changes cherry-picked from master branch, same title plus "(5.1)" You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1414 -- Commit Summary -- * ims_usrloc_scscf: missing assignment of record_route -- File Changes -- M src/modules/ims_usrloc_scscf/subscribe.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1414.patch https://github.com/kamailio/kamailio/pull/1414.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/1414

2 1

Re: [sr-dev] [kamailio/kamailio] json: add get_object API and fix str init (5fe8618)
by Daniel-Constantin Mierla 29 Jan '18

29 Jan '18

Looking at the code I think it is better to change the prototype of: ``` str _json_extract_field(struct json_object *json_obj, char *json_name) ``` to: ``` int _json_extract_field(struct json_object *json_obj, char *json_name, str *val) ``` Now it returns a variable declared on the stack, which could work with recent compilers, being returned by value. `str` itself is not a large structure, but returning structure values is not recommended in C, code analyzers complain about (same for passing a structure value as parameter -- it is recommended to use pointers). -- 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/5fe86186e2856ce5039c0133e1f53b6…

1 0

git:master:5fe86186: json: add get_object API and fix str init
by Emmanuel Schmidbauer 29 Jan '18

29 Jan '18

Module: kamailio Branch: master Commit: 5fe86186e2856ce5039c0133e1f53b62df2be485 URL: https://github.com/kamailio/kamailio/commit/5fe86186e2856ce5039c0133e1f53b6… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-29T07:32:11-07:00 json: add get_object API and fix str init --- Modified: src/modules/json/api.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5fe86186e2856ce5039c0133e1f53b6… Patch: https://github.com/kamailio/kamailio/commit/5fe86186e2856ce5039c0133e1f53b6… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h index 80d18c2c25..c900dd5c0d 100644 --- a/src/modules/json/api.h +++ b/src/modules/json/api.h @@ -25,11 +25,12 @@ #include "../../core/sr_module.h" typedef struct json_object *(*json_parse_f) (const char *str); -typedef str (*json_extract_field_f)( - struct json_object *json_obj, char *json_name); +typedef struct json_object *(*json_get_object_f) (struct json_object *json_obj, const char *str); +typedef str (*json_extract_field_f) (struct json_object *json_obj, char *json_name); typedef struct json_api { json_parse_f json_parse; + json_get_object_f get_object; json_extract_field_f extract_field; } json_api_t; diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index a008c13085..051da4dd59 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -65,9 +65,8 @@ struct module_exports exports = { 0 /* per-child init function */ }; -str _json_extract_field(struct json_object *json_obj, char *json_name) -{ - str val; +str _json_extract_field(struct json_object *json_obj, char *json_name) { + str val = {0, 0}; json_extract_field(json_name, val); return val; } @@ -81,6 +80,7 @@ int bind_json(json_api_t *api) { return -1; } api->json_parse = json_parse; + api->get_object = json_get_object; api->extract_field = _json_extract_field; return 0; }

1 0

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

29 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. Kindly, suggest me... 0(2832) ERROR: rtpengine [rtpengine.c:2566]: select_rtpp_set(): script error-invalid id_set to be selected 0(2832) ERROR: rtpengine [rtpengine.c:2566]: select_rtpp_set(): script error-invalid id_set to be selected 0(2832) NOTICE: rtpengine [rtpengine.c:1581]: mod_init(): Default rtpp set 0 NOT found 0(2832) WARNING: tm [tm.c:514]: fixup_routes(): t_on_failure("NATMANAGE"): empty/non existing route 0(2832) INFO: <core> [core/udp_server.c:153]: probe_max_receive_buffer(): SO_RCVBUF is initially 212992 0(2832) INFO: <core> [core/udp_server.c:205]: probe_max_receive_buffer(): SO_RCVBUF is finally 425984 0(2832) ERROR: <script>: event_route[htable:mod-init] { 4(2836) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 5(2837) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 3(2835) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 6(2838) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 7(2839) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 2(2834) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 8(2840) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 9(2841) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 12(2844) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 10(2842) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 11(2843) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 13(2845) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 14(2846) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 15(2847) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 1(2833) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 16(2848) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled root@debian:/home/debian-test# 17(2849) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp:127.0.0.1:2223> found, support for it enabled 18(2850) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 23(2855) WARNING: ims_usrloc_pcscf [usrloc_db.c:61]: connect_db(): DB connection already open... continuing 24(2856) WARNING: ims_usrloc_pcscf [usrloc_db.c:61]: connect_db(): DB connection already open... continuing 22(2854) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 24(2856) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 22(2854) INFO: jsonrpcs [jsonrpcs_sock.c:443]: jsonrpc_dgram_process(): a new child 0/2854 23(2855) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 21(2853) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 20(2852) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 20(2852) INFO: ctl [io_listener.c:210]: io_listen_loop(): io_listen_loop: using epoll_lt as the io watch method (auto detected) 19(2851) INFO: rtpengine [rtpengine.c:2412]: rtpp_test(): rtp proxy <udp: 127.0.0.1:2223> found, support for it enabled 24(2856) ERROR: <script>: Preloading NAT-PING. Rows: 2 24(2856) ERROR: <script>: OPTIONS to sip:alice@192.168.99.52:44667;transport=udp;registering_acc=koffee-ims_in via sip:192.168.99.52:44667... 24(2856) ERROR: <script>: OPTIONS to sip:alice@192.168.99.52:5060;transport=udp;registering_acc=koffee-ims_in via sip:192.168.99.52:5060... 4(2836) ERROR: <script>: REGISTER (sip:alice@koffee-ims.in ( 192.168.99.52:5060) to sip:alice@koffee-ims.in, e38b4463d2348ea1f3f9926a1ee5f704@0:0:0:0:0:0:0:0) 4(2836) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 4(2836) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 4(2836) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 4(2836) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 4(2836) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 6(2838) ERROR: <script>: REGISTER (sip:alice@koffee-ims.in ( 192.168.99.52:5060) to sip:alice@koffee-ims.in, e38b4463d2348ea1f3f9926a1ee5f704@0:0:0:0:0:0:0:0) 6(2838) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 6(2838) ERROR: ims_registrar_pcscf [save.c:342]: save_pending(): Error parsing sec-agree parameters: 4 6(2838) WARNING: ims_usrloc_pcscf [usrloc_db.c:420]: db_update_pcontact_security_temp(): not yet implemented or unknown security type 6(2838) ERROR: ims_usrloc_pcscf [udomain.c:586]: update_temp_security(): Error updating temp security for contact in DB 6(2838) ERROR: ims_registrar_pcscf [save.c:362]: save_pending(): Error updating temp security 8(2840) ERROR: <script>: SUBSCRIBE (sip:alice@koffee-ims.in ( 192.168.99.52:5060) to sip:alice@koffee-ims.in, aa9f02d325fb2b6defc5864b1e8fd76d@0:0:0:0:0:0:0:0) 8(2840) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 8(2840) INFO: ims_registrar_pcscf [service_routes.c:277]: getContactP(): Contact not found based on Contact-header, trying IP/Port/Proto 9(2841) ERROR: <script>: OPTIONS (sip:alice@koffee-ims.in ( 192.168.99.52:5060) to sip:alice@koffee-ims.in, 9d64ef64eefa0b048a1e5b532ac53e5d@0:0:0:0:0:0:0:0) 9(2841) INFO: rr [rr_mod.c:443]: pv_get_route_uri_f(): No route header present. 9(2841) INFO: ims_registrar_pcscf [service_routes.c:277]: getContactP(): Contact not found based on Contact-header, trying IP/Port/Proto 0(2832) ALERT: <core> [main.c:745]: handle_sigs(): child process 2855 exited by a signal 11 0(2832) ALERT: <core> [main.c:748]: handle_sigs(): core was generated 0(2832) INFO: <core> [main.c:771]: handle_sigs(): terminating due to SIGCHLD -- *Thanks,* *Prasannakumar Merugu9010028290*

1 0

Ann: Registration to Kamailio World 2018 is open!
by Daniel-Constantin Mierla 29 Jan '18

29 Jan '18

Hello, a quick note to the community forums to announce that the registration to next Kamailio World Conference (May 14-17, 2018, in Berlin, Germany) is now open! More details are available at: * https://www.kamailioworld.com/k06/registration/ In a matter of several days, we expect to publish the details about the first group of accepted speakers. Looking forward to meeting many of you in Berlin! 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

Errored: kamailio/kamailio#5447 (master - d40c65a)
by Travis CI 29 Jan '18

29 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5447 Status: Errored Duration: 12 minutes and 34 seconds Commit: d40c65a (master) Author: Daniel-Constantin Mierla Message: modules/ims*: Makefile updates - use KAMAILIO mod interface define - bits of updates in the comments View the changeset: https://github.com/kamailio/kamailio/compare/9f896a11d920...d40c65a9834d View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/334600997?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:d40c65a9: modules/ims*: Makefile updates
by Daniel-Constantin Mierla 29 Jan '18

29 Jan '18

Module: kamailio Branch: master Commit: d40c65a9834d6e0c12ee24e0fde5b75be94593e5 URL: https://github.com/kamailio/kamailio/commit/d40c65a9834d6e0c12ee24e0fde5b75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-29T09:14:40+01:00 modules/ims*: Makefile updates - use KAMAILIO mod interface define - bits of updates in the comments --- Modified: src/modules/ims_charging/Makefile Modified: src/modules/ims_diameter_server/Makefile Modified: src/modules/ims_icscf/Makefile Modified: src/modules/ims_qos/Makefile Modified: src/modules/ims_registrar_pcscf/Makefile Modified: src/modules/ims_registrar_scscf/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/d40c65a9834d6e0c12ee24e0fde5b75… Patch: https://github.com/kamailio/kamailio/commit/d40c65a9834d6e0c12ee24e0fde5b75… --- diff --git a/src/modules/ims_charging/Makefile b/src/modules/ims_charging/Makefile index 47767af2c7..3d95425135 100644 --- a/src/modules/ims_charging/Makefile +++ b/src/modules/ims_charging/Makefile @@ -8,7 +8,7 @@ auto_gen= NAME=ims_charging.so LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_diameter_server/Makefile b/src/modules/ims_diameter_server/Makefile index cc7a9fd702..e9c454dd71 100644 --- a/src/modules/ims_diameter_server/Makefile +++ b/src/modules/ims_diameter_server/Makefile @@ -1,14 +1,14 @@ # -# ims_qos make file +# ims_diameter_server make file +# # -# include ../../Makefile.defs auto_gen= NAME=ims_diameter_server.so LIBS=-lm -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_icscf/Makefile b/src/modules/ims_icscf/Makefile index 2a1490699e..0e8e2486a2 100644 --- a/src/modules/ims_icscf/Makefile +++ b/src/modules/ims_icscf/Makefile @@ -20,7 +20,7 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif -DEFS += -DOPENSER_MOD_INTERFACE +DEFS += -DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 diff --git a/src/modules/ims_qos/Makefile b/src/modules/ims_qos/Makefile index 1aec80850d..86d1646691 100644 --- a/src/modules/ims_qos/Makefile +++ b/src/modules/ims_qos/Makefile @@ -8,7 +8,7 @@ auto_gen= NAME=ims_qos.so LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_registrar_pcscf/Makefile b/src/modules/ims_registrar_pcscf/Makefile index a02fa4a88a..8de914fbb2 100644 --- a/src/modules/ims_registrar_pcscf/Makefile +++ b/src/modules/ims_registrar_pcscf/Makefile @@ -1,5 +1,5 @@ # -# registrar module makefile +# ims registrar module makefile # # # WARNING: do not run this directly, it should be run by the master Makefile @@ -26,7 +26,7 @@ ifneq ($(OS),darwin) LIBS += -lpthread endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_registrar_scscf/Makefile b/src/modules/ims_registrar_scscf/Makefile index 77fe9c2fe2..34e738a275 100644 --- a/src/modules/ims_registrar_scscf/Makefile +++ b/src/modules/ims_registrar_scscf/Makefile @@ -1,5 +1,5 @@ # -# registrar module makefile +# ims registrar module makefile # # # WARNING: do not run this directly, it should be run by the master Makefile @@ -21,7 +21,7 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims

1 0

git:master:072b9adc: utils: kamdbctl - version set to 5.2.0
by Daniel-Constantin Mierla 29 Jan '18

29 Jan '18

Module: kamailio Branch: master Commit: 072b9adcb267d8ff21d356bdcd57881d9576c336 URL: https://github.com/kamailio/kamailio/commit/072b9adcb267d8ff21d356bdcd57881… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-29T09:11:24+01:00 utils: kamdbctl - version set to 5.2.0 --- Modified: utils/kamctl/kamdbctl --- Diff: https://github.com/kamailio/kamailio/commit/072b9adcb267d8ff21d356bdcd57881… Patch: https://github.com/kamailio/kamailio/commit/072b9adcb267d8ff21d356bdcd57881… --- diff --git a/utils/kamctl/kamdbctl b/utils/kamctl/kamdbctl index 224111b9fb..dece5b60c5 100755 --- a/utils/kamctl/kamdbctl +++ b/utils/kamctl/kamdbctl @@ -1,11 +1,11 @@ -#!/bin/bash +#!/bin/bash # # control tool for maintaining Kamailio databases # #=================================================================== ### version for this script -VERSION='4.4.0' +VERSION='5.2.0' PATH=$PATH:/usr/local/sbin/

1 0

Errored: kamailio/kamailio#5446 (master - 9f896a1)
by Travis CI 28 Jan '18

28 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5446 Status: Errored Duration: 11 minutes and 3 seconds Commit: 9f896a1 (master) Author: Daniel-Constantin Mierla Message: utils/kamctl: version set to 5.2.0 View the changeset: https://github.com/kamailio/kamailio/compare/014958e62302...9f896a11d920 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/334426881?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:9f896a11: utils/kamctl: version set to 5.2.0
by Daniel-Constantin Mierla 28 Jan '18

28 Jan '18

Module: kamailio Branch: master Commit: 9f896a11d920523ab3616b8cae795cb44aaf6328 URL: https://github.com/kamailio/kamailio/commit/9f896a11d920523ab3616b8cae795cb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-28T18:56:44+01:00 utils/kamctl: version set to 5.2.0 --- Modified: utils/kamctl/kamctl --- Diff: https://github.com/kamailio/kamailio/commit/9f896a11d920523ab3616b8cae795cb… Patch: https://github.com/kamailio/kamailio/commit/9f896a11d920523ab3616b8cae795cb… --- diff --git a/utils/kamctl/kamctl b/utils/kamctl/kamctl index f82f6f540a..de667187d6 100755 --- a/utils/kamctl/kamctl +++ b/utils/kamctl/kamctl @@ -5,7 +5,7 @@ #=================================================================== ### version for this script -VERSION='5.0.0' +VERSION='5.2.0' PATH=$PATH:/usr/local/sbin/

1 0

Errored: kamailio/kamailio#5444 (master - 2f04f05)
by Travis CI 27 Jan '18

27 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5444 Status: Errored Duration: 10 minutes and 47 seconds Commit: 2f04f05 (master) Author: Daniel-Constantin Mierla Message: Merge pull request #1416 from kamailio/json-api json: add API for json_parse and json_extract_field View the changeset: https://github.com/kamailio/kamailio/compare/038c3f16d9a8...2f04f057c503 View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/334120210?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:014958e6: modules/ims*: define KAMAILIO_MOD_INTERFACE instead of the old variant
by Daniel-Constantin Mierla 27 Jan '18

27 Jan '18

Module: kamailio Branch: master Commit: 014958e62302819630ead306baa8e765b062196f URL: https://github.com/kamailio/kamailio/commit/014958e62302819630ead306baa8e76… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-27T16:26:04+01:00 modules/ims*: define KAMAILIO_MOD_INTERFACE instead of the old variant --- Modified: src/modules/ims_auth/Makefile Modified: src/modules/ims_isc/Makefile Modified: src/modules/ims_ocs/Makefile Modified: src/modules/ims_usrloc_pcscf/Makefile Modified: src/modules/ims_usrloc_scscf/Makefile --- Diff: https://github.com/kamailio/kamailio/commit/014958e62302819630ead306baa8e76… Patch: https://github.com/kamailio/kamailio/commit/014958e62302819630ead306baa8e76… --- diff --git a/src/modules/ims_auth/Makefile b/src/modules/ims_auth/Makefile index 967adddc90..1b44fef604 100644 --- a/src/modules/ims_auth/Makefile +++ b/src/modules/ims_auth/Makefile @@ -25,7 +25,7 @@ ifneq ($(OS),darwin) LIBS += -lrt endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_isc/Makefile b/src/modules/ims_isc/Makefile index 1fe2ee4ab0..828a6d0673 100644 --- a/src/modules/ims_isc/Makefile +++ b/src/modules/ims_isc/Makefile @@ -1,7 +1,7 @@ # # ims_isc make file # -# +# include ../../Makefile.defs auto_gen= @@ -20,7 +20,7 @@ else LIBS+=-L$(LOCALBASE)/lib -lxml2 endif -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_ocs/Makefile b/src/modules/ims_ocs/Makefile index e4b03f10ec..9efb049f4b 100644 --- a/src/modules/ims_ocs/Makefile +++ b/src/modules/ims_ocs/Makefile @@ -1,5 +1,5 @@ # -# ims_qos make file +# ims_ocs make file # # @@ -8,7 +8,7 @@ auto_gen= NAME=ims_ocs.so LIBS= -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/ims/kamailio_ims diff --git a/src/modules/ims_usrloc_pcscf/Makefile b/src/modules/ims_usrloc_pcscf/Makefile index 0c156de9f2..0b3acb1629 100644 --- a/src/modules/ims_usrloc_pcscf/Makefile +++ b/src/modules/ims_usrloc_pcscf/Makefile @@ -8,7 +8,7 @@ include ../../Makefile.defs auto_gen= NAME=ims_usrloc_pcscf.so -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 diff --git a/src/modules/ims_usrloc_scscf/Makefile b/src/modules/ims_usrloc_scscf/Makefile index 0c7556fb2c..3a45896f5f 100644 --- a/src/modules/ims_usrloc_scscf/Makefile +++ b/src/modules/ims_usrloc_scscf/Makefile @@ -8,7 +8,7 @@ include ../../Makefile.defs auto_gen= NAME=ims_usrloc_scscf.so -DEFS+=-DOPENSER_MOD_INTERFACE +DEFS+=-DKAMAILIO_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1

1 0

git:master:2f04f057: Merge pull request #1416 from kamailio/json-api
by GitHub 27 Jan '18

27 Jan '18

Module: kamailio Branch: master Commit: 2f04f057c50344b6e204862b40e2bab83431912f URL: https://github.com/kamailio/kamailio/commit/2f04f057c50344b6e204862b40e2bab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-27T16:22:19+01:00 Merge pull request #1416 from kamailio/json-api json: add API for json_parse and json_extract_field --- Added: src/modules/json/api.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/2f04f057c50344b6e204862b40e2bab… Patch: https://github.com/kamailio/kamailio/commit/2f04f057c50344b6e204862b40e2bab… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h new file mode 100644 index 0000000000..80d18c2c25 --- /dev/null +++ b/src/modules/json/api.h @@ -0,0 +1,57 @@ +/** + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _JSON_API_H_ +#define _JSON_API_H_ + +#include "../../core/sr_module.h" + +typedef struct json_object *(*json_parse_f) (const char *str); +typedef str (*json_extract_field_f)( + struct json_object *json_obj, char *json_name); + +typedef struct json_api { + json_parse_f json_parse; + json_extract_field_f extract_field; +} json_api_t; + +typedef int (*bind_json_f) (json_api_t *api); +int bind_json(json_api_t *api); + +/** + * @brief Load the JSON API + */ +static inline int json_load_api(json_api_t *api) { + bind_json_f bindjson; + + bindjson = (bind_json_f)find_export("bind_json", 0, 0); + if (bindjson == 0) { + LM_ERR("cannot find bind_json\n"); + return -1; + } + if (bindjson(api) < 0) { + LM_ERR("cannot bind json api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 4ab9ab1829..a008c13085 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -27,6 +27,7 @@ #include "../../core/mod_fix.h" #include "../../core/sr_module.h" +#include "api.h" #include "json_funcs.h" #include "json_trans.h" @@ -41,11 +42,11 @@ char tr_json_escape_char = '%'; static tr_export_t mod_trans[] = { {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; -static cmd_export_t cmds[]={ - {"json_get_field", (cmd_function)json_get_field, 3, - fixup_get_field, fixup_get_field_free, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; +static cmd_export_t cmds[] = { + {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { {"json_escape_char", PARAM_STR, &tr_json_escape_str}, {0, 0, 0}}; @@ -64,6 +65,26 @@ struct module_exports exports = { 0 /* per-child init function */ }; +str _json_extract_field(struct json_object *json_obj, char *json_name) +{ + str val; + json_extract_field(json_name, val); + return val; +} + +/** + * + */ +int bind_json(json_api_t *api) { + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->json_parse = json_parse; + api->extract_field = _json_extract_field; + return 0; +} + int mod_register(char *path, int *dlflags, void *p1, void *p2) { if(json_tr_init_buffers() < 0) {

1 0

git:master:a9b8682f: json: add API
by Emmanuel Schmidbauer 27 Jan '18

27 Jan '18

Module: kamailio Branch: master Commit: a9b8682f522f46c56144e61ff029cb1ab0413274 URL: https://github.com/kamailio/kamailio/commit/a9b8682f522f46c56144e61ff029cb1… Author: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Committer: Emmanuel Schmidbauer <emmanuel(a)getweave.com> Date: 2018-01-26T09:20:40-07:00 json: add API --- Added: src/modules/json/api.h Modified: src/modules/json/json_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a9b8682f522f46c56144e61ff029cb1… Patch: https://github.com/kamailio/kamailio/commit/a9b8682f522f46c56144e61ff029cb1… --- diff --git a/src/modules/json/api.h b/src/modules/json/api.h new file mode 100644 index 0000000000..80d18c2c25 --- /dev/null +++ b/src/modules/json/api.h @@ -0,0 +1,57 @@ +/** + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef _JSON_API_H_ +#define _JSON_API_H_ + +#include "../../core/sr_module.h" + +typedef struct json_object *(*json_parse_f) (const char *str); +typedef str (*json_extract_field_f)( + struct json_object *json_obj, char *json_name); + +typedef struct json_api { + json_parse_f json_parse; + json_extract_field_f extract_field; +} json_api_t; + +typedef int (*bind_json_f) (json_api_t *api); +int bind_json(json_api_t *api); + +/** + * @brief Load the JSON API + */ +static inline int json_load_api(json_api_t *api) { + bind_json_f bindjson; + + bindjson = (bind_json_f)find_export("bind_json", 0, 0); + if (bindjson == 0) { + LM_ERR("cannot find bind_json\n"); + return -1; + } + if (bindjson(api) < 0) { + LM_ERR("cannot bind json api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/src/modules/json/json_mod.c b/src/modules/json/json_mod.c index 4ab9ab1829..a008c13085 100644 --- a/src/modules/json/json_mod.c +++ b/src/modules/json/json_mod.c @@ -27,6 +27,7 @@ #include "../../core/mod_fix.h" #include "../../core/sr_module.h" +#include "api.h" #include "json_funcs.h" #include "json_trans.h" @@ -41,11 +42,11 @@ char tr_json_escape_char = '%'; static tr_export_t mod_trans[] = { {{"json", sizeof("json") - 1}, json_tr_parse}, {{0, 0}, 0}}; -static cmd_export_t cmds[]={ - {"json_get_field", (cmd_function)json_get_field, 3, - fixup_get_field, fixup_get_field_free, ANY_ROUTE}, - {0, 0, 0, 0, 0, 0} -}; +static cmd_export_t cmds[] = { + {"json_get_field", (cmd_function)json_get_field, 3, fixup_get_field, + fixup_get_field_free, ANY_ROUTE}, + {"bind_json", (cmd_function)bind_json, 0, 0, 0, ANY_ROUTE}, + {0, 0, 0, 0, 0, 0}}; static param_export_t params[] = { {"json_escape_char", PARAM_STR, &tr_json_escape_str}, {0, 0, 0}}; @@ -64,6 +65,26 @@ struct module_exports exports = { 0 /* per-child init function */ }; +str _json_extract_field(struct json_object *json_obj, char *json_name) +{ + str val; + json_extract_field(json_name, val); + return val; +} + +/** + * + */ +int bind_json(json_api_t *api) { + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->json_parse = json_parse; + api->extract_field = _json_extract_field; + return 0; +} + int mod_register(char *path, int *dlflags, void *p1, void *p2) { if(json_tr_init_buffers() < 0) {

1 0

[kamailio/kamailio] json: add API for json_parse and json_extract_field (#1416)
by Emmanuel Schmidbauer 27 Jan '18

27 Jan '18

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1416 -- Commit Summary -- * json: add API -- File Changes -- A src/modules/json/api.h (57) M src/modules/json/json_mod.c (31) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1416.patch https://github.com/kamailio/kamailio/pull/1416.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/1416

2 1

git:master:038c3f16: Merge pull request #1413 from armenb/ws_check_bounds_before_reading_mask
by GitHub 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 038c3f16d9a8371f00b1b8e34d37d6509465a471 URL: https://github.com/kamailio/kamailio/commit/038c3f16d9a8371f00b1b8e34d37d65… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-26T08:50:54+01:00 Merge pull request #1413 from armenb/ws_check_bounds_before_reading_mask websocket: check bounds before reading mask --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/038c3f16d9a8371f00b1b8e34d37d65… Patch: https://github.com/kamailio/kamailio/commit/038c3f16d9a8371f00b1b8e34d37d65… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 2739ecbc11..2d7ca8ec5a 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -470,13 +470,6 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, } else mask_start = 2; - /* Decode mask */ - frame->masking_key[0] = (buf[mask_start + 0] & 0xff); - frame->masking_key[1] = (buf[mask_start + 1] & 0xff); - frame->masking_key[2] = (buf[mask_start + 2] & 0xff); - frame->masking_key[3] = (buf[mask_start + 3] & 0xff); - - /* Decode and unmask payload */ if((unsigned long long)len != (unsigned long long)frame->payload_len + mask_start + 4) { LM_WARN("message not complete frame size %u but received %u\n", @@ -492,7 +485,15 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, *err_text = str_status_message_too_big; return -1; } + /* Decode mask */ + frame->masking_key[0] = (buf[mask_start + 0] & 0xff); + frame->masking_key[1] = (buf[mask_start + 1] & 0xff); + frame->masking_key[2] = (buf[mask_start + 2] & 0xff); + frame->masking_key[3] = (buf[mask_start + 3] & 0xff); + frame->payload_data = &buf[mask_start + 4]; + + /* Decode and unmask payload */ for(i = 0; i < frame->payload_len; i++) { j = i % 4; frame->payload_data[i] = frame->payload_data[i] ^ frame->masking_key[j];

1 0

git:master:4fabe253: websocket: check bounds before reading mask
by Armen Babikyan 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 4fabe253a1eb0f9b494521cfa98365523a93adcf URL: https://github.com/kamailio/kamailio/commit/4fabe253a1eb0f9b494521cfa983655… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2018-01-25T17:43:33-08:00 websocket: check bounds before reading mask --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/4fabe253a1eb0f9b494521cfa983655… Patch: https://github.com/kamailio/kamailio/commit/4fabe253a1eb0f9b494521cfa983655… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 9bc3268601..32a1f4bf6a 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -470,13 +470,6 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, } else mask_start = 2; - /* Decode mask */ - frame->masking_key[0] = (buf[mask_start + 0] & 0xff); - frame->masking_key[1] = (buf[mask_start + 1] & 0xff); - frame->masking_key[2] = (buf[mask_start + 2] & 0xff); - frame->masking_key[3] = (buf[mask_start + 3] & 0xff); - - /* Decode and unmask payload */ if((unsigned long long)len != (unsigned long long)frame->payload_len + mask_start + 4) { LM_WARN("message not complete frame size %u but received %u\n", @@ -492,7 +485,15 @@ static int decode_and_validate_ws_frame(ws_frame_t *frame, *err_text = str_status_message_too_big; return -1; } + /* Decode mask */ + frame->masking_key[0] = (buf[mask_start + 0] & 0xff); + frame->masking_key[1] = (buf[mask_start + 1] & 0xff); + frame->masking_key[2] = (buf[mask_start + 2] & 0xff); + frame->masking_key[3] = (buf[mask_start + 3] & 0xff); + frame->payload_data = &buf[mask_start + 4]; + + /* Decode and unmask payload */ for(i = 0; i < frame->payload_len; i++) { j = i % 4; frame->payload_data[i] = frame->payload_data[i] ^ frame->masking_key[j];

1 0

[kamailio/kamailio] websocket: check bounds before reading mask (#1413)
by Armen Babikyan 26 Jan '18

26 Jan '18

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1413 -- Commit Summary -- * websocket: check bounds before reading mask -- File Changes -- M src/modules/websocket/ws_frame.c (15) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1413.patch https://github.com/kamailio/kamailio/pull/1413.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/1413

2 2

git:master:9811e318: Merge pull request #1412 from armenb/ws_cid85650_fix
by GitHub 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 9811e318359b3099c3b1d7dff3673b642f8ccd0a URL: https://github.com/kamailio/kamailio/commit/9811e318359b3099c3b1d7dff3673b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-26T08:50:16+01:00 Merge pull request #1412 from armenb/ws_cid85650_fix websocket: handle unrecognized subprotocol better --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/9811e318359b3099c3b1d7dff3673b6… Patch: https://github.com/kamailio/kamailio/commit/9811e318359b3099c3b1d7dff3673b6… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 9bc3268601..2739ecbc11 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -678,6 +678,9 @@ int ws_frame_receive(sr_event_param_t *evp) return -1; } + } else { + LM_ERR("Unrecognized WebSocket subprotocol: %u\n", frame.wsc->sub_protocol); + return -1; } case OPCODE_CLOSE:

1 0

[kamailio/kamailio] websocket: handle unrecognized subprotocol better (#1412)
by Armen Babikyan 26 Jan '18

26 Jan '18

#### 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  You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1412 -- Commit Summary -- * websocket: handle unrecognized subprotocol better -- File Changes -- M src/modules/websocket/ws_frame.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1412.patch https://github.com/kamailio/kamailio/pull/1412.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/1412

2 2

git:master:91c38814: websocket: handle unrecognized subprotocol better
by Armen Babikyan 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 91c388147a9328743582a92c6f1184141aa268fb URL: https://github.com/kamailio/kamailio/commit/91c388147a9328743582a92c6f11841… Author: Armen Babikyan <armen(a)firespotter.com> Committer: Armen Babikyan <armen(a)firespotter.com> Date: 2018-01-25T17:20:35-08:00 websocket: handle unrecognized subprotocol better --- Modified: src/modules/websocket/ws_frame.c --- Diff: https://github.com/kamailio/kamailio/commit/91c388147a9328743582a92c6f11841… Patch: https://github.com/kamailio/kamailio/commit/91c388147a9328743582a92c6f11841… --- diff --git a/src/modules/websocket/ws_frame.c b/src/modules/websocket/ws_frame.c index 9bc3268601..2739ecbc11 100644 --- a/src/modules/websocket/ws_frame.c +++ b/src/modules/websocket/ws_frame.c @@ -678,6 +678,9 @@ int ws_frame_receive(sr_event_param_t *evp) return -1; } + } else { + LM_ERR("Unrecognized WebSocket subprotocol: %u\n", frame.wsc->sub_protocol); + return -1; } case OPCODE_CLOSE:

1 0

git:master:1caf97ee: usrloc: proper condition when using rm_expired_delay
by Daniel-Constantin Mierla 26 Jan '18

26 Jan '18

Module: kamailio Branch: master Commit: 1caf97eee90fa5711b60f5cb7bf3a21a0144d4b6 URL: https://github.com/kamailio/kamailio/commit/1caf97eee90fa5711b60f5cb7bf3a21… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-26T08:41:19+01:00 usrloc: proper condition when using rm_expired_delay --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/1caf97eee90fa5711b60f5cb7bf3a21… Patch: https://github.com/kamailio/kamailio/commit/1caf97eee90fa5711b60f5cb7bf3a21… --- diff --git a/src/modules/usrloc/udomain.c b/src/modules/usrloc/udomain.c index a3d948ad0b..8f5bfe3061 100644 --- a/src/modules/usrloc/udomain.c +++ b/src/modules/usrloc/udomain.c @@ -902,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_rm_expired_delay); + UL_DB_EXPIRES_SET(&vals[0], act_time + 1 - ul_rm_expired_delay); keys[1] = &expires_col; ops[1] = OP_NEQ;

1 0

git:master:f3064c68: modules: readme files regenerated - presence ... [skip ci]
by Kamailio Dev 25 Jan '18

25 Jan '18

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

1 0

git:master:67bc67c5: Merge pull request #1402 from kamailio/cchance/presence_dmq
by GitHub 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 67bc67c5487f29b6771d07ddd9e45cad5da46d43 URL: https://github.com/kamailio/kamailio/commit/67bc67c5487f29b6771d07ddd9e45ca… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-25T18:39:28Z Merge pull request #1402 from kamailio/cchance/presence_dmq presence: dmq integration --- Added: src/modules/presence/presence_dmq.c Added: src/modules/presence/presence_dmq.h Modified: src/lib/srdb1/schema/pr_presentity.xml Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/presence/Makefile Modified: src/modules/presence/doc/presence_admin.xml Modified: src/modules/presence/notify.c Modified: src/modules/presence/notify.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c Modified: utils/kamctl/db_berkeley/kamailio/presentity Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/dbtext/kamailio/presentity Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/presentity.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/presence-mod Modified: utils/kamctl/xhttp_pi/presence-table --- Diff: https://github.com/kamailio/kamailio/commit/67bc67c5487f29b6771d07ddd9e45ca… Patch: https://github.com/kamailio/kamailio/commit/67bc67c5487f29b6771d07ddd9e45ca…

1 0

git:master:a4034c1d: kamctl: regenerated db scripts to include presentity ruid column
by Charles Chance 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: a4034c1d087b1c87f4dd712554a2a6f6fa184d86 URL: https://github.com/kamailio/kamailio/commit/a4034c1d087b1c87f4dd712554a2a6f… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-01-24T14:20:53Z kamctl: regenerated db scripts to include presentity ruid column --- Modified: utils/kamctl/db_berkeley/kamailio/presentity Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/db_sqlite/presence-create.sql Modified: utils/kamctl/dbtext/kamailio/presentity Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/mongodb/kamailio/presentity.json Modified: utils/kamctl/mongodb/kamailio/version-create.mongo Modified: utils/kamctl/mysql/presence-create.sql Modified: utils/kamctl/oracle/presence-create.sql Modified: utils/kamctl/postgres/presence-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/presence-mod Modified: utils/kamctl/xhttp_pi/presence-table --- Diff: https://github.com/kamailio/kamailio/commit/a4034c1d087b1c87f4dd712554a2a6f… Patch: https://github.com/kamailio/kamailio/commit/a4034c1d087b1c87f4dd712554a2a6f…

1 0

git:master:3fc1da64: presence: added enable_dmq parameter to module docs
by Charles Chance 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 3fc1da644a6b375fc45ea17cbcf81643f70db545 URL: https://github.com/kamailio/kamailio/commit/3fc1da644a6b375fc45ea17cbcf8164… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-01-24T14:21:30Z presence: added enable_dmq parameter to module docs --- Modified: src/modules/presence/doc/presence_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/3fc1da644a6b375fc45ea17cbcf8164… Patch: https://github.com/kamailio/kamailio/commit/3fc1da644a6b375fc45ea17cbcf8164… --- diff --git a/src/modules/presence/doc/presence_admin.xml b/src/modules/presence/doc/presence_admin.xml index 0bedc37741..aa10dff34c 100644 --- a/src/modules/presence/doc/presence_admin.xml +++ b/src/modules/presence/doc/presence_admin.xml @@ -62,6 +62,11 @@ <emphasis>tm</emphasis>. </para> </listitem> + <listitem> + <para> + <emphasis>dmq (only if replication is enabled)</emphasis>. + </para> + </listitem> </itemizedlist> </para> </section> @@ -897,6 +902,33 @@ modparam("presence", "retrieve_order_by", "priority, received_time") </example> </section> +<section id="presence.p.enable_dmq"> + <title><varname>enable_dmq</varname> (integer)</title> + <para> + If set to 1, will enable DMQ replication of presentities between nodes. Use this instead of a shared DB + to share state across a cluster and update local watchers in realtime (subs_db_mode < 3) or on next + notifier run (subs_db_mode = 3). + </para> + <para> + <emphasis> + If this parameter is enabled, the DMQ module must be loaded first - otherwise, startup will fail. + </emphasis> + </para> + <para> + <emphasis> + Default value is 0. + </emphasis> + </para> + <example> + <title>Set <varname>enable_dmq</varname> parameter</title> + <programlisting format="linespecific"> + ... + modparam("presence", "enable_dmq", 1) + ... + </programlisting> + </example> +</section> + </section> <section>

1 0

git:master:acd42263: schema: add ruid column to presentity table
by Charles Chance 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: acd42263ea1e648f2f5789f993a63de1f05f8b1b URL: https://github.com/kamailio/kamailio/commit/acd42263ea1e648f2f5789f993a63de… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-01-24T14:19:20Z schema: add ruid column to presentity table --- Modified: src/lib/srdb1/schema/pr_presentity.xml --- Diff: https://github.com/kamailio/kamailio/commit/acd42263ea1e648f2f5789f993a63de… Patch: https://github.com/kamailio/kamailio/commit/acd42263ea1e648f2f5789f993a63de… --- diff --git a/src/lib/srdb1/schema/pr_presentity.xml b/src/lib/srdb1/schema/pr_presentity.xml index c994a62c9c..3d525f7f92 100644 --- a/src/lib/srdb1/schema/pr_presentity.xml +++ b/src/lib/srdb1/schema/pr_presentity.xml @@ -9,7 +9,7 @@ <table id="presentity" xmlns:db="http://docbook.org/ns/docbook"> <name>presentity</name> - <version>4</version> + <version>5</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para> @@ -98,6 +98,14 @@ <description>Priority of the record</description> </column> + <column id="ruid"> + <name>ruid</name> + <type>string</type> + <size>64</size> + <null/> + <description>Record internal unique id</description> + </column> + <index> <name>presentity_idx</name> <colref linkend="username"/> @@ -107,6 +115,12 @@ <unique/> </index> + <index> + <name>ruid_idx</name> + <colref linkend="ruid"/> + <unique/> + </index> + <index> <name>presentity_expires</name> <colref linkend="expires"/>

1 0

git:master:b7a5016c: presence: dmq integration
by Charles Chance 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: b7a5016cdbdb068fe23dc1a5d74aa01643c8ec20 URL: https://github.com/kamailio/kamailio/commit/b7a5016cdbdb068fe23dc1a5d74aa01… Author: Charles Chance <charles.chance(a)sipcentric.com> Committer: Charles Chance <charles.chance(a)sipcentric.com> Date: 2018-01-24T14:17:37Z presence: dmq integration - initial implementation - replication of presentity updates over DMQ - adds ruid column for matching across cluster --- Added: src/modules/presence/presence_dmq.c Added: src/modules/presence/presence_dmq.h Modified: src/modules/dmq/dmq.c Modified: src/modules/dmq/dmqnode.c Modified: src/modules/dmq/dmqnode.h Modified: src/modules/presence/Makefile Modified: src/modules/presence/notify.c Modified: src/modules/presence/notify.h Modified: src/modules/presence/presence.c Modified: src/modules/presence/presence.h Modified: src/modules/presence/presentity.c Modified: src/modules/presence/presentity.h Modified: src/modules/presence/publish.c --- Diff: https://github.com/kamailio/kamailio/commit/b7a5016cdbdb068fe23dc1a5d74aa01… Patch: https://github.com/kamailio/kamailio/commit/b7a5016cdbdb068fe23dc1a5d74aa01…

1 0

[kamailio/kamailio] presence: dmq integration (#1402)
by Charles Chance 25 Jan '18

25 Jan '18

Enabled via module parameter. First commit: - initial implementation - replication of presentity updates over DMQ - adds ruid column for matching across cluster Tested and in use across small production cluster (‘dialog’ and ‘message-summary’ events). Need to update docs prior to merging but raising PR first to hear any feedback. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1402 -- Commit Summary -- * presence: dmq integration -- File Changes -- M src/modules/dmq/dmq.c (2) M src/modules/dmq/dmqnode.c (8) M src/modules/dmq/dmqnode.h (2) M src/modules/presence/Makefile (1) M src/modules/presence/notify.c (1) M src/modules/presence/notify.h (1) M src/modules/presence/presence.c (20) M src/modules/presence/presence.h (4) A src/modules/presence/presence_dmq.c (489) A src/modules/presence/presence_dmq.h (50) M src/modules/presence/presentity.c (270) M src/modules/presence/presentity.h (8) M src/modules/presence/publish.c (10) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1402.patch https://github.com/kamailio/kamailio/pull/1402.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/1402

3 14

git:master:97fd1100: Merge pull request #1410 from christoph-v/missing_record_route_assignment
by GitHub 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 97fd1100b0bb4a33ad010d270404c25b3849873b URL: https://github.com/kamailio/kamailio/commit/97fd1100b0bb4a33ad010d270404c25… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-25T16:58:26+01:00 Merge pull request #1410 from christoph-v/missing_record_route_assignment ims_usrloc_scscf: missing assignment of record_route --- Modified: src/modules/ims_usrloc_scscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/97fd1100b0bb4a33ad010d270404c25… Patch: https://github.com/kamailio/kamailio/commit/97fd1100b0bb4a33ad010d270404c25… --- diff --git a/src/modules/ims_usrloc_scscf/subscribe.c b/src/modules/ims_usrloc_scscf/subscribe.c index 227d06d51a..a5bdf699d5 100644 --- a/src/modules/ims_usrloc_scscf/subscribe.c +++ b/src/modules/ims_usrloc_scscf/subscribe.c @@ -346,6 +346,7 @@ int update_subscriber(impurecord_t* urec, reg_subscriber** _reg_subscriber, int subs.callid = rs->call_id; subs.expires = rs->expires - act_time; subs.contact = rs->watcher_contact; + subs.record_route = rs->record_route; hash_code = core_hash(&subs.callid, &subs.to_tag, sub_dialog_hash_size);

1 0

git:master:595b8fe0: ims_usrloc_scscf: missing assignment of record_route
by Christoph Valentin 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 595b8fe06165328366865328e43c14a9ca23c386 URL: https://github.com/kamailio/kamailio/commit/595b8fe06165328366865328e43c14a… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-01-25T13:37:59+01:00 ims_usrloc_scscf: missing assignment of record_route In update_subscriber() function, when the rs is assigned to the subs, it is missing the record_route component, which leads to core dump in some scenarios. --- Modified: src/modules/ims_usrloc_scscf/subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/595b8fe06165328366865328e43c14a… Patch: https://github.com/kamailio/kamailio/commit/595b8fe06165328366865328e43c14a… --- diff --git a/src/modules/ims_usrloc_scscf/subscribe.c b/src/modules/ims_usrloc_scscf/subscribe.c index 227d06d51a..a5bdf699d5 100644 --- a/src/modules/ims_usrloc_scscf/subscribe.c +++ b/src/modules/ims_usrloc_scscf/subscribe.c @@ -346,6 +346,7 @@ int update_subscriber(impurecord_t* urec, reg_subscriber** _reg_subscriber, int subs.callid = rs->call_id; subs.expires = rs->expires - act_time; subs.contact = rs->watcher_contact; + subs.record_route = rs->record_route; hash_code = core_hash(&subs.callid, &subs.to_tag, sub_dialog_hash_size);

1 0

[kamailio/kamailio] ims_usrloc_scscf: missing assignment of record_route (#1410)
by Christoph VALENTIN 25 Jan '18

25 Jan '18

In update_subscriber() function, when the rs is assigned to the subs, it is missing the record_route component, which leads to core dump in some scenarios.   #### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Without this bugfix, a core dump can happen during SIP REGISTER in S-CSCF. Reason: the record_route component was forgotten to be assigned when assigning rs to Subs in the update_subscriber() function. This assignment was added. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1410 -- Commit Summary -- * ims_usrloc_scscf: missing assignment of record_route -- File Changes -- M src/modules/ims_usrloc_scscf/subscribe.c (1) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1410.patch https://github.com/kamailio/kamailio/pull/1410.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/1410

2 1

git:master:6d67bf0e: Merge pull request #1411 from christoph-v/wrong_query_buffer_assignment
by GitHub 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 6d67bf0ed3451fa16bf98d0984af85f25c4c1b56 URL: https://github.com/kamailio/kamailio/commit/6d67bf0ed3451fa16bf98d0984af85f… Author: ng-voice GmbH <info(a)ng-voice.com> Committer: GitHub <noreply(a)github.com> Date: 2018-01-25T16:57:56+01:00 Merge pull request #1411 from christoph-v/wrong_query_buffer_assignment ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() --- Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/6d67bf0ed3451fa16bf98d0984af85f… Patch: https://github.com/kamailio/kamailio/commit/6d67bf0ed3451fa16bf98d0984af85f… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index e1a7d4287e..b5301e0a3b 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -1079,7 +1079,7 @@ int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) { } - query_buffer_len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); + query_buffer.len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); LM_DBG("QUERY IS [%.*s] and len is %d\n", query_buffer.len, query_buffer.s, query_buffer.len); if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) {

1 0

[kamailio/kamailio] ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() (#1411)
by Christoph VALENTIN 25 Jan '18

25 Jan '18

When writing to query_buffer with the help of the snprintf() function, the result of the functio is written to variable query_buffer_len instead of to the query_buffer.len itself. This leads to core dump in some cases. Replaced "_" by "." in "query_buffer_len ="   #### 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  When linking a Contact to an IMPU during SIP REGISTER in S-CSCF, a core dump can happen due to missing assignment of length to query_buffer. Added the assignment. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1411 -- Commit Summary -- * ims_usrloc_scscf: assignment of length missing for query_buffer in -- File Changes -- M src/modules/ims_usrloc_scscf/usrloc_db.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1411.patch https://github.com/kamailio/kamailio/pull/1411.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/1411

2 1

git:master:11c179ab: ims_usrloc_scscf: assignment of length missing for query_buffer in
by Christoph Valentin 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 11c179ab232222f1c78f19557032afd49bef7324 URL: https://github.com/kamailio/kamailio/commit/11c179ab232222f1c78f19557032afd… Author: Christoph Valentin <christoph.valentin(a)kapsch.net> Committer: Christoph Valentin <christoph.valentin(a)kapsch.net> Date: 2018-01-25T13:13:07+01:00 ims_usrloc_scscf: assignment of length missing for query_buffer in db_link_contact_to_impu() When writing to query_buffer with the help of the snprintf() function, the result of the functio is written to variable query_buffer_len instead of to the query_buffer.len itself. This leads to core dump in some cases. Replaced "_" by "." in "query_buffer_len =" --- Modified: src/modules/ims_usrloc_scscf/usrloc_db.c --- Diff: https://github.com/kamailio/kamailio/commit/11c179ab232222f1c78f19557032afd… Patch: https://github.com/kamailio/kamailio/commit/11c179ab232222f1c78f19557032afd… --- diff --git a/src/modules/ims_usrloc_scscf/usrloc_db.c b/src/modules/ims_usrloc_scscf/usrloc_db.c index e1a7d4287e..b5301e0a3b 100644 --- a/src/modules/ims_usrloc_scscf/usrloc_db.c +++ b/src/modules/ims_usrloc_scscf/usrloc_db.c @@ -1079,7 +1079,7 @@ int db_link_contact_to_impu(impurecord_t* _r, ucontact_t* _c) { } - query_buffer_len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); + query_buffer.len = snprintf(query_buffer.s, query_buffer_len, impu_contact_insert_query, _r->public_identity.len, _r->public_identity.s, _c->c.len, _c->c.s); LM_DBG("QUERY IS [%.*s] and len is %d\n", query_buffer.len, query_buffer.s, query_buffer.len); if (ul_dbf.raw_query(ul_dbh, &query_buffer, &rs) != 0) {

1 0

[kamailio/kamailio] json_pua: new module (#1408)
by Emmanuel Schmidbauer 25 Jan '18

25 Jan '18

this module adds a new function `json_pua_publish()` which allows json data objects to be parsed and inserted into the presentity table. the function is borrowed from the nsq and kazoo modules. it allows presence to be controlled without loading the nsq or kazoo modules. this can be quite powerful as it will allow users to control presence by sending http json data objects to kamailio, for example: ``` event_route[xhttp:request] { $var(call-id) = $(rb{json.parse,Call-ID}); if ($(rb{json.parse,Event-Package}) == "dialog") { json_pua_publish($rb); pres_refresh_watchers("$(rb{json.parse,From})", "$(rb{json.parse,Event-Package})", 1); } xhttp_reply("200", "OK", "text/html", "$rb"); } ``` example curl request to send presence update: ``` curl -d '{"Call-ID":"user01(a)my.domain.io","Event-Category":"presence","Event-Name":"update","Event-Package":"dialog","Expires":"3600","From":"sip:user01@my.domain.io","From-User":"user01","From-Realm":"my.domain.io","To":"sip:park+6003@my.domain.io","To-User":"park+6003","To-Realm":"my.domain.io","State":"confirmed"}' http://localhost:8080/presence/ ``` You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1408 -- Commit Summary -- * json_pua: new module -- File Changes -- M src/modules/json/json_funcs.c (33) M src/modules/json/json_funcs.h (35) A src/modules/json_pua/Makefile (20) A src/modules/json_pua/README (0) A src/modules/json_pua/defs.h (130) A src/modules/json_pua/doc/Makefile (4) A src/modules/json_pua/doc/json_pua.xml (37) A src/modules/json_pua/doc/json_pua_admin.xml (170) A src/modules/json_pua/json_pua_mod.c (125) A src/modules/json_pua/json_pua_mod.h (50) A src/modules/json_pua/json_pua_publish.c (538) A src/modules/json_pua/json_pua_publish.h (32) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1408.patch https://github.com/kamailio/kamailio/pull/1408.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/1408

2 3

git:master:cda1d086: pua: proper safety check on subs->extra_headers->s for subscribe_cbparam()
by Daniel-Constantin Mierla 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: cda1d086c164052a5b79b54a8d0e5cf6e5fb3e1c URL: https://github.com/kamailio/kamailio/commit/cda1d086c164052a5b79b54a8d0e5cf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-25T15:03:27+01:00 pua: proper safety check on subs->extra_headers->s for subscribe_cbparam() - dicovered via GH PR #1409 --- Modified: src/modules/pua/send_subscribe.c --- Diff: https://github.com/kamailio/kamailio/commit/cda1d086c164052a5b79b54a8d0e5cf… Patch: https://github.com/kamailio/kamailio/commit/cda1d086c164052a5b79b54a8d0e5cf… --- diff --git a/src/modules/pua/send_subscribe.c b/src/modules/pua/send_subscribe.c index b75290b936..254e77e7fd 100644 --- a/src/modules/pua/send_subscribe.c +++ b/src/modules/pua/send_subscribe.c @@ -821,7 +821,7 @@ ua_pres_t* subscribe_cbparam(subs_info_t* subs, int ua_flag) { CONT_COPY(hentity, hentity->id, subs->id); } - if(subs->extra_headers && hentity->extra_headers->s) + if(subs->extra_headers && subs->extra_headers->s) { hentity->extra_headers= (str*)((char*)hentity+ size); size+= sizeof(str);

1 0

Errored: kamailio/kamailio#5427 (master - 3ebf070)
by Travis CI 25 Jan '18

25 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5427 Status: Errored Duration: 10 minutes and 52 seconds Commit: 3ebf070 (master) Author: Victor Seva Message: pkg/kamailio/deb: version set to 5.2.0~dev3 View the changeset: https://github.com/kamailio/kamailio/compare/0aa43efe604c...3ebf070467ae View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/333184928?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

Errored: kamailio/kamailio#5426 (master - 0aa43ef)
by Travis CI 25 Jan '18

25 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5426 Status: Errored Duration: 10 minutes and 47 seconds Commit: 0aa43ef (master) Author: Daniel-Constantin Mierla Message: Makefile.defs: version set to 5.2.0-dev3 View the changeset: https://github.com/kamailio/kamailio/compare/44dc6caa2b0f...0aa43efe604c View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/333181714?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:3ebf0704: pkg/kamailio/deb: version set to 5.2.0~dev3
by Victor Seva 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 3ebf070467aecd4a7e3d5e287b776831f31b25d8 URL: https://github.com/kamailio/kamailio/commit/3ebf070467aecd4a7e3d5e287b77683… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2018-01-25T10:35:09+01:00 pkg/kamailio/deb: version set to 5.2.0~dev3 --- 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/3ebf070467aecd4a7e3d5e287b77683… Patch: https://github.com/kamailio/kamailio/commit/3ebf070467aecd4a7e3d5e287b77683…

1 0

git:master:0aa43efe: Makefile.defs: version set to 5.2.0-dev3
by Daniel-Constantin Mierla 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 0aa43efe604c99da9a1e579ed19407fae4d8f2f9 URL: https://github.com/kamailio/kamailio/commit/0aa43efe604c99da9a1e579ed19407f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-25T10:24:35+01:00 Makefile.defs: version set to 5.2.0-dev3 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/0aa43efe604c99da9a1e579ed19407f… Patch: https://github.com/kamailio/kamailio/commit/0aa43efe604c99da9a1e579ed19407f… --- diff --git a/src/Makefile.defs b/src/Makefile.defs index 48ec3c919d..2355d8b3df 100644 --- a/src/Makefile.defs +++ b/src/Makefile.defs @@ -107,7 +107,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 5 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev2 +EXTRAVERSION = -dev3 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:master:2fc3be57: siptrace: use formatted string instead of series of concatenations
by Daniel-Constantin Mierla 25 Jan '18

25 Jan '18

Module: kamailio Branch: master Commit: 2fc3be572afe4dc666f7345c733a5bc1c8e94932 URL: https://github.com/kamailio/kamailio/commit/2fc3be572afe4dc666f7345c733a5bc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-25T10:18:20+01:00 siptrace: use formatted string instead of series of concatenations --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/2fc3be572afe4dc666f7345c733a5bc… Patch: https://github.com/kamailio/kamailio/commit/2fc3be572afe4dc666f7345c733a5bc… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index 851bf6e0f8..d936e4fbb6 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -1179,22 +1179,30 @@ static void trace_onreply_in(struct cell *t, int type, struct tmcb_params *ps) strcpy(statusbuf, int2str(ps->code, &sto.status.len)); sto.status.s = statusbuf; - 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 fromip 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) { 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; + } } sto.dir = "in"; @@ -1280,12 +1288,16 @@ static void trace_onreply_out(struct cell *t, int type, struct tmcb_params *ps) if(trace_local_ip.s && 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(msg->rcv.proto), + ip_addr2a(&req->rcv.dst_ip), (int)req->rcv.dst_port); + if(sto.fromip.len<0 || sto.fromip.len>=SIPTRACE_ADDR_MAX) { + LM_ERR("failed to format fromip buffer (%d)\n", sto.fromip.len); + sto.fromip.s = SIPTRACE_ANYADDR; + sto.fromip.len = SIPTRACE_ANYADDR_LEN; + } else { + sto.fromip.s = sto.fromip_buff; + } } strcpy(statusbuf, int2str(ps->code, &sto.status.len)); @@ -1298,13 +1310,16 @@ static void trace_onreply_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

Errored: kamailio/kamailio#5422 (master - 64303a9)
by Travis CI 24 Jan '18

24 Jan '18

Build Update for kamailio/kamailio ------------------------------------- Build: #5422 Status: Errored Duration: 10 minutes and 50 seconds Commit: 64303a9 (master) Author: Daniel-Constantin Mierla Message: nathelper: add_rcv_param() - do not enclose to double quotes if URI param - restrict adding the param to contact URI only for UDP, otherwise a second transport parameter appears in the URI - do not enclose the value in double quotes when adding as URI param, it is not allowed by SIP specs grammar - discussed on GH PR #1203 View the changeset: https://github.com/kamailio/kamailio/compare/f540ff43e526...64303a9398af View the full build log and details: https://travis-ci.org/kamailio/kamailio/builds/332729892?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:44dc6caa: modules: readme files regenerated - nathelper ... [skip ci]
by Kamailio Dev 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 44dc6caa2b0ff5ac17d5ae14830feae6d8f9ebd7 URL: https://github.com/kamailio/kamailio/commit/44dc6caa2b0ff5ac17d5ae14830feae… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-24T12:01:31+01:00 modules: readme files regenerated - nathelper ... [skip ci] --- Modified: src/modules/nathelper/README --- Diff: https://github.com/kamailio/kamailio/commit/44dc6caa2b0ff5ac17d5ae14830feae… Patch: https://github.com/kamailio/kamailio/commit/44dc6caa2b0ff5ac17d5ae14830feae… --- diff --git a/src/modules/nathelper/README b/src/modules/nathelper/README index 102a639ea0..d21c31c502 100644 --- a/src/modules/nathelper/README +++ b/src/modules/nathelper/README @@ -517,12 +517,14 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; 5.3. add_rcv_param([flag]), - Add a received parameter to the “Contact” header fields or the Contact - URI. The parameter will contain the URI created from the source IP, - port, and protocol of the packet containing the SIP message. The - parameter can be then processed by another registrar. This is useful, - for example, when replicating register messages using t_replicate - function to another registrar. + Add a received parameter to the “Contact” header fields (available for + all transports) or to the Contact URI (available only for UDP traffic). + + The parameter will contain the URI created from the source IP, port, + and protocol (if different than UDP) of the packet containing the SIP + message. The parameter can be then processed by another registrar. This + is useful, for example, when replicating register messages using + t_replicate function to another registrar. Meaning of the parameters is as follows: * flag - flags to indicate if the parameter should be added to

1 0

[kamailio/kamailio] nathelper: correct Contact received param (#1203)
by Sebastian Damm 24 Jan '18

24 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) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [x] PR should be backported to stable branches - [ ] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  - Received param was enclosed in quotes, making some UACs stumble upon it. This fix removes the quotes, adding the received param the same way as it is done for example in the path module. - Reported by Arslan Aseed. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1203 -- Commit Summary -- * nathelper: correct Contact received param -- File Changes -- M src/modules/nathelper/nathelper.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1203.patch https://github.com/kamailio/kamailio/pull/1203.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/1203

3 10

git:master:57bd759e: nathelper: documented the use of add_rcv_param() for Contact URI case
by Daniel-Constantin Mierla 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 57bd759e19b07647aac3bfce673131a142d9c07a URL: https://github.com/kamailio/kamailio/commit/57bd759e19b07647aac3bfce673131a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T11:58:45+01:00 nathelper: documented the use of add_rcv_param() for Contact URI case --- Modified: src/modules/nathelper/doc/nathelper_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/57bd759e19b07647aac3bfce673131a… Patch: https://github.com/kamailio/kamailio/commit/57bd759e19b07647aac3bfce673131a… --- diff --git a/src/modules/nathelper/doc/nathelper_admin.xml b/src/modules/nathelper/doc/nathelper_admin.xml index 513c48400e..f6e061799c 100644 --- a/src/modules/nathelper/doc/nathelper_admin.xml +++ b/src/modules/nathelper/doc/nathelper_admin.xml @@ -554,11 +554,15 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; </title> <para> Add a received parameter to the <quote>Contact</quote> header fields - or the Contact URI. The parameter will contain the URI created from the - source IP, port, and protocol of the packet containing the SIP message. - The parameter can be then processed by another registrar. This is useful, - for example, when replicating register messages using <function>t_replicate</function> - function to another registrar. + (available for all transports) or to the Contact URI (available only + for UDP traffic). + </para> + <para> + The parameter will contain the URI created from the + source IP, port, and protocol (if different than UDP) of the packet + containing the SIP message. The parameter can be then processed by + another registrar. This is useful, for example, when replicating register + messages using <function>t_replicate</function> function to another registrar. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -566,7 +570,7 @@ if (search("User-Agent: Cisco ATA.*") {fix_nated_sdp("3");}; <emphasis>flag</emphasis> - flags to indicate if the parameter should be added to Contact URI or Contact header. If the flag is non-zero, the parameter will be added to the Contact URI. If not - used or equal to zero, the parameter will go to the Contact + used or equal to zero, the parameter will go to the Contact header. </para></listitem> </itemizedlist>

1 0

git:master:64303a93: nathelper: add_rcv_param() - do not enclose to double quotes if URI param
by Daniel-Constantin Mierla 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 64303a9398afe65d65cf35489c04e725689a5da2 URL: https://github.com/kamailio/kamailio/commit/64303a9398afe65d65cf35489c04e72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T11:52:47+01:00 nathelper: add_rcv_param() - do not enclose to double quotes if URI param - restrict adding the param to contact URI only for UDP, otherwise a second transport parameter appears in the URI - do not enclose the value in double quotes when adding as URI param, it is not allowed by SIP specs grammar - discussed on GH PR #1203 --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/64303a9398afe65d65cf35489c04e72… Patch: https://github.com/kamailio/kamailio/commit/64303a9398afe65d65cf35489c04e72… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 168bae09cc..a45588a50d 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2110,9 +2110,13 @@ static int ki_add_rcv_param(sip_msg_t *msg, int upos) struct lump *anchor; char *param; str uri; - int hdr_param; - hdr_param = (upos)?0:1; + if(upos) { + if(msg->rcv.proto != PROTO_UDP) { + LM_ERR("adding received parameter to Contact URI works only for UDP\n"); + return -1; + } + } if(create_rcv_uri(&uri, msg) < 0) { return -1; @@ -2129,16 +2133,20 @@ static int ki_add_rcv_param(sip_msg_t *msg, int upos) return -1; } memcpy(param, RECEIVED, RECEIVED_LEN); - param[RECEIVED_LEN] = '\"'; - memcpy(param + RECEIVED_LEN + 1, uri.s, uri.len); - param[RECEIVED_LEN + 1 + uri.len] = '\"'; - - if(hdr_param) { - /* add the param as header param */ - anchor = anchor_lump(msg, c->name.s + c->len - msg->buf, 0, 0); + if(upos) { + memcpy(param + RECEIVED_LEN, uri.s, uri.len); } else { + param[RECEIVED_LEN] = '\"'; + memcpy(param + RECEIVED_LEN + 1, uri.s, uri.len); + param[RECEIVED_LEN + 1 + uri.len] = '\"'; + } + + if(upos) { /* add the param as uri param */ anchor = anchor_lump(msg, c->uri.s + c->uri.len - msg->buf, 0, 0); + } else { + /* add the param as header param */ + anchor = anchor_lump(msg, c->name.s + c->len - msg->buf, 0, 0); } if(anchor == NULL) { LM_ERR("anchor_lump failed\n"); @@ -2146,9 +2154,8 @@ static int ki_add_rcv_param(sip_msg_t *msg, int upos) return -1; } - if(insert_new_lump_after( - anchor, param, RECEIVED_LEN + 1 + uri.len + 1, 0) - == 0) { + if(insert_new_lump_after(anchor, param, + RECEIVED_LEN + 1 + uri.len + 1 - ((upos)?2:0), 0) == 0) { LM_ERR("insert_new_lump_after failed\n"); pkg_free(param); return -1;

1 0

git:master:08df9d1b: nathelper: fixed interpretation of flags param for add_rcv_param()
by Daniel-Constantin Mierla 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: 08df9d1b11ff3fcfe241ce179560431145be8216 URL: https://github.com/kamailio/kamailio/commit/08df9d1b11ff3fcfe241ce179560431… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-01-24T11:44:33+01:00 nathelper: fixed interpretation of flags param for add_rcv_param() - add as uri param when the flags are set and different than 0 - small typo in log message --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/08df9d1b11ff3fcfe241ce179560431… Patch: https://github.com/kamailio/kamailio/commit/08df9d1b11ff3fcfe241ce179560431… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c index 5eb7f6a12f..168bae09cc 100644 --- a/src/modules/nathelper/nathelper.c +++ b/src/modules/nathelper/nathelper.c @@ -2104,12 +2104,15 @@ static int create_rcv_uri(str *uri, struct sip_msg *m) * Add received parameter to Contacts for further * forwarding of the REGISTER requuest */ -static int ki_add_rcv_param(sip_msg_t *msg, int hdr_param) +static int ki_add_rcv_param(sip_msg_t *msg, int upos) { contact_t *c; struct lump *anchor; char *param; str uri; + int hdr_param; + + hdr_param = (upos)?0:1; if(create_rcv_uri(&uri, msg) < 0) { return -1; @@ -2169,7 +2172,7 @@ static int add_rcv_param_f(struct sip_msg *msg, char *str1, char *str2) if(str1) { if(fixup_get_ivalue(msg, (gparam_t*)str1, &hdr_param)<0) { - LM_ERR("failed to get falgs parameter\n"); + LM_ERR("failed to get flags parameter\n"); return -1; } }

1 0

git:master:f540ff43: modules: readme files regenerated - json ... [skip ci]
by Kamailio Dev 24 Jan '18

24 Jan '18

Module: kamailio Branch: master Commit: f540ff43e52696ad3f21edc8188cf2ddc62686bc URL: https://github.com/kamailio/kamailio/commit/f540ff43e52696ad3f21edc8188cf2d… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2018-01-24T09:46:40+01:00 modules: readme files regenerated - json ... [skip ci] --- Modified: src/modules/json/README --- Diff: https://github.com/kamailio/kamailio/commit/f540ff43e52696ad3f21edc8188cf2d… Patch: https://github.com/kamailio/kamailio/commit/f540ff43e52696ad3f21edc8188cf2d… --- diff --git a/src/modules/json/README b/src/modules/json/README index 2f3e6dc7a0..139597f9cb 100644 --- a/src/modules/json/README +++ b/src/modules/json/README @@ -1,84 +1,2 @@ -JSON Module -Matthew Williams - <matthew(a)flowroute.com> - -Edited by - -Matthew Williams - - <matthew(a)flowroute.com> - - Copyright © 2011 Flowroute LLC (flowroute.com) - __________________________________________________________________ - - Table of Contents - - 1. Admin Guide - - 1. Overview - 2. Dependencies - - 2.1. Kamailio Modules - 2.2. External Libraries or Applications - - 3. Functions - - 3.1. json_get_field(json_string, field_name, destination) - - List of Examples - - 1.1. json_get_field usage - -Chapter 1. Admin Guide - - Table of Contents - - 1. Overview - 2. Dependencies - - 2.1. Kamailio Modules - 2.2. External Libraries or Applications - - 3. Functions - - 3.1. json_get_field(json_string, field_name, destination) - -1. Overview - - This is a simple module allowing to retrieve values from a JSON string. - - For more complex operations with JSON documents, see the JANSSON - module. - -2. Dependencies - - 2.1. Kamailio Modules - 2.2. External Libraries or Applications - -2.1. Kamailio Modules - - The following modules must be loaded before this module: - * None - -2.2. External Libraries or Applications - - The following libraries or applications must be installed before - running Kamailio with this module loaded: - * libjson (https://github.com/json-c/json-c/wiki) - -3. Functions - - 3.1. json_get_field(json_string, field_name, destination) - -3.1. json_get_field(json_string, field_name, destination) - - Copy field 'field_name' from json object 'json_string' and store it in - pvar 'destination'. - - Example 1.1. json_get_field usage -... -json_get_field("{'foo':'bar'}", "foo", "$var(foo)"); -xlog("foo is $var(foo)"); -...

1 0

[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

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev