sr-dev July 2017

sr-dev@lists.kamailio.org

23 participants
410 discussions

git:master:126e76dc: core: mem/qm - fixed pointer expressions in qm_check() debug function

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 126e76dc035bd1320cb103c39ad52849844e7448 URL: https://github.com/kamailio/kamailio/commit/126e76dc035bd1320cb103c39ad5284… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:00:45+02:00 core: mem/qm - fixed pointer expressions in qm_check() debug function --- Modified: src/core/mem/q_malloc.c --- Diff: https://github.com/kamailio/kamailio/commit/126e76dc035bd1320cb103c39ad5284… Patch: https://github.com/kamailio/kamailio/commit/126e76dc035bd1320cb103c39ad5284… --- diff --git a/src/core/mem/q_malloc.c b/src/core/mem/q_malloc.c index 0c24ef2409..3c34c2c09f 100644 --- a/src/core/mem/q_malloc.c +++ b/src/core/mem/q_malloc.c @@ -728,18 +728,22 @@ void qm_check(struct qm_block* qm) abort(); }; #endif - if (f + sizeof(struct qm_frag) + f->size + sizeof(struct qm_frag_end) > qm->first_frag + qm->size) { + if ((char*)f + sizeof(struct qm_frag) + f->size + + sizeof(struct qm_frag_end) > (char*)qm->first_frag + qm->size) { LOG(L_CRIT, "BUG: qm_*: fragm. %p (address %p) " "bad size: %lu (frag end: %p > end of block: %p)\n", - f, (char*)f + sizeof(struct qm_frag) + sizeof(struct qm_frag_end), f->size, - f + sizeof(struct qm_frag) + f->size, qm->first_frag + qm->size); + f, (char*)f + sizeof(struct qm_frag), f->size, + (char*)f + sizeof(struct qm_frag) + f->size + + sizeof(struct qm_frag_end), + (char*)qm->first_frag + qm->size); qm_status(qm); abort(); } /* check struct qm_frag_end */ if (FRAG_END(f)->size != f->size) { LOG(L_CRIT, "BUG: qm_*: fragm. %p (address %p) " - "size in qm_frag and qm_frag_end does not match: frag->size=%lu, frag_end->size=%lu)\n", + "size in qm_frag and qm_frag_end does not match:" + " frag->size=%lu, frag_end->size=%lu)\n", f, (char*)f + sizeof(struct qm_frag), f->size, FRAG_END(f)->size); qm_status(qm);

7 years, 5 months

git:master:52f728f7: core: cfg.y - fixed condition on case parsing

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 52f728f73914ab960389ff8afbf1a223f91f07e2 URL: https://github.com/kamailio/kamailio/commit/52f728f73914ab960389ff8afbf1a22… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-04T09:00:45+02:00 core: cfg.y - fixed condition on case parsing --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/52f728f73914ab960389ff8afbf1a22… Patch: https://github.com/kamailio/kamailio/commit/52f728f73914ab960389ff8afbf1a22… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index 59125a1659..067b0f0dee 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -2389,7 +2389,7 @@ single_case: } } | DEFAULT COLON actions { - if ((($$=mk_case_stm(0, 0, $3, &i_tmp))==0) && (i_tmp=-10)){ + if ((($$=mk_case_stm(0, 0, $3, &i_tmp))==0) && (i_tmp==-10)){ YYABORT; } }

7 years, 5 months

[kamailio/kamailio] pua_reginfo: use outbound proxy for PUBLISHes (#1177)

by Vasiliy Ganchev

Hi again, duplicate of [previous pull](https://github.com/kamailio/kamailio/pull/1176), as there is some mess. Hope this time is better. thanks! You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1177 -- Commit Summary -- * pua_reginfo: use outbound proxy for PUBLISHes * pua_reginfo: correct docs -- File Changes -- M src/modules/pua_reginfo/doc/pua_reginfo_admin.xml (2) M src/modules/pua_reginfo/usrloc_cb.c (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1177.patch https://github.com/kamailio/kamailio/pull/1177.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/1177

7 years, 5 months

git:master:e4f0facc: modules: readme files regenerated - pua_reginfo ... [skip ci]

by Kamailio Dev

Module: kamailio Branch: master Commit: e4f0facccb130599acfd0c4abbfd954a427c3d96 URL: https://github.com/kamailio/kamailio/commit/e4f0facccb130599acfd0c4abbfd954… Author: Kamailio Dev <kamailio.dev(a)kamailio.org> Committer: Kamailio Dev <kamailio.dev(a)kamailio.org> Date: 2017-07-03T19:01:39+02:00 modules: readme files regenerated - pua_reginfo ... [skip ci] --- Modified: src/modules/pua_reginfo/README --- Diff: https://github.com/kamailio/kamailio/commit/e4f0facccb130599acfd0c4abbfd954… Patch: https://github.com/kamailio/kamailio/commit/e4f0facccb130599acfd0c4abbfd954… --- diff --git a/src/modules/pua_reginfo/README b/src/modules/pua_reginfo/README index 49a7fbcfed..68c9a85205 100644 --- a/src/modules/pua_reginfo/README +++ b/src/modules/pua_reginfo/README @@ -141,7 +141,8 @@ modparam("pua_reginfo", "publish_reginfo", 0) 3.3. outbound_proxy(str) - The outbound_proxy uri to be used when sending Subscribe requests. + The outbound_proxy uri to be used when sending Subscribe and Publish + requests. Default value is “NULL”.

7 years, 5 months

git:master:385995c2: pua_reginfo: use outbound proxy for PUBLISH requests

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 385995c27084bdca9ebc4a472f9ab41311416f35 URL: https://github.com/kamailio/kamailio/commit/385995c27084bdca9ebc4a472f9ab41… Author: Vasiliy Ganchev <vance(a)ukr.net> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T18:56:52+02:00 pua_reginfo: use outbound proxy for PUBLISH requests --- Modified: src/modules/pua_reginfo/doc/pua_reginfo_admin.xml Modified: src/modules/pua_reginfo/usrloc_cb.c --- Diff: https://github.com/kamailio/kamailio/commit/385995c27084bdca9ebc4a472f9ab41… Patch: https://github.com/kamailio/kamailio/commit/385995c27084bdca9ebc4a472f9ab41… --- diff --git a/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml b/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml index e7b7a6e50a..9754055c33 100644 --- a/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml +++ b/src/modules/pua_reginfo/doc/pua_reginfo_admin.xml @@ -125,7 +125,7 @@ modparam("pua_reginfo", "publish_reginfo", 0) <section> <title><varname>outbound_proxy</varname>(str)</title> <para> - The outbound_proxy uri to be used when sending Subscribe requests. + The outbound_proxy uri to be used when sending Subscribe and Publish requests. </para> <para> <emphasis> Default value is <quote>NULL</quote>. diff --git a/src/modules/pua_reginfo/usrloc_cb.c b/src/modules/pua_reginfo/usrloc_cb.c index 3e00a0eaed..f8a55480bb 100644 --- a/src/modules/pua_reginfo/usrloc_cb.c +++ b/src/modules/pua_reginfo/usrloc_cb.c @@ -323,6 +323,9 @@ void reginfo_usrloc_cb(ucontact_t* c, int type, void* param) { publ.event |= REGINFO_EVENT; publ.extra_headers= NULL; + if(outbound_proxy.s && outbound_proxy.len) + publ.outbound_proxy= &outbound_proxy; + if(pua.send_publish(&publ) < 0) { LM_ERR("Error while sending publish\n"); }

7 years, 5 months

git:master:4168a6c3: Merge pull request #1175 from claudiupb/redis_enhance_debug

by GitHub

Module: kamailio Branch: master Commit: 4168a6c3221f95e50aa7a0769d1abecfa255fa10 URL: https://github.com/kamailio/kamailio/commit/4168a6c3221f95e50aa7a0769d1abec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-07-03T18:52:32+02:00 Merge pull request #1175 from claudiupb/redis_enhance_debug ndb_redis: enhance debug info related to redis replies --- Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/4168a6c3221f95e50aa7a0769d1abec… Patch: https://github.com/kamailio/kamailio/commit/4168a6c3221f95e50aa7a0769d1abec… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 9395773731..520f32364b 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -608,7 +608,7 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) goto error_exec; } } - LM_DBG("reply is [%s]",rpl->rplRedis->str); + LM_DBG_redis_reply(rpl->rplRedis); /* replies are received just retrieve them */ for (i=1;i<rsrv->piped.pending_commands;i++) @@ -625,7 +625,13 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) LM_ERR("Unable to read reply\n"); continue; } - LM_DBG("reply is [%s]",rpl->rplRedis->str); + if (rpl->rplRedis == NULL) + { + LM_ERR("Trying to read reply for command %.*s but nothing in buffer!", + rsrv->piped.commands[i].len,rsrv->piped.commands[i].s); + continue; + } + LM_DBG_redis_reply(rpl->rplRedis); } redisc_free_pipelined_cmds(rsrv); rsrv->disable.consecutive_errors = 0; @@ -1061,3 +1067,57 @@ int redis_count_err_and_disable(redisc_server_t *rsrv) } return 0; } + +void print_redis_reply(int log_level, redisReply *rpl,int offset) +{ + int i; + char padding[MAXIMUM_NESTED_KEYS + 1]; + + if(!is_printable(log_level)) + return; + + if (!rpl) + { + LM_ERR("Unexpected null reply"); + return; + } + + if (offset > MAXIMUM_NESTED_KEYS) + { + LM_ERR("Offset is too big"); + return; + } + + for (i=0;i<offset;i++) + { + padding[i]='\t'; + } + padding[offset]='\0'; + + switch (rpl->type) + { + case REDIS_REPLY_STRING: + LOG(log_level,"%sstring reply: [%s]", padding, rpl->str); + break; + case REDIS_REPLY_INTEGER: + LOG(log_level,"%sinteger reply: %lld", padding, rpl->integer); + break; + case REDIS_REPLY_ARRAY: + LOG(log_level,"%sarray reply with %d elements", padding, (int)rpl->elements); + for (i=0; i < rpl->elements; i++) + { + LOG(log_level,"%selement %d:",padding,i); + print_redis_reply(log_level,rpl->element[i],offset+1); + } + break; + case REDIS_REPLY_NIL: + LOG(log_level,"%snil reply",padding); + break; + case REDIS_REPLY_STATUS: + LOG(log_level,"%sstatus reply: %s", padding, rpl->str); + break; + case REDIS_REPLY_ERROR: + LOG(log_level,"%serror reply: %s", padding, rpl->str); + break; + } +} diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index 73cbd0b3c0..50431cbc40 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -36,6 +36,7 @@ #define MAXIMUM_PIPELINED_COMMANDS 1000 #define MAXIMUM_NESTED_KEYS 10 +#define LM_DBG_redis_reply(rpl) print_redis_reply(L_DBG,(rpl),0) int redisc_init(void); int redisc_destroy(void); @@ -97,4 +98,5 @@ int redisc_free_reply(str *name); int redisc_check_auth(redisc_server_t *rsrv, char *pass); int redis_check_server(redisc_server_t *rsrv); int redis_count_err_and_disable(redisc_server_t *rsrv); +void print_redis_reply(int log_level, redisReply *rpl,int offset); #endif

7 years, 5 months

git:master:6002f2de: ndb_redis: enhance debug info related to redis replies

by Claudiu Boriga

Module: kamailio Branch: master Commit: 6002f2de79b1f344bf9326763d63a1f978d0ddc7 URL: https://github.com/kamailio/kamailio/commit/6002f2de79b1f344bf9326763d63a1f… Author: Claudiu Boriga <paul.boriga(a)1and1.ro> Committer: Claudiu Boriga <paul.boriga(a)1and1.ro> Date: 2017-07-03T16:22:32+03:00 ndb_redis: enhance debug info related to redis replies --- Modified: src/modules/ndb_redis/redis_client.c Modified: src/modules/ndb_redis/redis_client.h --- Diff: https://github.com/kamailio/kamailio/commit/6002f2de79b1f344bf9326763d63a1f… Patch: https://github.com/kamailio/kamailio/commit/6002f2de79b1f344bf9326763d63a1f… --- diff --git a/src/modules/ndb_redis/redis_client.c b/src/modules/ndb_redis/redis_client.c index 9395773731..520f32364b 100644 --- a/src/modules/ndb_redis/redis_client.c +++ b/src/modules/ndb_redis/redis_client.c @@ -608,7 +608,7 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) goto error_exec; } } - LM_DBG("reply is [%s]",rpl->rplRedis->str); + LM_DBG_redis_reply(rpl->rplRedis); /* replies are received just retrieve them */ for (i=1;i<rsrv->piped.pending_commands;i++) @@ -625,7 +625,13 @@ int redisc_exec_pipelined(redisc_server_t *rsrv) LM_ERR("Unable to read reply\n"); continue; } - LM_DBG("reply is [%s]",rpl->rplRedis->str); + if (rpl->rplRedis == NULL) + { + LM_ERR("Trying to read reply for command %.*s but nothing in buffer!", + rsrv->piped.commands[i].len,rsrv->piped.commands[i].s); + continue; + } + LM_DBG_redis_reply(rpl->rplRedis); } redisc_free_pipelined_cmds(rsrv); rsrv->disable.consecutive_errors = 0; @@ -1061,3 +1067,57 @@ int redis_count_err_and_disable(redisc_server_t *rsrv) } return 0; } + +void print_redis_reply(int log_level, redisReply *rpl,int offset) +{ + int i; + char padding[MAXIMUM_NESTED_KEYS + 1]; + + if(!is_printable(log_level)) + return; + + if (!rpl) + { + LM_ERR("Unexpected null reply"); + return; + } + + if (offset > MAXIMUM_NESTED_KEYS) + { + LM_ERR("Offset is too big"); + return; + } + + for (i=0;i<offset;i++) + { + padding[i]='\t'; + } + padding[offset]='\0'; + + switch (rpl->type) + { + case REDIS_REPLY_STRING: + LOG(log_level,"%sstring reply: [%s]", padding, rpl->str); + break; + case REDIS_REPLY_INTEGER: + LOG(log_level,"%sinteger reply: %lld", padding, rpl->integer); + break; + case REDIS_REPLY_ARRAY: + LOG(log_level,"%sarray reply with %d elements", padding, (int)rpl->elements); + for (i=0; i < rpl->elements; i++) + { + LOG(log_level,"%selement %d:",padding,i); + print_redis_reply(log_level,rpl->element[i],offset+1); + } + break; + case REDIS_REPLY_NIL: + LOG(log_level,"%snil reply",padding); + break; + case REDIS_REPLY_STATUS: + LOG(log_level,"%sstatus reply: %s", padding, rpl->str); + break; + case REDIS_REPLY_ERROR: + LOG(log_level,"%serror reply: %s", padding, rpl->str); + break; + } +} diff --git a/src/modules/ndb_redis/redis_client.h b/src/modules/ndb_redis/redis_client.h index 73cbd0b3c0..50431cbc40 100644 --- a/src/modules/ndb_redis/redis_client.h +++ b/src/modules/ndb_redis/redis_client.h @@ -36,6 +36,7 @@ #define MAXIMUM_PIPELINED_COMMANDS 1000 #define MAXIMUM_NESTED_KEYS 10 +#define LM_DBG_redis_reply(rpl) print_redis_reply(L_DBG,(rpl),0) int redisc_init(void); int redisc_destroy(void); @@ -97,4 +98,5 @@ int redisc_free_reply(str *name); int redisc_check_auth(redisc_server_t *rsrv, char *pass); int redis_check_server(redisc_server_t *rsrv); int redis_count_err_and_disable(redisc_server_t *rsrv); +void print_redis_reply(int log_level, redisReply *rpl,int offset); #endif

7 years, 5 months

[kamailio/kamailio] ndb_redis: enhance debug info related to redis replies (#1175)

by Paul Claudiu Boriga

#### Pre-Submission Checklist    - [x] Commit message has the format required by CONTRIBUTING guide - [x] Commits are split per component (core, individual modules, libs, utils, ...) - [x] Each component has a single commit (if not, squash them into one commit) - [x] No commits to README files for modules (changes must be done to docbook files in `doc/` subfolder, the README file is autogenerated) #### Type Of Change - [x] Small bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds new functionality) - [ ] Breaking change (fix or feature that would change existing functionality) #### Checklist:  - [ ] PR should be backported to stable branches - [x] Tested changes locally - [ ] Related to issue #XXXX (replace XXXX with an open issue number) #### Description  Added a way to print the redis responses when they are arrays, since the previous log message would just print (null) instead. In case a MULTI/EXEC transaction will be used to issue redis commands, the response would be an array, making the original debug message useless. With this new debug, arrays, strings, integers, and other replies such as status or error replies are logged properly. Also added an error message when a reply is expected but not received. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/1175 -- Commit Summary -- * ndb_redis: enhance debug info related to redis replies -- File Changes -- M src/modules/ndb_redis/ndb_redis_mod.c (9) M src/modules/ndb_redis/redis_client.c (64) M src/modules/ndb_redis/redis_client.h (3) -- Patch Links -- https://github.com/kamailio/kamailio/pull/1175.patch https://github.com/kamailio/kamailio/pull/1175.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/1175

7 years, 5 months

tls warnings

by Juha Heinanen

I got these TLS related warnings when compiling K 5.0 on Debian Stretch. -- Juha CC (gcc) [M tls.so] tls_init.o tls_init.c: In function 'init_ssl_methods': tls_init.c:377:2: warning: 'TLSv1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_cli - 1] = TLSv1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1614:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_client_method(void)) /* TLSv1.0 */ ^ tls_init.c:378:2: warning: 'TLSv1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_srv - 1] = TLSv1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1613:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_server_method(void)) /* TLSv1.0 */ ^ tls_init.c:379:2: warning: 'TLSv1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1 - 1] = TLSv1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1612:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_method(void)) /* TLSv1.0 */ ^ tls_init.c:382:2: warning: 'TLSv1_1_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_cli - 1] = TLSv1_1_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1620:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_client_method(void)) /* TLSv1.1 */ ^ tls_init.c:383:2: warning: 'TLSv1_1_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1_srv - 1] = TLSv1_1_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1619:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_server_method(void)) /* TLSv1.1 */ ^ tls_init.c:384:2: warning: 'TLSv1_1_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_1 - 1] = TLSv1_1_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1618:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_1_method(void)) /* TLSv1.1 */ ^ tls_init.c:388:2: warning: 'TLSv1_2_client_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_cli - 1] = TLSv1_2_client_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1626:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_client_method(void)) /* TLSv1.2 */ ^ tls_init.c:389:2: warning: 'TLSv1_2_server_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2_srv - 1] = TLSv1_2_server_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1625:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_server_method(void)) /* TLSv1.2 */ ^ tls_init.c:390:2: warning: 'TLSv1_2_method' is deprecated [-Wdeprecated-declarations] ssl_methods[TLS_USE_TLSv1_2 - 1] = TLSv1_2_method(); ^~~~~~~~~~~ In file included from /usr/include/openssl/ct.h:13:0, from /usr/include/openssl/ssl.h:61, from tls_init.c:45: /usr/include/openssl/ssl.h:1624:1: note: declared here DEPRECATEDIN_1_1_0(__owur const SSL_METHOD *TLSv1_2_method(void)) /* TLSv1.2 */ ^ CC (gcc) [M tls.so] tls_bio.o CC (gcc) [M tls.so] tls_locking.o tls_locking.c:98:13: warning: 'locking_f' defined but not used [-Wunused-function] static void locking_f(int mode, int n, const char* file, int line) ^~~~~~~~~ tls_locking.c:83:13: warning: 'dyn_destroy_f' defined but not used [-Wunused-function] static void dyn_destroy_f(struct CRYPTO_dynlock_value *l, ^~~~~~~~~~~~~ tls_locking.c:65:13: warning: 'dyn_lock_f' defined but not used [-Wunused-function] static void dyn_lock_f(int mode, struct CRYPTO_dynlock_value* l, ^~~~~~~~~~ tls_locking.c:42:37: warning: 'dyn_create_f' defined but not used [-Wunused-function] static struct CRYPTO_dynlock_value* dyn_create_f(const char* file, int line) ^~~~~~~~~~~~

7 years, 5 months

git:master:3ce65db8: cfgutils: more log messages for locking functions

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 3ce65db8747ad7b382824f389c2b782a76dbb7a1 URL: https://github.com/kamailio/kamailio/commit/3ce65db8747ad7b382824f389c2b782… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-03T17:02:02+02:00 cfgutils: more log messages for locking functions - it was silent if locks set was not initialized properly which could mislead at runtime, but not showing any error message - if locks set size is too big, set it to 14 (this is used as power of 2) --- Modified: src/modules/cfgutils/cfgutils.c --- Diff: https://github.com/kamailio/kamailio/commit/3ce65db8747ad7b382824f389c2b782… Patch: https://github.com/kamailio/kamailio/commit/3ce65db8747ad7b382824f389c2b782… --- diff --git a/src/modules/cfgutils/cfgutils.c b/src/modules/cfgutils/cfgutils.c index 0b72186546..ca7bf77ae3 100644 --- a/src/modules/cfgutils/cfgutils.c +++ b/src/modules/cfgutils/cfgutils.c @@ -705,9 +705,15 @@ static int ki_shm_summary(sip_msg_t* msg) static int cfg_lock_helper(str *lkey, int mode) { unsigned int pos; + + if(_cfg_lock_set==NULL) { + LM_ERR("lock set not initialized (attempt to do op: %d on: %.*s)\n", + mode, lkey->len, lkey->s); + return -1; + } pos = core_case_hash(lkey, 0, _cfg_lock_size); - LM_DBG("cfg_lock mode %d on %u\n", mode, pos); + LM_DBG("cfg_lock mode %d on %u (%.*s)\n", mode, pos, lkey->len, lkey->s); if(mode==0) { /* Lock */ @@ -749,8 +755,10 @@ static int cfg_trylock(str *lkey) static int w_cfg_lock_wrapper(struct sip_msg *msg, gparam_p key, int mode) { str s; - if(fixup_get_svalue(msg, key, &s)!=0) - { + if(key==NULL) { + return -1; + } + if(fixup_get_svalue(msg, key, &s)!=0) { LM_ERR("cannot get first parameter\n"); return -1; } @@ -759,22 +767,16 @@ static int w_cfg_lock_wrapper(struct sip_msg *msg, gparam_p key, int mode) static int w_cfg_lock(struct sip_msg *msg, char *key, char *s2) { - if(_cfg_lock_set==NULL || key==NULL) - return -1; return w_cfg_lock_wrapper(msg, (gparam_p)key, 0); } static int w_cfg_unlock(struct sip_msg *msg, char *key, char *s2) { - if(_cfg_lock_set==NULL || key==NULL) - return -1; return w_cfg_lock_wrapper(msg, (gparam_p)key, 1); } static int w_cfg_trylock(struct sip_msg *msg, char *key, char *s2) { - if(_cfg_lock_set==NULL || key==NULL) - return -1; return w_cfg_lock_wrapper(msg, (gparam_p)key, 2); } @@ -856,12 +858,15 @@ static int mod_init(void) lock_dealloc(gflags_lock); return -1; } - if(_cfg_lock_size>0 && _cfg_lock_size<=10) - { + if(_cfg_lock_size>0) { + if(_cfg_lock_size>14) { + LM_WARN("lock set size too large (%d), making it 14\n", + _cfg_lock_size); + _cfg_lock_size = 14; + } _cfg_lock_size = 1<<_cfg_lock_size; _cfg_lock_set = lock_set_alloc(_cfg_lock_size); - if(_cfg_lock_set==NULL || lock_set_init(_cfg_lock_set)==NULL) - { + if(_cfg_lock_set==NULL || lock_set_init(_cfg_lock_set)==NULL) { LM_ERR("cannot initiate lock set\n"); return -1; }

7 years, 5 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2017