sr-dev January 2017

sr-dev@lists.kamailio.org

33 participants
538 discussions

git:master:24fc0f0c: Merge pull request #951 from kelchy/master

by GitHub

Module: kamailio Branch: master Commit: 24fc0f0c7bfd19c0086040740040988125ef39ea URL: https://github.com/kamailio/kamailio/commit/24fc0f0c7bfd19c0086040740040988… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-26T19:01:51+01:00 Merge pull request #951 from kelchy/master jansson: add path to error log for easier debugging --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/24fc0f0c7bfd19c0086040740040988… Patch: https://github.com/kamailio/kamailio/commit/24fc0f0c7bfd19c0086040740040988… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 5637560..9f82243 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -142,14 +142,14 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, if(STR_EQ_STATIC(type_s, "object") || STR_EQ_STATIC(type_s, "obj")){ value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); if(value && !json_is_object(value)) { - ERR("value to add is not an object\n"); + ERR("value to add is not an object - \"%s\"\n", path_s.s); goto fail; } }else if(STR_EQ_STATIC(type_s, "array")) { value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); if(value && !json_is_array(value)) { - ERR("value to add is not an array\n"); + ERR("value to add is not an array - \"%s\"\n", path_s.s); goto fail; } @@ -157,7 +157,7 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, || STR_EQ_STATIC(type_s, "str")) { value = json_string(value_s.s); if(!value || !json_is_string(value)) { - ERR("value to add is not a string\n"); + ERR("value to add is not a string - \"%s\"\n", path_s.s); goto fail; } @@ -165,24 +165,24 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, || STR_EQ_STATIC(type_s, "int")) { long long i = strtoll(value_s.s, &endptr, 10); if(*endptr != '\0') { - ERR("parsing int failed for \"%s\"\n", value_s.s); + ERR("parsing int failed for \"%s\" - \"%s\"\n", path_s.s, value_s.s); goto fail; } value = json_integer(i); if(!value || !json_is_integer(value)) { - ERR("value to add is not an integer\n"); + ERR("value to add is not an integer \"%s\"\n", path_s.s); goto fail; } }else if(STR_EQ_STATIC(type_s, "real")) { double d = strtod(value_s.s, &endptr); if(*endptr != '\0') { - ERR("parsing real failed for \"%s\"\n", value_s.s); + ERR("parsing real failed for \"%s\" - \"%s\"\n", path_s.s, value_s.s); goto fail; } value = json_real(d); if(!value || !json_is_real(value)) { - ERR("value to add is not a real\n"); + ERR("value to add is not a real \"%s\"\n", path_s.s); goto fail; }

7 years, 8 months

git:master:918cde9f: jansson: add path to error log for easier debugging

by Kelvin Chua

Module: kamailio Branch: master Commit: 918cde9f30341fc52b98fb1ce6a2fcf78a0b6a0e URL: https://github.com/kamailio/kamailio/commit/918cde9f30341fc52b98fb1ce6a2fcf… Author: Kelvin Chua <kelchy(a)gmail.com> Committer: Kelvin Chua <kelchy(a)gmail.com> Date: 2017-01-26T15:52:49Z jansson: add path to error log for easier debugging --- Modified: src/modules/jansson/jansson_funcs.c --- Diff: https://github.com/kamailio/kamailio/commit/918cde9f30341fc52b98fb1ce6a2fcf… Patch: https://github.com/kamailio/kamailio/commit/918cde9f30341fc52b98fb1ce6a2fcf… --- diff --git a/src/modules/jansson/jansson_funcs.c b/src/modules/jansson/jansson_funcs.c index 5637560..9f82243 100644 --- a/src/modules/jansson/jansson_funcs.c +++ b/src/modules/jansson/jansson_funcs.c @@ -142,14 +142,14 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, if(STR_EQ_STATIC(type_s, "object") || STR_EQ_STATIC(type_s, "obj")){ value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); if(value && !json_is_object(value)) { - ERR("value to add is not an object\n"); + ERR("value to add is not an object - \"%s\"\n", path_s.s); goto fail; } }else if(STR_EQ_STATIC(type_s, "array")) { value = json_loads(value_s.s, JSON_REJECT_DUPLICATES, &parsing_error); if(value && !json_is_array(value)) { - ERR("value to add is not an array\n"); + ERR("value to add is not an array - \"%s\"\n", path_s.s); goto fail; } @@ -157,7 +157,7 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, || STR_EQ_STATIC(type_s, "str")) { value = json_string(value_s.s); if(!value || !json_is_string(value)) { - ERR("value to add is not a string\n"); + ERR("value to add is not a string - \"%s\"\n", path_s.s); goto fail; } @@ -165,24 +165,24 @@ int janssonmod_set(unsigned int append, struct sip_msg* msg, char* type_in, || STR_EQ_STATIC(type_s, "int")) { long long i = strtoll(value_s.s, &endptr, 10); if(*endptr != '\0') { - ERR("parsing int failed for \"%s\"\n", value_s.s); + ERR("parsing int failed for \"%s\" - \"%s\"\n", path_s.s, value_s.s); goto fail; } value = json_integer(i); if(!value || !json_is_integer(value)) { - ERR("value to add is not an integer\n"); + ERR("value to add is not an integer \"%s\"\n", path_s.s); goto fail; } }else if(STR_EQ_STATIC(type_s, "real")) { double d = strtod(value_s.s, &endptr); if(*endptr != '\0') { - ERR("parsing real failed for \"%s\"\n", value_s.s); + ERR("parsing real failed for \"%s\" - \"%s\"\n", path_s.s, value_s.s); goto fail; } value = json_real(d); if(!value || !json_is_real(value)) { - ERR("value to add is not a real\n"); + ERR("value to add is not a real \"%s\"\n", path_s.s); goto fail; }

7 years, 8 months

[kamailio/kamailio] jansson: add path to error log for easier debugging (#951)

by kelchy

You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/951 -- Commit Summary -- * jansson: add path to error log for easier debugging -- File Changes -- M src/modules/jansson/jansson_funcs.c (14) -- Patch Links -- https://github.com/kamailio/kamailio/pull/951.patch https://github.com/kamailio/kamailio/pull/951.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/951

7 years, 8 months

git:master:25aeed98: core: allow setting shm_mem_size in cfg if it still holds default value

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: 25aeed98a773fb796de47703a72532e5c0345f6c URL: https://github.com/kamailio/kamailio/commit/25aeed98a773fb796de47703a72532e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-26T17:02:05+01:00 core: allow setting shm_mem_size in cfg if it still holds default value - reported by Maxim Malygin, GH #950 --- Modified: src/core/cfg.y --- Diff: https://github.com/kamailio/kamailio/commit/25aeed98a773fb796de47703a72532e… Patch: https://github.com/kamailio/kamailio/commit/25aeed98a773fb796de47703a72532e… --- diff --git a/src/core/cfg.y b/src/core/cfg.y index f92559a..1326177 100644 --- a/src/core/cfg.y +++ b/src/core/cfg.y @@ -1436,7 +1436,7 @@ assign_stm: if (shm_initialized()) yyerror("shm/shm_mem_size must be before any modparam or the" " route blocks"); - else if (shm_mem_size == 0) + else if (shm_mem_size == 0 || shm_mem_size == SHM_MEM_POOL_SIZE) shm_mem_size=$3 * 1024 * 1024; } | SHM_MEM_SZ EQUAL error { yyerror("number expected"); }

7 years, 8 months

Query on kamctl

by Tapu Ghose

Hello, I recently started using Kamailio. At this point I am trying to understand how Kamailio works. If I understood correctly, "kamctl stats" dumps bunch of statistics. I was wondering the source of these stat data. I am trying to add some new stat data for our project. So far I understood that "kamctl stats" call get_statistics (..module/kex/core_stats.c) which in turns call counter_iterate_group_name (../counters.c). There I noticed a callback function "cbk". I am sort of stuck here. It will be highly appreciated if you give some hints on how to proceed. Looking forward to hear from you soon. My apologies in advance for the inconvenience. Thank you. Regards, Tapu Ghose. SDE, Ottawa, Cananda.

7 years, 8 months

git:master:7ae1384c: kazoo: avoid WARNING:qm_free: free(0) when kamailio shuts down on config parsing errors

by Ovidiu Sas

Module: kamailio Branch: master Commit: 7ae1384c7b944b4f6d49ad7deb5586cc4e397882 URL: https://github.com/kamailio/kamailio/commit/7ae1384c7b944b4f6d49ad7deb5586c… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: 2017-01-24T12:33:54-05:00 kazoo: avoid WARNING:qm_free: free(0) when kamailio shuts down on config parsing errors --- Modified: src/modules/kazoo/kazoo.c Modified: src/modules/kazoo/kz_amqp.c --- Diff: https://github.com/kamailio/kamailio/commit/7ae1384c7b944b4f6d49ad7deb5586c… Patch: https://github.com/kamailio/kamailio/commit/7ae1384c7b944b4f6d49ad7deb5586c… --- diff --git a/src/modules/kazoo/kazoo.c b/src/modules/kazoo/kazoo.c index 7d4b03e..8c44391 100644 --- a/src/modules/kazoo/kazoo.c +++ b/src/modules/kazoo/kazoo.c @@ -463,8 +463,8 @@ static int fire_init_event(int rank) static void mod_destroy(void) { kz_amqp_destroy(); - shm_free(kz_worker_pipes_fds); - shm_free(kz_worker_pipes); + if (kz_worker_pipes_fds) { shm_free(kz_worker_pipes_fds); } + if (kz_worker_pipes) { shm_free(kz_worker_pipes); } } diff --git a/src/modules/kazoo/kz_amqp.c b/src/modules/kazoo/kz_amqp.c index 9c802aa..2111e89 100644 --- a/src/modules/kazoo/kz_amqp.c +++ b/src/modules/kazoo/kz_amqp.c @@ -604,7 +604,7 @@ kz_amqp_server_ptr kz_amqp_destroy_server(kz_amqp_server_ptr server_ptr) kz_amqp_server_ptr next = server_ptr->next; kz_amqp_destroy_connection(server_ptr->connection); kz_amqp_destroy_channels(server_ptr); - shm_free(server_ptr->producer); + if (server_ptr->producer) { shm_free(server_ptr->producer); } shm_free(server_ptr); return next; }

7 years, 8 months

git:4.4:bd8ca757: htable: use custom column name for order by in db load

by Daniel-Constantin Mierla

Module: kamailio Branch: 4.4 Commit: bd8ca7573c3b840846f346a97de927fec2d04d6b URL: https://github.com/kamailio/kamailio/commit/bd8ca7573c3b840846f346a97de927f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-25T14:48:36+01:00 htable: use custom column name for order by in db load - reported by Sebastian Damm, GH #948 (cherry picked from commit a9ffc2a1f7514a7bd4ff0e294e3bcb50d3a2bf07) --- Modified: modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/bd8ca7573c3b840846f346a97de927f… Patch: https://github.com/kamailio/kamailio/commit/bd8ca7573c3b840846f346a97de927f… --- diff --git a/modules/htable/ht_db.c b/modules/htable/ht_db.c index e1ab7da..d5a5a54 100644 --- a/modules/htable/ht_db.c +++ b/modules/htable/ht_db.c @@ -204,6 +204,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) return -1; } if(ht->ncols>0) { + db_ord = &ht->scols[0]; for(c=0; c<ht->ncols; c++) { db_cols[c] = &ht->scols[c]; }

7 years, 8 months

git:master:a9ffc2a1: htable: use custom column name for order by in db load

by Daniel-Constantin Mierla

Module: kamailio Branch: master Commit: a9ffc2a1f7514a7bd4ff0e294e3bcb50d3a2bf07 URL: https://github.com/kamailio/kamailio/commit/a9ffc2a1f7514a7bd4ff0e294e3bcb5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-01-25T14:45:51+01:00 htable: use custom column name for order by in db load - reported by Sebastian Damm, GH #948 --- Modified: src/modules/htable/ht_db.c --- Diff: https://github.com/kamailio/kamailio/commit/a9ffc2a1f7514a7bd4ff0e294e3bcb5… Patch: https://github.com/kamailio/kamailio/commit/a9ffc2a1f7514a7bd4ff0e294e3bcb5… --- diff --git a/src/modules/htable/ht_db.c b/src/modules/htable/ht_db.c index 6f61e76..fd692ca 100644 --- a/src/modules/htable/ht_db.c +++ b/src/modules/htable/ht_db.c @@ -204,6 +204,7 @@ int ht_db_load_table(ht_t *ht, str *dbtable, int mode) return -1; } if(ht->ncols>0) { + db_ord = &ht->scols[0]; for(c=0; c<ht->ncols; c++) { db_cols[c] = &ht->scols[c]; }

7 years, 8 months

RFC: Kamailio tutorials/cookbooks/docs - wiki or markdown

by Daniel-Constantin Mierla

Hello, I want to start a discussion about some of the kamailio tutorials from the wiki, mainly those related to core cookbook, variables and transformations. They are now in dokuwiki at: - https://www.kamailio.org/wiki/#cookbooks The wiki served us pretty well so far, however the contributions there are not that active. From time to time we still get spammers, even we added restriction that only registered and authenticated users can write. I am thinking that maybe people don't like creating yet another account just add some example or rephrase for clarity. On the other hand, there are over 400 registered users, many of them I expect to be either made because if misunderstanding the purpose or by spammers that guessed the (sip) captcha (plenty of random usernames). Besides that I think the wiki adds overhead when releasing a new version as each time we have to copy and paste old version content to a new set of pages and update the version number. With the above in mind, I wonder if won't be better to store those tutorials in markdown format and use mkdocs.org or gitbook (https://github.com/GitbookIO/gitbook) tools to generate the html and host it in kamailio.org. The wiki will still be used to index them. Among the benefits I see: * store in github.com (a new repo, like: kamailio-docs) and all devs can contribute directly, other users can make pull requests * create branches for each major version of kamailio and backport across them with git whenever is applicable * the edit can be done directly via github.com website (similar to the wiki right now) and even read it directly from github in html transformed from markdown by github * one can get them offline by cloning the git repo, use them or enhance when offline Many if the tutorials will stay in the wiki, but I think those that are related to documenting per kamailio version should be migrated to gihub storage + markdown. If there is a strong pro opinion for this change, I can try to convert one of the cookbooks very soon so people can feel better the difference. If we get to a consensus, then I think we can have those tutorials in the new format for v5.0. Should anyone have comments, other suggestions or improvements, let's put them on debate. Cheers, Daniel -- Daniel-Constantin Mierla www.twitter.com/miconda -- www.linkedin.com/in/miconda Kamailio Advanced Training - Mar 6-8 (Europe) and Mar 20-22 (USA) - www.asipto.com Kamailio World Conference - May 8-10, 2017 - www.kamailioworld.com

7 years, 8 months

git:4.4:e9d57601: Merge pull request #946 from kamailio/lazedo-patch-3

by GitHub

Module: kamailio Branch: 4.4 Commit: e9d576019622059b0b0b6d4d6ca27940662fb605 URL: https://github.com/kamailio/kamailio/commit/e9d576019622059b0b0b6d4d6ca2794… Author: lazedo <luis.azedo(a)factorlusitano.com> Committer: GitHub <noreply(a)github.com> Date: 2017-01-24T12:55:12Z Merge pull request #946 from kamailio/lazedo-patch-3 tm: apply new updates with Via with updated request --- Modified: modules/tm/uac.c --- Diff: https://github.com/kamailio/kamailio/commit/e9d576019622059b0b0b6d4d6ca2794… Patch: https://github.com/kamailio/kamailio/commit/e9d576019622059b0b0b6d4d6ca2794… --- diff --git a/modules/tm/uac.c b/modules/tm/uac.c index 8c3a485..93ed0c9 100644 --- a/modules/tm/uac.c +++ b/modules/tm/uac.c @@ -426,7 +426,7 @@ static inline int t_uac_prepare(uac_req_t *uac_r, LM_DBG("apply new updates with Via to sip msg\n"); buf1 = build_req_buf_from_sip_req(&lreq, - (unsigned int*)&buf_len1, &dst, BUILD_IN_SHM); + (unsigned int*)&buf_len1, &request->dst, BUILD_IN_SHM); if (likely(buf1)){ shm_free(buf); buf = buf1;

7 years, 8 months

← Newer
1
...
9
10
11
12
13
14
15
...
54
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2017