sr-dev June 2018

sr-dev@lists.kamailio.org

26 participants
320 discussions

[kamailio/kamailio] mod kazoo cannot be loaded on latest alpine:edge (#1540)

by sergey-safarov

When loaded mod kazoo i get error ``` / # kamailio -DD -E 0(178) WARNING: <core> [core/cfg.y:3426]: warn_at(): warning in config file /etc/kamailio/default.cfg, line 67, column 12: raw socket support not compiled in 0(178) ERROR: <core> [core/sr_module.c:582]: load_module(): could not open module </usr/lib/kamailio/modules/kazoo.so>: Error relocating /usr/lib/kamailio/modules/kazoo.so: is_error: symbol not found 0(178) CRITICAL: <core> [core/cfg.y:3446]: yyerror_at(): parse error in config file /etc/kamailio/default.cfg, line 188, column 12-21: failed to load module 0(178) ERROR: <core> [core/modparam.c:152]: set_mod_param_regex(): No module matching <kazoo> found ``` And ldd output ``` / # LD_PRELOAD=/usr/sbin/kamailio ldd /usr/lib/kamailio/modules/kazoo.so ldd (0x5592f5d09000) /usr/sbin/kamailio => /usr/sbin/kamailio (0x7fa6235bc000) libjson-c.so.4 => /usr/lib/libjson-c.so.4 (0x7fa6233ae000) libuuid.so.1 => /lib/libuuid.so.1 (0x7fa6231a8000) librabbitmq.so.4 => /usr/lib/librabbitmq.so.4 (0x7fa622f8c000) libevent-2.1.so.6 => /usr/lib/libevent-2.1.so.6 (0x7fa622d42000) libsrdb1.so.1 => /usr/lib/kamailio//libsrdb1.so.1 (0x7fa622b21000) libc.musl-x86_64.so.1 => ldd (0x5592f5d09000) libssl.so.45 => /lib/libssl.so.45 (0x7fa6228d5000) libcrypto.so.43 => /lib/libcrypto.so.43 (0x7fa62252a000) Error relocating /usr/lib/kamailio/modules/kazoo.so: is_error: symbol not found / # ``` Symbol `is_error` is defined at `/usr/include/json-c/bits.h` ``` /** * @deprecated */ #define is_error(ptr) (ptr == NULL) ``` I not know why this simple definition is not compiled into mod kazoo on latest Alpine:edge. -- 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/1540

6 years, 5 months

git:master:586566c1: nsq: removed obsolete json is_error() macro

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 586566c19a85a611d389062ca1f1de271e1891c3 URL: https://github.com/kamailio/kamailio/commit/586566c19a85a611d389062ca1f1de2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T10:34:42+02:00 nsq: removed obsolete json is_error() macro --- Modified: src/modules/nsq/nsq_json.c --- Diff: https://github.com/kamailio/kamailio/commit/586566c19a85a611d389062ca1f1de2… Patch: https://github.com/kamailio/kamailio/commit/586566c19a85a611d389062ca1f1de2… --- diff --git a/src/modules/nsq/nsq_json.c b/src/modules/nsq/nsq_json.c index 85b817364a..a817b70ecd 100644 --- a/src/modules/nsq/nsq_json.c +++ b/src/modules/nsq/nsq_json.c @@ -110,7 +110,7 @@ struct json_object * nsq_json_get_field_object(str* json, str* field) struct json_object *j = json_tokener_parse(dup); pkg_free(dup); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON\n"); return NULL; }

6 years, 5 months

git:master:7d376661: kazoo: replaced obsolete json is_error() macro

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 7d3766614832ef22433e36ef0791fa41796829a2 URL: https://github.com/kamailio/kamailio/commit/7d3766614832ef22433e36ef0791fa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T10:33:26+02:00 kazoo: replaced obsolete json is_error() macro --- Modified: src/modules/kazoo/kz_amqp.c Modified: src/modules/kazoo/kz_json.c --- Diff: https://github.com/kamailio/kamailio/commit/7d3766614832ef22433e36ef0791fa4… Patch: https://github.com/kamailio/kamailio/commit/7d3766614832ef22433e36ef0791fa4… --- diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 3e161839dc..36e7ea0843 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -1241,7 +1241,7 @@ int kz_amqp_publish(struct sip_msg* msg, char* exchange, char* routing_key, char struct json_object *j = json_tokener_parse(json_s.s); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON payload : %.*s\n", json_s.len, json_s.s); return -1; } @@ -1304,7 +1304,7 @@ int kz_amqp_async_query(struct sip_msg* msg, char* _exchange, char* _routing_key json_obj = json_tokener_parse(json_s.s); - if (is_error(json_obj)) { + if (json_obj==NULL) { LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); goto error; } @@ -1457,7 +1457,7 @@ int kz_amqp_query_ex(struct sip_msg* msg, char* exchange, char* routing_key, cha struct json_object *j = json_tokener_parse(json_s.s); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON payload : %*.s\n", json_s.len, json_s.s); return -1; } diff --git a/src/modules/kazoo/kz_json.c b/src/modules/kazoo/kz_json.c index 7911489eaf..4fd30998f6 100644 --- a/src/modules/kazoo/kz_json.c +++ b/src/modules/kazoo/kz_json.c @@ -132,7 +132,7 @@ struct json_object * kz_json_get_field_object(str* json, str* field) struct json_object *j = json_tokener_parse(dup); pkg_free(dup); - if (is_error(j)) { + if (j==NULL) { LM_ERR("empty or invalid JSON\n"); return NULL; }

6 years, 5 months

[kamailio/kamailio] pv_evalx result in destination pv seems wrong (#1551)

by Victor Seva

### Description ``` xinfo("Send the call to CGRates ci='$ci'"); $var(tmp) = '"event":"CGR_AUTH_REQUEST", "cgr_category":"$dlg_var(cgrCategory)", "cgr_reqtype":"$dlg_var(cgrReqType)", "cgr_tenant":"$dlg_var(tenant)", "cgr_account":"$dlg_var(cgrAccount)", "cgr_destination":"$dlg_var(cgrDestination)", "direction":"$dlg_var(profile)", "source_user":"$dlg_var(source_user)", "recording_url":"", "account_code":"$dlg_var(account_code)", "billing_cli":"$dlg_var(billing_cli)", "cgr_setuptime":"$dlg_var(start_ts)", "reseller_id":"$dlg_var(reseller_id)"'; pv_evalx("$var(msg)", "$var(tmp)"); xinfo("--- $$var(tmp):'$var(tmp)'"); xinfo("--- $$var(msg):'$var(msg)'"); xinfo("++++"); ``` ### Troubleshooting #### Log Messages ``` May 31 15:07:27 PBX-2117 kamailio[30682]: INFO: <script>: Send the call to CGRates ci='ynfvvklkkcajrfi(a)slim.torreviejawireless.org' May 31 15:07:27 PBX-2117 kamailio[30682]: INFO: <script>: --- $var(tmp):'"event":"CGR_AUTH_REQUEST",#012 "cgr_category":"$dlg_var(cgrCategory)",#012 "cgr_reqtype":"$dlg_var(cgrReqType)",#012 "cgr_tenant":"$dlg_var(tenant)",#012 "cgr_account":"$dlg_var(cgrAccount)",#012 "cgr_destination":"$dlg_var(cgrDestination)",#012 "direction":"$dlg_var(profile)",#012 "source_user":"$dlg_var(source_user)",#012 "recording_url":"",#012 "account_code":"$dlg_var(account_code)",#012 "billing_cli":"$dlg_var(billing_cli)",#012 "cgr_setuptime":"$dlg_var(start_ts)",#012 "reseller_id":"$dlg_var(reseller_id)"' May 31 15:07:27 PBX-2117 kamailio[30682]: INFO: <script>: --- $var(msg):'5 May 31 15:07:27 PBX-2117 kamailio[30682]: INFO: <script>: ++++ ``` ### Possible Solutions  ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` version: kamailio 5.0.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled with gcc 4.8.2 ``` -- 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/1551

6 years, 5 months

git:master:c087b1d1: core: pv - default number of buffer slots set to 40

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: c087b1d1dd06a1fd417998fe0a51dedcfe02e8c6 URL: https://github.com/kamailio/kamailio/commit/c087b1d1dd06a1fd417998fe0a51ded… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T10:10:36+02:00 core: pv - default number of buffer slots set to 40 - it was 10 - allow handling more chained evaluations in large strings --- Modified: src/core/pvapi.c --- Diff: https://github.com/kamailio/kamailio/commit/c087b1d1dd06a1fd417998fe0a51ded… Patch: https://github.com/kamailio/kamailio/commit/c087b1d1dd06a1fd417998fe0a51ded… --- diff --git a/src/core/pvapi.c b/src/core/pvapi.c index dac770a0f3..841b1801fe 100644 --- a/src/core/pvapi.c +++ b/src/core/pvapi.c @@ -2025,7 +2025,7 @@ static char **_pv_print_buffer = NULL; static int _pv_print_buffer_size = PV_DEFAULT_PRINT_BUFFER_SIZE; static int _pv_print_buffer_size_active = 0; /* 6 mod params + 4 direct usage from mods */ -#define PV_DEFAULT_PRINT_BUFFER_SLOTS 10 +#define PV_DEFAULT_PRINT_BUFFER_SLOTS 40 static int _pv_print_buffer_slots = PV_DEFAULT_PRINT_BUFFER_SLOTS; static int _pv_print_buffer_slots_active = 0; static int _pv_print_buffer_index = 0;

6 years, 5 months

git:master:6eedbab9: topos: use method_id to match KDMQ

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 6eedbab99a500d71a1a66cbf8a1a94ae88f47b05 URL: https://github.com/kamailio/kamailio/commit/6eedbab99a500d71a1a66cbf8a1a94a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T09:26:11+02:00 topos: use method_id to match KDMQ --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/6eedbab99a500d71a1a66cbf8a1a94a… Patch: https://github.com/kamailio/kamailio/commit/6eedbab99a500d71a1a66cbf8a1a94a… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 5d3e4aec9c..30090b6b16 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -400,12 +400,9 @@ int tps_msg_sent(sr_event_param_t *evp) } if(local==1 && dialog==0) { - if((get_cseq(&msg)->method_id) & (METHOD_OPTIONS|METHOD_NOTIFY)) { - /* skip local out-of-dialog requests (e.g., keepalive) */ - goto done; - } - if(get_cseq(&msg)->method.len==4 - && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)==0) { + if((get_cseq(&msg)->method_id) + & (METHOD_OPTIONS|METHOD_NOTIFY|METHOD_KDMQ)) { + /* skip local out-of-dialog requests (e.g., keepalive, dmq) */ goto done; } }

6 years, 5 months

[kamailio/kamailio] Memory leak after SIP message fails to be sent due to no socket found (#1554)

by pwakano

### Description When SIP message fails to be sent due to no socket found, apparently the TM module is not deleting the transaction and so it is causing a memory leak. ### Troubleshooting #### Reproduction The easiest way to reproduce the problem is to setup a dispatcher destination with SIP ping enabled. Kamailio should not be listening to the interface which is used to reach that destination. So this will cause Kamailio to complain about not finding a socket to send the OPTIONS. After this happens, it is possible to see from the **kamcmd tm.stats** command that the "created" has increased by 1, freed has not changed and "delayed_free" also increased by 1. Problem is that the delayed_free never gets freed and after checking the **kamcmd core.shmmem**, for every failed OPTIONS request under this condition, 5808 bits are leaked... This goes on until there is no shared memory left..... #### Debugging Data #### Log Messages ``` /usr/sbin/kamailio[20755]: DEBUG: dispatcher [dispatch.c:2664]: ds_ping_set(): probing set #2, URI sip:10.11.12.13:6060 /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:10.11.12.13:6060> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/resolve.c:1225]: srv_sip_resolvehost(): 10.11.12.13:6060 proto=0 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/resolve.c:1346]: srv_sip_resolvehost(): returning 0xada520 (10.11.12.13:6060 proto=1) /usr/sbin/kamailio[20755]: DEBUG: <core> [core/forward.c:174]: get_out_socket(): socket determined: 0x7f33189ee298 /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:152]: dlg2hash(): hashid 8554 /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:238]: t_run_local_req(): executing event_route[tm:local-request] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:600]: parse_msg(): SIP Request: /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:602]: parse_msg(): method: <OPTIONS> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): uri: <sip:10.11.12.13:6060> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): version: <SIP/2.0> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKa612.f9317e75000000000000000000000000.0>; state=16 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:491]: parse_headers(): Via found, flags=2 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:493]: parse_headers(): this is the first via /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=10 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [25]; uri=[sip:10.11.12.13:6060] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body [<sip:10.11.12.13:6060>#015#012] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <10> <OPTIONS> /usr/sbin/kamailio[20755]: DEBUG: pv [pv_trans.c:564]: tr_eval_string(): i=0 j=10 /usr/sbin/kamailio[20755]: NOTICE: <script>: [479309551f] OPTIONS: Local Request to sip:10.11.12.13:6060 - sip:10.11.12.13:6060 /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_cseq.c:115]: dlg_cseq_prepare_new_msg(): prepare new msg for cseq update operations /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:600]: parse_msg(): SIP Request: /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:602]: parse_msg(): method: <OPTIONS> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:604]: parse_msg(): uri: <sip:10.11.12.13:6060> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:606]: parse_msg(): version: <SIP/2.0> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_via.c:1303]: parse_via_param(): Found param type 232, <branch> = <z9hG4bKa612.f9317e75000000000000000000000000.0>; state=16 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_via.c:2639]: parse_via(): end of header reached, state=5 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:491]: parse_headers(): Via found, flags=2 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:493]: parse_headers(): this is the first via /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_cseq.c:59]: dlg_cseq_prepare_msg(): prepare msg for cseq update operations /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=10 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:171]: get_hdr_field(): <To> [25]; uri=[sip:10.11.12.13:6060] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:172]: get_hdr_field(): to body [<sip:10.11.12.13:6060>#015#012] /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/msg_parser.c:152]: get_hdr_field(): cseq <CSeq>: <10> <OPTIONS> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_addr_spec.c:185]: parse_to_param(): add param: tag=744e9d847dad9acc2d5178ac65520eba-8cc2 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/parser/parse_addr_spec.c:864]: parse_addr_spec(): end of header reached, state=29 /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_cseq.c:382]: dlg_cseq_msg_sent(): traking cseq updates /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_hash.c:766]: internal_get_dlg(): no dialog callid='479309551fdf88bf-20755(a)55.66.77.88' found /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_hash.c:797]: get_dlg(): no dialog callid='479309551fdf88bf-20755(a)55.66.77.88' found /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_handlers.c:1202]: dlg_lookup_msg_dialog(): dlg with callid '479309551fdf88bf-20755(a)55.66.77.88' not found /usr/sbin/kamailio[20755]: DEBUG: dialog [dlg_cseq.c:394]: dlg_cseq_msg_sent(): no dialog for this request /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:638]: send_prepared_request_impl(): uac: 0x7f331184c5f8 branch: 0 to 10.11.12.13:6060 /usr/sbin/kamailio[20755]: DEBUG: tm [../../core/onsend.h:69]: run_onsend(): required parameters are not available - ignoring /usr/sbin/kamailio[20755]: DEBUG: dispatcher [dispatch.c:2664]: ds_ping_set(): probing set #1, URI sip:12.34.56.78:6060 /usr/sbin/kamailio[20755]: DEBUG: tm [uac.c:427]: t_uac_prepare(): next_hop=<sip:12.34.56.78:6060> /usr/sbin/kamailio[20755]: DEBUG: <core> [core/resolve.c:1225]: srv_sip_resolvehost(): 12.34.56.78:6060 proto=0 /usr/sbin/kamailio[20755]: DEBUG: <core> [core/resolve.c:1346]: srv_sip_resolvehost(): returning 0xada520 (12.34.56.78:6060 proto=1) /usr/sbin/kamailio[20755]: ERROR: <core> [core/forward.c:181]: get_out_socket(): no socket found /usr/sbin/kamailio[20755]: ERROR: <core> [core/forward.c:183]: get_out_socket(): no corresponding socket found for(udp:12.34.56.78:6060) /usr/sbin/kamailio[20755]: ERROR: tm [ut.h:317]: uri2dst2(): no corresponding socket found for "12.34.56.78" af 2 (udp:12.34.56.78:6060) /usr/sbin/kamailio[20755]: ERROR: tm [uac.c:449]: t_uac_prepare(): no socket found /usr/sbin/kamailio[20755]: ERROR: dispatcher [dispatch.c:2683]: ds_ping_set(): unable to ping [sip:12.34.56.78:6060] ``` Real IPs were replaced, this is their usage: 10.11.12.13 = Kamailio listening IP in local network interface 12.34.56.78 = destination SIP trunk which does not have a matching listened socket by Kamailio 55.66.77.88 = Kamailio listening IP in public network interface #### SIP Traffic ### Possible Solutions ### Additional Information * **Kamailio Version** - output of `kamailio -v` ``` # kamailio -v version: kamailio 5.0.6 (x86_64/linux) flags: STATS: Off, USE_TCP, USE_TLS, USE_SCTP, TLS_HOOKS, DISABLE_NAGLE, USE_MCAST, DNS_IP_HACK, SHM_MEM, SHM_MMAP, PKG_MALLOC, Q_MALLOC, F_MALLOC, TLSF_MALLOC, DBG_SR_MEMORY, USE_FUTEX, FAST_LOCK-ADAPTIVE_WAIT, USE_DNS_CACHE, USE_DNS_FAILOVER, USE_NAPTR, USE_DST_BLACKLIST, HAVE_RESOLV_RES ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535, DEFAULT PKG_SIZE 8MB poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. id: unknown compiled on 04:19:46 Mar 30 2018 with gcc 4.8.5 ``` * **Operating System**: ``` # cat /etc/redhat-release CentOS Linux release 7.4.1708 (Core) # uname -a Linux dev1-sbcaio-01 3.10.0-693.el7.x86_64 #1 SMP Tue Aug 22 21:09:27 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux ``` -- You are receiving this because you are subscribed to this thread. Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/issues/1554

6 years, 5 months

git:5.1:3da0bcb4: tm: free new tm cell in case of error if it was not referenced

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 3da0bcb4b4e27d115a2d6eb47cd0cebc33d34a61 URL: https://github.com/kamailio/kamailio/commit/3da0bcb4b4e27d115a2d6eb47cd0ceb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T08:59:39+02:00 tm: free new tm cell in case of error if it was not referenced - part of t_uac_prepare(), reported by GH #1554 (cherry picked from commit f94770840029c1c73ab129f4b71fcb0cf146d808) --- Modified: src/modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/3da0bcb4b4e27d115a2d6eb47cd0ceb… Patch: https://github.com/kamailio/kamailio/commit/3da0bcb4b4e27d115a2d6eb47cd0ceb… --- diff --git a/src/modules/tm/uac.c b/src/modules/tm/uac.c index ff466760dd..9b2f51b5f6 100644 --- a/src/modules/tm/uac.c +++ b/src/modules/tm/uac.c @@ -583,11 +583,18 @@ static inline int t_uac_prepare(uac_req_t *uac_r, error2: #ifdef TM_DEL_UNREF - if (!is_ack) { - UNREF_FREE(new_cell); - }else -#endif + if (is_ack) { free_cell(new_cell); + } else { + if(atomic_get_int(&new_cell->ref_count)==0) { + free_cell(new_cell); + } else { + UNREF_FREE(new_cell); + } + } +#else + free_cell(new_cell); +#endif error3: return ret; }

6 years, 5 months

git:5.1:6bff7a41: examples: remove execute mode from text file

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: 6bff7a4172df898483dfc928c19a26ec1c6a6f0f URL: https://github.com/kamailio/kamailio/commit/6bff7a4172df898483dfc928c19a26e… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T08:59:27+02:00 examples: remove execute mode from text file (cherry picked from commit 226a6aa06fc46ead24e262afd382af64452ae080) --- Modified: misc/examples/ims/pcscf/dispatcher.list.sample --- Diff: https://github.com/kamailio/kamailio/commit/6bff7a4172df898483dfc928c19a26e… Patch: https://github.com/kamailio/kamailio/commit/6bff7a4172df898483dfc928c19a26e… --- diff --git a/misc/examples/ims/pcscf/dispatcher.list.sample b/misc/examples/ims/pcscf/dispatcher.list.sample old mode 100755 new mode 100644

6 years, 5 months

git:5.1:cce9bab1: topos: fix condition to match KDMQ method

by Daniel-Constantin Mierla

Module: kamailio Branch: 5.1 Commit: cce9bab16ed607041a9849234e6b26fca72319e9 URL: https://github.com/kamailio/kamailio/commit/cce9bab16ed607041a9849234e6b26f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2018-06-07T08:58:57+02:00 topos: fix condition to match KDMQ method (cherry picked from commit e9be20215b8e995bac698b54b7960cdaa9b60798) --- Modified: src/modules/topos/topos_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/cce9bab16ed607041a9849234e6b26f… Patch: https://github.com/kamailio/kamailio/commit/cce9bab16ed607041a9849234e6b26f… --- diff --git a/src/modules/topos/topos_mod.c b/src/modules/topos/topos_mod.c index 9d43877af6..0368ae8299 100644 --- a/src/modules/topos/topos_mod.c +++ b/src/modules/topos/topos_mod.c @@ -404,7 +404,7 @@ int tps_msg_sent(sr_event_param_t *evp) goto done; } if(get_cseq(&msg)->method.len==4 - && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)) { + && strncmp(get_cseq(&msg)->method.s, "KDMQ", 4)==0) { goto done; } }

6 years, 5 months

← Newer
1
...
23
24
25
26
27
28
29
...
32
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2018