sr-dev January 2016

sr-dev@lists.kamailio.org

34 participants
295 discussions

[kamailio] db_text: add buffer size for reading text files (#490)

by lazedo

the static value of 4096 may not be enough when dealing with presence tables that have xml content You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/490 -- Commit Summary -- * db_text: add buffer size for reading text files -- File Changes -- M modules/db_text/README (84) M modules/db_text/dbt_file.c (15) M modules/db_text/dbt_lib.h (1) M modules/db_text/dbtext.c (4) M modules/db_text/doc/db_text_admin.xml (21) -- Patch Links -- https://github.com/kamailio/kamailio/pull/490.patch https://github.com/kamailio/kamailio/pull/490.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/490

8 years, 10 months

mem compiler warnings on trunk

by Ovidiu Sas

-- CC (gcc) [kamailio] mem/tlsf_malloc.o mem/tlsf_malloc.c: In function ‘tlsf_malloc_init_pkg_manager’: mem/tlsf_malloc.c:1353:16: warning: assignment from incompatible pointer type ma.xmalloc = tlsf_malloc; ^ mem/tlsf_malloc.c:1355:16: warning: assignment from incompatible pointer type ma.xrealloc = tlsf_realloc; ^ mem/tlsf_malloc.c:1358:16: warning: assignment from incompatible pointer type ma.xavailable = tlsf_available; ^ mem/tlsf_malloc.c: In function ‘tlsf_malloc_init_shm_manager’: mem/tlsf_malloc.c:1501:20: warning: assignment from incompatible pointer type ma.xmalloc_unsafe = tlsf_malloc; ^

8 years, 10 months

git:master:55350c0b: ims_charging: Added missing definition

by Carsten Bock

Module: kamailio Branch: master Commit: 55350c0b54cd2e884b8f97f8686dbcb98769a6f3 URL: https://github.com/kamailio/kamailio/commit/55350c0b54cd2e884b8f97f8686dbcb… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2016-01-26T19:30:20+01:00 ims_charging: Added missing definition --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/55350c0b54cd2e884b8f97f8686dbcb… Patch: https://github.com/kamailio/kamailio/commit/55350c0b54cd2e884b8f97f8686dbcb… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index 62f108c..e011036 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -63,6 +63,7 @@ extern int video_service_identifier; extern int video_rating_group; static int create_cca_return_code(int result); +static int create_cca_result_code(int result); static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, long elapsed_msecs); static void resume_on_interim_ccr(int is_timeout, void *param, AAAMessage *cca, long elapsed_msecs); static void resume_on_termination_ccr(int is_timeout, void *param, AAAMessage *cca, long elapsed_msecs);

8 years, 10 months

git:master:fb040b05: ims_charging: Added changes after previous commit

by Carsten Bock

Module: kamailio Branch: master Commit: fb040b05811b2979130bdf842345c927cd6c1888 URL: https://github.com/kamailio/kamailio/commit/fb040b05811b2979130bdf842345c92… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: 2016-01-26T18:41:37+01:00 ims_charging: Added changes after previous commit --- Modified: modules/ims_charging/ims_ro.c --- Diff: https://github.com/kamailio/kamailio/commit/fb040b05811b2979130bdf842345c92… Patch: https://github.com/kamailio/kamailio/commit/fb040b05811b2979130bdf842345c92… --- diff --git a/modules/ims_charging/ims_ro.c b/modules/ims_charging/ims_ro.c index ef27513..62f108c 100644 --- a/modules/ims_charging/ims_ro.c +++ b/modules/ims_charging/ims_ro.c @@ -1240,7 +1240,7 @@ int Ro_Send_CCR(struct sip_msg *msg, struct dlg_cell *dlg, int dir, int reservat if (ssd) shm_free(ssd); - return RO_RETURN_ERROR; + return RO_RETURN_ERROR; } static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, long elapsed_msecs) { @@ -1291,9 +1291,10 @@ static void resume_on_initial_ccr(int is_timeout, void *param, AAAMessage *cca, if (!ro_cca_data) { LM_ERR("Could not parse CCA message response.\n"); error_code = RO_RETURN_ERROR; + create_cca_result_code(0); goto error0; } - + create_cca_result_code((int)ro_cca_data->resultcode); if (ro_cca_data->resultcode != 2001) { LM_ERR("Got bad CCA result code - reservation failed"); error_code = RO_RETURN_FALSE; @@ -1435,10 +1436,10 @@ static int create_cca_result_code(int result) { avp_name.s.len = RO_AVP_CCA_RESULT_CODE_LENGTH; avp_val.n = result; - avp_val.s.s = RO_RETURN_TRUE_STR; //assume true - avp_val.s.len = 1; + avp_val.s.s = 0; + avp_val.s.len = 0; - rc = add_avp(AVP_NAME_STR | AVP_VAL_STR, avp_name, avp_val); + rc = add_avp(AVP_NAME_STR, avp_name, avp_val); if (rc < 0) LM_ERR("Couldn't create ["RO_AVP_CCA_RESULT_CODE"] AVP\n");

8 years, 10 months

git:master:5c7ee457: Merge pull request #429 from smititelu/KAMAILIO-29

by Richard Fuchs

Module: kamailio Branch: master Commit: 5c7ee4576ea353d8d2ffba66ea29c57cd2c26a7b URL: https://github.com/kamailio/kamailio/commit/5c7ee4576ea353d8d2ffba66ea29c57… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: 2016-01-26T12:34:01-05:00 Merge pull request #429 from smititelu/KAMAILIO-29 Rtpengine table changes --- Added: lib/srdb1/schema/kamailio-rtpengine.xml Added: lib/srdb1/schema/rtpengine.xml Added: utils/kamctl/db_berkeley/kamailio/rtpengine Added: utils/kamctl/db_sqlite/rtpengine-create.sql Added: utils/kamctl/dbtext/kamailio/rtpengine Added: utils/kamctl/mysql/rtpengine-create.sql Added: utils/kamctl/oracle/rtpengine-create.sql Added: utils/kamctl/postgres/rtpengine-create.sql Added: utils/kamctl/xhttp_pi/rtpengine-mod Added: utils/kamctl/xhttp_pi/rtpengine-table Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_db.c Modified: utils/kamctl/db_berkeley/kamailio/version Modified: utils/kamctl/dbtext/kamailio/version Modified: utils/kamctl/xhttp_pi/pi_framework.xml --- Diff: https://github.com/kamailio/kamailio/commit/5c7ee4576ea353d8d2ffba66ea29c57… Patch: https://github.com/kamailio/kamailio/commit/5c7ee4576ea353d8d2ffba66ea29c57…

8 years, 10 months

git:master:789dec73: rtpengine: rebuild rtpp_socks before send command

by Stefan Mititelu

Module: kamailio Branch: master Commit: 789dec73bd5f906b47ad95ee4e55ba2db3d7d3e2 URL: https://github.com/kamailio/kamailio/commit/789dec73bd5f906b47ad95ee4e55ba2… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2016-01-22T16:39:59+02:00 rtpengine: rebuild rtpp_socks before send command - update node selection only from displayed nodes - update rtpp_set_list alocation from get_rtpp_set() to mod_init(); thus all procs will have reference to the list of sets. - add locks for rtpp_set_head and rtpp_set - make rtpp_no shm variable guarded by rtpp_no_lock - add rtpp_socks_size pkg variable - compare rtpp_socks_size with rtpp_no and rebuild rtpp_socks if they differ --- Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/789dec73bd5f906b47ad95ee4e55ba2… Patch: https://github.com/kamailio/kamailio/commit/789dec73bd5f906b47ad95ee4e55ba2…

8 years, 10 months

git:master:b79d2343: rtpengine: Don't add invalid URL node, in db mode

by Stefan Mititelu

Module: kamailio Branch: master Commit: b79d23436bbfceb0debb8ff829b5ff8d2e49c46d URL: https://github.com/kamailio/kamailio/commit/b79d23436bbfceb0debb8ff829b5ff8… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-11T17:21:16+02:00 rtpengine: Don't add invalid URL node, in db mode Don't continue parsing the node url if errors were spotted, in db mode. --- Modified: modules/rtpengine/rtpengine.c --- Diff: https://github.com/kamailio/kamailio/commit/b79d23436bbfceb0debb8ff829b5ff8… Patch: https://github.com/kamailio/kamailio/commit/b79d23436bbfceb0debb8ff829b5ff8… --- diff --git a/modules/rtpengine/rtpengine.c b/modules/rtpengine/rtpengine.c index 4af1c5e..8481c43 100644 --- a/modules/rtpengine/rtpengine.c +++ b/modules/rtpengine/rtpengine.c @@ -794,7 +794,12 @@ int add_rtpengine_socks(struct rtpp_set * rtpp_list, char * rtpproxy, rtpp_no--; shm_free(pnode->rn_url.s); shm_free(pnode); - continue; + + if (!isDB) { + continue; + } else { + return 0; + } } /* Check the rn_address is 'hostname:port' */ @@ -812,7 +817,12 @@ int add_rtpengine_socks(struct rtpp_set * rtpp_list, char * rtpproxy, rtpp_no--; shm_free(pnode->rn_url.s); shm_free(pnode); - continue; + + if (!isDB) { + continue; + } else { + return 0; + } } }

8 years, 10 months

git:master:98877b5b: rtpengine: Add code indentation

by Stefan Mititelu

Module: kamailio Branch: master Commit: 98877b5b393e4f7d0ec4127f6964f2b2ad24ab64 URL: https://github.com/kamailio/kamailio/commit/98877b5b393e4f7d0ec4127f6964f2b… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-11T13:49:09+02:00 rtpengine: Add code indentation Add proper tab-like code indentation. --- Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h --- Diff: https://github.com/kamailio/kamailio/commit/98877b5b393e4f7d0ec4127f6964f2b… Patch: https://github.com/kamailio/kamailio/commit/98877b5b393e4f7d0ec4127f6964f2b…

8 years, 10 months

git:master:5ce6df2d: rtpengine: Add hiding of deleted table nodes

by Stefan Mititelu

Module: kamailio Branch: master Commit: 5ce6df2d3aee023f0e2d4f9cad14d6e560557ae2 URL: https://github.com/kamailio/kamailio/commit/5ce6df2d3aee023f0e2d4f9cad14d6e… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-11T12:25:33+02:00 rtpengine: Add hiding of deleted table nodes 'kamctl fifo nh_show_rtpp all' reflects the rtpengine table state. When node is deleted from the table the node itself isn't freed but disabled permanent and hidden for display. This is mainly because one might want the current session to finish for the deleted table nodes (see allow_op modparam). Hiding the nodes and not freeing them will spare time deciding if there are any sessions left for the deleted rtpengine. --- Modified: modules/rtpengine/doc/rtpengine_admin.xml Modified: modules/rtpengine/rtpengine.c Modified: modules/rtpengine/rtpengine.h Modified: modules/rtpengine/rtpengine_db.c --- Diff: https://github.com/kamailio/kamailio/commit/5ce6df2d3aee023f0e2d4f9cad14d6e… Patch: https://github.com/kamailio/kamailio/commit/5ce6df2d3aee023f0e2d4f9cad14d6e…

8 years, 10 months

git:master:65750d34: rtpengine: Update kamailio-db-devel db scripts

by Stefan Mititelu

Module: kamailio Branch: master Commit: 65750d3422f97568623036a027ddebcbe636198d URL: https://github.com/kamailio/kamailio/commit/65750d3422f97568623036a027ddebc… Author: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Committer: Stefan Mititelu <stefan.mititelu(a)1and1.ro> Date: 2015-12-10T14:29:00+02:00 rtpengine: Update kamailio-db-devel db scripts Add rtpengine 'utils/kamctl/$dbschema' scripts. --- Added: utils/kamctl/db_berkeley/kamailio/rtpengine Added: utils/kamctl/db_sqlite/rtpengine-create.sql Added: utils/kamctl/dbtext/kamailio/rtpengine Added: utils/kamctl/mysql/rtpengine-create.sql Added: utils/kamctl/oracle/rtpengine-create.sql Added: utils/kamctl/postgres/rtpengine-create.sql Added: utils/kamctl/xhttp_pi/rtpengine-mod Added: utils/kamctl/xhttp_pi/rtpengine-table --- Diff: https://github.com/kamailio/kamailio/commit/65750d3422f97568623036a027ddebc… Patch: https://github.com/kamailio/kamailio/commit/65750d3422f97568623036a027ddebc…

8 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
30
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2016