sr-dev March 2017

sr-dev@lists.kamailio.org

31 participants
269 discussions

git:master:d3d5ef92: Merge pull request #1013 from mslehto/hepv3
by GitHub 03 Mar '17

03 Mar '17

Module: kamailio Branch: master Commit: d3d5ef92d3661d5a95c55a77e8e17793950273c2 URL: https://github.com/kamailio/kamailio/commit/d3d5ef92d3661d5a95c55a77e8e1779… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-03-03T11:25:30+01:00 Merge pull request #1013 from mslehto/hepv3 modules/siptrace: remove duplicate HEP version check --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/d3d5ef92d3661d5a95c55a77e8e1779… Patch: https://github.com/kamailio/kamailio/commit/d3d5ef92d3661d5a95c55a77e8e1779… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index a476114..fbddf23 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -320,11 +320,6 @@ static int mod_init(void) } } - if(hep_version != 1 && hep_version != 2 && hep_version != 3) { - LM_ERR("unsupported version of HEP"); - return -1; - } - trace_on_flag = (int*)shm_malloc(sizeof(int)); if(trace_on_flag==NULL) { LM_ERR("no more shm memory left\n");

1 0

git:master:f98b6f60: modules/siptrace: remove duplicate HEP version check
by Mikko Lehto 03 Mar '17

03 Mar '17

Module: kamailio Branch: master Commit: f98b6f6034b30ace3812607db9d983e132f75c25 URL: https://github.com/kamailio/kamailio/commit/f98b6f6034b30ace3812607db9d983e… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2017-03-03T11:42:30+02:00 modules/siptrace: remove duplicate HEP version check --- Modified: src/modules/siptrace/siptrace.c --- Diff: https://github.com/kamailio/kamailio/commit/f98b6f6034b30ace3812607db9d983e… Patch: https://github.com/kamailio/kamailio/commit/f98b6f6034b30ace3812607db9d983e… --- diff --git a/src/modules/siptrace/siptrace.c b/src/modules/siptrace/siptrace.c index a476114..fbddf23 100644 --- a/src/modules/siptrace/siptrace.c +++ b/src/modules/siptrace/siptrace.c @@ -320,11 +320,6 @@ static int mod_init(void) } } - if(hep_version != 1 && hep_version != 2 && hep_version != 3) { - LM_ERR("unsupported version of HEP"); - return -1; - } - trace_on_flag = (int*)shm_malloc(sizeof(int)); if(trace_on_flag==NULL) { LM_ERR("no more shm memory left\n");

1 0

[kamailio/kamailio] modules/siptrace: remove duplicate HEP version check (#1013)
by Mikko Lehto 03 Mar '17

03 Mar '17

I think only this check is enough: https://github.com/kamailio/kamailio/blob/f6396033763f1d55c11744ddb9774e112… You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1013 -- Commit Summary -- * modules/siptrace: remove duplicate HEP version check -- File Changes -- M src/modules/siptrace/siptrace.c (5) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1013.patch https://github.com/kamailio/kamailio/pull/1013.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/1013

2 2

git:master:18c5ca1d: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 03 Mar '17

03 Mar '17

Module: kamailio Branch: master Commit: 18c5ca1daecb922f4df371065d489503b70a981c URL: https://github.com/kamailio/kamailio/commit/18c5ca1daecb922f4df371065d48950… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-03-03T09:46:21+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/18c5ca1daecb922f4df371065d48950… Patch: https://github.com/kamailio/kamailio/commit/18c5ca1daecb922f4df371065d48950…

1 0

git:master:76c5da5e: siputils: added is_alphanumex(tval, eset) function
by Daniel-Constantin Mierla 03 Mar '17

03 Mar '17

Module: kamailio Branch: master Commit: 76c5da5ec048cd62c0f3cab6bf38aef5f3c19248 URL: https://github.com/kamailio/kamailio/commit/76c5da5ec048cd62c0f3cab6bf38aef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-03T09:32:05+01:00 siputils: added is_alphanumex(tval, eset) function - check if tval contains only alphanumeric characters or those from the eset parameter --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/doc/siputils_admin.xml Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/76c5da5ec048cd62c0f3cab6bf38aef… Patch: https://github.com/kamailio/kamailio/commit/76c5da5ec048cd62c0f3cab6bf38aef… --- diff --git a/src/modules/siputils/checks.c b/src/modules/siputils/checks.c index 1fb6060..cfddfda 100644 --- a/src/modules/siputils/checks.c +++ b/src/modules/siputils/checks.c @@ -808,18 +808,26 @@ int is_numeric(sip_msg_t *msg, char *_sp, char* _s2) } /* - * Check if the parameter contains alphanumeric characters + * Check if the parameter contains alphanumeric characters or are part of + * the second parameter */ -int is_alphanum(sip_msg_t *msg, char *_sp, char* _s2) +int is_alphanumex(sip_msg_t *msg, char *_sp, char* _se) { str tval = {0, 0}; + str eset = {0, 0}; int i; + int j; + int found; - if(fixup_get_svalue(msg, (gparam_t*)_sp, &tval)!=0) - { - LM_ERR("cannot get parameter value\n"); + if(fixup_get_svalue(msg, (gparam_t*)_sp, &tval)!=0) { + LM_ERR("cannot get tval parameter value\n"); return -1; } + if(fixup_get_svalue(msg, (gparam_t*)_se, &eset)!=0) { + LM_ERR("cannot get eset parameter value\n"); + return -1; + } + if(tval.len<=0) return -2; @@ -827,8 +835,21 @@ int is_alphanum(sip_msg_t *msg, char *_sp, char* _s2) for(; i<tval.len; i++) { if( !((tval.s[i]>='0' && tval.s[i]<='9') || (tval.s[i]>='A' && tval.s[i]<='Z') - || (tval.s[i]>='z' && tval.s[i]<='z')) ) - return -3; + || (tval.s[i]>='z' && tval.s[i]<='z')) ) { + if(eset.len<=0) { + return -3; + } + found = 0; + for(j=0; j<eset.len; j++) { + if(tval.s[i]==eset.s[j]) { + found = 1; + break; + } + } + if(found==0) { + return -3; + } + } } return 1; diff --git a/src/modules/siputils/checks.h b/src/modules/siputils/checks.h index 9b5be13..f071e24 100644 --- a/src/modules/siputils/checks.h +++ b/src/modules/siputils/checks.h @@ -129,4 +129,10 @@ int is_numeric(sip_msg_t *msg, char *_sp, char* _s2); */ int is_alphanum(sip_msg_t *msg, char *_sp, char* _s2); +/* + * Check if the parameter contains alphanumeric characters or are part of + * the second parameter + */ +int is_alphanumex(sip_msg_t *msg, char *_sp, char* _se); + #endif /* CHECKS_H */ diff --git a/src/modules/siputils/doc/siputils_admin.xml b/src/modules/siputils/doc/siputils_admin.xml index 60cb3d4..e28f7a2 100644 --- a/src/modules/siputils/doc/siputils_admin.xml +++ b/src/modules/siputils/doc/siputils_admin.xml @@ -681,6 +681,30 @@ if (is_alphanum("$rU")) { </example> </section> + <section id="siputils.f.is_alphanumex"> + <title> + <function moreinfo="none">is_alphanumex(tval, eset)</function> + </title> + <para> + Checks if the value of parameter 'tval' consists solely of decimal + digits, alphabetic ASCII characters and the characters in the + second parameter 'eset'. The parameters can include variables. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>is_alphanumex</function> usage</title> + <programlisting format="linespecific"> +... +if (is_alphanumex("$rU", "+.-_")) { + ... +} +... +</programlisting> + </example> + </section> + <section id="siputils.f.encode_contact"> <title> <function moreinfo="none">encode_contact(encoding_prefix,hostpart)</function> diff --git a/src/modules/siputils/siputils.c b/src/modules/siputils/siputils.c index 3677086..f01bf6f 100644 --- a/src/modules/siputils/siputils.c +++ b/src/modules/siputils/siputils.c @@ -181,6 +181,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE}, {"is_alphanum", (cmd_function)is_alphanum, 1, fixup_spve_null, 0, ANY_ROUTE}, + {"is_alphanumex", (cmd_function)is_alphanumex, 2, fixup_spve_spve, + 0, ANY_ROUTE}, {"sip_p_charging_vector", (cmd_function)sip_handle_pcv, 1, fixup_spve_null, fixup_free_spve_null, ANY_ROUTE}, {0,0,0,0,0,0}

1 0

git:master:39a00f0a: modules: readme files regenerated - siputils ... [skip ci]
by Kamailio Dev 03 Mar '17

03 Mar '17

Module: kamailio Branch: master Commit: 39a00f0a5225289fb57e2346df400d23a01ce6f8 URL: https://github.com/kamailio/kamailio/commit/39a00f0a5225289fb57e2346df400d2… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-03-03T09:16:28+01:00 modules: readme files regenerated - siputils ... [skip ci] --- Modified: src/modules/siputils/README --- Diff: https://github.com/kamailio/kamailio/commit/39a00f0a5225289fb57e2346df400d2… Patch: https://github.com/kamailio/kamailio/commit/39a00f0a5225289fb57e2346df400d2…

1 0

git:master:41c4319d: siputils: added is_alphanum(v) function
by Daniel-Constantin Mierla 03 Mar '17

03 Mar '17

Module: kamailio Branch: master Commit: 41c4319de89b652efd5b5ab16252440404bc6825 URL: https://github.com/kamailio/kamailio/commit/41c4319de89b652efd5b5ab16252440… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-03T09:12:13+01:00 siputils: added is_alphanum(v) function - helper function to check if a string value contains only digits or alphabetic characters --- Modified: src/modules/siputils/checks.c Modified: src/modules/siputils/checks.h Modified: src/modules/siputils/doc/siputils_admin.xml Modified: src/modules/siputils/siputils.c --- Diff: https://github.com/kamailio/kamailio/commit/41c4319de89b652efd5b5ab16252440… Patch: https://github.com/kamailio/kamailio/commit/41c4319de89b652efd5b5ab16252440…

1 0

[kamailio/kamailio] Kamailio failed to autostart on reboot with MySQL database (#925)
by Fyodor 03 Mar '17

03 Mar '17

MYIP = my server ip MYDOMAIN = my domain name syslog: ``` Jan 13 04:18:19 kaf kamailio[1153]: loading modules under config path: /usr/lib/x86_64-linux-gnu/kamailio/modules/ Jan 13 04:18:19 kaf kamailio[1153]: Listening on Jan 13 04:18:19 kaf kamailio[1153]: udp: MYIP:5776 Jan 13 04:18:19 kaf kamailio[1153]: tcp: MYIP:5776 Jan 13 04:18:19 kaf kamailio[1153]: tls: MYIP:5777 Jan 13 04:18:19 kaf kamailio[1153]: Aliases: Jan 13 04:18:19 kaf kamailio[1153]: tls: MYDOMAIN:5777 Jan 13 04:18:19 kaf kamailio[1153]: tcp: MYDOMAIN:5776 Jan 13 04:18:19 kaf kamailio[1153]: udp: MYDOMAIN:5776 Jan 13 04:18:20 kaf systemd[1]: kamailio.service: Control process exited, code=exited status=255 Jan 13 04:18:20 kaf systemd[1]: Failed to start Kamailio (OpenSER) - the Open Source SIP Server. Jan 13 04:18:20 kaf systemd[1]: kamailio.service: Unit entered failed state. Jan 13 04:18:20 kaf systemd[1]: kamailio.service: Failed with result 'exit-code'. ``` `/etc/init.d/mysql-kamailio start` works fine (kamailio starts) `service kamailio start` - works fine mysql start fine kamailio.log: ``` Jan 13 04:18:19 kaf kamailio: INFO: tls [tls_init.c:403]: init_tls_compression(): tls: init_tls: disabling compression... Jan 13 04:18:19 kaf kamailio: INFO: <core> [sctp_core.c:74]: sctp_core_check_support(): SCTP API not enabled - if you want to use it, load sctp module Jan 13 04:18:19 kaf kamailio: INFO: <core> [tcp_main.c:4656]: init_tcp(): using epoll_lt as the io watch method (auto detected) Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: rr [../outbound/api.h:54]: ob_load_api(): Failed to import bind_ob Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: rr [rr_mod.c:174]: mod_init(): outbound module not available Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: usrloc [hslot.c:51]: ul_init_locks(): locks array size 1024 Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: auth [auth_mod.c:333]: mod_init(): auth: qop set, but nonce-count (nc_enabled) support disabled Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: tls [tls_mod.c:362]: mod_init(): With ECDH-Support! Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: tls [tls_mod.c:365]: mod_init(): With Diffie Hellman Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: tls [tls_init.c:591]: init_tls_h(): tls: _init_tls_h: compiled with openssl version "OpenSSL 1.0.2g 1 Mar 2016" (0x1000207f), kerberos support: off, compression: on Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: tls [tls_init.c:599]: init_tls_h(): tls: init_tls_h: installed openssl library version "OpenSSL 1.0.2g 1 Mar 2016" (0x1000207f), kerberos support: off, zlib compression: off#012 compiler: cc -I. -I.. -I../include -fPIC -DOPENSSL_PIC -DOPENSSL_THREADS -D_REENTRANT -DDSO_DLFCN -DHAVE_DLFCN_H -m64 -DL_ENDIAN -g -O2 -fstack-protector-strong -Wformat -Werror=format-security -Wdate-time -D_FORTIFY_SOURCE=2 -Wl,-Bsymbolic-functions -Wl,-z,relro -Wa,--noexecstack -Wall -DMD32_REG_T=int -DOPENSSL_IA32_SSE2 -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_MONT5 -DOPENSSL_BN_ASM_GF2m -DSHA1_ASM -DSHA256_ASM -DSHA512_ASM -DMD5_ASM -DAES_ASM -DVPAES_ASM -DBSAES_ASM -DWHIRLPOOL_ASM -DGHASH_ASM -DECP_NISTZ256_ASM Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: WARNING: tls [tls_init.c:653]: init_tls_h(): tls: openssl bug #1491 (crash/mem leaks on low memory) workaround enabled (on low memory tls operations will fail preemptively) with free memory thresholds 7864320 and 3932160 bytes Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: <core> [cfg/cfg_ctx.c:608]: cfg_set_now(): INFO: cfg_set_now(): tls.low_mem_threshold1 has been changed to 7864320 Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: <core> [cfg/cfg_ctx.c:608]: cfg_set_now(): INFO: cfg_set_now(): tls.low_mem_threshold2 has been changed to 3932160 Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: ERROR: db_mysql [km_my_con.c:124]: db_mysql_new_connection(): driver error: Can't connect to local MySQL server through socket '/var/run/mysqld/mysqld.sock' (2) Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: ERROR: <core> [db.c:318]: db_do_init2(): could not add connection to the pool Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: ERROR: usrloc [dlist.c:637]: register_udomain(): failed to open database connection Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: ERROR: registrar [reg_mod.c:561]: domain_fixup(): failed to register domain Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: ERROR: <core> [route.c:1153]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:676 Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: ERROR: <core> [route.c:1153]: fix_actions(): fixing failed (code=-1) at cfg:/etc/kamailio/kamailio.cfg:678 Jan 13 04:18:20 kaf /usr/sbin/kamailio[1276]: INFO: <core> [sctp_core.c:53]: sctp_core_destroy(): SCTP API not initialized ``` -- 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/925

3 5

git:4.4:b67b5136: mtree: safety checks for range within the chars table
by Daniel-Constantin Mierla 02 Mar '17

02 Mar '17

Module: kamailio Branch: 4.4 Commit: b67b5136501364721567ad07c7cb6d2024ae9243 URL: https://github.com/kamailio/kamailio/commit/b67b5136501364721567ad07c7cb6d2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-02T22:26:47+01:00 mtree: safety checks for range within the chars table (cherry picked from commit 980c861e39b1fb27de8d7c10390566e516e37fcc) (cherry picked from commit a5aab2ad5dad7d4c7c06cfc4f99703ab59586505) --- Modified: modules/mtree/mtree.c --- Diff: https://github.com/kamailio/kamailio/commit/b67b5136501364721567ad07c7cb6d2… Patch: https://github.com/kamailio/kamailio/commit/b67b5136501364721567ad07c7cb6d2…

1 0

git:5.0:a5aab2ad: mtree: safety checks for range within the chars table
by Daniel-Constantin Mierla 02 Mar '17

02 Mar '17

Module: kamailio Branch: 5.0 Commit: a5aab2ad5dad7d4c7c06cfc4f99703ab59586505 URL: https://github.com/kamailio/kamailio/commit/a5aab2ad5dad7d4c7c06cfc4f99703a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-03-02T22:18:00+01:00 mtree: safety checks for range within the chars table (cherry picked from commit 980c861e39b1fb27de8d7c10390566e516e37fcc) --- Modified: src/modules/mtree/mtree.c --- Diff: https://github.com/kamailio/kamailio/commit/a5aab2ad5dad7d4c7c06cfc4f99703a… Patch: https://github.com/kamailio/kamailio/commit/a5aab2ad5dad7d4c7c06cfc4f99703a…

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