sr-dev May 2015

sr-dev@lists.kamailio.org

34 participants
297 discussions

git:master:883760dc: lib/binrpc: initialize val to avoid compiler warnings
by Daniel-Constantin Mierla 06 May '15

06 May '15

Module: kamailio Branch: master Commit: 883760dc931418eb722975a2ba0c665e5393d500 URL: https://github.com/kamailio/kamailio/commit/883760dc931418eb722975a2ba0c665… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-07T00:18:04+02:00 lib/binrpc: initialize val to avoid compiler warnings - reported by Juha Heinanen --- Modified: lib/binrpc/binrpc_api.c --- Diff: https://github.com/kamailio/kamailio/commit/883760dc931418eb722975a2ba0c665… Patch: https://github.com/kamailio/kamailio/commit/883760dc931418eb722975a2ba0c665… --- diff --git a/lib/binrpc/binrpc_api.c b/lib/binrpc/binrpc_api.c index 1d4c41c..656b623 100644 --- a/lib/binrpc/binrpc_api.c +++ b/lib/binrpc/binrpc_api.c @@ -1151,6 +1151,7 @@ int binrpc_response_to_text( goto error; } + memset(&val, 0, sizeof(struct binrpc_val)); resp_handle->in_pkt.offset = resp_handle->in_pkt.in_struct = resp_handle->in_pkt.in_array = 0; p=resp_handle->reply_buf;

1 0

git:master:0870a36d: app_lua: fixed index of param array for some mongo api functions
by Daniel-Constantin Mierla 06 May '15

06 May '15

Module: kamailio Branch: master Commit: 0870a36d4c94f70d88f4c6e80aafd12ec402fb22 URL: https://github.com/kamailio/kamailio/commit/0870a36d4c94f70d88f4c6e80aafd12… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-07T00:09:58+02:00 app_lua: fixed index of param array for some mongo api functions - reported by Juha Heinanen --- Modified: modules/app_lua/app_lua_exp.c --- Diff: https://github.com/kamailio/kamailio/commit/0870a36d4c94f70d88f4c6e80aafd12… Patch: https://github.com/kamailio/kamailio/commit/0870a36d4c94f70d88f4c6e80aafd12… --- diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index e168ae9..6853b2d 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -2752,7 +2752,7 @@ static int lua_sr_ndb_mongodb_next_reply(lua_State *L) } param[0].s = (char *) lua_tostring(L, -1); - param[0].len = strlen(param[4].s); + param[0].len = strlen(param[0].s); ret = _lua_ndb_mongodbb.next_reply(&param[0]); @@ -2779,7 +2779,7 @@ static int lua_sr_ndb_mongodb_free_reply(lua_State *L) } param[0].s = (char *) lua_tostring(L, -1); - param[0].len = strlen(param[4].s); + param[0].len = strlen(param[0].s); ret = _lua_ndb_mongodbb.free_reply(&param[0]);

1 0

git:master:4d24e42e: uac: relocate setting flag for outgoing registration
by Daniel-Constantin Mierla 06 May '15

06 May '15

Module: kamailio Branch: master Commit: 4d24e42e127d4157e040512cac81a9548623748b URL: https://github.com/kamailio/kamailio/commit/4d24e42e127d4157e040512cac81a95… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-06T23:49:37+02:00 uac: relocate setting flag for outgoing registration - avoid letting it set in case of low shared memory - removed redundate reset of the same flag --- Modified: modules/uac/uac_reg.c --- Diff: https://github.com/kamailio/kamailio/commit/4d24e42e127d4157e040512cac81a95… Patch: https://github.com/kamailio/kamailio/commit/4d24e42e127d4157e040512cac81a95… --- diff --git a/modules/uac/uac_reg.c b/modules/uac/uac_reg.c index 5bf24eb..c56afef 100644 --- a/modules/uac/uac_reg.c +++ b/modules/uac/uac_reg.c @@ -898,7 +898,6 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) } error: - ri->flags &= ~(UAC_REG_ONGOING|UAC_REG_AUTHSENT); if(reg_retry_interval) { ri->timer_expires = time(NULL) + reg_retry_interval; } else { @@ -935,16 +934,16 @@ int uac_reg_update(reg_uac_t *reg, time_t tn) return 4; if(reg->timer_expires > tn + reg_timer_interval + 3) return 3; - reg->timer_expires = tn; - reg->flags |= UAC_REG_ONGOING; - reg->flags &= ~UAC_REG_ONLINE; - counter_add(regactive, -1); /* Take it out of the active pool while re-registering */ uuid = (char*)shm_malloc(reg->l_uuid.len+1); if(uuid==NULL) { LM_ERR("no more shm\n"); return -1; } + reg->timer_expires = tn; + reg->flags |= UAC_REG_ONGOING; + reg->flags &= ~UAC_REG_ONLINE; + counter_add(regactive, -1); /* Take it out of the active pool while re-registering */ memcpy(uuid, reg->l_uuid.s, reg->l_uuid.len); uuid[reg->l_uuid.len] = '\0';

1 0

git:tmp/usrloc-partition:ed2cbfe9: kamctl: regenerated db schema for location table
by Daniel-Constantin Mierla 06 May '15

06 May '15

Module: kamailio Branch: tmp/usrloc-partition Commit: ed2cbfe921a072852c50eaf3f1eeeb19125dc3d0 URL: https://github.com/kamailio/kamailio/commit/ed2cbfe921a072852c50eaf3f1eeeb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-06T18:11:58+02:00 kamctl: regenerated db schema for location table --- Modified: utils/kamctl/db_berkeley/kamailio/location Modified: utils/kamctl/db_sqlite/usrloc-create.sql Modified: utils/kamctl/dbtext/kamailio/location Modified: utils/kamctl/mysql/usrloc-create.sql Modified: utils/kamctl/oracle/usrloc-create.sql Modified: utils/kamctl/postgres/usrloc-create.sql Modified: utils/kamctl/xhttp_pi/pi_framework.xml Modified: utils/kamctl/xhttp_pi/usrloc-mod Modified: utils/kamctl/xhttp_pi/usrloc-table --- Diff: https://github.com/kamailio/kamailio/commit/ed2cbfe921a072852c50eaf3f1eeeb1… Patch: https://github.com/kamailio/kamailio/commit/ed2cbfe921a072852c50eaf3f1eeeb1…

1 0

git:tmp/usrloc-partition:5f313038: nathelper: set the max partition for keepalives in usrloc
by Daniel-Constantin Mierla 06 May '15

06 May '15

Module: kamailio Branch: tmp/usrloc-partition Commit: 5f313038b3b9a17a840ccf8c2eba86f2de867591 URL: https://github.com/kamailio/kamailio/commit/5f313038b3b9a17a840ccf8c2eba86f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-06T18:11:08+02:00 nathelper: set the max partition for keepalives in usrloc - used to distribute registration records for db only mode in usrloc --- Modified: modules/nathelper/nathelper.c --- Diff: https://github.com/kamailio/kamailio/commit/5f313038b3b9a17a840ccf8c2eba86f… Patch: https://github.com/kamailio/kamailio/commit/5f313038b3b9a17a840ccf8c2eba86f… --- diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index 81d2cac..14880a7 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -675,6 +675,7 @@ mod_init(void) LM_ERR("bad config - natping_processes must be >= 0\n"); return -1; } + ul.set_max_partition(natping_processes*natping_interval); sipping_flag = (sipping_flag==-1)?0:(1<<sipping_flag); natping_disable_flag = (natping_disable_flag==-1)?0:(1<<natping_disable_flag);

1 0

git:tmp/usrloc-partition:b615a96a: usrloc: fetching of records for nat keepalives in db only is done using partion column
by Daniel-Constantin Mierla 06 May '15

06 May '15

Module: kamailio Branch: tmp/usrloc-partition Commit: b615a96a1d823d2454e084b2c539b36fb199cf51 URL: https://github.com/kamailio/kamailio/commit/b615a96a1d823d2454e084b2c539b36… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-06T18:09:39+02:00 usrloc: fetching of records for nat keepalives in db only is done using partion column - don't use the module over auto incremented column, not being common to all db engines --- Modified: modules/usrloc/dlist.c Modified: modules/usrloc/dlist.h Modified: modules/usrloc/ucontact.c Modified: modules/usrloc/ul_mod.c Modified: modules/usrloc/ul_mod.h Modified: modules/usrloc/usrloc.c Modified: modules/usrloc/usrloc.h --- Diff: https://github.com/kamailio/kamailio/commit/b615a96a1d823d2454e084b2c539b36… Patch: https://github.com/kamailio/kamailio/commit/b615a96a1d823d2454e084b2c539b36…

1 0

git:tmp/usrloc-partition:c37d6d5c: srdb1: added partition column for location table
by Daniel-Constantin Mierla 06 May '15

06 May '15

Module: kamailio Branch: tmp/usrloc-partition Commit: c37d6d5c3d6f6e7b019f25096cf9f317b8272fe9 URL: https://github.com/kamailio/kamailio/commit/c37d6d5c3d6f6e7b019f25096cf9f31… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-06T18:08:50+02:00 srdb1: added partition column for location table - to be used for db-only nat keepalives distribution --- Modified: lib/srdb1/schema/location.xml --- Diff: https://github.com/kamailio/kamailio/commit/c37d6d5c3d6f6e7b019f25096cf9f31… Patch: https://github.com/kamailio/kamailio/commit/c37d6d5c3d6f6e7b019f25096cf9f31… --- diff --git a/lib/srdb1/schema/location.xml b/lib/srdb1/schema/location.xml index a39cd52..decd95f 100644 --- a/lib/srdb1/schema/location.xml +++ b/lib/srdb1/schema/location.xml @@ -204,6 +204,15 @@ </column> + <column> + <name>partition</name> + <type>int</type> + <size>11</size> + <default>0</default> + <description>The value to of the partition for keep alive requests</description> + </column> + + <index> <name>account_contact_idx</name> <colref linkend="username"/>

1 0

RFC: Config files installation
by Daniel-Constantin Mierla 06 May '15

06 May '15

Hello, cross posting to get heads up of everyone that wants to join the discussion, however, do reply to sr-dev(a)lists.sip-router.org, being more related to development and project files structure. At this moment we install three kamailio configuration files: - kamailio.cfg - the default one to be used when starting kamailio - kamailio-basic.cfg - a more simple version of configuration - kamailio-advanced.cfg - a more complex version (equivalent of kamailio-oob.cfg in etc/ source tree) Somehow it was suggested that apart of kamailio.cfg, the other files belong more to the docs (shared) folder (where we put INSTALL, README, etc), because they are not actually used as configuration files by kamailio installation (one has to change either init.d script or copy over kamailio.cfg). Also, some are confused not knowing if they are used or not at runtime. Shall we relocate where those files are deployed by installation? Another point: we deploy the radius dictionary with the core. I think it should be deployed by a radius module and be part of radius modules package. The question is which module should deploy it? Is auth_radius fine for everyone? Alternative would be acc_radius. To complete the cleanup of etc/ folder in the source code, I think the sip-router*.cfg files should me moved to examples/, at quick look they are invalid, using paths to old ser modules, no longer available at this moment (therefore I guess nobody is using them). Opinions and other suggestions are very welcome! Cheers, Daniel -- Daniel-Constantin Mierla http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio World Conference, May 27-29, 2015 Berlin, Germany - http://www.kamailioworld.com

1 0

git:master:73d8d719: Merge pull request #150 from mslehto/patch-2
by Daniel-Constantin Mierla 06 May '15

06 May '15

Module: kamailio Branch: master Commit: 73d8d719497d596ab42cf37e94c8ea4a412f2141 URL: https://github.com/kamailio/kamailio/commit/73d8d719497d596ab42cf37e94c8ea4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-05-06T09:43:35+02:00 Merge pull request #150 from mslehto/patch-2 sctp: fix typo scp_register_rpc -> sctp_register_rpc --- Modified: modules/sctp/sctp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/73d8d719497d596ab42cf37e94c8ea4… Patch: https://github.com/kamailio/kamailio/commit/73d8d719497d596ab42cf37e94c8ea4… --- diff --git a/modules/sctp/sctp_rpc.c b/modules/sctp/sctp_rpc.c index 15dbd07..030774a 100644 --- a/modules/sctp/sctp_rpc.c +++ b/modules/sctp/sctp_rpc.c @@ -154,7 +154,7 @@ static void core_sctpinfo(rpc_t* rpc, void* c) /* * RPC Methods exported by this module */ -static rpc_export_t scp_rpc_methods[] = { +static rpc_export_t sctp_rpc_methods[] = { {"sctp.options", core_sctp_options, core_sctp_options_doc, 0}, {"sctp.info", core_sctpinfo, core_sctpinfo_doc, 0}, @@ -165,7 +165,7 @@ static rpc_export_t scp_rpc_methods[] = { int sctp_register_rpc(void) { - if (rpc_register_array(scp_rpc_methods)!=0) + if (rpc_register_array(sctp_rpc_methods)!=0) { LM_ERR("failed to register RPC commands\n"); return -1;

1 0

git:master:177b0d28: sctp: fix typo scp_register_rpc -> sctp_register_rpc
by Mikko Lehto 06 May '15

06 May '15

Module: kamailio Branch: master Commit: 177b0d2807763b13d30148f44c1cc4d3d765d67c URL: https://github.com/kamailio/kamailio/commit/177b0d2807763b13d30148f44c1cc4d… Author: Mikko Lehto <mslehto(a)iki.fi> Committer: Mikko Lehto <mslehto(a)iki.fi> Date: 2015-05-06T06:32:30+03:00 sctp: fix typo scp_register_rpc -> sctp_register_rpc --- Modified: modules/sctp/sctp_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/177b0d2807763b13d30148f44c1cc4d… Patch: https://github.com/kamailio/kamailio/commit/177b0d2807763b13d30148f44c1cc4d… --- diff --git a/modules/sctp/sctp_rpc.c b/modules/sctp/sctp_rpc.c index 15dbd07..030774a 100644 --- a/modules/sctp/sctp_rpc.c +++ b/modules/sctp/sctp_rpc.c @@ -154,7 +154,7 @@ static void core_sctpinfo(rpc_t* rpc, void* c) /* * RPC Methods exported by this module */ -static rpc_export_t scp_rpc_methods[] = { +static rpc_export_t sctp_rpc_methods[] = { {"sctp.options", core_sctp_options, core_sctp_options_doc, 0}, {"sctp.info", core_sctpinfo, core_sctpinfo_doc, 0}, @@ -165,7 +165,7 @@ static rpc_export_t scp_rpc_methods[] = { int sctp_register_rpc(void) { - if (rpc_register_array(scp_rpc_methods)!=0) + if (rpc_register_array(sctp_rpc_methods)!=0) { LM_ERR("failed to register RPC commands\n"); return -1;

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 May 2015