sr-dev

sr-dev@lists.kamailio.org

7 participants
45206 discussions

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: https://github.com/kamailio/kamailio/commit/25d173a98ea0b5c07e4018da0cd0364… Patch: https://github.com/kamailio/kamailio/commit/25d173a98ea0b5c07e4018da0cd0364… --- diff --git a/src/modules/usrloc/usrloc_mod.h b/src/modules/usrloc/usrloc_mod.h index 12735f11ee..f04b61c2bf 100644 --- a/src/modules/usrloc/usrloc_mod.h +++ b/src/modules/usrloc/usrloc_mod.h @@ -26,8 +26,8 @@ * \ingroup usrloc */ -#ifndef UL_MOD_H -#define UL_MOD_H +#ifndef _USRLOC_MOD_H_ +#define _USRLOC_MOD_H_ #include "../../lib/srdb1/db.h" @@ -129,4 +129,4 @@ extern int ul_expires_type; #define UL_DB_EXPIRES_GET(r) ((ul_expires_type==1)?(time_t)VAL_BIGINT(r):VAL_TIME(r)) -#endif /* UL_MOD_H */ +#endif /* _USRLOC_MOD_H_ */

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/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"

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: https://github.com/kamailio/kamailio/commit/c0b87c2cc13b1f46b8c5c902a0f5a82… Patch: https://github.com/kamailio/kamailio/commit/c0b87c2cc13b1f46b8c5c902a0f5a82… --- diff --git a/src/core/hash_func.h b/src/core/hash_func.h index 203e10b1c8..aeb9794bf2 100644 --- a/src/core/hash_func.h +++ b/src/core/hash_func.h @@ -13,8 +13,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 */ /*! @@ -26,14 +26,14 @@ -#ifndef _HASH_H -#define _HASH_H +#ifndef _HASH_FUNC_H_ +#define _HASH_FUNC_H_ #include "str.h" #include "hashes.h" /* always use a power of 2 for hash table size */ -#define T_TABLE_POWER 16 +#define T_TABLE_POWER 16 #define TABLE_ENTRIES (1 << (T_TABLE_POWER)) unsigned int new_hash( str call_id, str cseq_nr );

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.com/kamailio/kamailio/commit/ac3fe062bd9b429133ab086fc28e15b… Patch: https://github.com/kamailio/kamailio/commit/ac3fe062bd9b429133ab086fc28e15b… --- diff --git a/src/lib/srdb1/db_ut.c b/src/lib/srdb1/db_ut.c index 39ac11d379..318b442e44 100644 --- a/src/lib/srdb1/db_ut.c +++ b/src/lib/srdb1/db_ut.c @@ -350,7 +350,7 @@ int db_str2time(const char* _s, time_t* _v) */ int db_time2str_ex(time_t _v, char* _s, int* _l, int _qmode) { - struct tm* t; + struct tm t; int l; if ((!_s) || (!_l) || (*_l < 2)) { @@ -361,8 +361,8 @@ int db_time2str_ex(time_t _v, char* _s, int* _l, int _qmode) if(_qmode) *_s++ = '\''; /* Convert time_t structure to format accepted by the database */ - t = localtime(&_v); - l = strftime(_s, *_l -1, "%Y-%m-%d %H:%M:%S", t); + localtime_r(&_v, &t); + l = strftime(_s, *_l -1, "%Y-%m-%d %H:%M:%S", &t); if (l == 0) { LM_ERR("Error during time conversion\n");

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/kamailio-basic-kemi-python.py --- Diff: https://github.com/kamailio/kamailio/commit/758229d440d95a58e839a50e9e8ea25… Patch: https://github.com/kamailio/kamailio/commit/758229d440d95a58e839a50e9e8ea25… --- diff --git a/misc/examples/kemi/kamailio-basic-kemi-python.py b/misc/examples/kemi/kamailio-basic-kemi-python.py index dc0f7957da..64e0cc43fd 100644 --- a/misc/examples/kemi/kamailio-basic-kemi-python.py +++ b/misc/examples/kemi/kamailio-basic-kemi-python.py @@ -362,7 +362,7 @@ def ksr_onreply_manage(self, msg): # Manage failure routing cases # -- equivalent of failure_route[...]{} def ksr_failure_manage(self, msg): - if self.ksr_route_natmanage()==-255 : return 1; + if self.ksr_route_natmanage(msg)==-255 : return 1; if KSR.tm.t_is_canceled()>0 : return 1;

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) --- Modified: src/lib/srutils/tmrec.c --- Diff: https://github.com/kamailio/kamailio/commit/f3dbeda6825b5cd6c28a3258503e27e… Patch: https://github.com/kamailio/kamailio/commit/f3dbeda6825b5cd6c28a3258503e27e…

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: src/core/forward.c Modified: src/core/name_alias.h Modified: src/core/socket_info.c --- Diff: https://github.com/kamailio/kamailio/commit/f128c37d77d2568f7b378e8d08265e1… Patch: https://github.com/kamailio/kamailio/commit/f128c37d77d2568f7b378e8d08265e1…

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 --- 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

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/htable_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/4790825cc98068b07c1e0402bdea93f… Patch: https://github.com/kamailio/kamailio/commit/4790825cc98068b07c1e0402bdea93f… --- diff --git a/src/modules/htable/doc/htable_admin.xml b/src/modules/htable/doc/htable_admin.xml index 17391626a1..f0b560cfd1 100644 --- a/src/modules/htable/doc/htable_admin.xml +++ b/src/modules/htable/doc/htable_admin.xml @@ -341,11 +341,17 @@ $ kamcmd htable.dump htable </listitem> <listitem> <para> - <emphasis>size</emphasis> - number specifying the size of hash - table. Larger value means less collisions. The number of entries - (aka slots or buckets) in the table is 2^size. The possible range + <emphasis>size</emphasis> - number to control how many slots + (buckets) to create for the hash table. Larger value means more + slots with higher probability for less collisions. The actual number + slots (or buckets) created for the table is 2^size. The possible range for this value is from 2 to 31, smaller or larger values will be - increased to 3 (8 slots) or decreased to 14 (16384 slots). + increased to 3 (8 slots) or decreased to 14 (16384 slots). Note + that each slot can store more than one item, when there are + collisions of hash ids computed for keys. The items in the same + slot are stored in a linked list. In other words, the size is not + setting a limit of how many items can be stored in a hash table, as + long as there is enough free shared memory, new items can be added. </para> </listitem> <listitem>

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/changelog Modified: pkg/kamailio/deb/jessie/changelog Modified: pkg/kamailio/deb/precise/changelog Modified: pkg/kamailio/deb/sid/changelog Modified: pkg/kamailio/deb/stretch/changelog Modified: pkg/kamailio/deb/trusty/changelog Modified: pkg/kamailio/deb/wheezy/changelog Modified: pkg/kamailio/deb/xenial/changelog --- Diff: https://github.com/kamailio/kamailio/commit/291dc3e6cdc77e912e6a2e71b01250e… Patch: https://github.com/kamailio/kamailio/commit/291dc3e6cdc77e912e6a2e71b01250e…

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev