sr-dev January 2020

sr-dev@lists.kamailio.org

22 participants
417 discussions

git:5.2:5c2a2c51: Revert "evapi: use local allocated buffer to get data parameter for event relay"

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 5c2a2c51fc5e2d4469818028c57c0ef8be9757a6 URL: https://github.com/kamailio/kamailio/commit/5c2a2c51fc5e2d4469818028c57c0ef… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T17:54:42+01:00 Revert "evapi: use local allocated buffer to get data parameter for event relay" - This reverts commit b1bb24d3639c2869f825dd692a9b1346d1bb30b5. - needs PV core enchancements which don't apply cleanly to this branch --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/5c2a2c51fc5e2d4469818028c57c0ef… Patch: https://github.com/kamailio/kamailio/commit/5c2a2c51fc5e2d4469818028c57c0ef…

4 years, 11 months

git:5.2:46737e2f: Changelog: content updated for 5.2.6

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 46737e2ffdb3baa47c199dabe517b986bdf897f8 URL: https://github.com/kamailio/kamailio/commit/46737e2ffdb3baa47c199dabe517b98… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T17:07:43+01:00 Changelog: content updated for 5.2.6 --- Modified: ChangeLog --- Diff: https://github.com/kamailio/kamailio/commit/46737e2ffdb3baa47c199dabe517b98… Patch: https://github.com/kamailio/kamailio/commit/46737e2ffdb3baa47c199dabe517b98…

4 years, 11 months

git:5.2:b7de33e0: modules: readme files regenerated - modules ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: 5.2 Commit: b7de33e0a67e18fdb4e9d4cb11946dff77410e44 URL: https://github.com/kamailio/kamailio/commit/b7de33e0a67e18fdb4e9d4cb11946df… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2020-01-24T17:01:26+01:00 modules: readme files regenerated - modules ... [skip ci] --- Modified: src/modules/ctl/README --- Diff: https://github.com/kamailio/kamailio/commit/b7de33e0a67e18fdb4e9d4cb11946df… Patch: https://github.com/kamailio/kamailio/commit/b7de33e0a67e18fdb4e9d4cb11946df… --- diff --git a/src/modules/ctl/README b/src/modules/ctl/README index 2eb67adbc3..e30377976d 100644 --- a/src/modules/ctl/README +++ b/src/modules/ctl/README @@ -158,7 +158,7 @@ $ kamcmd ps Example 1.2. Set binrpc parameter loadmodule "ctl" # optional listen addresses, if no one is specified, -# ctl will listen on unixs:/tmp/ser_ctl +# ctl will listen on unixs:/tmp/kamailio_ctl modparam("ctl", "binrpc", "unix:/var/run/kamailio/kamailio_ctl") # default modparam("ctl", "binrpc", "udp:localhost:2046") @@ -173,7 +173,8 @@ modparam("ctl", "binrpc", "udp:*:3012") # udp any , port 3012 3.2. binrpc_buffer_size (integer or string) - the size of the internal buffer. + The size of the internal buffer used for printing elements of the RPC + response (e.g., internal RPC printf()). The value is given in bytes. Default: 1024. @@ -218,18 +219,19 @@ modparam("ctl", "group", 100) fifo used for the obsolete fifo protocol. The fifo protocol can be run over a real fifo, over UDP or over TCP. Format: [protocol:]path|address. If no protocol is specified the default is - "fifo". Examples: "fifo:/tmp/ser_fifo", "/tmp/ser_fifo2", "udp:*:2050", - "tcp:localhost:2050". For more details on the UDP and TCP formats see - binrpc. Multiple fifos or fifo transports can be used in the same time - (just by setting the fifo parameter multiple times in the config). + "fifo". Examples: "fifo:/tmp/kamailio_fifo", "/tmp/kamailio_fifo2", + "udp:*:2050", "tcp:localhost:2050". For more details on the UDP and TCP + formats see binrpc. Multiple fifos or fifo transports can be used in + the same time (just by setting the fifo parameter multiple times in the + config). Default: not set (no fifo will be used). Example 1.7. Set fifo parameter ... # old fifo support -modparam("ctl", "fifo", "fifo:/tmp/ser_fifo") # classic fifo -modparam("ctl", "fifo", "/tmp/ser_fifo2") +modparam("ctl", "fifo", "fifo:/tmp/kamailio_fifo") # classic fifo +modparam("ctl", "fifo", "/tmp/kamailio_fifo2") modparam("ctl", "fifo", "udp:*:2050") # fifo protocol over udp modparam("ctl", "fifo", "tcp:*:2050") # fifo over tcp ...

4 years, 11 months

git:5.2:fc63e970: kamdbctl: split create user and grant access statements for mysql

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: fc63e970304ba74b7f6800176b0a9b41b7b39f52 URL: https://github.com/kamailio/kamailio/commit/fc63e970304ba74b7f6800176b0a9b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:54:44+01:00 kamdbctl: split create user and grant access statements for mysql - MySQL 8 doesn't support all in one statement (cherry picked from commit c0879add55bef77703f2259f224b4a1f954cd8bf) --- Modified: utils/kamctl/kamdbctl.mysql --- Diff: https://github.com/kamailio/kamailio/commit/fc63e970304ba74b7f6800176b0a9b4… Patch: https://github.com/kamailio/kamailio/commit/fc63e970304ba74b7f6800176b0a9b4… --- diff --git a/utils/kamctl/kamdbctl.mysql b/utils/kamctl/kamdbctl.mysql index 6103705bc0..e8f8d2e861 100644 --- a/utils/kamctl/kamdbctl.mysql +++ b/utils/kamctl/kamdbctl.mysql @@ -160,8 +160,10 @@ kamailio_db_grant () # pars: <database name> minfo "granting privileges to database $1 ..." # Users: kamailio is the regular user, kamailioro only for reading - sql_query "" "GRANT ALL PRIVILEGES ON $1.* TO '${DBRWUSER}'@'$DBHOST' IDENTIFIED BY '$DBRWPW'; - GRANT SELECT ON $1.* TO '${DBROUSER}'@'$DBHOST' IDENTIFIED BY '$DBROPW';" + 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';" if [ $? -ne 0 ] ; then merr "granting privileges to database $1 failed!" @@ -169,8 +171,10 @@ kamailio_db_grant () # pars: <database name> fi if [ "$DBHOST" != "localhost" ] ; then - sql_query "" "GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'localhost' IDENTIFIED BY '$DBRWPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'localhost' IDENTIFIED BY '$DBROPW';" + 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';" if [ $? -ne 0 ] ; then merr "granting localhost privileges to database $1 failed!" exit 1 @@ -178,8 +182,10 @@ kamailio_db_grant () # pars: <database name> fi if [ ! -z "$DBACCESSHOST" ] ; then - sql_query "" "GRANT ALL PRIVILEGES ON $1.* TO '$DBRWUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBRWPW'; - GRANT SELECT ON $1.* TO '$DBROUSER'@'$DBACCESSHOST' IDENTIFIED BY '$DBROPW';" + 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';" if [ $? -ne 0 ] ; then merr "granting access host privileges to database $1 failed!" exit 1

4 years, 11 months

git:5.2:114cda75: ctl: docs - more infor about binrpc_buffer_size modparam

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 114cda75a593a5f1119bc8b5b545b4560416b41c URL: https://github.com/kamailio/kamailio/commit/114cda75a593a5f1119bc8b5b545b45… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:47:21+01:00 ctl: docs - more infor about binrpc_buffer_size modparam - replaced ser with kamailio in a few examples (cherry picked from commit c9070600af1b7993b003964b5c58db3391d50f60) (cherry picked from commit 4ca6ad00eb71ea76dacf71c6126a4fe853d898c9) --- Modified: src/modules/ctl/doc/ctl_params.xml --- Diff: https://github.com/kamailio/kamailio/commit/114cda75a593a5f1119bc8b5b545b45… Patch: https://github.com/kamailio/kamailio/commit/114cda75a593a5f1119bc8b5b545b45… --- diff --git a/src/modules/ctl/doc/ctl_params.xml b/src/modules/ctl/doc/ctl_params.xml index d94efdd6ca..820327780b 100644 --- a/src/modules/ctl/doc/ctl_params.xml +++ b/src/modules/ctl/doc/ctl_params.xml @@ -73,7 +73,7 @@ <programlisting> loadmodule "ctl" # optional listen addresses, if no one is specified, -# ctl will listen on unixs:/tmp/ser_ctl +# ctl will listen on unixs:/tmp/kamailio_ctl modparam("ctl", "binrpc", "unix:/var/run/&kamailiobinary;/&kamailiobinary;_ctl") # default modparam("ctl", "binrpc", "udp:localhost:2046") @@ -92,7 +92,8 @@ modparam("ctl", "binrpc", "udp:*:3012") # udp any , port 3012 <section id="binrpc_buffer_size"> <title><varname>binrpc_buffer_size</varname> (integer or string)</title> <para> - the size of the internal buffer. + The size of the internal buffer used for printing elements of the RPC + response (e.g., internal RPC printf()). The value is given in bytes. </para> <para> Default: 1024. @@ -167,7 +168,7 @@ modparam("ctl", "group", 100) The fifo protocol can be run over a real fifo, over UDP or over TCP. Format: [protocol:]path|address. If no protocol is specified the default is "fifo". - Examples: "fifo:/tmp/ser_fifo", "/tmp/ser_fifo2", "udp:*:2050", + Examples: "fifo:/tmp/kamailio_fifo", "/tmp/kamailio_fifo2", "udp:*:2050", "tcp:localhost:2050". For more details on the UDP and TCP formats see <varname>binrpc</varname>. @@ -183,8 +184,8 @@ modparam("ctl", "group", 100) <programlisting> ... # old fifo support -modparam("ctl", "fifo", "fifo:/tmp/ser_fifo") # classic fifo -modparam("ctl", "fifo", "/tmp/ser_fifo2") +modparam("ctl", "fifo", "fifo:/tmp/kamailio_fifo") # classic fifo +modparam("ctl", "fifo", "/tmp/kamailio_fifo2") modparam("ctl", "fifo", "udp:*:2050") # fifo protocol over udp modparam("ctl", "fifo", "tcp:*:2050") # fifo over tcp ...

4 years, 11 months

git:5.2:0e552e6c: uri_db: spelling fix in variable name

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 0e552e6c2efcf449e91040b781eafafca2a1e97a URL: https://github.com/kamailio/kamailio/commit/0e552e6c2efcf449e91040b781eafaf… Author: Henning Westerholt <hw(a)skalatan.de> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:43:48+01:00 uri_db: spelling fix in variable name (cherry picked from commit 23b60ed9fbf9396bd531c76f57c133d5850c0764) --- Modified: src/modules/uri_db/checks.h --- Diff: https://github.com/kamailio/kamailio/commit/0e552e6c2efcf449e91040b781eafaf… Patch: https://github.com/kamailio/kamailio/commit/0e552e6c2efcf449e91040b781eafaf… --- diff --git a/src/modules/uri_db/checks.h b/src/modules/uri_db/checks.h index c7bac8cf34..208cf824d0 100644 --- a/src/modules/uri_db/checks.h +++ b/src/modules/uri_db/checks.h @@ -63,7 +63,7 @@ int uridb_db_ver(const str* db_url, str* name); int ki_check_to(struct sip_msg* _m); int ki_check_from(struct sip_msg* _m); int ki_check_uri(struct sip_msg* msg, str *suri); -int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srelam); +int ki_check_uri_realm(struct sip_msg* msg, str *suri, str *susername, str *srealm); int ki_does_uri_exist(struct sip_msg* _msg); #endif /* CHECKS_H */

4 years, 11 months

git:5.2:2f0a0b78: nathelper: removed exe flag from c file

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 2f0a0b785efc921cd82dee274b548516b1bb5d40 URL: https://github.com/kamailio/kamailio/commit/2f0a0b785efc921cd82dee274b54851… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:43:32+01:00 nathelper: removed exe flag from c file (cherry picked from commit 82195c2a51c5020ca0024f59492a4e2faef0e15a) --- Modified: src/modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/2f0a0b785efc921cd82dee274b54851… Patch: https://github.com/kamailio/kamailio/commit/2f0a0b785efc921cd82dee274b54851… --- diff --git a/src/modules/nathelper/nathelper.c b/src/modules/nathelper/nathelper.c old mode 100755 new mode 100644

4 years, 11 months

git:5.2:3d6246d9: core: pad some fields in contained structs for 4 byte alignment

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: 3d6246d97385fbd3742c1d860b8f974a79f0ef8c URL: https://github.com/kamailio/kamailio/commit/3d6246d97385fbd3742c1d860b8f974… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:41:23+01:00 core: pad some fields in contained structs for 4 byte alignment - safety for sigbus on strict cpu architectures when accesing fields by address (cherry picked from commit 1296bb2270985a1bf3af04f35e4cdae1fe4b184a) --- Modified: src/core/ip_addr.h --- Diff: https://github.com/kamailio/kamailio/commit/3d6246d97385fbd3742c1d860b8f974… Patch: https://github.com/kamailio/kamailio/commit/3d6246d97385fbd3742c1d860b8f974… --- diff --git a/src/core/ip_addr.h b/src/core/ip_addr.h index df57c5faa3..abad7f2530 100644 --- a/src/core/ip_addr.h +++ b/src/core/ip_addr.h @@ -91,6 +91,7 @@ typedef struct addr_info { typedef struct advertise_info { str name; /* name - eg.: foo.bar or 10.0.0.1 */ unsigned short port_no; /* port number */ + short port_pad; /* padding field */ str port_no_str; /* port number converted to string -- optimization*/ str address_str; /*ip address converted to string -- optimization*/ struct ip_addr address; /* ip address */ @@ -109,6 +110,8 @@ typedef struct socket_info { struct socket_info* prev; unsigned short port_no; /* port number */ char proto; /* tcp or udp*/ + char proto_pad0; /* padding field */ + short proto_pad1; /* padding field */ str sock_str; /* Socket proto, ip, and port as string */ struct addr_info* addr_info_lst; /* extra addresses (e.g. SCTP mh) */ int workers; /* number of worker processes for this socket */ @@ -143,7 +146,11 @@ typedef struct receive_info { * the msg was received */ char proto; #ifdef USE_COMP + char proto_pad0; /* padding field */ short comp; /* compression */ +#else + char proto_pad0; /* padding field */ + short proto_pad1; /* padding field */ #endif /* no need for dst_su yet */ } receive_info_t; @@ -153,10 +160,14 @@ typedef struct dest_info { struct socket_info* send_sock; union sockaddr_union to; int id; /* tcp stores the connection id here */ - char proto; snd_flags_t send_flags; + char proto; #ifdef USE_COMP + char proto_pad0; /* padding field */ short comp; +#else + char proto_pad0; /* padding field */ + short proto_pad1; /* padding field */ #endif } dest_info_t;

4 years, 11 months

git:5.2:a519a289: statsc: debug message when fetching stats values

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: a519a289cccf89a06bb7fa3857fef5505049a277 URL: https://github.com/kamailio/kamailio/commit/a519a289cccf89a06bb7fa3857fef55… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:42:17+01:00 statsc: debug message when fetching stats values (cherry picked from commit a463c53e767114567ff25f0fe50115da0e3d0045) --- Modified: src/modules/statsc/statsc_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/a519a289cccf89a06bb7fa3857fef55… Patch: https://github.com/kamailio/kamailio/commit/a519a289cccf89a06bb7fa3857fef55… --- diff --git a/src/modules/statsc/statsc_mod.c b/src/modules/statsc/statsc_mod.c index 75c88c9cd5..4755b77e2b 100644 --- a/src/modules/statsc/statsc_mod.c +++ b/src/modules/statsc/statsc_mod.c @@ -257,6 +257,7 @@ void statsc_timer(unsigned int ticks, void *param) statsc_nmap_t *sm = NULL; time_t tn; int n; + int i; if(_statsc_info==NULL || _statsc_info->slist==NULL) { LM_ERR("statsc not initialized\n"); @@ -270,8 +271,12 @@ void statsc_timer(unsigned int ticks, void *param) LM_DBG("statsc timer - time: %lu - ticks: %u - index: %d - steps: %llu\n", (unsigned long)tn, ticks, n, (unsigned long long)_statsc_info->steps); + i = 0; for(sm=_statsc_info->slist->next; sm!=NULL; sm=sm->next) { + LM_DBG("fetching value for: [%.*s] - step [%d]\n", sm->rname.len, + sm->rname.s, i); statsc_svalue(&sm->rname, sm->vals + n); + i++; } _statsc_info->steps++; }

4 years, 11 months

git:5.2:b1bb24d3: evapi: use local allocated buffer to get data parameter for event relay

by Henning Westerholt

Module: kamailio Branch: 5.2 Commit: b1bb24d3639c2869f825dd692a9b1346d1bb30b5 URL: https://github.com/kamailio/kamailio/commit/b1bb24d3639c2869f825dd692a9b134… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Henning Westerholt <hw(a)skalatan.de> Date: 2020-01-24T16:39:55+01:00 evapi: use local allocated buffer to get data parameter for event relay - use system malloc given that the data can be passed from jsonrpcs, which uses system malloc as well - try to grow the internall buffer as needed based on estimated size of output for the data parameter (cherry picked from commit 63334e312d60a5d6a6470b0067c29db672d08c7c) --- Modified: src/modules/evapi/evapi_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/b1bb24d3639c2869f825dd692a9b134… Patch: https://github.com/kamailio/kamailio/commit/b1bb24d3639c2869f825dd692a9b134…

4 years, 11 months

← Newer
1
...
16
17
18
19
20
21
22
...
42
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2020