sr-dev April 2017

sr-dev@lists.kamailio.org

31 participants
427 discussions

git:5.0:c9ccc96d: tm: don't reset uac reply if in a continue route
by Federico Cabiddu 18 Apr '17

18 Apr '17

Module: kamailio Branch: 5.0 Commit: c9ccc96d97258a26248abea4c034bb458b71c61d URL: https://github.com/kamailio/kamailio/commit/c9ccc96d97258a26248abea4c034bb4… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2017-04-18T21:07:54+02:00 tm: don't reset uac reply if in a continue route (cherry picked from commit 152504f108d39ae33c845f7e74a889411868033d) --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/c9ccc96d97258a26248abea4c034bb4… Patch: https://github.com/kamailio/kamailio/commit/c9ccc96d97258a26248abea4c034bb4… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 6163240..38f5d03 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1279,7 +1279,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, picked_branch = branch; run_branch_failure_handlers( Trans, Trans->uac[branch].reply, new_code, extra_flags); - Trans->uac[branch].reply = 0; + /* Don't do reset the reply if we are in a resume route, + * we need to free it at the end of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; } @@ -1362,8 +1365,11 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, /* now reset it; after the failure logic, the reply may * not be stored any more and we don't want to keep into - * transaction some broken reference */ - Trans->uac[branch].reply = 0; + * transaction some broken reference. Don't do it if we + * are in a resume route, we need to free it at the end + * of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; /* look if the callback perhaps replied transaction; it also * covers the case in which a transaction is replied localy

1 0

git:master:81741d65: app_jsdt: updated embedded duktape js interpreter from 2.0.0 to 2.0.2
by Daniel-Constantin Mierla 18 Apr '17

18 Apr '17

Module: kamailio Branch: master Commit: 81741d652c751a0abbbb5aa96f98635888ed359a URL: https://github.com/kamailio/kamailio/commit/81741d652c751a0abbbb5aa96f98635… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-18T18:55:15+02:00 app_jsdt: updated embedded duktape js interpreter from 2.0.0 to 2.0.2 --- Modified: src/modules/app_jsdt/duk_config.h Modified: src/modules/app_jsdt/duktape.c Modified: src/modules/app_jsdt/duktape.h --- Diff: https://github.com/kamailio/kamailio/commit/81741d652c751a0abbbb5aa96f98635… Patch: https://github.com/kamailio/kamailio/commit/81741d652c751a0abbbb5aa96f98635…

1 0

git:master:531627c8: Merge pull request #1063 from grumvalski/t_continue_crash
by GitHub 18 Apr '17

18 Apr '17

Module: kamailio Branch: master Commit: 531627c8c8f07e38577478b88689a24542a50d38 URL: https://github.com/kamailio/kamailio/commit/531627c8c8f07e38577478b88689a24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-04-18T18:48:01+02:00 Merge pull request #1063 from grumvalski/t_continue_crash tm: don't reset uac reply if in a continue route --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/531627c8c8f07e38577478b88689a24… Patch: https://github.com/kamailio/kamailio/commit/531627c8c8f07e38577478b88689a24… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 6163240..38f5d03 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1279,7 +1279,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, picked_branch = branch; run_branch_failure_handlers( Trans, Trans->uac[branch].reply, new_code, extra_flags); - Trans->uac[branch].reply = 0; + /* Don't do reset the reply if we are in a resume route, + * we need to free it at the end of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; } @@ -1362,8 +1365,11 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, /* now reset it; after the failure logic, the reply may * not be stored any more and we don't want to keep into - * transaction some broken reference */ - Trans->uac[branch].reply = 0; + * transaction some broken reference. Don't do it if we + * are in a resume route, we need to free it at the end + * of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; /* look if the callback perhaps replied transaction; it also * covers the case in which a transaction is replied localy

1 0

git:master:152504f1: tm: don't reset uac reply if in a continue route
by grumvalski 18 Apr '17

18 Apr '17

Module: kamailio Branch: master Commit: 152504f108d39ae33c845f7e74a889411868033d URL: https://github.com/kamailio/kamailio/commit/152504f108d39ae33c845f7e74a8894… Author: grumvalski <federico.cabiddu(a)gmail.com> Committer: grumvalski <federico.cabiddu(a)gmail.com> Date: 2017-04-08T10:16:35+02:00 tm: don't reset uac reply if in a continue route --- Modified: src/modules/tm/t_reply.c --- Diff: https://github.com/kamailio/kamailio/commit/152504f108d39ae33c845f7e74a8894… Patch: https://github.com/kamailio/kamailio/commit/152504f108d39ae33c845f7e74a8894… --- diff --git a/src/modules/tm/t_reply.c b/src/modules/tm/t_reply.c index 6163240..38f5d03 100644 --- a/src/modules/tm/t_reply.c +++ b/src/modules/tm/t_reply.c @@ -1279,7 +1279,10 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, picked_branch = branch; run_branch_failure_handlers( Trans, Trans->uac[branch].reply, new_code, extra_flags); - Trans->uac[branch].reply = 0; + /* Don't do reset the reply if we are in a resume route, + * we need to free it at the end of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; } @@ -1362,8 +1365,11 @@ static enum rps t_should_relay_response( struct cell *Trans , int new_code, /* now reset it; after the failure logic, the reply may * not be stored any more and we don't want to keep into - * transaction some broken reference */ - Trans->uac[branch].reply = 0; + * transaction some broken reference. Don't do it if we + * are in a resume route, we need to free it at the end + * of the continue processing */ + if (!(Trans->flags&T_ASYNC_CONTINUE)) + Trans->uac[branch].reply = 0; /* look if the callback perhaps replied transaction; it also * covers the case in which a transaction is replied localy

1 0

[kamailio/kamailio] tm: don't reset uac reply if in a continue route (#1063)
by Federico Cabiddu 18 Apr '17

18 Apr '17

Fix for https://github.com/kamailio/kamailio/issues/1056. If the reply is continued we need the reply after sending it out, even if it's a final reply. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1063 -- Commit Summary -- * tm: don't reset uac reply if in a continue route -- File Changes -- M src/modules/tm/t_reply.c (7) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1063.patch https://github.com/kamailio/kamailio/pull/1063.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/1063

2 5

is liblua5.3 supported?
by Juha Heinanen 18 Apr '17

18 Apr '17

debian stretch has liblua5.3. is that version supported by kamailio or is 5.1 still required? -- juha

2 2

[kamailio/kamailio] Fix memory leak in ldap module. (#1071)
by vitalikvoip 18 Apr '17

18 Apr '17

There was a memory leak in the ldap module that occurred only after calling ldap_result_next(). Has run my synthetic tests and tested that it works fine. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1071 -- Commit Summary -- * Fix memory leak in ldap module that happens after calling ldap_result_next() -- File Changes -- M src/modules/ldap/ldap_api_fn.c (25) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1071.patch https://github.com/kamailio/kamailio/pull/1071.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/1071

2 3

git:master:6d87794c: ndb_redis: Added REDIS-Cluster support [BETA]
by Carsten Bock 18 Apr '17

18 Apr '17

Module: kamailio Branch: master Commit: 6d87794cac3f6f3bb967d6e0bf6714a4d78f1bd5 URL: https://github.com/kamailio/kamailio/commit/6d87794cac3f6f3bb967d6e0bf6714a… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2017-04-04T12:55:26+02:00 ndb_redis: Added REDIS-Cluster support [BETA] --- Modified: src/modules/ndb_redis/doc/ndb_redis.xml Modified: src/modules/ndb_redis/doc/ndb_redis_admin.xml Modified: src/modules/ndb_redis/ndb_redis_mod.c Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/6d87794cac3f6f3bb967d6e0bf6714a… Patch: https://github.com/kamailio/kamailio/commit/6d87794cac3f6f3bb967d6e0bf6714a…

2 7

git:master:87edc25f: ldap: fix memory leak that happens after calling ldap_result_next()
by Daniel-Constantin Mierla 18 Apr '17

18 Apr '17

Module: kamailio Branch: master Commit: 87edc25fd458be80ed5cfec21fbe2940a8f9c17f URL: https://github.com/kamailio/kamailio/commit/87edc25fd458be80ed5cfec21fbe294… Author: Vitaliy Aleksandrov <vitalik.voip(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-04-18T14:27:12+02:00 ldap: fix memory leak that happens after calling ldap_result_next() - GH #1071 --- Modified: src/modules/ldap/ldap_api_fn.c --- Diff: https://github.com/kamailio/kamailio/commit/87edc25fd458be80ed5cfec21fbe294… Patch: https://github.com/kamailio/kamailio/commit/87edc25fd458be80ed5cfec21fbe294… --- diff --git a/src/modules/ldap/ldap_api_fn.c b/src/modules/ldap/ldap_api_fn.c index 05b4119..d95d1cc 100644 --- a/src/modules/ldap/ldap_api_fn.c +++ b/src/modules/ldap/ldap_api_fn.c @@ -39,6 +39,7 @@ #include "ld_session.h" static LDAP* last_ldap_handle = NULL; +static LDAPMessage* last_ldap_result_holder = NULL; static LDAPMessage* last_ldap_result = NULL; int get_connected_ldap_session( @@ -111,9 +112,10 @@ int get_connected_ldap_session(char* _lds_name, struct ld_session** _lds) } else { - if (last_ldap_result != NULL) + if (last_ldap_result_holder != NULL) { - ldap_msgfree(last_ldap_result); + ldap_msgfree(last_ldap_result_holder); + last_ldap_result_holder = NULL; last_ldap_result = NULL; } ldap_disconnect(_lds_name); @@ -412,9 +414,10 @@ int lds_search( /* * free last_ldap_result */ - if (last_ldap_result != NULL) { - ldap_msgfree(last_ldap_result); - last_ldap_result = NULL; + if (last_ldap_result_holder != NULL) { + ldap_msgfree(last_ldap_result_holder); + last_ldap_result_holder = NULL; + last_ldap_result = NULL; } @@ -445,7 +448,7 @@ int lds_search( NULL, &lds->client_search_timeout, 0, - &last_ldap_result); + &last_ldap_result_holder); #ifdef LDAP_PERF gettimeofday(&after_search, NULL); @@ -458,10 +461,10 @@ int lds_search( if (*_ld_error != LDAP_SUCCESS) { - if (last_ldap_result != NULL) + if (last_ldap_result_holder != NULL) { - ldap_msgfree(last_ldap_result); - last_ldap_result = NULL; + ldap_msgfree(last_ldap_result_holder); + last_ldap_result_holder = NULL; } if (LDAP_API_ERROR(*_ld_error)) @@ -476,13 +479,15 @@ int lds_search( } last_ldap_handle = lds->handle; - *_ld_result_count = ldap_count_entries(lds->handle, last_ldap_result); + *_ld_result_count = ldap_count_entries(lds->handle, last_ldap_result_holder); if (*_ld_result_count < 0) { LM_DBG("[%s]: ldap_count_entries failed\n", _lds_name); return -1; } + last_ldap_result = last_ldap_result_holder; + return 0; }

1 0

git:master:95153bd3: modules/{acc, cdp}: allows big endian build
by Tuan M. Hoang 18 Apr '17

18 Apr '17

Module: kamailio Branch: master Commit: 95153bd37df81d08b8c02cc892d019817ec05644 URL: https://github.com/kamailio/kamailio/commit/95153bd37df81d08b8c02cc892d0198… Author: Tuan M. Hoang <tmhoang(a)flatglobe.org> Committer: Tuan M. Hoang <tmhoang(a)flatglobe.org> Date: 2017-04-11T13:08:51-04:00 modules/{acc,cdp}: allows big endian build --- Modified: src/modules/acc/diam_message.h Modified: src/modules/cdp/diameter.h --- Diff: https://github.com/kamailio/kamailio/commit/95153bd37df81d08b8c02cc892d0198… Patch: https://github.com/kamailio/kamailio/commit/95153bd37df81d08b8c02cc892d0198… --- diff --git a/src/modules/acc/diam_message.h b/src/modules/acc/diam_message.h index 35ad2d9..e4faaf0 100644 --- a/src/modules/acc/diam_message.h +++ b/src/modules/acc/diam_message.h @@ -74,7 +74,6 @@ #define ST_MSG_CODE 0x13010000 #define MASK_MSG_CODE 0xffffff00 #else - #error BIG endian detected!! #define AS_MSG_CODE 0x00000112 #define AC_MSG_CODE 0x0000010f #define CE_MSG_CODE 0x00000101 diff --git a/src/modules/cdp/diameter.h b/src/modules/cdp/diameter.h index 38115a9..2be2525 100644 --- a/src/modules/cdp/diameter.h +++ b/src/modules/cdp/diameter.h @@ -115,7 +115,6 @@ #define ST_MSG_CODE 0x13010000 #define MASK_MSG_CODE 0xffffff00 #else - #error BIG endian detected!! #define AS_MSG_CODE 0x00000112 #define AC_MSG_CODE 0x0000010f #define CE_MSG_CODE 0x00000101

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
43
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2017