- sr-dev - kamailio.org

git:master:17d30403: core: kemi - added KSR.is_KDQM()
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 17d3040365400d14d251247c9c3319fc003f2cb2 URL: https://github.com/kamailio/kamailio/commit/17d3040365400d14d251247c9c3319f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-18T11:28:20+02:00 core: kemi - added KSR.is_KDQM() --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/17d3040365400d14d251247c9c3319f… Patch: https://github.… [View More]

1 0

[kamailio/kamailio] KSR.is_MESSAGE() Not implemented (#2331)
by hance2010 18 May '20

18 May '20

### Description KSR.is_MESSAGE() Not implemented. kamailio v5.3.4  ### 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` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2331 [View Less]

2 2

git:master:8db5a12f: core: kemi - added missing is_MESSAGE()
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 8db5a12f7fab1a1fc7d50c87bbf1aee325b067c2 URL: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-18T08:29:09+02:00 core: kemi - added missing is_MESSAGE() - GH #2331 --- Modified: src/core/kemi.c --- Diff: https://github.com/kamailio/kamailio/commit/8db5a12f7fab1a1fc7d50c87bbf1aee… … [View More]

1 0

git:master:7749069c: uid_uri_db: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 7749069cd05b9619ee32237773097441e241bac4 URL: https://github.com/kamailio/kamailio/commit/7749069cd05b9619ee3223777309744… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:01:18+02:00 uid_uri_db: use file specific include guard --- Modified: src/modules/uid_uri_db/uid_uri_db_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:3d73e8cb: acc_diameter: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 3d73e8cb9f7431383c5a4ce798e2610f37ff92dc URL: https://github.com/kamailio/kamailio/commit/3d73e8cb9f7431383c5a4ce798e2610… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:00:28+02:00 acc_diameter: use file specific include guard --- Modified: src/modules/acc_diameter/diam_message.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:9053c70f: auth_diameter: use file specific include guard
by Daniel-Constantin Mierla 18 May '20

18 May '20

Module: kamailio Branch: master Commit: 9053c70fe7e147b784c53a57014796282701c74d URL: https://github.com/kamailio/kamailio/commit/9053c70fe7e147b784c53a570147962… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-17T10:01:00+02:00 auth_diameter: use file specific include guard --- Modified: src/modules/auth_diameter/diameter_msg.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:d26ccdea: core: define macro for signature to be used for server and user-agent
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: d26ccdea61230bfc7720a2523c7b6dd8d2692d6d URL: https://github.com/kamailio/kamailio/commit/d26ccdea61230bfc7720a2523c7b6dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T15:20:45+02:00 core: define macro for signature to be used for server and user-agent --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:c0e687d8: websocket: use signature macro instead of offsetting inside server hdr define
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: c0e687d820f9bbf2b6b1ef6892e5b34c30f25a63 URL: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T15:21:43+02:00 websocket: use signature macro instead of offsetting inside server hdr define - pass rcv info structure by address - remove function name from logs --- Modified: src/modules/… [View More]websocket/websocket.c Modified: src/modules/websocket/ws_conn.c Modified: src/modules/websocket/ws_conn.h Modified: src/modules/websocket/ws_frame.h Modified: src/modules/websocket/ws_handshake.c --- Diff: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… Patch: https://github.com/kamailio/kamailio/commit/c0e687d820f9bbf2b6b1ef6892e5b34… --- diff --git a/src/modules/websocket/websocket.c b/src/modules/websocket/websocket.c index 87cf4e3a5f..5cef5d6b1a 100644 --- a/src/modules/websocket/websocket.c +++ b/src/modules/websocket/websocket.c @@ -210,8 +210,8 @@ static int mod_init(void) } if(ws_ping_application_data.len < 1 || ws_ping_application_data.len > 125) { - ws_ping_application_data.s = DEFAULT_PING_APPLICATION_DATA + 8; - ws_ping_application_data.len = DEFAULT_PING_APPLICATION_DATA_LEN - 8; + ws_ping_application_data.s = DEFAULT_PING_APPLICATION_DATA; + ws_ping_application_data.len = DEFAULT_PING_APPLICATION_DATA_LEN; } if(ws_keepalive_mechanism != KEEPALIVE_MECHANISM_NONE) { diff --git a/src/modules/websocket/ws_conn.c b/src/modules/websocket/ws_conn.c index a4442ae0d8..8570afa086 100644 --- a/src/modules/websocket/ws_conn.c +++ b/src/modules/websocket/ws_conn.c @@ -184,14 +184,14 @@ void wsconn_destroy(void) } } -int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) +int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol) { int cur_cons, max_cons; - int id = rcv.proto_reserved1; + int id = rcv->proto_reserved1; int id_hash = tcp_id_hash(id); ws_connection_t *wsc; - LM_DBG("wsconn_add id [%d]\n", id); + LM_DBG("connection id [%d]\n", id); /* Allocate and fill in new WebSocket connection */ wsc = shm_malloc(sizeof(ws_connection_t) + BUF_SIZE + 1); @@ -203,13 +203,13 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) wsc->id = id; wsc->id_hash = id_hash; wsc->state = WS_S_OPEN; - wsc->rcv = rcv; + wsc->rcv = *rcv; wsc->sub_protocol = sub_protocol; wsc->run_event = 0; wsc->frag_buf.s = ((char *)wsc) + sizeof(ws_connection_t); atomic_set(&wsc->refcnt, 0); - LM_DBG("wsconn_add new wsc => [%p], ref => [%d]\n", wsc, + LM_DBG("new wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); WSCONN_LOCK; @@ -229,7 +229,7 @@ int wsconn_add(struct receive_info rcv, unsigned int sub_protocol) WSCONN_UNLOCK; - LM_DBG("wsconn_add added to conn_table wsc => [%p], ref => [%d]\n", wsc, + LM_DBG("added to conn_table wsc => [%p], ref => [%d]\n", wsc, atomic_get(&wsc->refcnt)); /* Update connection statistics */ diff --git a/src/modules/websocket/ws_conn.h b/src/modules/websocket/ws_conn.h index 9319238e4d..f8aa93543c 100644 --- a/src/modules/websocket/ws_conn.h +++ b/src/modules/websocket/ws_conn.h @@ -95,7 +95,7 @@ extern stat_var *ws_msrp_max_concurrent_connections; int wsconn_init(void); void wsconn_destroy(void); -int wsconn_add(struct receive_info rcv, unsigned int sub_protocol); +int wsconn_add(struct receive_info *rcv, unsigned int sub_protocol); int wsconn_rm(ws_connection_t *wsc, ws_conn_eventroute_t run_event_route); int wsconn_update(ws_connection_t *wsc); void wsconn_close_now(ws_connection_t *wsc); diff --git a/src/modules/websocket/ws_frame.h b/src/modules/websocket/ws_frame.h index d0f8d84ed0..51a62e04c8 100644 --- a/src/modules/websocket/ws_frame.h +++ b/src/modules/websocket/ws_frame.h @@ -49,8 +49,8 @@ extern int ws_keepalive_mechanism; #define DEFAULT_KEEPALIVE_TIMEOUT 180 /* seconds */ extern str ws_ping_application_data; -#define DEFAULT_PING_APPLICATION_DATA SERVER_HDR -#define DEFAULT_PING_APPLICATION_DATA_LEN SERVER_HDR_LEN +#define DEFAULT_PING_APPLICATION_DATA SRVAPP_SIGNATURE +#define DEFAULT_PING_APPLICATION_DATA_LEN SRVAPP_SIGNATURE_LEN extern stat_var *ws_failed_connections; extern stat_var *ws_local_closed_connections; diff --git a/src/modules/websocket/ws_handshake.c b/src/modules/websocket/ws_handshake.c index 58e6077bb5..878c483f2a 100644 --- a/src/modules/websocket/ws_handshake.c +++ b/src/modules/websocket/ws_handshake.c @@ -310,7 +310,7 @@ int ws_handle_handshake(struct sip_msg *msg) (unsigned char *)reply_key.s, base64_enc_len(SHA_DIGEST_LENGTH)); /* Add the connection to the WebSocket connection table */ - wsconn_add(msg->rcv, sub_protocol); + wsconn_add(&msg->rcv, sub_protocol); /* Make sure Kamailio core sends future messages on this connection directly to this module */ [View Less]

1 0

git:master:97c7081d: path: updates for outboud module api
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: 97c7081df94eaabd8e48b084671ea831b5ec9024 URL: https://github.com/kamailio/kamailio/commit/97c7081df94eaabd8e48b084671ea83… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T12:51:41+02:00 path: updates for outboud module api --- Modified: src/modules/path/path.c --- Diff: https://github.com/kamailio/kamailio/commit/97c7081df94eaabd8e48b084671ea83… Patch: … [View More]

1 0

git:master:6aca846d: rr: updates for outboud module api
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: 6aca846dce4b797a66aaa865fb5a1e81f7806b4c URL: https://github.com/kamailio/kamailio/commit/6aca846dce4b797a66aaa865fb5a1e8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T12:51:50+02:00 rr: updates for outboud module api --- Modified: src/modules/rr/record.c --- Diff: https://github.com/kamailio/kamailio/commit/6aca846dce4b797a66aaa865fb5a1e8… Patch: … [View More]

1 0

git:master:56ea88ef: outbound: pass recv info struct by address
by Daniel-Constantin Mierla 16 May '20

16 May '20

Module: kamailio Branch: master Commit: 56ea88ef9a0628d7ca644f31840101ffe573e5c3 URL: https://github.com/kamailio/kamailio/commit/56ea88ef9a0628d7ca644f31840101f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-16T12:49:17+02:00 outbound: pass recv info struct by address - fix performance inefficiency for passing large structs by value --- Modified: src/modules/outbound/api.h Modified: src/modules/… [View More]outbound/outbound_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/56ea88ef9a0628d7ca644f31840101f… Patch: https://github.com/kamailio/kamailio/commit/56ea88ef9a0628d7ca644f31840101f… --- diff --git a/src/modules/outbound/api.h b/src/modules/outbound/api.h index 6e65e44e17..ae2b3b3615 100644 --- a/src/modules/outbound/api.h +++ b/src/modules/outbound/api.h @@ -30,7 +30,7 @@ #include "../../core/str.h" #include "../../core/sr_module.h" -typedef int (*encode_flow_token_t)(str *, struct receive_info); +typedef int (*encode_flow_token_t)(str *, struct receive_info *); typedef int (*decode_flow_token_t)(struct sip_msg *, struct receive_info **, str); typedef int (*use_outbound_t)(struct sip_msg *); diff --git a/src/modules/outbound/outbound_mod.c b/src/modules/outbound/outbound_mod.c index 788376541c..82d18a3eca 100644 --- a/src/modules/outbound/outbound_mod.c +++ b/src/modules/outbound/outbound_mod.c @@ -156,7 +156,7 @@ static void destroy(void) static unsigned char unenc_flow_token[UNENC_FLOW_TOKEN_MAX_LENGTH]; static unsigned char hmac_sha1[EVP_MAX_MD_SIZE]; -int encode_flow_token(str *flow_token, struct receive_info rcv) +int encode_flow_token(str *flow_token, struct receive_info *rcv) { int pos = FLOW_TOKEN_START_POS, i; @@ -168,19 +168,19 @@ int encode_flow_token(str *flow_token, struct receive_info rcv) /* Encode protocol information */ unenc_flow_token[pos++] = - (rcv.dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv.proto; + (rcv->dst_ip.af == AF_INET6 ? 0x80 : 0x00) | rcv->proto; /* Encode destination address */ - for (i = 0; i < (rcv.dst_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv.dst_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv.dst_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv.dst_port & 0xff; + for (i = 0; i < (rcv->dst_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = rcv->dst_ip.u.addr[i]; + unenc_flow_token[pos++] = (rcv->dst_port >> 8) & 0xff; + unenc_flow_token[pos++] = rcv->dst_port & 0xff; /* Encode source address */ - for (i = 0; i < (rcv.src_ip.af == AF_INET6 ? 16 : 4); i++) - unenc_flow_token[pos++] = rcv.src_ip.u.addr[i]; - unenc_flow_token[pos++] = (rcv.src_port >> 8) & 0xff; - unenc_flow_token[pos++] = rcv.src_port & 0xff; + for (i = 0; i < (rcv->src_ip.af == AF_INET6 ? 16 : 4); i++) + unenc_flow_token[pos++] = rcv->src_ip.u.addr[i]; + unenc_flow_token[pos++] = (rcv->src_port >> 8) & 0xff; + unenc_flow_token[pos++] = rcv->src_port & 0xff; /* HMAC-SHA1 the calculated flow-token, truncate to 80 bits, and prepend onto the flow-token */ [View Less]

1 0

[kamailio/kamailio] RPC Command tm.clean (#2329)
by Marat 15 May '20

15 May '20

Hello. I have a philosophical question about [tm.clean](https://kamailio.org/docs/modules/5.1.x/modules/tm.html#tm.rpc.cl… command. Unfortunately, I don’t understand what this command is for, because in my view, expired transactions are automatically deleted. This is all I could find: > pc command tm.clean to clean long time expired transactions (for troubleshooting purposes) [[1]](https://www.kamailio.org/wiki/features/new-in-5.1.x) So, can you give an example when a transaction can … [View More]

2 2

possible bug on kemi dlg_ontimeout
by David Escartin 15 May '20

15 May '20

Hello all Testing dialog timeout event callback for kemi lua setup on kamailio 5.4.0-dev3 (x86_64/linux) d74157-dirty, i had some problems to perform the dlg timeroute behaviour the same as we could on native version. If i used KSR.dialog.var_sets to set $dlg_ctx(timeout_route), I saw that on a dialog timeout, the dlg_ontimeout event route was not triggered, and only the dialog callback was executed with evname dialog:end. (only executing event_route -1 on state 5) So i'm guessing that the … [View More]

2 5

[kamailio/kamailio] tm core.when free ack cancel_buf. (#2321)
by zhangyang 15 May '20

15 May '20

### Description wh have a too long 500msg,when the build ack,it abort we use ka listen two port ,and use port 1 send port 2 after port2 send port1,it loop in kamailio.cfg.its my wrong,but kamailio core.... ### Troubleshooting #### Debugging Data this is core bt #0 0x00002ae1c343c5f7 in raise () from /lib64/libc.so.6 #1 0x00002ae1c343dce8 in abort () from /lib64/libc.so.6 #2 0x000000000068155a in qm_debug_check_frag (qm=0x2ae1c8fb4000, f=0x2ae1c93bf558, file=0x2ae1c4a1b9ff "tm: … [View More]t_msgbuilder.c", line=518, efile=0x7f1ca7 "core/mem/q_malloc.c", eline=504) at core/mem/q_malloc.c:139 #3 0x0000000000684bf5 in qm_free (qmp=0x2ae1c8fb4000, p=0x2ae1c93bf590, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", func=0x2ae1c4a1fb50 <__FUNCTION__.11261> "build_local_reparse", line=518, mname=0x2ae1c4a1aa30 "tm") at core/mem/q_malloc.c:504 #4 0x000000000068e83f in qm_shm_free (qmp=0x2ae1c8fb4000, p=0x2ae1c93bf590, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", func=0x2ae1c4a1fb50 <__FUNCTION__.11261> "build_local_reparse", line=518, mname=0x2ae1c4a1aa30 "tm") at core/mem/q_malloc.c:1268 #5 0x00002ae1c4951e76 in build_local_reparse (Trans=0x2ae1c94524d8, branch=0, len=0x7ffe977ff370, method=0x2ae1c4a2399b "ACK", method_len=3, to=0x7ffe977ff130, reason=0x0) at t_msgbuilder.c:518 #6 0x00002ae1c497336e in build_ack (rpl=0x2ae1c3d3bb08, trans=0x2ae1c94524d8, branch=0, ret_len=0x7ffe977ff370) at t_reply.c:354 #7 0x00002ae1c4986066 in reply_received (p_msg=0x2ae1c3d3bb08) at t_reply.c:2292 #8 0x000000000053da31 in do_forward_reply (msg=0x2ae1c3d3bb08, mode=0) at core/forward.c:748 #9 0x000000000053f5a9 in forward_reply (msg=0x2ae1c3d3bb08) at core/forward.c:853 #10 0x000000000059c633 in receive_msg ( buf=0xa6ee20 <buf.6868> "SIP/2.0 500 Internal Server Error\r\nVia: SIP/2.0/UDP 172.18.67.32;branch=z9hG4bK4301.6c6183869659ad37775254042e1ec6f4.0\r\nVia: SIP/2.0/UDP 172.18.67.32;branch=z9hG4bK4301.a149a0620b507cd0ba760eeb1cd32b3"..., len=27098, rcv_info=0x7ffe977ffae0) at core/receive.c:434 #11 0x000000000048e42c in udp_rcv_loop () at core/udp_server.c:541 #12 0x000000000042509d in main_loop () at main.c:1669 #13 0x000000000042c788 in main (argc=9, argv=0x7ffe97800028) at main.c:2710 (gdb) up #1 0x00002ae1c343dce8 in abort () from /lib64/libc.so.6 (gdb) up #2 0x000000000068155a in qm_debug_check_frag (qm=0x2ae1c8fb4000, f=0x2ae1c93bf558, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", line=518, efile=0x7f1ca7 "core/mem/q_malloc.c", eline=504) at core/mem/q_malloc.c:139 139 core/mem/q_malloc.c: 没有那个文件或目录. (gdb) up #3 0x0000000000684bf5 in qm_free (qmp=0x2ae1c8fb4000, p=0x2ae1c93bf590, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", func=0x2ae1c4a1fb50 <__FUNCTION__.11261> "build_local_reparse", line=518, mname=0x2ae1c4a1aa30 "tm") at core/mem/q_malloc.c:504 504 in core/mem/q_malloc.c (gdb) up #4 0x000000000068e83f in qm_shm_free (qmp=0x2ae1c8fb4000, p=0x2ae1c93bf590, file=0x2ae1c4a1b9ff "tm: t_msgbuilder.c", func=0x2ae1c4a1fb50 <__FUNCTION__.11261> "build_local_reparse", line=518, mname=0x2ae1c4a1aa30 "tm") at core/mem/q_malloc.c:1268 1268 in core/mem/q_malloc.c (gdb) up #5 0x00002ae1c4951e76 in build_local_reparse (Trans=0x2ae1c94524d8, branch=0, len=0x7ffe977ff370, method=0x2ae1c4a2399b "ACK", method_len=3, to=0x7ffe977ff130, reason=0x0) at t_msgbuilder.c:518 518 t_msgbuilder.c: 没有那个文件或目录. (gdb) p cancel_buf $1 = 0x2ae1c93bf590 "ACK sip:2002@172.18.67.42 SIP/2.0\r\n\253" (gdb) p reason $2 = (struct cancel_reason *) 0x0 #### Log Messages [2020-05-11 11:10:27] (124796) INFO: <script>: IN_REPLY_PBX [2020-05-11 11:10:27] (124796) INFO: <script>: IN_REPLY_PBX IN Call <null>: Status 100 3001@172.18.67.42:5060 -----> 2002@172.18.67.32:5060 [2020-05-11 11:10:27] (124796) ERROR: tm [t_msgbuilder.c:516]: build_local_reparse(): HDR_EOH_T was not found [2020-05-11 11:10:27] (124796) CRITICAL: <core> [core/mem/q_malloc.c:137]: qm_debug_check_frag(): BUG: qm: fragm. 0x2ae1c93bf558 (address 0x2ae1c93bf590) end overwritten (2e322f5049532032, ab0a0d30)! Memory allocator was called from tm: t_msgbuilder.c:518. Fragment marked by tm: t_msgbuilder.c:345. Exec from core/mem/q_malloc.c:504. #### SIP Traffic we use ka listen two port ,and use port 1 send port 2 after port2 send port1,it loop in kamailio.cfg.its my wrong,but kamailio core.... ### Possible Solutions we see t_msgbuilder.c shm_free(cancel_buf); faild ... ### Additional Information version: kamailio 5.2.5 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_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:28:15 Nov 4 2019 with gcc 4.8.5 * **Operating System**: CentOS Linux release 7.2.1511 (Core) Linux localhost.localdomain 3.10.0-327.el7.x86_64 #1 SMP Thu Nov 19 22:10:57 UTC 2015 x86_64 x86_64 x86_64 GNU/Linux -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2321 [View Less]

3 8

git:master:7ae675bd: pua_reginfo: free xml doc in case of error
by Daniel-Constantin Mierla 14 May '20

14 May '20

Module: kamailio Branch: master Commit: 7ae675bd90b4420ebaa17768c97aa09219f53116 URL: https://github.com/kamailio/kamailio/commit/7ae675bd90b4420ebaa17768c97aa09… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-14T21:21:51+02:00 pua_reginfo: free xml doc in case of error - a few whitespacing fixes --- Modified: src/modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/… [View More]commit/7ae675bd90b4420ebaa17768c97aa09… Patch: https://github.com/kamailio/kamailio/commit/7ae675bd90b4420ebaa17768c97aa09… --- diff --git a/src/modules/pua_reginfo/usrloc_cb.c b/src/modules/pua_reginfo/usrloc_cb.c index f8a55480bb..f128680122 100644 --- a/src/modules/pua_reginfo/usrloc_cb.c +++ b/src/modules/pua_reginfo/usrloc_cb.c @@ -16,8 +16,8 @@ * 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 + * 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 */ @@ -57,7 +57,7 @@ void pua_reginfo_update_self_op(int v) } str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { - xmlDocPtr doc = NULL; + xmlDocPtr doc = NULL; xmlNodePtr root_node = NULL; xmlNodePtr registration_node = NULL; xmlNodePtr contact_node = NULL; @@ -78,11 +78,12 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { root_node = xmlNewNode(NULL, BAD_CAST "reginfo"); if(root_node==0) { LM_ERR("Unable to create reginfo-XML-Element\n"); + xmlFreeDoc(doc); return NULL; } /* This is our Root-Element: */ - xmlDocSetRootElement(doc, root_node); - + xmlDocSetRootElement(doc, root_node); + xmlNewProp(root_node, BAD_CAST "xmlns", BAD_CAST "urn:ietf:params:xml:ns:reginfo"); /* we set the version to 0 but it should be set to the correct value in the pua module */ @@ -163,7 +164,7 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { memset(buf, 0, sizeof(buf)); snprintf(buf, sizeof(buf), "%.*s", ptr->received.len, ptr->received.s); xmlNewProp(contact_node, BAD_CAST "received", BAD_CAST buf); - + /* path Attribute */ memset(buf, 0, sizeof(buf)); snprintf(buf, sizeof(buf), "%.*s", ptr->path.len, ptr->path.s); @@ -216,7 +217,7 @@ str* build_reginfo_full(urecord_t * record, str uri, ucontact_t* c, int type) { } if(doc) xmlFreeDoc(doc); return NULL; -} +} void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { str* body= NULL; @@ -240,7 +241,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { content_type.s = "application/reginfo+xml"; content_type.len = 23; - + /* Debug Output: */ LM_DBG("AOR: %.*s (%.*s)\n", c->aor->len, c->aor->s, c->domain->len, c->domain->s); if(type & UL_CONTACT_INSERT) LM_DBG("type= UL_CONTACT_INSERT\n"); @@ -292,7 +293,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { } uri.len = snprintf(uri.s, uri.len, "sip:%.*s", record->aor.len, record->aor.s); } - + /* Build the XML-Body: */ body = build_reginfo_full(record, uri, c, type); @@ -315,8 +316,8 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { publ.id.len = id_buf_len; publ.content_type = content_type; publ.expires = 3600; - - /* make UPDATE_TYPE, as if this "publish dialog" is not found + + /* make UPDATE_TYPE, as if this "publish dialog" is not found by pua it will fallback to INSERT_TYPE anyway */ publ.flag|= UPDATE_TYPE; publ.source_flag |= REGINFO_PUBLISH; @@ -328,7 +329,7 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { if(pua.send_publish(&publ) < 0) { LM_ERR("Error while sending publish\n"); - } + } error: if (uri.s) pkg_free(uri.s); if(body) { @@ -338,4 +339,4 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { if(record) ul.release_urecord(record); return; -} +} [View Less]

1 0

git:master:4ad790f6: evapi: cast to void* when printing logs with pointer value
by Daniel-Constantin Mierla 14 May '20

14 May '20

Module: kamailio Branch: master Commit: 4ad790f697554332ea590793d3ec56e13437e82f URL: https://github.com/kamailio/kamailio/commit/4ad790f697554332ea590793d3ec56e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-14T21:15:51+02:00 evapi: cast to void* when printing logs with pointer value --- Modified: src/modules/evapi/evapi_dispatch.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:c4591349: tm: safety checks for branch request len
by Daniel-Constantin Mierla 14 May '20

14 May '20

Module: kamailio Branch: master Commit: c45913497f222c67bcccdbc8724b25bb083c556f URL: https://github.com/kamailio/kamailio/commit/c45913497f222c67bcccdbc8724b25b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-14T20:38:22+02:00 tm: safety checks for branch request len --- Modified: src/modules/tm/t_cancel.c Modified: src/modules/tm/t_fwd.c Modified: src/modules/tm/t_msgbuilder.c Modified: src/modules/… [View More]

1 0

git:master:a5722aa7: ctl: small spelling fix in comment
by Henning Westerholt 14 May '20

14 May '20

Module: kamailio Branch: master Commit: a5722aa7773eb4153e8c3b241cae6e3f5f7a9894 URL: https://github.com/kamailio/kamailio/commit/a5722aa7773eb4153e8c3b241cae6e3… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-14T16:38:31Z ctl: small spelling fix in comment --- Modified: src/modules/ctl/binrpc.h --- Diff: https://github.com/kamailio/kamailio/commit/a5722aa7773eb4153e8c3b241cae6e3… Patch: https://github.com/… [View More]

1 0

git:master:cbb070b7: cdp: small spelling fix in log message
by Henning Westerholt 14 May '20

14 May '20

Module: kamailio Branch: master Commit: cbb070b74e63017a23355dd8d5266c2d57b762f9 URL: https://github.com/kamailio/kamailio/commit/cbb070b74e63017a23355dd8d5266c2… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-14T16:37:34Z cdp: small spelling fix in log message --- Modified: src/modules/cdp/diameter_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/cbb070b74e63017a23355dd8d5266c2… Patch: https://github.… [View More]

1 0

git:master:fc09015b: core: small spelling fix in comment
by Henning Westerholt 14 May '20

14 May '20

Module: kamailio Branch: master Commit: fc09015bbad342b435de7ddb3300e19a415c340d URL: https://github.com/kamailio/kamailio/commit/fc09015bbad342b435de7ddb3300e19… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-14T16:38:00Z core: small spelling fix in comment --- Modified: src/core/dns_cache.h --- Diff: https://github.com/kamailio/kamailio/commit/fc09015bbad342b435de7ddb3300e19… Patch: https://github.com/kamailio/… [View More]

1 0

[kamailio/kamailio] Debian package version don't support distribution upgrades (#2160)
by Bas Couwenberg 14 May '20

14 May '20

When upgrading from stretch to buster the kamailio packages aren't upgraded because the 5.3.1+stretch version is greater than 5.3.1+buster: ``` $ dpkg --compare-versions 5.3.1+stretch gt 5.3.1+buster ; echo $? 0 ``` The package version should include the release version instead of its codename, e.g. 5.3.1+deb9u1 & 5.3.1+deb10u1 like done for [stable updates](https://www.debian.org/doc/manuals/developers-reference/pkgs.en.ht…: ``` $ dpkg --compare-versions 5.3.1+deb10u1 gt 5.3.1+deb9u1 ; … [View More]

3 5

[kamailio/kamailio] jansson_set() "result has json error" on long json strings (#2327)
by Victor Seva 14 May '20

14 May '20

### Description We noticed random errors from jansson module when: ``` xlog("L_NOTICE", "**** PRE '«$avp(i:901)»' - [% logres %]\n"); jansson_set("str", "cc_sub", "$avp(s:caller_concurrent_calls_count)", "$(avp(i:901)[*])"); ``` ``` May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near 'xMTAwMiIsImxucF' May 14 10:… [View More]11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near '0' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near 'TEwMDEiLCJkX' ``` ### Troubleshooting #### Reproduction `` jansson_set(type, key/path, value, result)`` Using a long json result, in my tests longer than 400 chars fires the ERROR #### Log Messages ``` May 14 10:11:37 sp1 proxy[23633]: NOTICE: <script>: Setting acc destination-leg for uuid '«0d5845e9-2cd1-4b1e-bbc4-6ca9102f864e»': '«{"gpp":["long long long long","long long long long","long long long long","long long long long","long long long long","l ong long long long","long long long long","long long long long","long long long long","long long long long"],"plu":0,"s_id":"","c_id":"","a_id":315,"dialed":"4311001","uuid":"0d5845e9-2cd1-4b1e-bbc4-6ca9102f864e","u":"testuser1001","d":"spce.test","u_in ":"4311001","d_in":"spce.test","lcr":0,"lnp_p":"","u_out":"testuser1001","lnp_t":"","fci":"","cc_quota":"","cc_sub":"","cc_cust":""}»' - R=«sip:conf=4311001@conference.local» ID=«NGCP%invite_conference_update%///1-23982(a)127.126.0.xn--1_pbx-1-yna UA='<null>' May 14 10:11:37 sp1 proxy[23633]: NOTICE: <script>: **** PRE '«{"gpp":[null,null,null,null,null,null,null,null,null,null],"clir":0,"uuid":"adeff08b-bd66-4578-8a01-194185d06827","u":"testuser1002","d":"spce.test","cli":"43110011002","s_id":"","c_id":""," a_id":315,"pau":"","par":"","s":"call","ip":"127.126.0.1","t":1589443897.908021,"lnp_p":"","cli_out":"43110011002","lnp_t":"","pai":"","div":"","cid":"","u2u":"","lcr":0,"cc_quota":"","cc_sub":"","cc_cust":""}»' - ID=«NGCP%invite_conference_update%///1- 23982(a)127.126.0.xn--1_pbx-1-yna UA='<null>' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near 'xMTAwMiIsImxucF' May 14 10:11:37 sp1 proxy[23633]: ERROR: jansson [jansson_funcs.c:219]: janssonmod_set(): result has json error at line 1: end of file expected near '0' ``` ### Possible Solutions In my fast check I notice the result is forced to end in '\0'. Preparing a PR with a solution. ### Additional Information * **Kamailio Version** - output of `kamailio -v` This is Sipwise's version but with no jansson patches at all ``` version: kamailio 5.3.4 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, 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 8.3.0 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2327 [View Less]

1 1

git:master:3abc650d: jansson: use the core macros for ending string value with '\0' and to restore
by Victor Seva 14 May '20

14 May '20

Module: kamailio Branch: master Commit: 3abc650d37e426840f060426a851ecac5210d2e5 URL: https://github.com/kamailio/kamailio/commit/3abc650d37e426840f060426a851eca… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-14T10:47:48+02:00 jansson: use the core macros for ending string value with '\0' and to restore fix #2327 --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.… [View More]com/kamailio/kamailio/commit/3abc650d37e426840f060426a851eca… Patch: https://github.com/kamailio/kamailio/commit/3abc650d37e426840f060426a851eca… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 7eceae4e96..a5f8b1f6fd 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -26,6 +26,7 @@ #include "../../core/mod_fix.h" #include "../../core/lvalue.h" +#include "../../core/str.h" #include "jansson_path.h" #include "jansson_funcs.h" @@ -33,13 +34,13 @@ int janssonmod_get_helper(sip_msg_t* msg, str *path_s, str *src_s, pv_spec_t *dst_pv) { - + char c; pv_value_t dst_val; json_t* json = NULL; json_error_t parsing_error; - + STR_VTOZ(src_s->s[src_s->len], c); json = json_loads(src_s->s, JSON_REJECT_DUPLICATES, &parsing_error); - + STR_ZTOV(src_s->s[src_s->len], c); if(!json) { ERR("failed to parse json: %.*s\n", src_s->len, src_s->s); ERR("json error at line %d, col %d: %s\n", @@ -98,7 +99,7 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, str type_s; str value_s; str path_s; - + char c; pv_spec_t* result_pv; pv_value_t result_val; @@ -126,14 +127,11 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, result_val.rs.len = strlen("{}"); } -/* - ALERT("type is: %.*s\n", type_s.len, type_s.s); - ALERT("path is: %.*s\n", path_s.len, path_s.s); - ALERT("value is: %.*s\n", value_s.len, value_s.s); - ALERT("result is: %.*s\n", result_val.rs.len, result_val.rs.s); -*/ - char* result = result_val.rs.s; + LM_DBG("type is: %.*s\n", type_s.len, type_s.s); + LM_DBG("path is: %.*s\n", path_s.len, path_s.s); + LM_DBG("value is: %.*s\n", value_s.len, value_s.s); + LM_DBG("result is: %.*s\n", result_val.rs.len, result_val.rs.s); json_t* result_json = NULL; json_t* value = NULL; @@ -143,14 +141,18 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, /* check the type */ if(STR_EQ_STATIC(type_s, "object") || STR_EQ_STATIC(type_s, "obj")){ + STR_VTOZ(value_s.s[value_s.len], c); value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); + STR_ZTOV(value_s.s[value_s.len], c); if(value && !json_is_object(value)) { ERR("value to add is not an object - \"%s\"\n", path_s.s); goto fail; } }else if(STR_EQ_STATIC(type_s, "array")) { + STR_VTOZ(value_s.s[value_s.len], c); value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); + STR_ZTOV(value_s.s[value_s.len], c); if(value && !json_is_array(value)) { ERR("value to add is not an array - \"%s\"\n", path_s.s); goto fail; @@ -211,9 +213,9 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, } char* path = path_s.s; - - result_json = json_loads(result, JSON_REJECT_DUPLICATES, &parsing_error); - + STR_VTOZ(result_val.rs.s[result_val.rs.len], c); + result_json = json_loads(result_val.rs.s, JSON_REJECT_DUPLICATES, &parsing_error); + STR_ZTOV(result_val.rs.s[result_val.rs.len], c); if(!result_json) { ERR("result has json error at line %d: %s\n", parsing_error.line, parsing_error.text); @@ -240,6 +242,7 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, int janssonmod_array_size(struct sip_msg* msg, char* path_in, char* src_in, char* dst) { + char c; str src_s; str path_s; pv_spec_t *dst_pv; @@ -259,9 +262,9 @@ int janssonmod_array_size(struct sip_msg* msg, char* path_in, char* src_in, char json_t* json = NULL; json_error_t parsing_error; - + STR_VTOZ(src_s.s[src_s.len], c); json = json_loads(src_s.s, JSON_REJECT_DUPLICATES, &parsing_error); - + STR_ZTOV(src_s.s[src_s.len], c); if(!json) { ERR("json error at line %d: %s\n", parsing_error.line, parsing_error.text); [View Less]

1 0

git:master:c1d3fdb3: misc: examples/kemi - small typo in lua example
by Daniel-Constantin Mierla 13 May '20

13 May '20

Module: kamailio Branch: master Commit: c1d3fdb31871078b666278a933dbab20a0a8dca3 URL: https://github.com/kamailio/kamailio/commit/c1d3fdb31871078b666278a933dbab2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T18:35:56+02:00 misc: examples/kemi - small typo in lua example --- Modified: misc/examples/kemi/kamailio-basic-kemi-lua.lua --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

Kamailio 5.2.7 Released
by Henning Westerholt 13 May '20

13 May '20

Hello, Kamailio SIP Server v5.2.7 stable release is out. This is a maintenance release of the previous stable branch (5.2), that includes fixes since the release of v5.2.6. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.2.x. Deployments running previous v5.2.x versions are strongly recommended to be upgraded to v5.2.7. For more details about version 5.2.7 (including links and guidelines to download the tar … [View More]

1 0

git:5.2:9ea54fe1: Changelog: update Changelog for 5.2.7
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 9ea54fe13f45723e83d773fb8a63fab98d8b8e0a URL: https://github.com/kamailio/kamailio/commit/9ea54fe13f45723e83d773fb8a63fab… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T15:12:58Z Changelog: update Changelog for 5.2.7 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/9ea54fe13f45723e83d773fb8a63fab… Patch: https://github.com/kamailio/kamailio/commit/9ea54fe13f45723e83d773fb8a63fab…

1 0

git:5.2:7a6c6031: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 7a6c603118acab5a515690f3c397f66088815733 URL: https://github.com/kamailio/kamailio/commit/7a6c603118acab5a515690f3c397f66… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-13T15:46:57+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/app_sqlang/README Modified: src/modules/corex/README Modified: src/modules/msilo/README Modified: src/… [View More]

1 0

git:5.3:fc28a142: pkg/kamailio: fixed python3 deps for RHEL 6
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: fc28a14203f59c62d2c745ffd294a5091bf8cb26 URL: https://github.com/kamailio/kamailio/commit/fc28a14203f59c62d2c745ffd294a50… Author: Sergey Safarov <s.safarov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T12:23:08Z pkg/kamailio: fixed python3 deps for RHEL 6 (cherry picked from commit 5f31a56acd25f892e6275e6ac786677f2eb2be0c) --- Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/… [View More]

1 0

git:5.3:cc31c71e: core: better debug logging in mk_action function
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: cc31c71e56f8feeeab45532f8fa954991817ed6d URL: https://github.com/kamailio/kamailio/commit/cc31c71e56f8feeeab45532f8fa9549… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T12:07:36Z core: better debug logging in mk_action function (cherry picked from commit 10b96696b82d2e70c15f3e4bc52097f0a5062499) --- Modified: src/core/route_struct.c --- Diff: https://github.com/kamailio/… [View More]

1 0

git:5.3:95733559: lib/srdb1/schema: removed kamailio-extensions.xml file
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 957335591e589cde0ae3127b6d2e50c092708e0e URL: https://github.com/kamailio/kamailio/commit/957335591e589cde0ae3127b6d2e50c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T12:16:32Z lib/srdb1/schema: removed kamailio-extensions.xml file - file didn't have any content itself, tried to include an inexistent extra.xml, which generated an warning for 'make dbschema' (cherry … [View More]

1 0

git:5.3:99c3ddec: pdb: covert byte-by-byte from buffer to short-int to avoid unalignment compile warning
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 99c3ddecd7887abed5ab087decdd9ff3712ff545 URL: https://github.com/kamailio/kamailio/commit/99c3ddecd7887abed5ab087decdd9ff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:56:48Z pdb: covert byte-by-byte from buffer to short-int to avoid unalignment compile warning - GH #2298 (cherry picked from commit 86ebb4eef482b37a3bb8bf033caa4d87fd8aeb87) --- Modified: src/… [View More]modules/pdb/pdb.c --- Diff: https://github.com/kamailio/kamailio/commit/99c3ddecd7887abed5ab087decdd9ff… Patch: https://github.com/kamailio/kamailio/commit/99c3ddecd7887abed5ab087decdd9ff… --- diff --git a/src/modules/pdb/pdb.c b/src/modules/pdb/pdb.c index b72ecf7f29..1ab15af2e7 100644 --- a/src/modules/pdb/pdb.c +++ b/src/modules/pdb/pdb.c @@ -189,6 +189,8 @@ static int pdb_msg_format_send(struct pdb_msg *msg, } +/* two chars to short-int without caring of memory alignment in char buffer */ +#define PDB_BUFTOSHORT(_b, _n) (((short int)_b[_n]) << 8) | (0x00ff & _b[_n+1]) /*! * \return 1 if query for the number succeded and the avp with the corresponding carrier id was set, @@ -199,7 +201,7 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct struct pdb_msg msg; struct timeval tstart, tnow; struct server_item_t *server; - short int carrierid, *_id; + short int carrierid, _id; short int _idv; char buf[sizeof(struct pdb_msg)]; size_t reqlen; @@ -345,8 +347,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct case PDB_CODE_OK: msg.bdy.payload[sizeof(struct pdb_bdy) - 1] = '\0'; if (strcmp(msg.bdy.payload, number.s) == 0) { - _id = (short int *)&(msg.bdy.payload[reqlen]); /* make gcc happy */ - carrierid=ntohs(*_id); /* convert to host byte order */ + _id = PDB_BUFTOSHORT(msg.bdy.payload, reqlen); /* make gcc happy */ + carrierid=ntohs(_id); /* convert to host byte order */ goto found; } break; @@ -368,8 +370,8 @@ static int pdb_query(struct sip_msg *_msg, struct multiparam_t *_number, struct default: buf[sizeof(struct pdb_msg) - 1] = '\0'; if (strncmp(buf, number.s, number.len) == 0) { - _id = (short int *)&(buf[reqlen]); - carrierid=ntohs(*_id); /* convert to host byte order */ + _id = PDB_BUFTOSHORT(buf, reqlen); /* make gcc happy */ + carrierid=ntohs(_id); /* convert to host byte order */ goto found; } break; [View Less]

1 0

git:5.3:2396526c: lib/srdb1: fix warning about wrong namespace in version.xml
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 2396526ca13f3373d41d727119326fd9a41b7eb7 URL: https://github.com/kamailio/kamailio/commit/2396526ca13f3373d41d727119326fd… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:52:32Z lib/srdb1: fix warning about wrong namespace in version.xml (cherry picked from commit d4311f3dfa3fc6c3836e8573fb12bc2ae4b6c264) --- Modified: src/lib/srdb1/schema/version.xml --- Diff: https://… [View More]

1 0

git: new commits in branch 5.2
by Henning Westerholt 13 May '20

13 May '20

- URL: https://github.com/kamailio/kamailio/commit/f1c05b27544736f9f7f4db25072e62e… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:43:15Z core: initialize memory to 0 in cfg parser in a few more places (cherry picked from commit 5e42adae624f9741e26dfb0af4accede2a8f92d2) - URL: https://github.com/kamailio/kamailio/commit/1cc1cd9d1f921af74aaf4355b860605… Author: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T11:43:15Z core: small improvement … [View More]

1 0

warnings with gcc 9.3 on app_sqlang ,squirrel
by Henning Westerholt 13 May '20

13 May '20

Hello, Just a quick note - I get the following warnings on app_sqlang with gcc 9.3.0 (Ubuntu 20.04): henning@static:~/repositories/kamailio/src/modules/app_sqlang$ make CC (gcc) [M app_sqlang.so] app_sqlang_api.o CC (gcc) [M app_sqlang.so] app_sqlang_kemi_export.o CC (gcc) [M app_sqlang.so] app_sqlang_mod.o make --no-print-directory -C ./squirrel/squirrel SQMARCH64="-m64" CC_EXTRA_FLAGS="-fPIC" \ OUT="../../libsquirrel.a" sq64 gcc -O2 -m64 -… [View More]D_SQ64 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c sqapi.cpp sqbaselib.cpp sqfuncstate.cpp sqdebug.cpp sqlexer.cpp sqobject.cpp sqcompiler.cpp sqstate.cpp sqtable.cpp sqmem.cpp sqvm.cpp sqclass.cpp -I../include -I. -Iinclude -fPIC In file included from sqobject.h:5, from sqpcheader.h:17, from sqapi.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqapi.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqbaselib.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqbaselib.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqobject.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqobject.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqstate.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqstate.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ In file included from sqobject.h:5, from sqpcheader.h:17, from sqvm.cpp:4: squtils.h: In instantiation of 'void sqvector<T>::remove(SQUnsignedInteger) [with T = SQObjectPtr; SQUnsignedInteger = long long unsigned int]': sqarray.h:83:27: required from here squtils.h:97:20: warning: 'void* memmove(void*, const void*, size_t)' writing to an object of type 'struct SQObjectPtr' with no trivial copy-assignment; use copy-assignment or copy-initialization instead [-Wclass-memaccess] 97 | memmove(&_vals[idx], &_vals[idx+1], sizeof(T) * (_size - idx - 1)); | ~~~~~~~^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In file included from sqpcheader.h:17, from sqvm.cpp:4: sqobject.h:205:8: note: 'struct SQObjectPtr' declared here 205 | struct SQObjectPtr : public SQObject | ^~~~~~~~~~~ -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/> [View Less]

3 3

[kamailio/kamailio] ndb_redis: failed build on alpine (#2325)
by sergey-safarov 13 May '20

13 May '20

### Description ``` CC (gcc) [M db_redis.so] db_redis_mod.o CC (gcc) [M db_redis.so] redis_connection.o CC (gcc) [M db_redis.so] redis_dbase.o CC (gcc) [M db_redis.so] redis_table.o make[3]: 'libsrdb2.so.1.0' is up to date. make[3]: 'libsrdb1.so.1.0' is up to date. LD (gcc) [M db_redis.so] db_redis.so CC (gcc) [M ndb_redis.so] ndb_redis_mod.o CC (gcc) [M ndb_redis.so] redis_client.o redis_client.c: In function 'redisc_append_cmd': redis_client.c:558:31: error: expected 'while' before ';' token … [View More]

1 2

git:5.2:c291d25b: pkg/kamailio/deb: version set 5.2.7
by Victor Seva 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: c291d25b4da3b13eee49121f30947b12ea8562e1 URL: https://github.com/kamailio/kamailio/commit/c291d25b4da3b13eee49121f30947b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-13T12:43:45+02:00 pkg/kamailio/deb: version set 5.2.7 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/… [View More]

1 0

git:5.2:08889eb0: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 08889eb0cf8986920fdbd81ce5097913296a6fd3 URL: https://github.com/kamailio/kamailio/commit/08889eb0cf8986920fdbd81ce509791… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-13T12:31:53+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/htable/README Modified: src/modules/rtjson/README Modified: src/modules/tls/README Modified: src/… [View More]

1 0

git: new commits in branch 5.2
by Henning Westerholt 13 May '20

13 May '20

- URL: https://github.com/kamailio/kamailio/commit/93d19643fa01c821ca653c7d10f5904… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: 2020-05-13T10:23:09Z usrloc: doc fixes * add doc for parameter reg_id_column * fix title for parameter partition_column (cherry picked from commit 305ba1b23bae19a4042c3e8fa88451b47ac69ff5) - URL: https://github.com/kamailio/kamailio/commit/1cedde96d36c24e6fd2f1a98d6ea9a2… Author: Bastian Triller <bastian.triller(a)gmail.com> Date: … [View More]

1 0

git:5.3:11f64c95: ims_usrloc_scscf: extend and fix log messages
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 11f64c9562c71b45497901be6b606ba86546126e URL: https://github.com/kamailio/kamailio/commit/11f64c9562c71b45497901be6b606ba… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T10:05:35Z ims_usrloc_scscf: extend and fix log messages (cherry picked from commit b2487d95f61b46033eb2825c5f54d5f19ca1e878) --- Modified: src/modules/ims_usrloc_scscf/impurecord.c Modified: src/modules/… [View More]

1 0

git:5.3:ebd35b33: ims_registrar_scscf: fix aor generation in lookup()
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: ebd35b33f3afe9aa1b1858f07b672370267f532c URL: https://github.com/kamailio/kamailio/commit/ebd35b33f3afe9aa1b1858f07b67237… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T10:05:18Z ims_registrar_scscf: fix aor generation in lookup() - Generate AoR in lookup() from parsed uri user and host. Skipping all user's and host's parameters. (cherry picked from commit … [View More]e53b25f89a14aba93d3c48a1b2f983114db1760c) --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/ebd35b33f3afe9aa1b1858f07b67237… Patch: https://github.com/kamailio/kamailio/commit/ebd35b33f3afe9aa1b1858f07b67237… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 0e7b06cf60..640dbb9707 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -61,13 +61,12 @@ */ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { impurecord_t* r; - str aor; + str aor, tmp_aor; ucontact_t* ptr = 0; int res; int ret; str path_dst; flag_t old_bflags; - int i = 0; int ue_type; /*0=any, 1=3gpp, 2=sip */ impu_contact_t *impucontact; @@ -91,29 +90,35 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) { - aor.s = pkg_malloc(_m->new_uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); - aor.len = _m->new_uri.len; - } else { - aor.s = pkg_malloc(_m->first_line.u.request.uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - aor.len = _m->first_line.u.request.uri.len; - } - - for (i = 4; i < aor.len; i++) - if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { - aor.len = i; - break; - } + if (parse_sip_msg_uri(_m) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + return -1; + } + + if (_m->new_uri.s) { + tmp_aor = _m->new_uri; + } else { + tmp_aor = _m->first_line.u.request.uri; + } + + aor.s = pkg_malloc(tmp_aor.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + + // build aor + // add 'sip:' or 'tel:' + memcpy(aor.s, tmp_aor.s, 4); + aor.len = 4; + // add user part + memcpy(aor.s + aor.len, _m->parsed_uri.user.s, _m->parsed_uri.user.len); + aor.len += _m->parsed_uri.user.len; + // add '@' + aor.s[aor.len++] = '@'; + // add host part + memcpy(aor.s + aor.len, _m->parsed_uri.host.s, _m->parsed_uri.host.len); + aor.len += _m->parsed_uri.host.len; LM_DBG("Looking for <%.*s>\n", aor.len, aor.s); [View Less]

1 0

git:5.3:702ec6fb: ims_registrar_scscf: fix multiple contacts in NOTIFY
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.3 Commit: 702ec6fb87ede0fe20e621b1e4a8eead057b0fcc URL: https://github.com/kamailio/kamailio/commit/702ec6fb87ede0fe20e621b1e4a8eea… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T10:05:11Z ims_registrar_scscf: fix multiple contacts in NOTIFY - Prevent multiple contacts for NOTIFY message in Message body <registration> tag after RE-REGISTRATION procedure. (cherry picked … [View More]

1 0

git:5.2:55ee4b0e: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 55ee4b0ec44b57612653188ea6394f269f47138b URL: https://github.com/kamailio/kamailio/commit/55ee4b0ec44b57612653188ea6394f2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-13T11:46:39+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/dispatcher/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git: new commits in branch 5.2
by Henning Westerholt 13 May '20

13 May '20

- URL: https://github.com/kamailio/kamailio/commit/8c09b29f1a9e577dbf3c42df83e20ad… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:15:13Z dispatcher: docs - note about special attributes section for weight dispatching (cherry picked from commit 7602329391760b2f18d653f46d6a596be1daade5) - URL: https://github.com/kamailio/kamailio/commit/6f096013bf782f35e9ea96fc2174884… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-13T09:16:… [View More]

1 0

git:5.2:3235a046: Makefile.defs: detect gcc 9.0+, manual backport of 07209c3095d
by Henning Westerholt 13 May '20

13 May '20

Module: kamailio Branch: 5.2 Commit: 3235a04621dbcc3196d7e49641ec73fcebcf0ece URL: https://github.com/kamailio/kamailio/commit/3235a04621dbcc3196d7e49641ec73f… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-13T08:47:09Z Makefile.defs: detect gcc 9.0+, manual backport of 07209c3095d --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/3235a04621dbcc3196d7e49641ec73f… Patch: https://github.com/kamailio/kamailio/commit/3235a04621dbcc3196d7e49641ec73f…

1 0

Releasing Kamailio 5.2.7
by Henning Westerholt 13 May '20

13 May '20

Hello, as discussed in the last development meeting, I am planning to release next week (likely on Wednesday 13th May) the next minor version out of branch 5.2, version 5.2.7. Backports of fixed issues from git master will be integrated as usual. If you are aware of new issues which were not yet reported, let us know (by creating an issue on the tracker). Cheers, Henning -- Henning Westerholt - https://skalatan.de/blog/ Kamailio services - https://gilawa.com<https://gilawa.com/>

1 1

git:master:730f65c0: core: explicit cast to (void*) for %p format printing
by Daniel-Constantin Mierla 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 730f65c06d0b8436e4a9cd0c1a62d2433819dc45 URL: https://github.com/kamailio/kamailio/commit/730f65c06d0b8436e4a9cd0c1a62d24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-12T19:52:52+02:00 core: explicit cast to (void*) for %p format printing - c standard required that for a defined value and in some cases the code analysers complain, especially when reading the … [View More]

1 0

git:master:702630b4: imc: reserve last char in global buffer for ending zero
by Daniel-Constantin Mierla 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 702630b484ac6f7c017829c24294ce7552f1682a URL: https://github.com/kamailio/kamailio/commit/702630b484ac6f7c017829c24294ce7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-12T18:01:15+02:00 imc: reserve last char in global buffer for ending zero --- Modified: src/modules/imc/imc_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:94eb9fed: keepalive: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 94eb9fed8b1d4a0aaaf76506e339f2d6a9e34e7d URL: https://github.com/kamailio/kamailio/commit/94eb9fed8b1d4a0aaaf76506e339f2d… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:45:23+02:00 keepalive: use ctime_r() for a safer multi-thread usage --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:259af0c1: sipdump: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 259af0c1eea8419df247c8da0f12b1881afa5332 URL: https://github.com/kamailio/kamailio/commit/259af0c1eea8419df247c8da0f12b18… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:32:31+02:00 sipdump: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/sipdump/sipdump_write.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:92e2c22c: tmrec: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 92e2c22c3c709c3c9a5243b5d5bdd48293865b0c URL: https://github.com/kamailio/kamailio/commit/92e2c22c3c709c3c9a5243b5d5bdd48… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:27:58+02:00 tmrec: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/tmrec/tmrec_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:19769eb3: pv: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 19769eb372ca4d37ed45fef561cf966360ea6fd4 URL: https://github.com/kamailio/kamailio/commit/19769eb372ca4d37ed45fef561cf966… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:26:07+02:00 pv: use ctime_r() for a safer multi-thread usage --- Modified: src/modules/pv/pv_time.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:f72cc60b: msilo: use [c|gm]time_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: f72cc60b9e82bc810c08d42a49bb23e5134ffa9d URL: https://github.com/kamailio/kamailio/commit/f72cc60b9e82bc810c08d42a49bb23e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:19:18+02:00 msilo: use [c|gm]time_r() for a safer multi-thread usage --- Modified: src/modules/msilo/msfuncs.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]f72cc60b9e82bc810c08d42a49bb23e… Patch: https://github.com/kamailio/kamailio/commit/f72cc60b9e82bc810c08d42a49bb23e… --- diff --git a/src/modules/msilo/msfuncs.c b/src/modules/msilo/msfuncs.c index 5262a81159..dd2f4762b7 100644 --- a/src/modules/msilo/msfuncs.c +++ b/src/modules/msilo/msfuncs.c @@ -93,24 +93,24 @@ int m_apo_escape(char* src, int slen, char* dst, int dlen) */ int timetToSipDateStr(time_t date, char* buf, int bufLen) { - struct tm *gmt; + struct tm gmt; char* dayArray[7] = {"Sun","Mon","Tue","Wed","Thu","Fri","Sat"}; char* monthArray[12] = {"Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"}; int len = 0; - gmt = gmtime(&date); + gmtime_r(&date, &gmt); /* In RFC 3261 the format is always GMT and in the string form like * "Wkday, Day Month Year HOUR:MIN:SEC GMT" * "Mon, 19 Feb 2007 18:42:27 GMT" */ len = snprintf(buf,bufLen,"Date: %s, %02d %s %d %02d:%02d:%02d GMT\r\n", - dayArray[gmt->tm_wday], - gmt->tm_mday, - monthArray[gmt->tm_mon], - 1900 + gmt->tm_year, - gmt->tm_hour, - gmt->tm_min, - gmt->tm_sec + dayArray[gmt.tm_wday], + gmt.tm_mday, + monthArray[gmt.tm_mon], + 1900 + gmt.tm_year, + gmt.tm_hour, + gmt.tm_min, + gmt.tm_sec ); /* snprintf returns number of chars it should have printed, so you @@ -243,7 +243,7 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) return -1; } -/** build MESSAGE body --- add incoming time and 'from' +/** build MESSAGE body --- add incoming time and 'from' * * expects - max buf len of the resulted body in body->len * - body->s MUST be allocated @@ -252,11 +252,12 @@ int m_build_headers(str *buf, str ctype, str contact, time_t date, str extra) int m_build_body(str *body, time_t date, str msg, time_t sdate) { char *p; - + char t_buf[26] = {0}; + if(!body || !(body->s) || body->len <= 0 || msg.len <= 0 || date < 0 || msg.len < 0 || (46+msg.len > body->len) ) goto error; - + p = body->s; if(ms_add_date!=0) @@ -265,28 +266,28 @@ int m_build_body(str *body, time_t date, str msg, time_t sdate) { memcpy(p, "[Reminder message - ", 20); p += 20; - - memcpy(p, ctime(&sdate), 24); + ctime_r(&sdate, t_buf); + memcpy(p, t_buf, 24); p += 24; *p++ = ']'; } else { memcpy(p, "[Offline message - ", 19); p += 19; - - memcpy(p, ctime(&date), 24); + ctime_r(&date, t_buf); + memcpy(p, t_buf, 24); p += 24; *p++ = ']'; } *p++ = ' '; } - + memcpy(p, msg.s, msg.len); p += msg.len; body->len = p - body->s; - + return 0; error: return -1; [View Less]

1 0

git:master:2394c0a9: msrp: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 2394c0a97387efefde6a6784e09e02f3ff8a841c URL: https://github.com/kamailio/kamailio/commit/2394c0a97387efefde6a6784e09e02f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:14:39+02:00 msrp: use ctime_r() for a safer multi-thread usage --- Modified: src/modules/msrp/msrp_cmap.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:0cdd35c7: acc: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 0cdd35c7c685cf65687be12c23135be89728cbf3 URL: https://github.com/kamailio/kamailio/commit/0cdd35c7c685cf65687be12c23135be… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:11:29+02:00 acc: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/acc/acc.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:a05d313e: sipdump: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: a05d313e0fa27952d7b10329ca1da9b041369ffb URL: https://github.com/kamailio/kamailio/commit/a05d313e0fa27952d7b10329ca1da9b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T16:08:21+02:00 sipdump: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:14aa67d7: xhttp_rpc: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 14aa67d750150cf6eb588b350ce156b770d4816d URL: https://github.com/kamailio/kamailio/commit/14aa67d750150cf6eb588b350ce156b… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T15:02:50+02:00 xhttp_rpc: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/xhttp_rpc/xhttp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:c244381c: acc: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: c244381c69459b3708d3603e548fafac8321acf8 URL: https://github.com/kamailio/kamailio/commit/c244381c69459b3708d3603e548fafa… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:59:13+02:00 acc: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/acc/acc_cdr.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:1fe9da8c: drouting: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 1fe9da8c118f2ff3ebe1913238b609500cca8f23 URL: https://github.com/kamailio/kamailio/commit/1fe9da8c118f2ff3ebe1913238b6095… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:57:13+02:00 drouting: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/drouting/dr_time.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:d780945b: smsops: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: d780945bc9a186d54439e1258ac540cd5f7bd86d URL: https://github.com/kamailio/kamailio/commit/d780945bc9a186d54439e1258ac540c… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:54:04+02:00 smsops: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/smsops/smsops_impl.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:150e757e: db_mysql: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 150e757ec0fdadeee7b0ce8b6362f1a01aa0c382 URL: https://github.com/kamailio/kamailio/commit/150e757ec0fdadeee7b0ce8b6362f1a… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:51:48+02:00 db_mysql: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/db_mysql/my_cmd.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:60072749: jsonrpcs: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 6007274938387359bb0a9b54528a5f3c87700356 URL: https://github.com/kamailio/kamailio/commit/6007274938387359bb0a9b54528a5f3… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:49:47+02:00 jsonrpcs: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/jsonrpcs/jsonrpcs_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:d54eed9e: msilo: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: d54eed9eb2f3a09a70f679ea0fb7cac64a5aa14a URL: https://github.com/kamailio/kamailio/commit/d54eed9eb2f3a09a70f679ea0fb7cac… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:46:15+02:00 msilo: use ctime_r() for a safer multi-thread usage > The reentrant version ctime_r() does the same, but stores > the string in a user-supplied buffer which … [View More]

1 0

git:master:3dc960b6: xprint: use ctime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 3dc960b6db3dc5807814fc73887f985bf2ff91d7 URL: https://github.com/kamailio/kamailio/commit/3dc960b6db3dc5807814fc73887f985… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:38:43+02:00 xprint: use ctime_r() for a safer multi-thread usage > The reentrant version ctime_r() does the same, but stores > the string in a user-supplied buffer which … [View More]

1 0

git:master:f9ae1174: db_redis: use localtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: f9ae11746fb820bb24057f4b3509bd59b6d3e936 URL: https://github.com/kamailio/kamailio/commit/f9ae11746fb820bb24057f4b3509bd5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:30:26+02:00 db_redis: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/db_redis/redis_dbase.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:8f8ebbe6: textops: use gmtime_r() for a safer multi-thread usage
by Victor Seva 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 8f8ebbe65cfa5d90a7a4186be605192c179a6483 URL: https://github.com/kamailio/kamailio/commit/8f8ebbe65cfa5d90a7a4186be605192… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-12T14:22:24+02:00 textops: use gmtime_r() for a safer multi-thread usage --- Modified: src/modules/textops/textops.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:90275e02: modules: readme files regenerated - keepalive ... [skip ci]
by Kamailio Dev 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 90275e02faf75454026597c1e720487b5d845f79 URL: https://github.com/kamailio/kamailio/commit/90275e02faf75454026597c1e720487… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-12T14:16:12+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]90275e02faf75454026597c1e720487… Patch: https://github.com/kamailio/kamailio/commit/90275e02faf75454026597c1e720487… --- diff --git a/src/modules/keepalive/README b/src/modules/keepalive/README index 4437803128..f69641e421 100644 --- a/src/modules/keepalive/README +++ b/src/modules/keepalive/README @@ -56,7 +56,7 @@ Yasin CANER 1. Available Functions 1.1. add_destination(uri, owner, flags, ping_interval, - [callback, [user_attr]]) + [statechanged_clb, response_clb, [user_attr]]) 1.2. Examples @@ -324,8 +324,8 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, ping_interval, [callback, - [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, + [statechanged_clb, response_clb, [user_attr]]) 1.2. Examples @@ -338,13 +338,13 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, ping_interval, [callback, - [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, + [statechanged_clb, response_clb, [user_attr]]) 1.2. Examples -1.1. add_destination(uri, owner, flags, ping_interval, [callback, -[user_attr]]) +1.1. add_destination(uri, owner, flags, ping_interval, [statechanged_clb, +response_clb, [user_attr]]) This function registers a new destination to monitor. Monitoring of the destination starts as soon as it returns with success (0 value). @@ -361,7 +361,7 @@ Chapter 2. Developer Guide * flags (integer) - destination flags (unused for now, use 0 value) * ping_interval (integer) - Pinging interval in seconds for this destination - * callback (ka_statechanged_f, optional) - callback function, + * statechanged_clb (ka_statechanged_f, optional) - callback function, executed on destination's state change. The callback function is of type void (*ka_statechanged_f)(str *uri, int state, void *user_attr);. Use NULL to set no callback. @@ -370,9 +370,17 @@ Chapter 2. Developer Guide waiting first ping replies or timeout) + 1 - destination is UP + 2 - destination is DOWN - * user_attr (void * pointer, optional) - If callback function is - setup, this parameter will be forwarded to it, as last parameter. - Use NULL to set no user_attr parameter. + * response_clb (ka_response_f, optional) - callback function, + executed on destination's response provided. + The callback function is of type void (*ka_response_f)(str *uri, + struct tmcb_params *ps, void *user_attr);. Use NULL to set no + callback. + ps is a pack structure with all params passed to callback function. + Defined in t_hooks.h + * user_attr (void * pointer, optional) - If any callback function is + setup, this parameter will be forwarded to it (or both callbacks in + both are defined), as last parameter. Use NULL to set no user_attr + parameter. Returned values: * 0 if ok @@ -395,17 +403,18 @@ if (bind_keepalive( &ka_api ) != 0) { } ... ... -/* callback function */ -void my_callback(str uri, int state, void *user_attr) { - +/* callback function (on state changed) */ +void my_state_changed_clb(str uri, int state, void *user_attr) { printf("%.*s new state is: %d\n", uri.len, uri.str, state) } -/* register a new destination */ -str dest = str_init("sip:192.168.10.21:5060"); -str owner = str_init("mymodule"); +/* callback function (on each response received) */ +void my_response_clb(str *uri, struct tmcb_params *ps, void *user_attr) { + printf("response [%d] from %.*s\n", ps->code, uri.len, uri.str) +} -if (ka_api.add_destination(dest, owner, 0, 60, my_callback, NULL) != 0) { +if (ka_api.add_destination(dest, owner, 0, 60, my_state_changed_clb, + my_response_clb, NULL) != 0) { LM_ERR("can't add destination\n"); goto error; } [View Less]

1 0

[kamailio/kamailio] keepalive: update rpc response to include current state (#2323)
by Kinshuk Bairagi 12 May '20

12 May '20

#### 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 … [View More]

2 3

git:master:2372dc93: Merge pull request #2323 from voiceip/keepalive-rpc-change
by GitHub 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 2372dc933926611dad22812e0d550ae736249a06 URL: https://github.com/kamailio/kamailio/commit/2372dc933926611dad22812e0d550ae… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:05:27+02:00 Merge pull request #2323 from voiceip/keepalive-rpc-change keepalive: update rpc response to include current state --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://… [View More]

1 0

git:master:7ae22f68: keepalive: update rpc response
by kinshuk.bairagi 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 7ae22f6872cc3f74fecb0ebee797ff3f80c34fd3 URL: https://github.com/kamailio/kamailio/commit/7ae22f6872cc3f74fecb0ebee797ff3… Author: kinshuk.bairagi <me(a)kinshuk.in> Committer: kinshuk.bairagi <me(a)kinshuk.in> Date: 2020-05-11T17:53:28+05:30 keepalive: update rpc response - Adds current state as part of rpc response per destination wise --- Modified: src/modules/keepalive/keepalive_rpc.c --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

[kamailio/kamailio] ndb_redis: add sentinel support to reconnection logic (#2319)
by Carlos Cruz Luengo 12 May '20

12 May '20

#### 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 … [View More]

2 2

git:master:62e51095: Merge pull request #2319 from cruzccl/redis-sentinel-reconnection
by GitHub 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 62e510957c28e8b8419f7f65b6a866c1a9d0de5b URL: https://github.com/kamailio/kamailio/commit/62e510957c28e8b8419f7f65b6a866c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:04:21+02:00 Merge pull request #2319 from cruzccl/redis-sentinel-reconnection ndb_redis: add sentinel support to reconnection logic --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://… [View More]github.com/kamailio/kamailio/commit/62e510957c28e8b8419f7f65b6a866c… Patch: https://github.com/kamailio/kamailio/commit/62e510957c28e8b8419f7f65b6a866c… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 44460aa2fd..5ad063f89a 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -408,8 +408,11 @@ redisc_server_t *redisc_get_server(str *name) */ int redisc_reconnect_server(redisc_server_t *rsrv) { - char addr[256], pass[256], unix_sock_path[256]; - unsigned int port, db, sock = 0, haspass = 0; + char addr[256], pass[256], unix_sock_path[256], sentinel_group[256]; + unsigned int port, db, sock = 0, haspass = 0, sentinel_master = 1; + char sentinels[MAXIMUM_SENTINELS][256]; + uint8_t sentinels_count = 0; + int i, row; param_t *pit = NULL; struct timeval tv_conn; struct timeval tv_cmd; @@ -442,6 +445,84 @@ int redisc_reconnect_server(redisc_server_t *rsrv) } else if(pit->name.len==4 && strncmp(pit->name.s, "pass", 4)==0) { snprintf(pass, sizeof(pass)-1, "%.*s", pit->body.len, pit->body.s); haspass = 1; + } else if(pit->name.len==14 && strncmp(pit->name.s, + "sentinel_group", 14)==0) { + snprintf(sentinel_group, sizeof(sentinel_group)-1, "%.*s", + pit->body.len, pit->body.s); + } else if(pit->name.len==15 && strncmp(pit->name.s, + "sentinel_master", 15)==0) { + if(str2int(&pit->body, &sentinel_master) < 0) + sentinel_master = 1; + } else if(pit->name.len==8 && strncmp(pit->name.s, + "sentinel", 8)==0) { + if( sentinels_count < MAXIMUM_SENTINELS ){ + snprintf(sentinels[sentinels_count], + sizeof(sentinels[sentinels_count])-1, "%.*s", + pit->body.len, pit->body.s); + sentinels_count++; + } + else { + LM_ERR("too many sentinels, maximum %d supported.\n", + MAXIMUM_SENTINELS); + return -1; + } + } + } + + // if sentinels are provided, we need to connect to them and retrieve the redis server + // address / port + if(sentinels_count > 0) { + for(i= 0; i< sentinels_count; i++) { + char *sentinelAddr = sentinels[i]; + char *pos; + redisContext *redis; + redisReply *res, *res2; + + port = 6379; + if( (pos = strchr(sentinelAddr, ':')) != NULL ) { + port = atoi(pos+1); + pos[i] = '\0'; + } + + redis = redisConnectWithTimeout(sentinelAddr, port, tv_conn); + if( redis ) { + if(sentinel_master != 0) { + res = redisCommand(redis, + "SENTINEL get-master-addr-by-name %s", + sentinel_group); + if( res && (res->type == REDIS_REPLY_ARRAY) + && (res->elements == 2) ) { + strncpy(addr, res->element[0]->str, + res->element[0]->len + 1); + port = atoi(res->element[1]->str); + LM_DBG("sentinel replied: %s:%d\n", addr, port); + } + } + else { + res = redisCommand(redis, "SENTINEL slaves %s", + sentinel_group); + if( res && (res->type == REDIS_REPLY_ARRAY) ) { + for(row = 0; row< res->elements; row++){ + res2 = res->element[row]; + for(i= 0; i< res2->elements; i+= 2) { + if( strncmp(res2->element[i]->str, + "ip", 2) == 0 ) { + strncpy(addr, res2->element[i+1]->str, + res2->element[i+1]->len); + addr[res2->element[i+1]->len] = '\0'; + } + else if( strncmp(res2->element[i]->str, + "port", 4) == 0) { + port = atoi(res2->element[i+1]->str); + break; + } + } + } + LM_DBG("slave for %s: %s:%d\n", sentinel_group, + addr, port); + } + } + } } } [View Less]

1 0

[kamailio/kamailio] Keepalive/response callback (#2318)
by Nacho G. 12 May '20

12 May '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  This change allows you to set a new callback for keepalive that will be executed each time it receives a response for an OPTIONS message. This change is compatible (not breaking) with .cfg or kemi invocations, but it's breaking developers api. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2318 -- Commit Summary -- * keepalive: Added callback to run on each destination response. * drouting: update to new keepalive interface, using new on response callback -- File Changes -- M src/modules/drouting/drouting.c (2) M src/modules/keepalive/api.h (3) M src/modules/keepalive/doc/keepalive.xml (1) M src/modules/keepalive/doc/keepalive_devel.xml (32) M src/modules/keepalive/keepalive.h (7) M src/modules/keepalive/keepalive_api.c (5) M src/modules/keepalive/keepalive_core.c (3) M src/modules/keepalive/keepalive_mod.c (6) M src/modules/keepalive/keepalive_rpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2318.patch https://github.com/kamailio/kamailio/pull/2318.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/2318 [View Less]

2 2

git:master:2373495a: Merge pull request #2318 from NGSegovia/keepalive/response_callback
by GitHub 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 2373495a3f79509a2f79830da0105d02bf1b649e URL: https://github.com/kamailio/kamailio/commit/2373495a3f79509a2f79830da0105d0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-12T14:02:18+02:00 Merge pull request #2318 from NGSegovia/keepalive/response_callback Keepalive/response callback --- Modified: src/modules/drouting/drouting.c Modified: src/modules/keepalive/api.h Modified: … [View More]

1 0

git:master:9700a8da: keepalive: Added callback to run on each destination response.
by Nacho Garcia Segovia 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 9700a8dae237758e162e509455bc3a62b19730f4 URL: https://github.com/kamailio/kamailio/commit/9700a8dae237758e162e509455bc3a6… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-07T23:50:10+02:00 keepalive: Added callback to run on each destination response. - This functionality it's just available when using api.h bindings. For exported functions no callback will be used, … [View More]

1 0

git:master:9cd73c58: drouting: update to new keepalive interface, using new on response callback
by Nacho Garcia Segovia 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 9cd73c58239e50574d73d88792240a4ca569d709 URL: https://github.com/kamailio/kamailio/commit/9cd73c58239e50574d73d88792240a4… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-07T23:50:20+02:00 drouting: update to new keepalive interface, using new on response callback - Changes required because of dependencies from module keepalive. --- Modified: src/modules/drouting/… [View More]

1 0

git:master:66aebfd6: modules: readme files regenerated - rtpengine ... [skip ci]
by Kamailio Dev 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 66aebfd65be6b6f9645413b1c2cff932c9dfc2dd URL: https://github.com/kamailio/kamailio/commit/66aebfd65be6b6f9645413b1c2cff93… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-12T10:31:19+02:00 modules: readme files regenerated - rtpengine ... [skip ci] --- Modified: src/modules/rtpengine/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:bcada2c8: rtpengine: Update docs - fix formatting, some typos
by Olle E. Johansson 12 May '20

12 May '20

Module: kamailio Branch: master Commit: bcada2c8afbea70e2f05c9c2419af857577316a3 URL: https://github.com/kamailio/kamailio/commit/bcada2c8afbea70e2f05c9c2419af85… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-12T10:22:07+02:00 rtpengine: Update docs - fix formatting, some typos --- Modified: src/modules/rtpengine/doc/rtpengine_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:4d450116: modules: readme files regenerated - tls ... [skip ci]
by Kamailio Dev 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 4d450116309d1a2e2b6aceb6fa16657a1e9f44fb URL: https://github.com/kamailio/kamailio/commit/4d450116309d1a2e2b6aceb6fa16657… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-12T09:16:20+02:00 modules: readme files regenerated - tls ... [skip ci] --- Modified: src/modules/tls/README --- Diff: https://github.com/kamailio/kamailio/commit/4d450116309d1a2e2b6aceb6fa16657… … [View More]Patch: https://github.com/kamailio/kamailio/commit/4d450116309d1a2e2b6aceb6fa16657… --- diff --git a/src/modules/tls/README b/src/modules/tls/README index 04503393a2..81eb47590b 100644 --- a/src/modules/tls/README +++ b/src/modules/tls/README @@ -638,7 +638,7 @@ Place holder use SSLv3 for anything which should be secure. * SSLv2 - only SSLv2 connections, for old clients. Note: you shouldn't use SSLv2 for anything which should be secure. Newer - versions of libssl don't include support for it anymore. + versions of OpenSSL libraries don't include support for it anymore. * SSLv23 - any of the SSLv2, SSLv3 and TLSv1 or newer methods will be accepted. From the OpenSSL manual: "A TLS/SSL connection established with @@ -649,9 +649,9 @@ Place holder TLSv1.2 and permits a fallback to SSLv3. A server will support SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. This is the best choice when compatibility is a concern." - Note: For older libssl version, this option allows SSLv2, with - hello messages done over SSLv2. You shouldn't use SSLv2 or SSLv3 - for anything which should be secure. + Note: For older OpenSSL library versions, this option allows SSLv2, + with hello messages done over SSLv2. You shouldn't use SSLv2 or + SSLv3 for anything which should be secure. If RFC 3261 conformance is desired, at least TLSv1 must be used. For compatibility with older clients SSLv23 is the option, but again, be @@ -1220,7 +1220,7 @@ modparam("tls", "session_cache", 1) The value for session ID context, making sense when session caching is enabled. - By default TLS session_id is "sip-router-tls-3.1". + By default TLS session_id is "kamailio-tls-5.x.y". Example 1.38. Set session_id parameter ... @@ -1477,7 +1477,7 @@ modparam("tls", "private_key", "/engine:my_HSM_key_label") modparam("tls", "engine", "pkcs11") modparam("tls", "private_key", "/engine:pkcs11:token=MYTOKEN;object=MYKEYLABEL") -modparam("tls", "engine_conf", "/usr/local/etc/kamailio/openssl.cnf") +modparam("tls", "engine_config", "/usr/local/etc/kamailio/openssl.cnf") modparam("tls", "engine_algorithms", "ALL") ... [View Less]

1 0

git:master:ff887fe5: TLS: Try to always refer to OpenSSL as "OpenSSL" instead of other names
by Olle E. Johansson 12 May '20

12 May '20

Module: kamailio Branch: master Commit: ff887fe5d0d7cec7fc0640a54c80b322d421ed36 URL: https://github.com/kamailio/kamailio/commit/ff887fe5d0d7cec7fc0640a54c80b32… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-12T09:08:33+02:00 TLS: Try to always refer to OpenSSL as "OpenSSL" instead of other names --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:70bcb5f8: TLS: Fix TLS session id example to match source code
by Olle E. Johansson 12 May '20

12 May '20

Module: kamailio Branch: master Commit: 70bcb5f88dc87e27940cc71e293d1c68a7717af6 URL: https://github.com/kamailio/kamailio/commit/70bcb5f88dc87e27940cc71e293d1c6… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-12T09:07:02+02:00 TLS: Fix TLS session id example to match source code --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/70bcb5f88dc87e27940cc71e293d1c6… Patch: … [View More]

1 0

git:master:f75e64b2: TLS: fix typo in docs
by Olle E. Johansson 12 May '20

12 May '20

Module: kamailio Branch: master Commit: f75e64b2335fcf07c3371a4108063e8c0a3a52b9 URL: https://github.com/kamailio/kamailio/commit/f75e64b2335fcf07c3371a4108063e8… Author: Olle E. Johansson <oej(a)edvina.net> Committer: Olle E. Johansson <oej(a)edvina.net> Date: 2020-05-12T09:05:51+02:00 TLS: fix typo in docs --- Modified: src/modules/tls/doc/params.xml --- Diff: https://github.com/kamailio/kamailio/commit/f75e64b2335fcf07c3371a4108063e8… Patch: https://github.com/kamailio/… [View More]

1 0

[kamailio/kamailio] No reply on dispatcher ping with asterisk 16.10.0 (#2320)
by Alvaro Mazuera 12 May '20

12 May '20

Hi, I am implementing a sip proxy with kamailio and multiple asterisk servers, when kamailio send the OPTIONS asterisk don´t reply, and i see with sngrep tool that in the asterisk servers the SIP message OPTIONS arrives, but has no reply from asterisk, and enabling the sip debug nothing occurs, but the OPTIONS message between asterisk servers is all ok. On kamailio logs get: dispatcher [dispatch.c:3159]: ds_options_callback(): OPTIONS-Request was finished with code 408 (to sip:172.20.20.4, … [View More]

3 5

git:master:a08b7640: core: dprint - escaped control chars need 6 bytes
by Daniel-Constantin Mierla 11 May '20

11 May '20

Module: kamailio Branch: master Commit: a08b7640e27524863acd7dc732dffc744f801b5d URL: https://github.com/kamailio/kamailio/commit/a08b7640e27524863acd7dc732dffc7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T20:34:27+02:00 core: dprint - escaped control chars need 6 bytes - they are encoded as \uXXXX --- Modified: src/core/dprint.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:d13f863e: core: udp server - add sockaddr_storage to ensure enough size for sockaddr_union
by Daniel-Constantin Mierla 11 May '20

11 May '20

Module: kamailio Branch: master Commit: d13f863e74c6c0275264e588f1dca206cf099587 URL: https://github.com/kamailio/kamailio/commit/d13f863e74c6c0275264e588f1dca20… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T17:46:29+02:00 core: udp server - add sockaddr_storage to ensure enough size for sockaddr_union - safety check that from addr len is matching expected size for listen socket - rename local … [View More]

1 0

git:master:9cae0698: regex: leave enough space in buffers for parenthesis and -ending
by Daniel-Constantin Mierla 11 May '20

11 May '20

Module: kamailio Branch: master Commit: 9cae069832c8f37ebf9e686b3fbcab5d63652755 URL: https://github.com/kamailio/kamailio/commit/9cae069832c8f37ebf9e686b3fbcab5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T17:46:29+02:00 regex: leave enough space in buffers for parenthesis and -ending --- Modified: src/modules/regex/regex_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:361542a9: cfgt: fix implicit declaration of 'strcasestr'
by Victor Seva 11 May '20

11 May '20

Module: kamailio Branch: master Commit: 361542a953ceaab1894f790e21eecf74008b749a URL: https://github.com/kamailio/kamailio/commit/361542a953ceaab1894f790e21eecf7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-11T15:06:26+02:00 cfgt: fix implicit declaration of 'strcasestr' > cfgt_int.c: In function 'cfgt_msgout': > cfgt_int.c:863:21: warning: implicit declaration of function 'strcasestr'… [View More]

1 0

git: new commits in branch 5.3
by Victor Seva 11 May '20

11 May '20

- URL: https://github.com/kamailio/kamailio/commit/2012b6ff81c87be6c05cdf25f4f2a9b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:28+02:00 xmlops: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 64d37971d2d3fbd87176fe71ae19adca7f47a6ea) - URL: https://github.com/kamailio/kamailio/commit/c81c26637bd9a4869cb446c6f70f21c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-… [View More]11T14:29:29+02:00 lib/ims: Makefile - try to use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 58deac2e7fd62afca409b17903deb951493b213a) - URL: https://github.com/kamailio/kamailio/commit/9708c4b553692747603923fa8562f37… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:30+02:00 cdp: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 2749962b8354be1731ab68a0ae4aa0fac4f944e1) - URL: https://github.com/kamailio/kamailio/commit/863882cc2b4980a3215bbb5310720fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:31+02:00 cplc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit f05a46dc79de45c6cb958b845b9f2d85452c4f37) - URL: https://github.com/kamailio/kamailio/commit/c3ec851cae8609660372b28f6c4eba1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:31+02:00 ims_auth: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 4d3496fb82df1d249a78365e0c50b4ec13989261) - URL: https://github.com/kamailio/kamailio/commit/457d46778bd8b88ffb319779cdc3b96… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:32+02:00 ims_icscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 80f2eb33a967ede3e70fef572dc9b42172ad067c) - URL: https://github.com/kamailio/kamailio/commit/dad9ce4a79efa93bb0541bc610ab406… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:33+02:00 ims_isc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 71e67531194aa867b8f3f32b72d07e1bd4ad7dff) - URL: https://github.com/kamailio/kamailio/commit/d2076d22d30f1ad71a69c178d6f5ff4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:34+02:00 ims_registrar_pcscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 29573bbdb09412c9cbfe839f0c80b7dd7fe77804) - URL: https://github.com/kamailio/kamailio/commit/44442227e6477f52ed06287827ac818… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:34+02:00 ims_registrar_scscf: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit ff92622c3b4c6224f75318ba9e39c9b4389bff1e) - URL: https://github.com/kamailio/kamailio/commit/65228082e4cddec5377632e50fbf09a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:35+02:00 lost: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 8d7c0f80083351de98b99d2505170b740974080a) - URL: https://github.com/kamailio/kamailio/commit/9e01d1bc26443b7fe95ce8bc894ba5b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:36+02:00 presence_conference: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 8e9e1fdeacc4c1b2b0cd67f1b36d73737dacd015) - URL: https://github.com/kamailio/kamailio/commit/f05809a2a1aaf2e599646f18ffd42bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:37+02:00 pua: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 4f43047172260e1a524700a866693f99ea11383b) - URL: https://github.com/kamailio/kamailio/commit/016747536accc3fd32654b0197735da… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:38+02:00 pua_bla: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit e00ce6016afd5c0fba084a19a45fb13353e7f6f4) - URL: https://github.com/kamailio/kamailio/commit/74b7f6bca2e286a151a093d5b1f4d26… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:38+02:00 pua_dialoginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit b4842e81e3aa861739c996ff795b6d7261202b66) - URL: https://github.com/kamailio/kamailio/commit/ac699321c417232a0444d84b7e0c147… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:39+02:00 pua_reginfo: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 7f6648a8586fdfd5a1fdba05556333095bc25777) - URL: https://github.com/kamailio/kamailio/commit/ef5a8bcc8bc986e1658dc863f4eaecf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:40+02:00 pua_usrloc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 20d9453cd3259e8afa1de92a7dba1d25f5f43fe4) - URL: https://github.com/kamailio/kamailio/commit/31097600fa8ee6867e6c6dccdb95370… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:41+02:00 pua_xmpp: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit d40a924bd698ddf365b4db52cba2ab45f7d7a6e2) - URL: https://github.com/kamailio/kamailio/commit/40c925ae5cd7726d5730486999671cd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:41+02:00 rls: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit fbfe21f54c7fd845bf9c99c4091980b1ee4d61d5) - URL: https://github.com/kamailio/kamailio/commit/5cd1c93c452dc37ee96b2cf9959ac3c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:42+02:00 xcap_server: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 169ccce5e3cb302352b1e4d5ac0a0dc58eb552cb) - URL: https://github.com/kamailio/kamailio/commit/81eb48d0627e9b677114fdce8e0890b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:43+02:00 xhttp_pi: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit fe173b2af121b2d6388fea3632037a0ea2999988) - URL: https://github.com/kamailio/kamailio/commit/a91e7fdc9128b59c2084cab1a0e7c0e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-11T14:29:44+02:00 xmlrpc: Makefile - use pkg-config if xml2-config is not found - GH #2199 (cherry picked from commit 994a8dfc070d84b5dad28fa873d8759280c910f2) [View Less]

1 0

[kamailio/kamailio] support pkg-config when detecting libxml2 (#2199)
by Victor Seva 11 May '20

11 May '20

>From https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=949521: > your package is using `xml2-config` to detect and use libxml2. I'm removing that script, so please update your build system to use pkg-config instead. > >Additionally, your package is not failing to build, so it's creating binaries that are not linked against libxml2 anymore: -- 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/2199

4 12

git:master:0fff35bd: usrloc: fix define name typo for the new keepalive management
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: 0fff35bd8368bc0a2a2236a6ee01456db1807911 URL: https://github.com/kamailio/kamailio/commit/0fff35bd8368bc0a2a2236a6ee01456… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T21:48:29+02:00 usrloc: fix define name typo for the new keepalive management - user right db value index for null checking - ensure ending 0 doesn't overflow on aor building --- Modified: … [View More]

1 0

git:master:aac577a4: core: safer truncation of hostname using memcpy
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: aac577a4655ebf09d5cbef3e1a49f72d25ea57d7 URL: https://github.com/kamailio/kamailio/commit/aac577a4655ebf09d5cbef3e1a49f72… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T21:28:01+02:00 core: safer truncation of hostname using memcpy --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/aac577a4655ebf09d5cbef3e1a49f72… … [View More]

1 0

git:master:375d0146: presence: check for null head when reordering returned presentity list
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: 375d01466dffcef9e7064f4100a5afef48dbde39 URL: https://github.com/kamailio/kamailio/commit/375d01466dffcef9e7064f4100a5afe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T21:37:52+02:00 presence: check for null head when reordering returned presentity list --- Modified: src/modules/presence/hash.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:3e969a5b: sipdump: safety check for local socket pointer
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: 3e969a5b4d9a75d082f7d59b0fa1dc6362391675 URL: https://github.com/kamailio/kamailio/commit/3e969a5b4d9a75d082f7d59b0fa1dc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T18:01:13+02:00 sipdump: safety check for local socket pointer - use generic address is not set --- Modified: src/modules/sipdump/sipdump_mod.c --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:fc7b0d65: core: events - increased SREV_CB_LIST_SIZE
by Daniel-Constantin Mierla 08 May '20

08 May '20

Module: kamailio Branch: master Commit: fc7b0d65a227a176f79459c86844668bcd519148 URL: https://github.com/kamailio/kamailio/commit/fc7b0d65a227a176f79459c86844668… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-08T13:54:49+02:00 core: events - increased SREV_CB_LIST_SIZE - there can be several modules registering for these core callbacks --- Modified: src/core/events.h --- Diff: https://github.com/… [View More]

1 0

git:master:e996aec3: modules: readme files regenerated - siptrace ... [skip ci]
by Kamailio Dev 07 May '20

07 May '20

Module: kamailio Branch: master Commit: e996aec353972e7f0a4cb5e2a6156e2eee478954 URL: https://github.com/kamailio/kamailio/commit/e996aec353972e7f0a4cb5e2a6156e2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-07T20:46:12+02:00 modules: readme files regenerated - siptrace ... [skip ci] --- Modified: src/modules/siptrace/README --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:5429a0ed: modules: readme files regenerated - keepalive ... [skip ci]
by The Root 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 5429a0ed51a04c484e1def93887b344b2d90379f URL: https://github.com/kamailio/kamailio/commit/5429a0ed51a04c484e1def93887b344… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: The Root <root(a)kamailio.org> Date: 2020-05-07T20:46:04+02:00 modules: readme files regenerated - keepalive ... [skip ci] --- Modified: src/modules/keepalive/README --- Diff: https://github.com/kamailio/kamailio/commit/5429a0ed51a04c484e1def93887b344… … [View More]Patch: https://github.com/kamailio/kamailio/commit/5429a0ed51a04c484e1def93887b344… --- diff --git a/src/modules/keepalive/README b/src/modules/keepalive/README index 150da0acdc..4437803128 100644 --- a/src/modules/keepalive/README +++ b/src/modules/keepalive/README @@ -55,8 +55,8 @@ Yasin CANER 1. Available Functions - 1.1. add_destination(uri, owner, flags, [callback, - [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, + [callback, [user_attr]]) 1.2. Examples @@ -324,7 +324,9 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, [callback, [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, [callback, + [user_attr]]) + 1.2. Examples The KeepAlive module provides an internal API to be used by other @@ -336,10 +338,13 @@ Chapter 2. Developer Guide 1. Available Functions - 1.1. add_destination(uri, owner, flags, [callback, [user_attr]]) + 1.1. add_destination(uri, owner, flags, ping_interval, [callback, + [user_attr]]) + 1.2. Examples -1.1. add_destination(uri, owner, flags, [callback, [user_attr]]) +1.1. add_destination(uri, owner, flags, ping_interval, [callback, +[user_attr]]) This function registers a new destination to monitor. Monitoring of the destination starts as soon as it returns with success (0 value). @@ -354,6 +359,8 @@ Chapter 2. Developer Guide * owner (string) - module name “owning” the destination (for information purpose) * flags (integer) - destination flags (unused for now, use 0 value) + * ping_interval (integer) - Pinging interval in seconds for this + destination * callback (ka_statechanged_f, optional) - callback function, executed on destination's state change. The callback function is of type void (*ka_statechanged_f)(str @@ -398,7 +405,7 @@ void my_callback(str uri, int state, void *user_attr) { str dest = str_init("sip:192.168.10.21:5060"); str owner = str_init("mymodule"); -if (ka_api.add_destination(dest, owner, 0, my_callback, NULL) != 0) { +if (ka_api.add_destination(dest, owner, 0, 60, my_callback, NULL) != 0) { LM_ERR("can't add destination\n"); goto error; } [View Less]

1 0

git:master:9137f924: siptrace: small spelling fix in docs
by Henning Westerholt 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 9137f924956920d660d9f9353d5117aa6eafe8a3 URL: https://github.com/kamailio/kamailio/commit/9137f924956920d660d9f9353d5117a… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-07T18:45:22Z siptrace: small spelling fix in docs --- Modified: src/modules/siptrace/doc/siptrace_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/9137f924956920d660d9f9353d5117a… Patch: https:… [View More]

1 0

git:master:1d555161: tm: small spelling fix in comments
by Henning Westerholt 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 1d555161195ebccd35534f8533eacdcbba7020fc URL: https://github.com/kamailio/kamailio/commit/1d555161195ebccd35534f8533eacdc… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-07T18:45:04Z tm: small spelling fix in comments --- Modified: src/modules/tm/rpc_uac.c --- Diff: https://github.com/kamailio/kamailio/commit/1d555161195ebccd35534f8533eacdc… Patch: https://github.com/… [View More]

1 0

[kamailio/kamailio] ims_usrloc_scscf: extend and fix log messages (#2316)
by alexyosifov 07 May '20

07 May '20

#### 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 - [x] 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/2316 -- Commit Summary -- * ims_usrloc_scscf: extend and fix log messages -- File Changes -- M src/modules/ims_usrloc_scscf/impurecord.c (22) M src/modules/ims_usrloc_scscf/subscribe.c (4) M src/modules/ims_usrloc_scscf/udomain.c (11) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2316.patch https://github.com/kamailio/kamailio/pull/2316.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/2316 [View Less]

2 2

git:master:b2487d95: ims_usrloc_scscf: extend and fix log messages
by Henning Westerholt 07 May '20

07 May '20

Module: kamailio Branch: master Commit: b2487d95f61b46033eb2825c5f54d5f19ca1e878 URL: https://github.com/kamailio/kamailio/commit/b2487d95f61b46033eb2825c5f54d5f… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-05-07T14:18:21+02:00 ims_usrloc_scscf: extend and fix log messages --- Modified: src/modules/ims_usrloc_scscf/impurecord.c Modified: src/modules/ims_usrloc_scscf/subscribe.c Modified: src/modules/… [View More]

1 0

[kamailio/kamailio] ims_registrar_scscf: pass event type as parameter (#2296)
by alexyosifov 07 May '20

07 May '20

- pass event type as parameter in notify_subscribers()   #### 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 - [x] 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/2296 -- Commit Summary -- * ims_registrar_scscf: pass event type as parameter -- File Changes -- M src/modules/ims_registrar_scscf/cxdx_callbacks.c (4) M src/modules/ims_registrar_scscf/reg_rpc.c (2) M src/modules/ims_registrar_scscf/registrar_notify.c (6) M src/modules/ims_registrar_scscf/registrar_notify.h (2) M src/modules/ims_registrar_scscf/save.c (6) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2296.patch https://github.com/kamailio/kamailio/pull/2296.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/2296 [View Less]

3 4

git:master:1c7b7603: ims_registrar_scscf: pass event type as parameter
by Aleksandar Yosifov 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 1c7b7603937cb7f32d6109c22a978bb8efd37e6c URL: https://github.com/kamailio/kamailio/commit/1c7b7603937cb7f32d6109c22a978bb… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-04-22T16:25:32+03:00 ims_registrar_scscf: pass event type as parameter - pass event type as parameter in notify_subscribers() --- Modified: src/modules/ims_registrar_scscf/cxdx_callbacks.c Modified: … [View More]

1 0

git:master:d35e9768: Merge pull request #2296 from alexyosifov/ims_registrar_scscf_event_reg
by GitHub 07 May '20

07 May '20

Module: kamailio Branch: master Commit: d35e97684ae3dcefa2351172cc477bb11927305d URL: https://github.com/kamailio/kamailio/commit/d35e97684ae3dcefa2351172cc477bb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-07T13:16:09+02:00 Merge pull request #2296 from alexyosifov/ims_registrar_scscf_event_reg ims_registrar_scscf: pass event type as parameter --- Modified: src/modules/ims_registrar_scscf/cxdx_callbacks.c … [View More]

1 0

[kamailio/kamailio] ims_registrar_scscf: fix aor generation in lookup() (#2292)
by alexyosifov 07 May '20

07 May '20

- Generate AoR in lookup() from parsed uri user and host. Skipping all user's and host's parameters.   #### 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 - [x] 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/2292 -- Commit Summary -- * ims_registrar_scscf: fix aor generation in lookup() -- File Changes -- M src/modules/ims_registrar_scscf/lookup.c (55) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2292.patch https://github.com/kamailio/kamailio/pull/2292.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/2292 [View Less]

3 5

git:master:465211bc: Merge pull request #2292 from alexyosifov/ims_registrar_scscf_lookup_fix
by GitHub 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 465211bc18152c9a4c5b60341a9d02f82971afb0 URL: https://github.com/kamailio/kamailio/commit/465211bc18152c9a4c5b60341a9d02f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-07T13:14:53+02:00 Merge pull request #2292 from alexyosifov/ims_registrar_scscf_lookup_fix ims_registrar_scscf: fix aor generation in lookup() --- Modified: src/modules/ims_registrar_scscf/lookup.c --- Diff: … [View More] https://github.com/kamailio/kamailio/commit/465211bc18152c9a4c5b60341a9d02f… Patch: https://github.com/kamailio/kamailio/commit/465211bc18152c9a4c5b60341a9d02f… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 0e7b06cf60..640dbb9707 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -61,13 +61,12 @@ */ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { impurecord_t* r; - str aor; + str aor, tmp_aor; ucontact_t* ptr = 0; int res; int ret; str path_dst; flag_t old_bflags; - int i = 0; int ue_type; /*0=any, 1=3gpp, 2=sip */ impu_contact_t *impucontact; @@ -91,29 +90,35 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) { - aor.s = pkg_malloc(_m->new_uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); - aor.len = _m->new_uri.len; - } else { - aor.s = pkg_malloc(_m->first_line.u.request.uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - aor.len = _m->first_line.u.request.uri.len; - } - - for (i = 4; i < aor.len; i++) - if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { - aor.len = i; - break; - } + if (parse_sip_msg_uri(_m) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + return -1; + } + + if (_m->new_uri.s) { + tmp_aor = _m->new_uri; + } else { + tmp_aor = _m->first_line.u.request.uri; + } + + aor.s = pkg_malloc(tmp_aor.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + + // build aor + // add 'sip:' or 'tel:' + memcpy(aor.s, tmp_aor.s, 4); + aor.len = 4; + // add user part + memcpy(aor.s + aor.len, _m->parsed_uri.user.s, _m->parsed_uri.user.len); + aor.len += _m->parsed_uri.user.len; + // add '@' + aor.s[aor.len++] = '@'; + // add host part + memcpy(aor.s + aor.len, _m->parsed_uri.host.s, _m->parsed_uri.host.len); + aor.len += _m->parsed_uri.host.len; LM_DBG("Looking for <%.*s>\n", aor.len, aor.s); [View Less]

1 0

git:master:e53b25f8: ims_registrar_scscf: fix aor generation in lookup()
by Aleksandar Yosifov 07 May '20

07 May '20

Module: kamailio Branch: master Commit: e53b25f89a14aba93d3c48a1b2f983114db1760c URL: https://github.com/kamailio/kamailio/commit/e53b25f89a14aba93d3c48a1b2f9831… Author: Aleksandar Yosifov <alexyosifov(a)gmail.com> Committer: Aleksandar Yosifov <alexyosifov(a)gmail.com> Date: 2020-04-21T13:55:36+03:00 ims_registrar_scscf: fix aor generation in lookup() - Generate AoR in lookup() from parsed uri user and host. Skipping all user's and host's parameters. --- Modified: src/… [View More]modules/ims_registrar_scscf/lookup.c --- Diff: https://github.com/kamailio/kamailio/commit/e53b25f89a14aba93d3c48a1b2f9831… Patch: https://github.com/kamailio/kamailio/commit/e53b25f89a14aba93d3c48a1b2f9831… --- diff --git a/src/modules/ims_registrar_scscf/lookup.c b/src/modules/ims_registrar_scscf/lookup.c index 0e7b06cf60..640dbb9707 100644 --- a/src/modules/ims_registrar_scscf/lookup.c +++ b/src/modules/ims_registrar_scscf/lookup.c @@ -61,13 +61,12 @@ */ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { impurecord_t* r; - str aor; + str aor, tmp_aor; ucontact_t* ptr = 0; int res; int ret; str path_dst; flag_t old_bflags; - int i = 0; int ue_type; /*0=any, 1=3gpp, 2=sip */ impu_contact_t *impucontact; @@ -91,29 +90,35 @@ int lookup(struct sip_msg* _m, udomain_t* _d, char* ue_type_c) { ue_type=0; } - if (_m->new_uri.s) { - aor.s = pkg_malloc(_m->new_uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->new_uri.s, _m->new_uri.len); - aor.len = _m->new_uri.len; - } else { - aor.s = pkg_malloc(_m->first_line.u.request.uri.len); - if (aor.s == NULL) { - LM_ERR("memory allocation failure\n"); - return -1; - } - memcpy(aor.s, _m->first_line.u.request.uri.s, _m->first_line.u.request.uri.len); - aor.len = _m->first_line.u.request.uri.len; - } - - for (i = 4; i < aor.len; i++) - if (aor.s[i] == ':' || aor.s[i] == ';' || aor.s[i] == '?') { - aor.len = i; - break; - } + if (parse_sip_msg_uri(_m) < 0) { + LM_ERR("Error while parsing the Request-URI\n"); + return -1; + } + + if (_m->new_uri.s) { + tmp_aor = _m->new_uri; + } else { + tmp_aor = _m->first_line.u.request.uri; + } + + aor.s = pkg_malloc(tmp_aor.len); + if (aor.s == NULL) { + LM_ERR("memory allocation failure\n"); + return -1; + } + + // build aor + // add 'sip:' or 'tel:' + memcpy(aor.s, tmp_aor.s, 4); + aor.len = 4; + // add user part + memcpy(aor.s + aor.len, _m->parsed_uri.user.s, _m->parsed_uri.user.len); + aor.len += _m->parsed_uri.user.len; + // add '@' + aor.s[aor.len++] = '@'; + // add host part + memcpy(aor.s + aor.len, _m->parsed_uri.host.s, _m->parsed_uri.host.len); + aor.len += _m->parsed_uri.host.len; LM_DBG("Looking for <%.*s>\n", aor.len, aor.s); [View Less]

1 0

git:5.3:39fce673: ndb_redis: redis_cmd() check reply type to detect command errors
by Victor Seva 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: 39fce673e50a52dbb0b1c8c786c98b15e8bdfeb7 URL: https://github.com/kamailio/kamailio/commit/39fce673e50a52dbb0b1c8c786c98b1… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-07T13:11:03+02:00 ndb_redis: redis_cmd() check reply type to detect command errors fix #2300 (cherry picked from commit d00b14704805d728f5a845a6af900eff1ed372ac) --- Modified: src/… [View More]

1 0

git:5.2:13f4b108: ndb_redis: redis_cmd() check reply type to detect command errors
by Victor Seva 07 May '20

07 May '20

Module: kamailio Branch: 5.2 Commit: 13f4b108e1a424c42121f752de91fdeca8c0480a URL: https://github.com/kamailio/kamailio/commit/13f4b108e1a424c42121f752de91fde… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-07T13:11:27+02:00 ndb_redis: redis_cmd() check reply type to detect command errors fix #2300 (cherry picked from commit d00b14704805d728f5a845a6af900eff1ed372ac) --- Modified: src/… [View More]

1 0

[kamailio/kamailio] ndb_redis: redis_cmd() doesn't return error with a faulty command (#2300)
by Victor Seva 07 May '20

07 May '20

### Description Detected that a command like this was not returning <0 ``` if(redis_cmd("test", "HSET dd field1", "r")) { [...] } ``` Same command on redis-cli: ``` # redis-cli 127.0.0.1:6379> HSET dd field1 (error) ERR wrong number of arguments for 'hset' command ``` ### Troubleshooting #### Reproduction I've added some debug to the code and I find out that the command is returning: ``` Apr 23 10:55:02 spce proxy[12880]: DEBUG: ndb_redis [redis_client.c:956]: redisc_exec(): rpl-&… [View More]gt;rplRedis->type:3 ``` That's an INTEGER. From hiredis/read.h: ``` #define REDIS_REPLY_INTEGER 3 #define REDIS_REPLY_NIL 4 #define REDIS_REPLY_STATUS 5 #define REDIS_REPLY_ERROR 6 ``` I've created a simple test code to check the same command: ``` #include <stdio.h> #include <stdarg.h> #include "hiredis.h" void check(redisContext *c, const char *cmd, ...) { va_list ap; va_start(ap,cmd); redisReply *r = redisvCommand(c, cmd, ap); va_end(ap); if(r == NULL) { printf("reply NULL\n"); } printf("reply->type:%d\n", r->type); freeReplyObject(r); } int main(void) { redisContext *c = redisConnect("127.0.0.1", 6379); if (c == NULL || c->err) { if (c) { printf("Error: %s\n", c->errstr); } else { printf("Can't allocate redis context\n"); } return 1; } check(c, "HSET dd field"); redisFree(c); return 0; } ``` ``` root@spce:/usr/local/devel# cc t.c -o t -lhiredis -I/usr/include/hiredis root@spce:/usr/local/devel# ./t reply->type:6 ``` No problems there. The reply is ERROR. ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.3 (x86_64/linux) flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, NO_SIG_DEBUG, DNS_IP_HACK, 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, TLS_PTHREAD_MUTEX_SHARED ADAPTIVE_WAIT_LOOPS 1024, MAX_RECV_BUFFER_SIZE 262144, 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 8.3.0 ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2300 [View Less]

2 6

[kamailio/kamailio] ndb_redis: redis_cmd() check reply type to detect command errors (#2314)
by Victor Seva 07 May '20

07 May '20

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual … [View More]

2 2

git:master:d00b1470: ndb_redis: redis_cmd() check reply type to detect command errors
by Victor Seva 07 May '20

07 May '20

Module: kamailio Branch: master Commit: d00b14704805d728f5a845a6af900eff1ed372ac URL: https://github.com/kamailio/kamailio/commit/d00b14704805d728f5a845a6af900ef… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-07T13:09:15+02:00 ndb_redis: redis_cmd() check reply type to detect command errors fix #2300 --- Modified: src/modules/ndb_redis/redis_client.c --- Diff: https://github.com/kamailio/… [View More]

1 0

[kamailio/kamailio] keepalive: custom pinging interval per destination (#2313)
by Nacho G. 07 May '20

07 May '20

- This functionality it's just available when using api.h bindings. For exported functions current value ka_ping_interval is used. - Modified add_destination function to provide this new parameter. - Now we have one timer per destination, instead of multiple, so we don't need to iterate over all destinations. Timers are cleaned when destinations are 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 - [ ] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [x] 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  With this code, you can have a different pinging timeout for each destination, instead of the fixed (default 30 seconds) one. This change is compatible (not breaking) with .cfg or kemi invocations, but it's breaking developers api. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2313 -- Commit Summary -- * keepalive: custom pinging interval per destination -- File Changes -- M src/modules/keepalive/api.h (2) M src/modules/keepalive/doc/keepalive.xml (3) M src/modules/keepalive/doc/keepalive_devel.xml (9) M src/modules/keepalive/keepalive.h (9) M src/modules/keepalive/keepalive_api.c (23) M src/modules/keepalive/keepalive_core.c (46) M src/modules/keepalive/keepalive_mod.c (12) M src/modules/keepalive/keepalive_rpc.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2313.patch https://github.com/kamailio/kamailio/pull/2313.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/2313 [View Less]

2 4

git:master:10fd9fb2: Merge pull request #2313 from NGSegovia/keepalive/custom_ping_interval
by GitHub 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 10fd9fb2d8785fe9670a96b8e699135cbde3f28e URL: https://github.com/kamailio/kamailio/commit/10fd9fb2d8785fe9670a96b8e699135… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-07T13:08:51+02:00 Merge pull request #2313 from NGSegovia/keepalive/custom_ping_interval keepalive: custom pinging interval per destination --- Modified: src/modules/drouting/drouting.c Modified: src/modules/… [View More]

1 0

git:master:616aa146: drouting: update to new keepalive interface, using custom pinging interval per destination
by Nacho Garcia Segovia 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 616aa146f919b8a42101a323c611a6a525b19236 URL: https://github.com/kamailio/kamailio/commit/616aa146f919b8a42101a323c611a6a… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-06T23:13:27+02:00 drouting: update to new keepalive interface, using custom pinging interval per destination - Changes required because of dependencies from module keepalive. --- Modified: src/… [View More]

1 0

git:master:4cebb16b: keepalive: custom pinging interval per destination
by Nacho Garcia Segovia 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 4cebb16b536c35ec74ecbdf595c5c6dbafe5afa1 URL: https://github.com/kamailio/kamailio/commit/4cebb16b536c35ec74ecbdf595c5c6d… Author: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Committer: Nacho Garcia Segovia <nacho.gs(a)zaleos.net> Date: 2020-05-06T23:10:40+02:00 keepalive: custom pinging interval per destination - This functionality it's just available when using api.h bindings. For exported functions current value ka_ping_interval is used.… [View More]

1 0

git:5.3:f977da4c: kamctl: regenerated db schema for secfilter
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: f977da4c7058a62919557eba3f6edcd5faa61cda URL: https://github.com/kamailio/kamailio/commit/f977da4c7058a62919557eba3f6edcd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:21:12+02:00 kamctl: regenerated db schema for secfilter (cherry picked from commit 59c49af039f468466b0d853a4ceab8fe7f566215) --- Modified: utils/kamctl/db_berkeley/kamailio/secfilter … [View More]Modified: utils/kamctl/db_sqlite/secfilter-create.sql Modified: utils/kamctl/mongodb/kamailio/secfilter.json Modified: utils/kamctl/mysql/secfilter-create.sql Modified: utils/kamctl/oracle/secfilter-create.sql Modified: utils/kamctl/postgres/secfilter-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/f977da4c7058a62919557eba3f6edcd… Patch: https://github.com/kamailio/kamailio/commit/f977da4c7058a62919557eba3f6edcd… --- diff --git a/utils/kamctl/db_berkeley/kamailio/secfilter b/utils/kamctl/db_berkeley/kamailio/secfilter index 38fbb9a05e..b264e5b0a3 100644 --- a/utils/kamctl/db_berkeley/kamailio/secfilter +++ b/utils/kamctl/db_berkeley/kamailio/secfilter @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|'' +NIL|0|0|'' diff --git a/utils/kamctl/db_sqlite/secfilter-create.sql b/utils/kamctl/db_sqlite/secfilter-create.sql index 476ea46de4..44e1f4e4c2 100644 --- a/utils/kamctl/db_sqlite/secfilter-create.sql +++ b/utils/kamctl/db_sqlite/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id INTEGER PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/mongodb/kamailio/secfilter.json b/utils/kamctl/mongodb/kamailio/secfilter.json index 1f7baf47fc..7c433e929d 100644 --- a/utils/kamctl/mongodb/kamailio/secfilter.json +++ b/utils/kamctl/mongodb/kamailio/secfilter.json @@ -9,12 +9,12 @@ }, "action": { "type": "int", - "default": "", + "default": 0, "null": false }, "type": { "type": "int", - "default": "", + "default": 0, "null": false }, "data": { diff --git a/utils/kamctl/mysql/secfilter-create.sql b/utils/kamctl/mysql/secfilter-create.sql index 18a67c79b6..9b35b8d570 100644 --- a/utils/kamctl/mysql/secfilter-create.sql +++ b/utils/kamctl/mysql/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE `secfilter` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - `action` SMALLINT DEFAULT '' NOT NULL, - `type` SMALLINT DEFAULT '' NOT NULL, + `action` SMALLINT DEFAULT 0 NOT NULL, + `type` SMALLINT DEFAULT 0 NOT NULL, `data` VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/oracle/secfilter-create.sql b/utils/kamctl/oracle/secfilter-create.sql index 684d1c44cf..d980915525 100644 --- a/utils/kamctl/oracle/secfilter-create.sql +++ b/utils/kamctl/oracle/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id NUMBER(10) PRIMARY KEY, - action NUMBER(5) DEFAULT '', - type NUMBER(5) DEFAULT '', + action NUMBER(5) DEFAULT 0 NOT NULL, + type NUMBER(5) DEFAULT 0 NOT NULL, data VARCHAR2(64) DEFAULT '' ); diff --git a/utils/kamctl/postgres/secfilter-create.sql b/utils/kamctl/postgres/secfilter-create.sql index 71badd4ece..ce048396fa 100644 --- a/utils/kamctl/postgres/secfilter-create.sql +++ b/utils/kamctl/postgres/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id SERIAL PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL ); [View Less]

1 0

git:5.3:221175ff: srdb1: default value set to 0 for number types
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: 221175ff31bfead160ef9f3bc8ac613a107f98cf URL: https://github.com/kamailio/kamailio/commit/221175ff31bfead160ef9f3bc8ac613… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:21:02+02:00 srdb1: default value set to 0 for number types (cherry picked from commit b0f1486f8a656922aac02020c9e3141639f2ecb9) --- Modified: src/lib/srdb1/schema/secfilter.xml --- Diff: … [View More]

1 0

git:5.3:ac1b7f30: pua: use file name specific include guard
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: 5.3 Commit: ac1b7f30b4cdc6d48d77f19421822300bcaa34be URL: https://github.com/kamailio/kamailio/commit/ac1b7f30b4cdc6d48d77f1942182230… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:20:53+02:00 pua: use file name specific include guard (cherry picked from commit 076649793bfdbdc4f03f96961f23997c87ce4268) --- Modified: src/modules/pua/hash.h Modified: src/modules/pua/pua.… [View More]

1 0

git:master:59c49af0: kamctl: regenerated db schema for secfilter
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: master Commit: 59c49af039f468466b0d853a4ceab8fe7f566215 URL: https://github.com/kamailio/kamailio/commit/59c49af039f468466b0d853a4ceab8f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:19:36+02:00 kamctl: regenerated db schema for secfilter --- Modified: utils/kamctl/db_berkeley/kamailio/secfilter Modified: utils/kamctl/db_sqlite/secfilter-create.sql Modified: utils/… [View More]kamctl/mongodb/kamailio/secfilter.json Modified: utils/kamctl/mysql/secfilter-create.sql Modified: utils/kamctl/oracle/secfilter-create.sql Modified: utils/kamctl/postgres/secfilter-create.sql --- Diff: https://github.com/kamailio/kamailio/commit/59c49af039f468466b0d853a4ceab8f… Patch: https://github.com/kamailio/kamailio/commit/59c49af039f468466b0d853a4ceab8f… --- diff --git a/utils/kamctl/db_berkeley/kamailio/secfilter b/utils/kamctl/db_berkeley/kamailio/secfilter index 38fbb9a05e..b264e5b0a3 100644 --- a/utils/kamctl/db_berkeley/kamailio/secfilter +++ b/utils/kamctl/db_berkeley/kamailio/secfilter @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|''|'' +NIL|0|0|'' diff --git a/utils/kamctl/db_sqlite/secfilter-create.sql b/utils/kamctl/db_sqlite/secfilter-create.sql index 476ea46de4..44e1f4e4c2 100644 --- a/utils/kamctl/db_sqlite/secfilter-create.sql +++ b/utils/kamctl/db_sqlite/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id INTEGER PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/mongodb/kamailio/secfilter.json b/utils/kamctl/mongodb/kamailio/secfilter.json index 1f7baf47fc..7c433e929d 100644 --- a/utils/kamctl/mongodb/kamailio/secfilter.json +++ b/utils/kamctl/mongodb/kamailio/secfilter.json @@ -9,12 +9,12 @@ }, "action": { "type": "int", - "default": "", + "default": 0, "null": false }, "type": { "type": "int", - "default": "", + "default": 0, "null": false }, "data": { diff --git a/utils/kamctl/mysql/secfilter-create.sql b/utils/kamctl/mysql/secfilter-create.sql index 18a67c79b6..9b35b8d570 100644 --- a/utils/kamctl/mysql/secfilter-create.sql +++ b/utils/kamctl/mysql/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE `secfilter` ( `id` INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, - `action` SMALLINT DEFAULT '' NOT NULL, - `type` SMALLINT DEFAULT '' NOT NULL, + `action` SMALLINT DEFAULT 0 NOT NULL, + `type` SMALLINT DEFAULT 0 NOT NULL, `data` VARCHAR(64) DEFAULT '' NOT NULL ); diff --git a/utils/kamctl/oracle/secfilter-create.sql b/utils/kamctl/oracle/secfilter-create.sql index 684d1c44cf..d980915525 100644 --- a/utils/kamctl/oracle/secfilter-create.sql +++ b/utils/kamctl/oracle/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id NUMBER(10) PRIMARY KEY, - action NUMBER(5) DEFAULT '', - type NUMBER(5) DEFAULT '', + action NUMBER(5) DEFAULT 0 NOT NULL, + type NUMBER(5) DEFAULT 0 NOT NULL, data VARCHAR2(64) DEFAULT '' ); diff --git a/utils/kamctl/postgres/secfilter-create.sql b/utils/kamctl/postgres/secfilter-create.sql index 71badd4ece..ce048396fa 100644 --- a/utils/kamctl/postgres/secfilter-create.sql +++ b/utils/kamctl/postgres/secfilter-create.sql @@ -1,7 +1,7 @@ CREATE TABLE secfilter ( id SERIAL PRIMARY KEY NOT NULL, - action SMALLINT DEFAULT '' NOT NULL, - type SMALLINT DEFAULT '' NOT NULL, + action SMALLINT DEFAULT 0 NOT NULL, + type SMALLINT DEFAULT 0 NOT NULL, data VARCHAR(64) DEFAULT '' NOT NULL ); [View Less]

1 0

git:master:b0f1486f: srdb1: default value set to 0 for number types
by Daniel-Constantin Mierla 07 May '20

07 May '20

Module: kamailio Branch: master Commit: b0f1486f8a656922aac02020c9e3141639f2ecb9 URL: https://github.com/kamailio/kamailio/commit/b0f1486f8a656922aac02020c9e3141… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-07T08:19:05+02:00 srdb1: default value set to 0 for number types --- Modified: src/lib/srdb1/schema/secfilter.xml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

ICMP port-unreachable for UDP INVITEs
by James Browne 06 May '20

06 May '20

I've searched, but I cannot find anything recent about this. My kamailio 5.0.8 proxy sends an INVITE downstream over UDP and gets an ICMP port-unreachable response from the UAS. Apparently ignoring this, it re-transmits the INVITEs and eventually times out and sends to the next host (from the SRV lookup). According to RFC 3261 (https://tools.ietf.org/html/rfc3261#section-8.1.3.1), If a fatal transport error is reported by the transport layer (generally, due to fatal ICMP errors in … [View More]

2 2

git:master:07664979: pua: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: master Commit: 076649793bfdbdc4f03f96961f23997c87ce4268 URL: https://github.com/kamailio/kamailio/commit/076649793bfdbdc4f03f96961f23997… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T17:15:36+02:00 pua: use file name specific include guard --- Modified: src/modules/pua/hash.h Modified: src/modules/pua/pua.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:14645b55: pv: use localtime_r() for a safer multi-thread usage
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: master Commit: 14645b550cf9500e6a6e4a7d2ed8749e9aa174dc URL: https://github.com/kamailio/kamailio/commit/14645b550cf9500e6a6e4a7d2ed8749… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T17:03:45+02:00 pv: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/pv/pv_trans.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:a6a40467: htable: use localtime_r() for a safer multi-thread usage
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: master Commit: a6a4046757c2cac79455aa4a2d2ac632faa5e379 URL: https://github.com/kamailio/kamailio/commit/a6a4046757c2cac79455aa4a2d2ac63… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T17:13:16+02:00 htable: use localtime_r() for a safer multi-thread usage --- Modified: src/modules/htable/htable.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

Kamailio v5.3.4 Released
by Daniel-Constantin Mierla 06 May '20

06 May '20

Hello, Kamailio SIP Server v5.3.4 stable release is out. This is a maintenance release of the latest stable branch, 5.3, that includes fixes since the release of v5.3.3. There is no change to database schema or configuration language structure that you have to do on previous installations of v5.3.x. Deployments running previous v5.3.x versions are strongly recommended to be upgraded to v5.3.4. For more details about version 5.3.4 (including links and guidelines to download the tarball or … [View More]

1 0

git:5.3:117ff918: ChangeLog: content updated for v5.3.4
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 117ff918b9df221475682d1755d6dfbd704c846e URL: https://github.com/kamailio/kamailio/commit/117ff918b9df221475682d1755d6dfb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T13:24:27+02:00 ChangeLog: content updated for v5.3.4 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/117ff918b9df221475682d1755d6dfb… Patch: https://github.com/kamailio/kamailio/commit/117ff918b9df221475682d1755d6dfb…

1 0

git:5.3:195c2602: Makefile.defs: version set to 5.3.4
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 195c2602db69b37db66662e736e6e43dc65a16b1 URL: https://github.com/kamailio/kamailio/commit/195c2602db69b37db66662e736e6e43… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T13:21:19+02:00 Makefile.defs: version set to 5.3.4 --- Modified: src/Makefile.defs --- Diff: https://github.com/kamailio/kamailio/commit/195c2602db69b37db66662e736e6e43… Patch: https://… [View More]

1 0

git:5.3:9f2af321: pkg: set version to 5.3.4 for pkg specs
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 9f2af321f677c0b5173ea4f99bef667fd6320a1f URL: https://github.com/kamailio/kamailio/commit/9f2af321f677c0b5173ea4f99bef667… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:48:04+02:00 pkg: set version to 5.3.4 for pkg specs --- Modified: pkg/kamailio/alpine/APKBUILD Modified: pkg/kamailio/obs/kamailio.spec --- Diff: https://github.com/kamailio/kamailio/… [View More]

1 0

git:5.3:4322479f: modules: readme files regenerated - modules ... [skip ci]
by Kamailio Dev 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 4322479f914cc4a256000c1dae44129939d4dd10 URL: https://github.com/kamailio/kamailio/commit/4322479f914cc4a256000c1dae44129… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-05-06T12:31:52+02:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/htable/README --- Diff: https://github.com/kamailio/kamailio/commit/4322479f914cc4a256000c1dae44129…… [View More]

1 0

git:5.3:b03c2cc7: snmpstats: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: b03c2cc751524197530899c38ca2e44845595e76 URL: https://github.com/kamailio/kamailio/commit/b03c2cc751524197530899c38ca2e44… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:03:07+02:00 snmpstats: use file name specific include guard (cherry picked from commit 13622cf6e36e50c42ec882272b1c48107fa55677) --- Modified: src/modules/snmpstats/snmp_statistics.h --- … [View More]

1 0

git:5.3:f8445492: ratelimit: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: f84454927bf9435a44bef595dc2df924eb051487 URL: https://github.com/kamailio/kamailio/commit/f84454927bf9435a44bef595dc2df92… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:02:58+02:00 ratelimit: use file name specific include guard (cherry picked from commit 68b5b3ce5b8ae38ed5ba7731ae1a6315adedd0e5) --- Modified: src/modules/ratelimit/rl_statistics.h --- … [View More]

1 0

git:5.3:9e5c25ea: pipelimit: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 9e5c25ea35fd949e3ed458b23dd4ecd369bb09c8 URL: https://github.com/kamailio/kamailio/commit/9e5c25ea35fd949e3ed458b23dd4ecd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:02:46+02:00 pipelimit: use file name specific include guard (cherry picked from commit e4356d56d57599ff063e6849cab8cab5267d26e0) --- Modified: src/modules/pipelimit/pl_statistics.h --- … [View More]

1 0

git:5.3:a7a65053: app_sqlang: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: a7a6505314d47346b728c65fbe26485d42293599 URL: https://github.com/kamailio/kamailio/commit/a7a6505314d47346b728c65fbe26485… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:02:11+02:00 app_sqlang: use file name specific include guard (cherry picked from commit 9a2fea75dcee851b1dc22e5a9e7a6ee0d05814ef) --- Modified: src/modules/app_sqlang/app_sqlang_api.h --- … [View More]

1 0

git:5.3:25d173a9: usrloc: use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 25d173a98ea0b5c07e4018da0cd03649ae6db563 URL: https://github.com/kamailio/kamailio/commit/25d173a98ea0b5c07e4018da0cd0364… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:01:55+02:00 usrloc: use file name specific include guard (cherry picked from commit f4f66ad91324116e5d4e9e02fa9caedcad2b2d2f) --- Modified: src/modules/usrloc/usrloc_mod.h --- Diff: … [View More]

1 0

git:5.3:3234f21e: uid_domain: use module specific include guards
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 3234f21edcffdf74fdf23efc5fae4fbc524e58a2 URL: https://github.com/kamailio/kamailio/commit/3234f21edcffdf74fdf23efc5fae4fb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:01:46+02:00 uid_domain: use module specific include guards (cherry picked from commit b3c981db67845622fb8c85a20e18e1b98c29eb69) --- Modified: src/modules/uid_domain/domain.h Modified: src/… [View More]modules/uid_domain/domain_api.h Modified: src/modules/uid_domain/domain_rpc.h Modified: src/modules/uid_domain/hash.h Modified: src/modules/uid_domain/uid_domain_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/3234f21edcffdf74fdf23efc5fae4fb… Patch: https://github.com/kamailio/kamailio/commit/3234f21edcffdf74fdf23efc5fae4fb… --- diff --git a/src/modules/uid_domain/domain.h b/src/modules/uid_domain/domain.h index 44ad7ee4db..c52417a601 100644 --- a/src/modules/uid_domain/domain.h +++ b/src/modules/uid_domain/domain.h @@ -19,8 +19,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_H -#define _DOMAIN_H +#ifndef _UID_DOMAIN_H_ +#define _UID_DOMAIN_H_ #include <time.h> #include <stdio.h> diff --git a/src/modules/uid_domain/domain_api.h b/src/modules/uid_domain/domain_api.h index acc957971f..4a64a469cb 100644 --- a/src/modules/uid_domain/domain_api.h +++ b/src/modules/uid_domain/domain_api.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_API_H -#define _DOMAIN_API_H +#ifndef _UID_DOMAIN_API_H_ +#define _UID_DOMAIN_API_H_ #include "../../core/sr_module.h" #include "../../core/dprint.h" diff --git a/src/modules/uid_domain/domain_rpc.h b/src/modules/uid_domain/domain_rpc.h index 27641b6d47..996e7f01aa 100644 --- a/src/modules/uid_domain/domain_rpc.h +++ b/src/modules/uid_domain/domain_rpc.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_RPC_H -#define _DOMAIN_RPC_H +#ifndef _UID_DOMAIN_RPC_H_ +#define _UID_DOMAIN_RPC_H_ #include "../../core/rpc.h" diff --git a/src/modules/uid_domain/hash.h b/src/modules/uid_domain/hash.h index e72616f775..1c07a83321 100644 --- a/src/modules/uid_domain/hash.h +++ b/src/modules/uid_domain/hash.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _HASH_H -#define _HASH_H +#ifndef _UID_DOMAIN_HASH_H_ +#define _UID_DOMAIN_HASH_H_ #include <stdio.h> #include "uid_domain_mod.h" diff --git a/src/modules/uid_domain/uid_domain_mod.h b/src/modules/uid_domain/uid_domain_mod.h index 4f15b6d0ef..75c21c2175 100644 --- a/src/modules/uid_domain/uid_domain_mod.h +++ b/src/modules/uid_domain/uid_domain_mod.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _UID_DOMAIN_MOD_H -#define _UID_DOMAIN_MOD_H +#ifndef _UID_DOMAIN_MOD_H_ +#define _UID_DOMAIN_MOD_H_ #include "../../lib/srdb2/db.h" #include "../../core/str.h" [View Less]

1 0

git:5.3:c0b87c2c: core: hash_func.h - use file name specific include guard
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: c0b87c2cc13b1f46b8c5c902a0f5a82e913b85d9 URL: https://github.com/kamailio/kamailio/commit/c0b87c2cc13b1f46b8c5c902a0f5a82… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:01:19+02:00 core: hash_func.h - use file name specific include guard (cherry picked from commit 9691f6e0cab48114ef4067a22cc8f9c1efb8944c) --- Modified: src/core/hash_func.h --- Diff: … [View More]

1 0

git:5.3:ac3fe062: libs/srdb1: use thread safe localtime_r()
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: ac3fe062bd9b429133ab086fc28e15b97421a092 URL: https://github.com/kamailio/kamailio/commit/ac3fe062bd9b429133ab086fc28e15b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:01:02+02:00 libs/srdb1: use thread safe localtime_r() (cherry picked from commit c01633dc54d8d4dc3b3bc2cab064f91a49c8257d) --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.… [View More]

1 0

git:5.3:758229d4: misc: examples/kemi - missing parameter in kamailio-basic-kemi-python.py
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 758229d440d95a58e839a50e9e8ea2591a43a992 URL: https://github.com/kamailio/kamailio/commit/758229d440d95a58e839a50e9e8ea25… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:00:14+02:00 misc: examples/kemi - missing parameter in kamailio-basic-kemi-python.py (cherry picked from commit 6b69754f28ab8df61852b9f8695e59305a7c6c3a) --- Modified: misc/examples/kemi/… [View More]

1 0

git:5.3:f3dbeda6: core: utils/tmrec - use safer localtime_r() instead of localtime()
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: f3dbeda6825b5cd6c28a3258503e27ec2462ebd7 URL: https://github.com/kamailio/kamailio/commit/f3dbeda6825b5cd6c28a3258503e27e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T12:00:31+02:00 core: utils/tmrec - use safer localtime_r() instead of localtime() - coherent whitespacing and indentation (cherry picked from commit a7496069c60479e41d92830172bd5b9315001df5) --… [View More]

1 0

git:5.3:f128c37d: core: more debug messages when matching myself
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: f128c37d77d2568f7b378e8d08265e1fb2265bf5 URL: https://github.com/kamailio/kamailio/commit/f128c37d77d2568f7b378e8d08265e1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T11:57:51+02:00 core: more debug messages when matching myself - coherent coding style for related functions (cherry picked from commit 34b9b59b97f7d529025863992408fd60a27a941a) --- Modified: … [View More]

1 0

git:5.3:8f5653e6: kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 8f5653e6cd84bc1dfa2498959b99f3fe2911b483 URL: https://github.com/kamailio/kamailio/commit/8f5653e6cd84bc1dfa2498959b99f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T11:57:37+02:00 kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser (cherry picked from commit 66ef7ab7b078794b96ecee13f6867d5f90a8d63e) --- Modified: utils/kamctl/kamdbctl.mysql … [View More]--- Diff: https://github.com/kamailio/kamailio/commit/8f5653e6cd84bc1dfa2498959b99f3f… Patch: https://github.com/kamailio/kamailio/commit/8f5653e6cd84bc1dfa2498959b99f3f… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index e8f8d2e861..358742dad4 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -161,9 +161,12 @@ kamailio_db_grant () # pars: <database name> # Users: kamailio is the regular user, kamailioro only for reading sql_query "" "CREATE USER '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST'; - CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "granting privileges to database $1 failed!" @@ -172,9 +175,11 @@ kamailio_db_grant () # pars: <database name> if [ "$DBHOST" != "localhost" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost'; - CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -183,9 +188,11 @@ kamailio_db_grant () # pars: <database name> if [ ! -z "$DBACCESSHOST" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST'; - CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1 @@ -203,8 +210,11 @@ kamailio_db_revoke () # pars: <database name> minfo "revoking privileges to database $1 ..." # Users: kamailio is the regular user, kamailioro only for reading - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST'; - REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "revoking privileges to database $1 failed!" @@ -212,8 +222,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ "$DBHOST" != "localhost" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -221,8 +233,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ ! -z "$DBACCESSHOST" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1 [View Less]

1 0

git:5.3:4790825c: htable: docs - more details about size attribute for htable
by Daniel-Constantin Mierla 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 4790825cc98068b07c1e0402bdea93f839a1fd77 URL: https://github.com/kamailio/kamailio/commit/4790825cc98068b07c1e0402bdea93f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-06T11:57:22+02:00 htable: docs - more details about size attribute for htable (cherry picked from commit 35f711e6ec74c6e67edf99adaa15cc353f2ce949) --- Modified: src/modules/htable/doc/… [View More]

1 0

git:5.3:291dc3e6: pkg/kamailio/deb: version set 5.3.4
by Victor Seva 06 May '20

06 May '20

Module: kamailio Branch: 5.3 Commit: 291dc3e6cdc77e912e6a2e71b01250e709d26183 URL: https://github.com/kamailio/kamailio/commit/291dc3e6cdc77e912e6a2e71b01250e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-06T09:23:41+02:00 pkg/kamailio/deb: version set 5.3.4 --- Modified: pkg/kamailio/deb/bionic/changelog Modified: pkg/kamailio/deb/buster/changelog Modified: pkg/kamailio/deb/debian/… [View More]

1 0

Releasing Kamailio v5.3.4
by Daniel-Constantin Mierla 06 May '20

06 May '20

Hello, based on the discussions from yesterday's online devel meeting, I am planning to release next week (likely on Wednesday, May 6) the next minor version out of branch 5.3, respectively 5.3.4. Should anyone be aware of issues not reported to the bug tracker or commits for fixes in master not backported to 5.3 branch, let us know. For new issues, the best is to report them on the tracker. For commits, you can provide links/hashids or make pull requests. Cheers, Daniel -- Daniel-… [View More]

1 1

[kamailio/kamailio] Continued OpenSSL 1.1 crashes with 5.3.0 (#2121)
by Nathan Whitehorn 05 May '20

05 May '20

### Description After upgrading to 5.3.0 from 5.2.2 (standard packages on FreeBSD 12.0), I am experiencing intermittent crashes related to handling of BYE messages. ### Troubleshooting #### Reproduction This happens ~ weekly and I have not found a good way to reproduce it. #### Debugging Data An example backtrace is below from the last dumped core (the SIGSEGV one); unfortunately it overwrote the earlier one: ``` * thread #1, name = 'kamailio', stop reason = signal SIGSEGV * frame #0: … [View More]0x00000008009c5b79 libc.so.7`___lldb_unnamed_symbol403$$libc.so.7 + 41 frame #1: 0x00000008009ed63e libc.so.7`__free + 990 frame #2: 0x000000080271562b libthr.so.3`pthread_rwlock_destroy + 59 frame #3: 0x0000000802bedbf6 libcrypto.so.111`CRYPTO_THREAD_lock_free + 22 frame #4: 0x0000000802aef3c4 libcrypto.so.111`RSA_free + 100 frame #5: 0x0000000802b10c32 libcrypto.so.111`EVP_PKEY_free + 66 frame #6: 0x000000080296ed86 libssl.so.111`___lldb_unnamed_symbol646$$libssl.so.111 + 134 frame #7: 0x000000080295f93c libssl.so.111`SSL_CTX_free + 236 frame #8: 0x00000008028aee42 tls.so`tls_free_domain + 114 frame #9: 0x00000008028af1d7 tls.so`tls_free_cfg + 199 frame #10: 0x00000008028af2df tls.so`tls_destroy_cfg + 191 frame #11: 0x00000008028ad1f1 tls.so`destroy_tls_h + 1185 frame #12: 0x000000000041adea kamailio`destroy_tls + 26 frame #13: 0x00000000002e36fd kamailio`cleanup + 269 frame #14: 0x00000000002eb5b7 kamailio`___lldb_unnamed_symbol5$$kamailio + 1351 frame #15: 0x00000000002ea5e5 kamailio`handle_sigs + 21669 frame #16: 0x00000000002fb83e kamailio`main_loop + 40014 frame #17: 0x0000000000307d2b kamailio`main + 50267 frame #18: 0x00000000002e311b kamailio`_start + 283 ``` This is with OpenSSL 1.1 With the LD_PRELOAD hack to 5.2.2, things were completely stable; I am trying to use kamailio without the LD_PRELOAD'ed mutex wrapper now, which I believe is no longer required. It looks like the SSL-related stuff in the TLS crash (which was 5 minutes later!) is unrelated to the initial problem and may just be an artifact of one of the kamailio processes crashing earlier. #### Log Messages ``` Nov 2 08:11:31 home /usr/local/sbin/kamailio[94702]: CRITICAL: {1 527440 BYE 973470944-5061-16392(a)BA.A.B.I} <core> [core/mem/q_malloc.c:149]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(c0c0c000, abcdefed)[0x801544c58:0x801544c90]! Memory allocator was called from core: core/action.c:754. Fragment marked by core: core/dset.c:733. Exec from core/mem/q_malloc.c:504. Nov 2 08:13:41 home /usr/local/sbin/kamailio[94703]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 22 Nov 2 08:13:41 home kernel: pid 94702 (kamailio), uid 0: exited on signal 6 (core dumped) Nov 2 08:13:41 home /usr/local/sbin/kamailio[94692]: ALERT: <core> [main.c:767]: handle_sigs(): child process 94702 exited by a signal 6 Nov 2 08:13:41 home /usr/local/sbin/kamailio[94692]: ALERT: <core> [main.c:770]: handle_sigs(): core was generated Nov 2 08:14:56 home login[8284]: ROOT LOGIN (root) ON ttyu0 Nov 2 08:16:26 home kernel: pid 94692 (kamailio), uid 0: exited on signal 11 (core dumped) ``` I had an identical problem a week ago, also with a crash on a BYE for an active call: ``` Oct 27 13:00:02 home /usr/local/sbin/kamailio[79819]: CRITICAL: {1 598425 BYE 649761149-5061-291(a)BA.A.B.I} <core> [core/mem/q_malloc.c:149]: qm_debug_check_frag(): BUG: qm: prev. fragm. tail overwritten(c0c0c000, abcdefed)[0x801551808:0x801551840]! Memory allocator was called from core: core/action.c:754. Fragment marked by core: core/dset.c:733. Exec from core/mem/q_malloc.c:504. Oct 27 13:02:09 home /usr/local/sbin/kamailio[79820]: CRITICAL: <core> [core/pass_fd.c:277]: receive_fd(): EOF on 22 Oct 27 13:02:09 home kernel: pid 79819 (kamailio), uid 0: exited on signal 6 (core dumped) Oct 27 13:02:09 home /usr/local/sbin/kamailio[79809]: ALERT: <core> [main.c:767]: handle_sigs(): child process 79819 exited by a signal 6 Oct 27 13:02:09 home /usr/local/sbin/kamailio[79809]: ALERT: <core> [main.c:770]: handle_sigs(): core was generated Oct 27 13:04:55 home kernel: pid 79809 (kamailio), uid 0: exited on signal 11 (core dumped) ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.3.0 (x86_64/freebsd) 4cc67a flags: USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, 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_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, select, kqueue. id: 4cc67a compiled on 18:51:34 Oct 25 2019 with cc 6.0 ``` * **Operating System**: FreeBSD 12.0 ``` FreeBSD home.XXX 12.0-RELEASE-p10 FreeBSD 12.0-RELEASE-p10 GENERIC amd64 ``` -- 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/2121 [View Less]

2 16

git:master:57dbfba9: cfgt: don't process non-sip messages
by Victor Seva 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 57dbfba97f03370db3ad36e1d52f85f725f12972 URL: https://github.com/kamailio/kamailio/commit/57dbfba97f03370db3ad36e1d52f85f… Author: Sipwise Development Team <support(a)sipwise.com> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-05T12:39:28+02:00 cfgt: don't process non-sip messages * Skip OPTION messages internally generated --- Modified: src/modules/cfgt/cfgt_int.c --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:1250364a: pv_headers: rework
by Victor Seva 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 1250364ab16aa99c0a933b27a0118ecf274c25ab URL: https://github.com/kamailio/kamailio/commit/1250364ab16aa99c0a933b27a0118ec… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-05T12:07:43+02:00 pv_headers: rework * don't try to detect branch every time * reduce use of dynamic memory * rework reply scenario, keep reply_counter in xavp * hook to branch event too … [View More]

1 0

Roadmap to the next major release - Kamailio v5.4.0
by Daniel-Constantin Mierla 05 May '20

05 May '20

Hello, I am going to send a few emails on different topics to inform the broader community on mailing lists about what was discussed during the last online development meeting that happened last Wednesday, so everyone becomes aware and add own opinions and suggestions. First here is about the next major release, which is considered for the mid of summer. To allow the usual 1-1.5 months of testing time frame, the development has to be frozen in the first part of June (more or less one month … [View More]

1 0

info: in-memory presentity records
by Daniel-Constantin Mierla 05 May '20

05 May '20

Hello, the presentity records (PUBLISH data) stored by the presence module needed always an external storage backend (sql/no-sql database), for subscriptions (active watchers) it was possible to use memory caching only. I recently added support for cache-only module for PUBLISH data as well, more details are presented in the news article: * https://www.kamailio.org/w/2020/05/in-memory-presentity-records/ That could help simplifying network architecture on distributed platforms … [View More]

1 0

rtpproxy and NAT
by Pavithra M 05 May '20

05 May '20

Hi, kamailio version - 5.3.3 I have configured rtpproxy in pcscf . rtpproxy 17002 1 0 18:40 ? 00:00:00 /usr/bin/rtpproxy -s udp:10.40.10.3 7722 -u rtpproxy rtpproxy -p /var/run/rtpproxy/rtpproxy.pid -l 10.45.4.22 -d DBUG LOG_LOCAL0 I have configured rtpproxy in kamailio.cfg as well. modparam("rtpproxy", "rtpproxy_sock", "udp:10.40.10.3:7722") 10.40.10.3 - private IP 10.45.4.22 - public IP I have enabled NAT configuration also. When i make a call from zoiper client , rtp … [View More]

1 3

git:master:13622cf6: snmpstats: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 13622cf6e36e50c42ec882272b1c48107fa55677 URL: https://github.com/kamailio/kamailio/commit/13622cf6e36e50c42ec882272b1c481… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:07:14+02:00 snmpstats: use file name specific include guard --- Modified: src/modules/snmpstats/snmp_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:e4356d56: pipelimit: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: e4356d56d57599ff063e6849cab8cab5267d26e0 URL: https://github.com/kamailio/kamailio/commit/e4356d56d57599ff063e6849cab8cab… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:06:31+02:00 pipelimit: use file name specific include guard --- Modified: src/modules/pipelimit/pl_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:68b5b3ce: ratelimit: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 68b5b3ce5b8ae38ed5ba7731ae1a6315adedd0e5 URL: https://github.com/kamailio/kamailio/commit/68b5b3ce5b8ae38ed5ba7731ae1a631… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:06:56+02:00 ratelimit: use file name specific include guard --- Modified: src/modules/ratelimit/rl_statistics.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:c67a0eab: rr: different function parameter name to be different than global variable
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: c67a0eabea5fd11693bb716782cd581094250f7f URL: https://github.com/kamailio/kamailio/commit/c67a0eabea5fd11693bb716782cd581… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T08:05:07+02:00 rr: different function parameter name to be different than global variable --- Modified: src/modules/rr/rr_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:9a2fea75: app_sqlang: use file name specific include guard
by Daniel-Constantin Mierla 05 May '20

05 May '20

Module: kamailio Branch: master Commit: 9a2fea75dcee851b1dc22e5a9e7a6ee0d05814ef URL: https://github.com/kamailio/kamailio/commit/9a2fea75dcee851b1dc22e5a9e7a6ee… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-05T07:59:32+02:00 app_sqlang: use file name specific include guard --- Modified: src/modules/app_sqlang/app_sqlang_api.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:de77beff: rtpmanage: enable hadling of PRACK requests
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: de77beffb436e783031a6aa71c1887848cb2cc73 URL: https://github.com/kamailio/kamailio/commit/de77beffb436e783031a6aa71c18878… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T20:05:26+02:00 rtpmanage: enable hadling of PRACK requests - they can have SDP - use more compact bitwise match for method types --- Modified: src/modules/rtpengine/rtpengine.c --- Diff: … [View More]

1 0

git:master:f4f66ad9: usrloc: use file name specific include guard
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: f4f66ad91324116e5d4e9e02fa9caedcad2b2d2f URL: https://github.com/kamailio/kamailio/commit/f4f66ad91324116e5d4e9e02fa9caed… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T19:38:07+02:00 usrloc: use file name specific include guard --- Modified: src/modules/usrloc/usrloc_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:b3c981db: uid_domain: use module specific include guards
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: b3c981db67845622fb8c85a20e18e1b98c29eb69 URL: https://github.com/kamailio/kamailio/commit/b3c981db67845622fb8c85a20e18e1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T19:01:21+02:00 uid_domain: use module specific include guards --- Modified: src/modules/uid_domain/domain.h Modified: src/modules/uid_domain/domain_api.h Modified: src/modules/uid_domain/… [View More]domain_rpc.h Modified: src/modules/uid_domain/hash.h Modified: src/modules/uid_domain/uid_domain_mod.h --- Diff: https://github.com/kamailio/kamailio/commit/b3c981db67845622fb8c85a20e18e1b… Patch: https://github.com/kamailio/kamailio/commit/b3c981db67845622fb8c85a20e18e1b… --- diff --git a/src/modules/uid_domain/domain.h b/src/modules/uid_domain/domain.h index 44ad7ee4db..c52417a601 100644 --- a/src/modules/uid_domain/domain.h +++ b/src/modules/uid_domain/domain.h @@ -19,8 +19,8 @@ * with this program; if not, write to the Free Software Foundation, Inc., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_H -#define _DOMAIN_H +#ifndef _UID_DOMAIN_H_ +#define _UID_DOMAIN_H_ #include <time.h> #include <stdio.h> diff --git a/src/modules/uid_domain/domain_api.h b/src/modules/uid_domain/domain_api.h index acc957971f..4a64a469cb 100644 --- a/src/modules/uid_domain/domain_api.h +++ b/src/modules/uid_domain/domain_api.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_API_H -#define _DOMAIN_API_H +#ifndef _UID_DOMAIN_API_H_ +#define _UID_DOMAIN_API_H_ #include "../../core/sr_module.h" #include "../../core/dprint.h" diff --git a/src/modules/uid_domain/domain_rpc.h b/src/modules/uid_domain/domain_rpc.h index 27641b6d47..996e7f01aa 100644 --- a/src/modules/uid_domain/domain_rpc.h +++ b/src/modules/uid_domain/domain_rpc.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _DOMAIN_RPC_H -#define _DOMAIN_RPC_H +#ifndef _UID_DOMAIN_RPC_H_ +#define _UID_DOMAIN_RPC_H_ #include "../../core/rpc.h" diff --git a/src/modules/uid_domain/hash.h b/src/modules/uid_domain/hash.h index e72616f775..1c07a83321 100644 --- a/src/modules/uid_domain/hash.h +++ b/src/modules/uid_domain/hash.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _HASH_H -#define _HASH_H +#ifndef _UID_DOMAIN_HASH_H_ +#define _UID_DOMAIN_HASH_H_ #include <stdio.h> #include "uid_domain_mod.h" diff --git a/src/modules/uid_domain/uid_domain_mod.h b/src/modules/uid_domain/uid_domain_mod.h index 4f15b6d0ef..75c21c2175 100644 --- a/src/modules/uid_domain/uid_domain_mod.h +++ b/src/modules/uid_domain/uid_domain_mod.h @@ -20,8 +20,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _UID_DOMAIN_MOD_H -#define _UID_DOMAIN_MOD_H +#ifndef _UID_DOMAIN_MOD_H_ +#define _UID_DOMAIN_MOD_H_ #include "../../lib/srdb2/db.h" #include "../../core/str.h" [View Less]

1 0

git:master:c01633dc: libs/srdb1: use thread safe localtime_r()
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: c01633dc54d8d4dc3b3bc2cab064f91a49c8257d URL: https://github.com/kamailio/kamailio/commit/c01633dc54d8d4dc3b3bc2cab064f91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T18:26:47+02:00 libs/srdb1: use thread safe localtime_r() --- Modified: src/lib/srdb1/db_ut.c --- Diff: https://github.com/kamailio/kamailio/commit/c01633dc54d8d4dc3b3bc2cab064f91… Patch: … [View More]

1 0

git:master:9691f6e0: core: hash_func.h - use file name specific include guard
by Daniel-Constantin Mierla 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 9691f6e0cab48114ef4067a22cc8f9c1efb8944c URL: https://github.com/kamailio/kamailio/commit/9691f6e0cab48114ef4067a22cc8f9c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-04T18:35:00+02:00 core: hash_func.h - use file name specific include guard --- Modified: src/core/hash_func.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:5.2:4061a1d7: utils/kamctl: dbtextdb.py close previous opened file properly
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.2 Commit: 4061a1d7cd130a5c3e4236c2abb999658ee02e36 URL: https://github.com/kamailio/kamailio/commit/4061a1d7cd130a5c3e4236c2abb9996… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:07:58+02:00 utils/kamctl: dbtextdb.py close previous opened file properly related #1747 (cherry picked from commit 5f52f9905bbdf63d636080f7d0340af4f71ed12a) (cherry picked from … [View More]

1 0

git:5.2:0d9c72b2: utils/kamctl: dbtextdb remove DeprecationWarning on test
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.2 Commit: 0d9c72b27d75fb2e4ec879e855ce141394ce1918 URL: https://github.com/kamailio/kamailio/commit/0d9c72b27d75fb2e4ec879e855ce141… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:07:05+02:00 utils/kamctl: dbtextdb remove DeprecationWarning on test related #1747 (cherry picked from commit 765efa80c7d27e9447bc1ad8a354ee24723580ef) (cherry picked from commit … [View More]

1 0

git:5.2:23062ed5: utils/kamctl: fix handling of Exceptions
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.2 Commit: 23062ed50ea4e6b6e00468cc7f8ec57ccc613429 URL: https://github.com/kamailio/kamailio/commit/23062ed50ea4e6b6e00468cc7f8ec57… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:07:04+02:00 utils/kamctl: fix handling of Exceptions > Traceback (most recent call last): > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239, … [View More]in <module> > main(sys.argv) > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main > except (Error, e): > NameError: name 'e' is not defined (cherry picked from commit 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9) (cherry picked from commit 5f6f4331811e654e75b49263f8fb823bea9874a3) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/23062ed50ea4e6b6e00468cc7f8ec57… Patch: https://github.com/kamailio/kamailio/commit/23062ed50ea4e6b6e00468cc7f8ec57… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3a35554013..3d5ee7ecc5 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -356,7 +356,7 @@ def _EscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -377,7 +377,7 @@ def _UnEscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -988,21 +988,19 @@ def _TypeCheck(self, val, col): if not val and not self.header[col]['null']: raise ExecuteError(col + ' cannot be empty or null') - if (self.header[col]['type'].lower() == 'int' or - self.header[col]['type'].lower() == 'double'): + hdr_t = self.header[col]['type'].lower() + if hdr_t == 'int' or hdr_t == 'double': try: if val: val = eval(val) - except (NameError, e): + except NameError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) - except (SyntaxError, e): + (col, self.table, hdr_t, e)) + except SyntaxError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) + (col, self.table, hdr_t, e)) return val @@ -1083,7 +1081,7 @@ def OpenTable(self): # save a copy of the data before modifying self.orig_data = self.data[:] - except (IOError, e): + except IOError as e: raise ExecuteError('Unable to open table %s: %s' % (self.table, e)) Debug('Header is: %s' % self.header) @@ -1230,7 +1228,7 @@ def main(argv): print('Updated %s, rows affected: %d' % (conn.table, row)) else: print(row) - except (Error, e): + except Error as e: print(e) sys.exit(1) [View Less]

1 0

git:5.2:a2660fbe: utils/kamctl: fix dbtestdb
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.2 Commit: a2660fbe2e974553f0146c9ee84fcc6fa2f8f705 URL: https://github.com/kamailio/kamailio/commit/a2660fbe2e974553f0146c9ee84fcc6… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:07:05+02:00 utils/kamctl: fix dbtestdb some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… related #1747 (cherry … [View More]picked from commit b722a48144ac9e029bdbc2968dedbe56966a3f7c) (cherry picked from commit c4dd3218e6b723c688762a5c4253fa70f3f588bc) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/a2660fbe2e974553f0146c9ee84fcc6… Patch: https://github.com/kamailio/kamailio/commit/a2660fbe2e974553f0146c9ee84fcc6… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3d5ee7ecc5..7e1de04687 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -146,11 +146,11 @@ def _ParseColumns(self): # check if there is a function modifier on the columns if self.tokens[0] == 'COUNT': self.count = True - if col_end == 1: - raise ParseError('COUNT must be followed by column name[s]') - if not self.tokens[1].startswith(self._paren_placeholder): - raise ParseError('COUNT must be followed by ()') - cols_str = self._ReplaceParens(self.tokens[1]) + if col_end == 1: + raise ParseError('COUNT must be followed by column name[s]') + if not self.tokens[1].startswith(self._paren_placeholder): + raise ParseError('COUNT must be followed by ()') + cols_str = self._ReplaceParens(self.tokens[1]) cols = cols_str.split(',') for col in cols: @@ -300,7 +300,7 @@ def _ParseTargets(self): if self.tokens.pop(0) != 'SET': raise ParseError('UPDATE command must be followed by SET') - self.targets = self._ParsePairs(' '.join(self.tokens), ',') + self.targets = self._ParsePairs(' '.join(self.tokens), ',') # INSERT if self.command == 'INSERT': @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode): string = '%s%s' % (string, c) continue # wait for matching delim - started -= 1 - if not started: - values.append(string) - new_args = '%s %s' % (new_args, '%s%d' % (placeholder, - my_id)) - my_id += 1 - string = '' + started -= 1 + if not started: + values.append(string) + new_args = '%s %s' % (new_args, '%s%d' % (placeholder, + my_id)) + my_id += 1 + string = '' - else: - if not started: - new_args = '%s%s' % (new_args, c) else: - string = '%s%s' % (string, c) + if not started: + new_args = '%s%s' % (new_args, c) + else: + string = '%s%s' % (string, c) if started: if mode == 'parens': @@ -714,8 +714,8 @@ def _RunInsert(self): elif self.header[col]['auto']: new_row[col] = self._GetNextAuto(col) - else: - raise ExecuteError(col + ' cannot be empty or null') + else: + raise ExecuteError(col + ' cannot be empty or null') self.data.append(new_row) return [1] [View Less]

1 0

git:5.3:e26e587f: utils/kamctl: dbtextdb.py close previous opened file properly
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: e26e587f31eb23c431a2cfb149ec7a86b4f648bc URL: https://github.com/kamailio/kamailio/commit/e26e587f31eb23c431a2cfb149ec7a8… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:01:53+02:00 utils/kamctl: dbtextdb.py close previous opened file properly related #1747 (cherry picked from commit 5f52f9905bbdf63d636080f7d0340af4f71ed12a) --- Modified: utils/… [View More]

1 0

git:5.3:5a90c8bc: utils/kamctl: dbtextdb remove DeprecationWarning on test
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: 5a90c8bc600fe9a93a5ce4f828ce50f3bf532b99 URL: https://github.com/kamailio/kamailio/commit/5a90c8bc600fe9a93a5ce4f828ce50f… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:01:42+02:00 utils/kamctl: dbtextdb remove DeprecationWarning on test related #1747 (cherry picked from commit 765efa80c7d27e9447bc1ad8a354ee24723580ef) --- Modified: utils/kamctl/… [View More]

1 0

git:5.3:c4dd3218: utils/kamctl: fix dbtestdb
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: c4dd3218e6b723c688762a5c4253fa70f3f588bc URL: https://github.com/kamailio/kamailio/commit/c4dd3218e6b723c688762a5c4253fa7… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T17:01:19+02:00 utils/kamctl: fix dbtestdb some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… related #1747 (cherry … [View More]picked from commit b722a48144ac9e029bdbc2968dedbe56966a3f7c) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/c4dd3218e6b723c688762a5c4253fa7… Patch: https://github.com/kamailio/kamailio/commit/c4dd3218e6b723c688762a5c4253fa7… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3d5ee7ecc5..7e1de04687 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -146,11 +146,11 @@ def _ParseColumns(self): # check if there is a function modifier on the columns if self.tokens[0] == 'COUNT': self.count = True - if col_end == 1: - raise ParseError('COUNT must be followed by column name[s]') - if not self.tokens[1].startswith(self._paren_placeholder): - raise ParseError('COUNT must be followed by ()') - cols_str = self._ReplaceParens(self.tokens[1]) + if col_end == 1: + raise ParseError('COUNT must be followed by column name[s]') + if not self.tokens[1].startswith(self._paren_placeholder): + raise ParseError('COUNT must be followed by ()') + cols_str = self._ReplaceParens(self.tokens[1]) cols = cols_str.split(',') for col in cols: @@ -300,7 +300,7 @@ def _ParseTargets(self): if self.tokens.pop(0) != 'SET': raise ParseError('UPDATE command must be followed by SET') - self.targets = self._ParsePairs(' '.join(self.tokens), ',') + self.targets = self._ParsePairs(' '.join(self.tokens), ',') # INSERT if self.command == 'INSERT': @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode): string = '%s%s' % (string, c) continue # wait for matching delim - started -= 1 - if not started: - values.append(string) - new_args = '%s %s' % (new_args, '%s%d' % (placeholder, - my_id)) - my_id += 1 - string = '' + started -= 1 + if not started: + values.append(string) + new_args = '%s %s' % (new_args, '%s%d' % (placeholder, + my_id)) + my_id += 1 + string = '' - else: - if not started: - new_args = '%s%s' % (new_args, c) else: - string = '%s%s' % (string, c) + if not started: + new_args = '%s%s' % (new_args, c) + else: + string = '%s%s' % (string, c) if started: if mode == 'parens': @@ -714,8 +714,8 @@ def _RunInsert(self): elif self.header[col]['auto']: new_row[col] = self._GetNextAuto(col) - else: - raise ExecuteError(col + ' cannot be empty or null') + else: + raise ExecuteError(col + ' cannot be empty or null') self.data.append(new_row) return [1] [View Less]

1 0

[kamailio/kamailio] [Feature Request] Python3 compatibility for dbtextdb (#1747)
by Anthony Messina 04 May '20

04 May '20

kamctl's dbtextdb.py fails to build in a Python3-only environment. Update dbtextdb to Python3. -- 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/1747

4 12

git:master:5f52f990: utils/kamctl: dbtextdb.py close previous opened file properly
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 5f52f9905bbdf63d636080f7d0340af4f71ed12a URL: https://github.com/kamailio/kamailio/commit/5f52f9905bbdf63d636080f7d0340af… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T15:22:36+02:00 utils/kamctl: dbtextdb.py close previous opened file properly related #1747 --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:765efa80: utils/kamctl: dbtextdb remove DeprecationWarning on test
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 765efa80c7d27e9447bc1ad8a354ee24723580ef URL: https://github.com/kamailio/kamailio/commit/765efa80c7d27e9447bc1ad8a354ee2… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T15:06:43+02:00 utils/kamctl: dbtextdb remove DeprecationWarning on test related #1747 --- Modified: utils/kamctl/dbtextdb/dbtextdb_test.py --- Diff: https://github.com/kamailio/… [View More]

1 0

git:master:b722a481: utils/kamctl: fix dbtestdb
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: b722a48144ac9e029bdbc2968dedbe56966a3f7c URL: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T14:48:41+02:00 utils/kamctl: fix dbtestdb some indentantion errors introduced at https://github.com/kamailio/kamailio/commit/bc8bdcaa726f375f6deea8228a1ab0c… related #1747 --- … [View More]Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5… Patch: https://github.com/kamailio/kamailio/commit/b722a48144ac9e029bdbc2968dedbe5… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3d5ee7ecc5..7e1de04687 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -146,11 +146,11 @@ def _ParseColumns(self): # check if there is a function modifier on the columns if self.tokens[0] == 'COUNT': self.count = True - if col_end == 1: - raise ParseError('COUNT must be followed by column name[s]') - if not self.tokens[1].startswith(self._paren_placeholder): - raise ParseError('COUNT must be followed by ()') - cols_str = self._ReplaceParens(self.tokens[1]) + if col_end == 1: + raise ParseError('COUNT must be followed by column name[s]') + if not self.tokens[1].startswith(self._paren_placeholder): + raise ParseError('COUNT must be followed by ()') + cols_str = self._ReplaceParens(self.tokens[1]) cols = cols_str.split(',') for col in cols: @@ -300,7 +300,7 @@ def _ParseTargets(self): if self.tokens.pop(0) != 'SET': raise ParseError('UPDATE command must be followed by SET') - self.targets = self._ParsePairs(' '.join(self.tokens), ',') + self.targets = self._ParsePairs(' '.join(self.tokens), ',') # INSERT if self.command == 'INSERT': @@ -570,19 +570,19 @@ def _ParseOutHelper(self, placeholder, delims, mode): string = '%s%s' % (string, c) continue # wait for matching delim - started -= 1 - if not started: - values.append(string) - new_args = '%s %s' % (new_args, '%s%d' % (placeholder, - my_id)) - my_id += 1 - string = '' + started -= 1 + if not started: + values.append(string) + new_args = '%s %s' % (new_args, '%s%d' % (placeholder, + my_id)) + my_id += 1 + string = '' - else: - if not started: - new_args = '%s%s' % (new_args, c) else: - string = '%s%s' % (string, c) + if not started: + new_args = '%s%s' % (new_args, c) + else: + string = '%s%s' % (string, c) if started: if mode == 'parens': @@ -714,8 +714,8 @@ def _RunInsert(self): elif self.header[col]['auto']: new_row[col] = self._GetNextAuto(col) - else: - raise ExecuteError(col + ' cannot be empty or null') + else: + raise ExecuteError(col + ' cannot be empty or null') self.data.append(new_row) return [1] [View Less]

1 0

git:5.3:5f6f4331: utils/kamctl: fix handling of Exceptions
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: 5.3 Commit: 5f6f4331811e654e75b49263f8fb823bea9874a3 URL: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T12:10:05+02:00 utils/kamctl: fix handling of Exceptions > Traceback (most recent call last): > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239, … [View More]in <module> > main(sys.argv) > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main > except (Error, e): > NameError: name 'e' is not defined (cherry picked from commit 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9) --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823… Patch: https://github.com/kamailio/kamailio/commit/5f6f4331811e654e75b49263f8fb823… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3a35554013..3d5ee7ecc5 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -356,7 +356,7 @@ def _EscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -377,7 +377,7 @@ def _UnEscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -988,21 +988,19 @@ def _TypeCheck(self, val, col): if not val and not self.header[col]['null']: raise ExecuteError(col + ' cannot be empty or null') - if (self.header[col]['type'].lower() == 'int' or - self.header[col]['type'].lower() == 'double'): + hdr_t = self.header[col]['type'].lower() + if hdr_t == 'int' or hdr_t == 'double': try: if val: val = eval(val) - except (NameError, e): + except NameError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) - except (SyntaxError, e): + (col, self.table, hdr_t, e)) + except SyntaxError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) + (col, self.table, hdr_t, e)) return val @@ -1083,7 +1081,7 @@ def OpenTable(self): # save a copy of the data before modifying self.orig_data = self.data[:] - except (IOError, e): + except IOError as e: raise ExecuteError('Unable to open table %s: %s' % (self.table, e)) Debug('Header is: %s' % self.header) @@ -1230,7 +1228,7 @@ def main(argv): print('Updated %s, rows affected: %d' % (conn.table, row)) else: print(row) - except (Error, e): + except Error as e: print(e) sys.exit(1) [View Less]

1 0

git:master:1aca79c4: utils/kamctl: fix handling of Exceptions
by Victor Seva 04 May '20

04 May '20

Module: kamailio Branch: master Commit: 1aca79c43cb8dbd920c1eb81c0c30cf89f0985b9 URL: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: 2020-05-04T11:33:12+02:00 utils/kamctl: fix handling of Exceptions > Traceback (most recent call last): > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1239,… [View More] in <module> > main(sys.argv) > File "/usr/lib/x86_64-linux-gnu/kamailio/kamctl/dbtextdb/dbtextdb.py", line 1233, in main > except (Error, e): > NameError: name 'e' is not defined --- Modified: utils/kamctl/dbtextdb/dbtextdb.py --- Diff: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf… Patch: https://github.com/kamailio/kamailio/commit/1aca79c43cb8dbd920c1eb81c0c30cf… --- diff --git a/utils/kamctl/dbtextdb/dbtextdb.py b/utils/kamctl/dbtextdb/dbtextdb.py index 3a35554013..3d5ee7ecc5 100755 --- a/utils/kamctl/dbtextdb/dbtextdb.py +++ b/utils/kamctl/dbtextdb/dbtextdb.py @@ -356,7 +356,7 @@ def _EscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -377,7 +377,7 @@ def _UnEscapeChars(self, value): # test that the value is string, if not return it as is try: value.find('a') - except: + except Exception: return value escaped = value @@ -988,21 +988,19 @@ def _TypeCheck(self, val, col): if not val and not self.header[col]['null']: raise ExecuteError(col + ' cannot be empty or null') - if (self.header[col]['type'].lower() == 'int' or - self.header[col]['type'].lower() == 'double'): + hdr_t = self.header[col]['type'].lower() + if hdr_t == 'int' or hdr_t == 'double': try: if val: val = eval(val) - except (NameError, e): + except NameError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) - except (SyntaxError, e): + (col, self.table, hdr_t, e)) + except SyntaxError as e: raise ExecuteError('Failed to parse %s in %s ' '(unable to convert to type %s): %s' % - (col, self.table, self.header[col]['type'], - e)) + (col, self.table, hdr_t, e)) return val @@ -1083,7 +1081,7 @@ def OpenTable(self): # save a copy of the data before modifying self.orig_data = self.data[:] - except (IOError, e): + except IOError as e: raise ExecuteError('Unable to open table %s: %s' % (self.table, e)) Debug('Header is: %s' % self.header) @@ -1230,7 +1228,7 @@ def main(argv): print('Updated %s, rows affected: %d' % (conn.table, row)) else: print(row) - except (Error, e): + except Error as e: print(e) sys.exit(1) [View Less]

1 0

[kamailio/kamailio] Kamailio service is failed (#2309)
by rombojack 04 May '20

04 May '20

I recently installed kamailio and it was enabled & started--> Service is active & running But once I added users I see kamailio service is failed [root@rlab111053 kamailio]# systemctl status kamailio ● kamailio.service - Kamailio (OpenSER) - the Open Source SIP Server Loaded: loaded (/etc/systemd/system/kamailio.service; enabled; vendor preset: disabled) Active: failed (Result: start-limit) since Wed 2020-04-29 18:47:26 IST; 860ms ago Process: 16759 ExecStart=/usr/sbin/… [View More]kamailio -DD -P /var/run/kamailio/kamailio.pid -f $CFGFILE -m $SHM_MEMORY -M $PKG_MEMORY (code=exited, status=255) Main PID: 16759 (code=exited, status=255) Apr 29 18:47:25 rlab111053 systemd[1]: kamailio.service: main process exited, code=exited, status=255/n/a Apr 29 18:47:25 rlab111053 systemd[1]: Unit kamailio.service entered failed state. Apr 29 18:47:25 rlab111053 systemd[1]: kamailio.service failed. Apr 29 18:47:26 rlab111053 systemd[1]: kamailio.service holdoff time over, scheduling restart. Apr 29 18:47:26 rlab111053 systemd[1]: Stopped Kamailio (OpenSER) - the Open Source SIP Server. Apr 29 18:47:26 rlab111053 systemd[1]: start request repeated too quickly for kamailio.service Apr 29 18:47:26 rlab111053 systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server. Apr 29 18:47:26 rlab111053 systemd[1]: Unit kamailio.service entered failed state. Apr 29 18:47:26 rlab111053 systemd[1]: kamailio.service failed. **I am using below version** [root@rlab111053 kamailio]# kamailio -version version: kamailio 5.1.10 (x86_64/linux) cfcfd5 flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, USE_RAW_SOCKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144 MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: cfcfd5 compiled on 15:40:49 Mar 6 2020 with gcc 4.8.5 [root@rlab111053 kamailio]# Can some help to fix it  ### Description  ### 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` ``` (paste your output here) ``` * **Operating System**:  ``` (paste your output here) ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/2309 [View Less]

3 3

[kamailio/kamailio] Add iteration by all DNS NAPTR records (#2290)
by Semen Darienko 03 May '20

03 May '20

Current stable release support using only one (first by ordering) NAPTR DNS record. I didn't find any ideas how to configure possibility for use all supported NAPTR / SRV records. This pull request resolve this issue. General issue: PreConditions: # host -t naptr voip.somehost.com voip.somehost.com has NAPTR record 1 0 "S" "SIPS+D2T" "" _sips._tcp.voip.somehost.com. voip.somehost.com has NAPTR record 2 0 "S" &… [View More]

2 3

git:master:28049aaf: core: dns - use all NAPTR records
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: 28049aafc8dd06c160ce5e7b8d5e4fc728441b0c URL: https://github.com/kamailio/kamailio/commit/28049aafc8dd06c160ce5e7b8d5e4fc… Author: Semen Darienko <semen.darienko(a)wildix.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T12:26:45+02:00 core: dns - use all NAPTR records - enable using of all NAPTR records instead of the first one ordered by priority - GH #2290 --- Modified: src/core/dns_cache.c Modified: src/… [View More]core/resolve.c Modified: src/core/resolve.h --- Diff: https://github.com/kamailio/kamailio/commit/28049aafc8dd06c160ce5e7b8d5e4fc… Patch: https://github.com/kamailio/kamailio/commit/28049aafc8dd06c160ce5e7b8d5e4fc… --- diff --git a/src/core/dns_cache.c b/src/core/dns_cache.c index 81fc6a9e45..c8567813e5 100644 --- a/src/core/dns_cache.c +++ b/src/core/dns_cache.c @@ -2644,6 +2644,10 @@ struct naptr_rdata* dns_naptr_sip_iterate(struct dns_rr* naptr_head, } LM_DBG("found a valid sip NAPTR rr %.*s, proto %d\n", naptr->repl_len, naptr->repl, (int)naptr_proto); + if (naptr->skip_record) { + i++; + continue; + } if ((naptr_proto_supported(naptr_proto))){ if (naptr_choose(&naptr_saved, &saved_proto, naptr, naptr_proto)) @@ -3203,6 +3207,63 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name, #ifdef USE_NAPTR + + +static void mark_skip_current_naptr(struct dns_rr* naptr_head, struct dns_hash_entry* srv) +{ + int i; + struct dns_rr* l; + struct naptr_rdata* naptr; + + if (!naptr_head || !srv) { + return; + } + + for(l=naptr_head, i=0; l && (i<MAX_NAPTR_RRS); l=l->next, i++) { + naptr = (struct naptr_rdata *) l->rdata; + if (naptr == 0) { + break; + } + if (naptr->skip_record) { + continue; + } + if (srv->name_len == naptr->repl_len && !memcmp(srv->name, naptr->repl, srv->name_len)) { + naptr->skip_record = 1; + LM_NOTICE("Mark to skip %.*s NAPTR record due to all IPs are unreachable\n", naptr->repl_len, naptr->repl); + break; + } + } +} + + +inline static int have_more_active_naptr(struct dns_rr* naptr_head) +{ + int i, res = 0; + struct dns_rr* l; + struct naptr_rdata* naptr; + char naptr_proto; + + if (!naptr_head) { + return res; + } + + for(l=naptr_head, i=0; l && (i<MAX_NAPTR_RRS); l=l->next, i++) { + naptr = (struct naptr_rdata *) l->rdata; + if (naptr == 0) { + break; + } + if (naptr->skip_record) { + continue; + } else if ((naptr_proto = naptr_get_sip_proto(naptr)) <= 0) { + continue; + } else if ((naptr_proto_supported(naptr_proto))) { + res = 1; + break; + } + } + return res; +} + /* resolves a host name trying: * - NAPTR lookup if the address is not an ip and proto!=0, port!=0 * *port==0 and *proto=0 and if flags allow NAPTR lookups @@ -3227,6 +3288,7 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, char n_proto, origproto; str srv_name; int ret; + int try_lookup_naptr = 0; ret=-E_DNS_NO_NAPTR; if(proto) origproto=*proto; @@ -3259,9 +3321,27 @@ inline static int dns_naptr_sip_resolve(struct dns_srv_handle* h, str* name, *port=h->port; return 0; } - /* do naptr lookup */ - if ((e=dns_get_entry(name, T_NAPTR))==0) - goto naptr_not_found; + try_lookup_naptr = 1; + } + /* do naptr lookup */ + if ((e=dns_get_entry(name, T_NAPTR))==0) + goto naptr_not_found; + + if (!try_lookup_naptr) { + if(proto) *proto=origproto; + int res = dns_srv_sip_resolve(h, name, ip, port, proto, flags); + if (res) { + mark_skip_current_naptr(e->rr_lst, h->srv); + if (have_more_active_naptr(e->rr_lst)) { + // No more avaliable IP for current NAPTR record, let's try next one + try_lookup_naptr = 1; + } + } else { + return res; + } + } + + if (try_lookup_naptr) { naptr_iterate_init(&tried_bmp); while(dns_naptr_sip_iterate(e->rr_lst, &tried_bmp, &srv_name, &n_proto)){ diff --git a/src/core/resolve.c b/src/core/resolve.c index af269a2b42..193ac528af 100644 --- a/src/core/resolve.c +++ b/src/core/resolve.c @@ -407,6 +407,7 @@ struct naptr_rdata* dns_naptr_parser( unsigned char* msg, unsigned char* end, PKG_MEM_ERROR; goto error; } + naptr->skip_record = 0; naptr->order=ntohs(order); naptr->pref=ntohs(pref); diff --git a/src/core/resolve.h b/src/core/resolve.h index 5ef849ccf8..d49ebdc206 100644 --- a/src/core/resolve.h +++ b/src/core/resolve.h @@ -123,6 +123,7 @@ struct naptr_rdata { unsigned char services_len; unsigned char regexp_len; unsigned char repl_len; /* not currently used */ + unsigned char skip_record; char str_table[1]; /* contains all the strings */ }; [View Less]

1 0

git:master:3c7d378d: core: added LGTM analysis config file
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: 3c7d378ddf3a21a2d4e1ac6bd64f9ea40bbd3602 URL: https://github.com/kamailio/kamailio/commit/3c7d378ddf3a21a2d4e1ac6bd64f9ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 core: added LGTM analysis config file - LGTM is integrated by github --- Added: .lgtm.yml --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:6b69754f: misc: examples/kemi - missing parameter in kamailio-basic-kemi-python.py
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: 6b69754f28ab8df61852b9f8695e59305a7c6c3a URL: https://github.com/kamailio/kamailio/commit/6b69754f28ab8df61852b9f8695e593… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 misc: examples/kemi - missing parameter in kamailio-basic-kemi-python.py --- Modified: misc/examples/kemi/kamailio-basic-kemi-python.py --- Diff: https://github.com/… [View More]

1 0

git:master:a7496069: core: utils/tmrec - use safer localtime_r() instead of localtime()
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: a7496069c60479e41d92830172bd5b9315001df5 URL: https://github.com/kamailio/kamailio/commit/a7496069c60479e41d92830172bd5b9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 core: utils/tmrec - use safer localtime_r() instead of localtime() - coherent whitespacing and indentation --- Modified: src/core/utils/tmrec.c --- Diff: https://github.… [View More]

1 0

git:master:e46dcd29: core: kemi - option to return 0 instead of null for xval
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: e46dcd2930c97855b9d87061ec4e4167b119d232 URL: https://github.com/kamailio/kamailio/commit/e46dcd2930c97855b9d87061ec4e416… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 core: kemi - option to return 0 instead of null for xval --- Modified: src/core/kemi.c Modified: src/core/kemi.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:855c06f4: sqlops: functions to get null result value as empty or zero
by Daniel-Constantin Mierla 03 May '20

03 May '20

Module: kamailio Branch: master Commit: 855c06f45ff69918c3e9502e7198cffc21be5cd9 URL: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-03T11:38:59+02:00 sqlops: functions to get null result value as empty or zero --- Modified: src/modules/sqlops/sqlops.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]855c06f45ff69918c3e9502e7198cff… Patch: https://github.com/kamailio/kamailio/commit/855c06f45ff69918c3e9502e7198cff… --- diff --git a/src/modules/sqlops/sqlops.c b/src/modules/sqlops/sqlops.c index 7172bcc8b4..b3f21f6ff3 100644 --- a/src/modules/sqlops/sqlops.c +++ b/src/modules/sqlops/sqlops.c @@ -540,7 +540,8 @@ static sr_kemi_xval_t _ksr_kemi_sqlops_xval = {0}; /** * */ -static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, int col) +static sr_kemi_xval_t* ki_sqlops_result_get_mode(sip_msg_t *msg, str *resid, + int row, int col, int rmode) { sql_result_t *res = NULL; @@ -548,31 +549,31 @@ static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, if (resid == NULL || resid->s == NULL || resid->len == 0) { LM_ERR("invalid result name\n"); - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } res = sql_get_result(resid); if(res==NULL) { LM_ERR("invalid result container [%.*s]\n", resid->len, resid->s); - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(row >= res->nrows) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(col >= res->ncols) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(res->vals[row][col].flags&PV_VAL_NULL) { - sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, SR_KEMI_XVAL_NULL_NONE); + sr_kemi_xval_null(&_ksr_kemi_sqlops_xval, rmode); return &_ksr_kemi_sqlops_xval; } if(res->vals[row][col].flags&PV_VAL_INT) { - _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_STR; + _ksr_kemi_sqlops_xval.vtype = SR_KEMIP_INT; _ksr_kemi_sqlops_xval.v.n = res->vals[row][col].value.n; return &_ksr_kemi_sqlops_xval; } @@ -581,6 +582,36 @@ static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, int row, return &_ksr_kemi_sqlops_xval; } +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_get(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_NONE); +} + +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_gete(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_EMPTY); +} + +/** + * + */ +static sr_kemi_xval_t* ki_sqlops_result_getz(sip_msg_t *msg, str *resid, + int row, int col) +{ + return ki_sqlops_result_get_mode(msg, resid, row, col, + SR_KEMI_XVAL_NULL_ZERO); +} + /** * */ @@ -626,6 +657,16 @@ static sr_kemi_t sr_kemi_sqlops_exports[] = { { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } }, + { str_init("sqlops"), str_init("sql_result_gete"), + SR_KEMIP_XVAL, ki_sqlops_result_gete, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, + { str_init("sqlops"), str_init("sql_result_getz"), + SR_KEMIP_XVAL, ki_sqlops_result_getz, + { SR_KEMIP_STR, SR_KEMIP_INT, SR_KEMIP_INT, + SR_KEMIP_NONE, SR_KEMIP_NONE, SR_KEMIP_NONE } + }, { {0, 0}, {0, 0}, 0, NULL, { 0, 0, 0, 0, 0, 0 } } }; [View Less]

1 0

[kamailio/kamailio] presence module with in-memory presentity records (#2294)
by Daniel-Constantin Mierla 02 May '20

02 May '20

Track the issues discovered by different developers while implementing in-memory only presentity records for presence module. -- 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/2294

2 10

[kamailio/kamailio] usrloc: change "-" for "_" in stats name to be prometheus compliant (#2304)
by Federico Cabiddu 02 May '20

02 May '20

#### 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  usrloc generated statistics (contacts, expires, users) contain "-" in their names (usrloc-contacs and so on), which is not valid according to prometheus naming convention. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/2304 -- Commit Summary -- * usrloc: change "-" for "_" in stats name to be prometheus compliant -- File Changes -- M src/modules/usrloc/udomain.c (2) -- Patch Links -- https://github.com/kamailio/kamailio/pull/2304.patch https://github.com/kamailio/kamailio/pull/2304.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/2304 [View Less]

3 16

git:master:f6c68817: Merge pull request #2304 from kamailio/grumvalski/usrloc_stats
by GitHub 02 May '20

02 May '20

Module: kamailio Branch: master Commit: f6c688178902138dff8115cdabd72e8631a635dc URL: https://github.com/kamailio/kamailio/commit/f6c688178902138dff8115cdabd72e8… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2020-05-02T16:22:06+02:00 Merge pull request #2304 from kamailio/grumvalski/usrloc_stats usrloc: change "-" for "_" in stats name to be prometheus compliant --- Modified: src/core/cfg.lex Modified: src/core/cfg.y … [View More]

1 0

git:master:9948696f: core: remove stats_name_separator from cfg_group_core
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 9948696fd84605919e6ce6a7106099f1cdd0de98 URL: https://github.com/kamailio/kamailio/commit/9948696fd84605919e6ce6a7106099f… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-05-02T10:14:23+02:00 core: remove stats_name_separator from cfg_group_core --- Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: src/core/config.h … [View More]

1 0

git:master:0595795c: ims_usrloc_pcscf, p_usrloc, usrloc: use KSR_STATS_NAMESEP for stats names
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 0595795c659f6af586e63837efe56b45808cd735 URL: https://github.com/kamailio/kamailio/commit/0595795c659f6af586e63837efe56b4… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T16:24:24+02:00 ims_usrloc_pcscf, p_usrloc, usrloc: use KSR_STATS_NAMESEP for stats names --- Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/udomain.c … [View More]

1 0

git:master:3203a657: core: new core parameter stats_name_separator
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 3203a6572b874d191c3be61519853005bd5ab056 URL: https://github.com/kamailio/kamailio/commit/3203a6572b874d191c3be6151985300… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-05-01T13:02:39+02:00 core: new core parameter stats_name_separator --- Modified: src/core/cfg.lex Modified: src/core/cfg.y Modified: src/core/cfg_core.c Modified: src/core/cfg_core.h Modified: … [View More]

1 0

git:master:4357b5e6: core: define KSR_STATS_NAMESEP for stats name separator
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 4357b5e6be2a71a401e9d53c43e787b9bfcc8ed0 URL: https://github.com/kamailio/kamailio/commit/4357b5e6be2a71a401e9d53c43e787b… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T16:22:40+02:00 core: define KSR_STATS_NAMESEP for stats name separator --- Modified: src/core/config.h --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:ddd27713: usrloc: change "-" for "_" in stats name to be prometheus compliant
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: ddd277139165f39406832ddd557c2b56b75a7100 URL: https://github.com/kamailio/kamailio/commit/ddd277139165f39406832ddd557c2b5… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T10:24:04+02:00 usrloc: change "-" for "_" in stats name to be prometheus compliant --- Modified: src/modules/usrloc/udomain.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:2fe0378c: p_usrloc, ims_usrloc_pcscf: change "-" for "_" in stats name to be prometheus compliant
by Federico Cabiddu 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 2fe0378c3d0596e30d8ec9ea4cb7d828321d2030 URL: https://github.com/kamailio/kamailio/commit/2fe0378c3d0596e30d8ec9ea4cb7d82… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2020-04-28T14:48:59+02:00 p_usrloc, ims_usrloc_pcscf: change "-" for "_" in stats name to be prometheus compliant --- Modified: src/modules/ims_usrloc_pcscf/udomain.c Modified: src/modules/p_usrloc/… [View More]

1 0

json request fails
by Juha Heinanen 02 May '20

02 May '20

I noticed that json rpc commands have started to fail, for example, May 2 15:41:15 char /usr/bin/sip-proxy[10440]: INFO: Executing JSON request <{"jsonrpc":"2.0","method":"siptrace.status","params":["on"],"id":1}> from <127.0.0.1> with host <127.0.0.1:6060> May 2 15:41:15 char /usr/bin/sip-proxy[10440]: ERROR: <core> [core/parser/parse_from.c:53]: parse_from_header(): bad msg or missing FROM header May 2 15:41:15 char /usr/bin/sip-proxy[10440]: ERROR: siptrace [… [View More]

2 4

git:master:c840fa6e: siptrace: skip non-sip traffic for db storage using core callbacks
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: c840fa6eb19b4b5d316e36ce534f4d481805ee0b URL: https://github.com/kamailio/kamailio/commit/c840fa6eb19b4b5d316e36ce534f4d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T15:02:55+02:00 siptrace: skip non-sip traffic for db storage using core callbacks --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

undefined symbol: ul_cseq_delay
by Juha Heinanen 02 May '20

02 May '20

I build my sip proxy from today's master and it didn't start: May 2 15:12:51 char sip-proxy[22422]: 0(22474) ERROR: <core> [core/sr_module.c:512]: load_module(): could not open module </usr/lib/x86_64-linux-gnu/sip-proxy/modules/usrloc.so>: /usr/lib/x86_64-linux-gnu/sip-proxy/modules/usrloc.so: undefined symbol: ul_cseq_delay -- Juha

2 2

git:master:d515c93a: usrloc: fixed missing symbol for ul_cseq_delay
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: d515c93a5c9c9eb920f001d04870dc6333ca60dd URL: https://github.com/kamailio/kamailio/commit/d515c93a5c9c9eb920f001d04870dc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T14:29:53+02:00 usrloc: fixed missing symbol for ul_cseq_delay --- Modified: src/modules/usrloc/urecord.c --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]

1 0

git:master:66ef7ab7: kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 66ef7ab7b078794b96ecee13f6867d5f90a8d63e URL: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T08:47:30+02:00 kamctl: kamdbclt mysql skip creating dbrouser if same as dbrwuser --- Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/… [View More]66ef7ab7b078794b96ecee13f6867d5… Patch: https://github.com/kamailio/kamailio/commit/66ef7ab7b078794b96ecee13f6867d5… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index bdb8b98ab4..4050371bfe 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -161,9 +161,12 @@ kamailio_db_grant () # pars: <database name> # Users: kamailio is the regular user, kamailioro only for reading sql_query "" "CREATE USER '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST'; - CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "granting privileges to database $1 failed!" @@ -172,9 +175,11 @@ kamailio_db_grant () # pars: <database name> if [ "$DBHOST" != "localhost" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost'; - CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -183,9 +188,11 @@ kamailio_db_grant () # pars: <database name> if [ ! -z "$DBACCESSHOST" ] ; then sql_query "" "CREATE USER '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; - GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST'; - CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "CREATE USER '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW'; + GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1 @@ -203,8 +210,11 @@ kamailio_db_revoke () # pars: <database name> minfo "revoking privileges to database $1 ..." # Users: kamailio is the regular user, kamailioro only for reading - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST'; - REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '${DBRWUSER}'@'$DBHOST';" + + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '${DBROUSER}'@'$DBHOST';" + fi if [ $? -ne 0 ] ; then merr "revoking privileges to database $1 failed!" @@ -212,8 +222,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ "$DBHOST" != "localhost" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'localhost';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'localhost';" + fi if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -221,8 +233,10 @@ kamailio_db_revoke () # pars: <database name> fi if [ ! -z "$DBACCESSHOST" ] ; then - sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST'; - REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + sql_query "" "REVOKE ALL PRIVILEGES ON $1.* FROM '$DBRWUSER'@'$DBACCESSHOST';" + if [ "${DBRWUSER}" != "${DBROUSER}" ] ; then + sql_query "" "REVOKE SELECT ON $1.* FROM '$DBROUSER'@'$DBACCESSHOST';" + fi if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1 [View Less]

1 0

git:master:34b9b59b: core: more debug messages when matching myself
by Daniel-Constantin Mierla 02 May '20

02 May '20

Module: kamailio Branch: master Commit: 34b9b59b97f7d529025863992408fd60a27a941a URL: https://github.com/kamailio/kamailio/commit/34b9b59b97f7d529025863992408fd6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-02T08:47:30+02:00 core: more debug messages when matching myself - coherent coding style for related functions --- Modified: src/core/forward.c Modified: src/core/name_alias.h Modified: src/… [View More]

1 0

[kamailio/kamailio] hash table size issue (#2311)
by fborot 01 May '20

01 May '20

I have my hash table set to size = 16 modparam("htable", "htable", "a=>size=16;autoexpire=0;dbtable=htable;") I had around 3000 entries in that table, some entries with more than 10 duplicate keys (key_type = 1) and we found that when reading the entries of the duplicated keys it could not go pass index 9 even though in the physical table there were 17 entries. I deleted some old entries and now the table is about 2000 items and it seems to work properly again ,(loads all value in memory).… [View More]

2 5

git:5.3:cca28078: core: do not use tcp id for lookup if not needed
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: cca28078f7fe329046744c9b63d01bb9945a8dca URL: https://github.com/kamailio/kamailio/commit/cca28078f7fe329046744c9b63d01bb… Author: Donato Sciarra <donato.sciarra(a)bmw.de> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:55:25+02:00 core: do not use tcp id for lookup if not needed In case the first lookup (with tcp id) is not successfull, the second attempt should have been performed without a tcp id. Issue was … [View More]

1 0

git:5.3:21e8b244: Makefile.defs: expose CC_NAME variable
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 21e8b244cea32cd3dedba6fb515877a7cdf47a7a URL: https://github.com/kamailio/kamailio/commit/21e8b244cea32cd3dedba6fb515877a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:54:19+02:00 Makefile.defs: expose CC_NAME variable (cherry picked from commit e64b29141afddf06bf7d5d68aa88679b54c5076c) --- Modified: src/Makefile.defs --- Diff: https://github.com/… [View More]

1 0

git:5.3:178cbde6: app_python: use -fno-strict-aliasing for gcc
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 178cbde6eac86a86b92b107cf2f039400c578a5f URL: https://github.com/kamailio/kamailio/commit/178cbde6eac86a86b92b107cf2f0394… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:54:30+02:00 app_python: use -fno-strict-aliasing for gcc - python2 is known for not confirming strict aliasing - it is EoL and likely not going to be fixed - GH #2298 (cherry picked from … [View More]

1 0

git:5.3:0b6283dc: db2_local: replace timelocal() with mktime()
by Daniel-Constantin Mierla 01 May '20

01 May '20

Module: kamailio Branch: 5.3 Commit: 0b6283dc6006c8817664dd915057442500e0dae8 URL: https://github.com/kamailio/kamailio/commit/0b6283dc6006c8817664dd915057442… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2020-05-01T09:53:53+02:00 db2_local: replace timelocal() with mktime() - timelocal() is nonstandard GNU extension, not recommended to be used and mktime() should be equivalent: * https://linux.die.net/… [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev