sr-dev May 2010

sr-dev@lists.kamailio.org

18 participants
140 discussions

git:sr_3.0: modules_k/permissions: backported address table reload fix from master
by Juha Heinanen 09 May '10

09 May '10

Module: sip-router Branch: sr_3.0 Commit: c8390476a7d30a0352beeb434920947730965a53 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c839047… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun May 9 15:55:22 2010 +0300 modules_k/permissions: backported address table reload fix from master --- modules_k/permissions/address.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 126c8d8..63c0cf1 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -78,6 +78,17 @@ int reload_address_table(void) cols[2] = &mask_col; cols[3] = &port_col; + if (db_handle) { + LM_ERR("db_handle already exists\n"); + return -1; + } + + db_handle = perm_dbf.init(&db_url); + if (!db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } + if (perm_dbf.use_table(db_handle, &address_table) < 0) { LM_ERR("failed to use table\n"); return -1; @@ -161,6 +172,9 @@ int reload_address_table(void) perm_dbf.free_result(db_handle, res); + perm_dbf.close(db_handle); + db_handle = 0; + *addr_hash_table = new_hash_table; *subnet_table = new_subnet_table; @@ -203,9 +217,13 @@ int init_addresses(void) if(db_check_table_version(&perm_dbf, db_handle, &address_table, TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); perm_dbf.close(db_handle); + db_handle = 0; return -1; } + perm_dbf.close(db_handle); + db_handle = 0; + addr_hash_table_1 = new_addr_hash_table(); if (!addr_hash_table_1) return -1; @@ -234,9 +252,6 @@ int init_addresses(void) goto error; } - perm_dbf.close(db_handle); - db_handle = 0; - return 0; error: @@ -265,8 +280,6 @@ error: shm_free(subnet_table); subnet_table = 0; } - perm_dbf.close(db_handle); - db_handle = 0; return -1; }

1 0

git:kamailio_3.0: modules_k/permissions: backported address table reload fix from master
by Juha Heinanen 09 May '10

09 May '10

Module: sip-router Branch: kamailio_3.0 Commit: b0091da84ee5bbbc18cb799eefc497be707ab0f9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0091da… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun May 9 15:55:22 2010 +0300 modules_k/permissions: backported address table reload fix from master --- modules_k/permissions/address.c | 23 ++++++++++++++++++----- 1 files changed, 18 insertions(+), 5 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 126c8d8..63c0cf1 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -78,6 +78,17 @@ int reload_address_table(void) cols[2] = &mask_col; cols[3] = &port_col; + if (db_handle) { + LM_ERR("db_handle already exists\n"); + return -1; + } + + db_handle = perm_dbf.init(&db_url); + if (!db_handle) { + LM_ERR("unable to connect database\n"); + return -1; + } + if (perm_dbf.use_table(db_handle, &address_table) < 0) { LM_ERR("failed to use table\n"); return -1; @@ -161,6 +172,9 @@ int reload_address_table(void) perm_dbf.free_result(db_handle, res); + perm_dbf.close(db_handle); + db_handle = 0; + *addr_hash_table = new_hash_table; *subnet_table = new_subnet_table; @@ -203,9 +217,13 @@ int init_addresses(void) if(db_check_table_version(&perm_dbf, db_handle, &address_table, TABLE_VERSION) < 0) { LM_ERR("error during table version check.\n"); perm_dbf.close(db_handle); + db_handle = 0; return -1; } + perm_dbf.close(db_handle); + db_handle = 0; + addr_hash_table_1 = new_addr_hash_table(); if (!addr_hash_table_1) return -1; @@ -234,9 +252,6 @@ int init_addresses(void) goto error; } - perm_dbf.close(db_handle); - db_handle = 0; - return 0; error: @@ -265,8 +280,6 @@ error: shm_free(subnet_table); subnet_table = 0; } - perm_dbf.close(db_handle); - db_handle = 0; return -1; }

1 0

git:kamailio_3.0: avposp: use state in searching first avp in avp_copy
by Daniel-Constantin Mierla 06 May '10

06 May '10

Module: sip-router Branch: kamailio_3.0 Commit: 59894cc9d53b03494753a00c4057c595afc3e5c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59894cc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 21:09:47 2010 +0200 avposp: use state in searching first avp in avp_copy - state parameter was missing when searching first avp, keeping it uninitialized when searching the next, causing a crash when flag 'g' was used in avp_copy - reported by Jon Bonilla (Manwe) (cherry picked from commit 027d68e9cc7afcdb3ba8922215a28e33a5225097) --- modules/avpops/avpops_impl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 3817cd8..77de8a8 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -842,7 +842,7 @@ int ops_copy_avp( struct sip_msg* msg, struct fis_param* src, goto error; } - avp = search_first_avp( name_type1, avp_name1, &avp_val, 0); + avp = search_first_avp( name_type1, avp_name1, &avp_val, &st); while ( avp ) { /* build a new avp with new name, but old value */

1 0

git:master: avposp: use state in searching first avp in avp_copy
by Daniel-Constantin Mierla 06 May '10

06 May '10

Module: sip-router Branch: master Commit: 027d68e9cc7afcdb3ba8922215a28e33a5225097 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=027d68e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 21:09:47 2010 +0200 avposp: use state in searching first avp in avp_copy - state parameter was missing when searching first avp, keeping it uninitialized when searching the next, causing a crash when flag 'g' was used in avp_copy - reported by Jon Bonilla (Manwe) --- modules/avpops/avpops_impl.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 3817cd8..77de8a8 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -842,7 +842,7 @@ int ops_copy_avp( struct sip_msg* msg, struct fis_param* src, goto error; } - avp = search_first_avp( name_type1, avp_name1, &avp_val, 0); + avp = search_first_avp( name_type1, avp_name1, &avp_val, &st); while ( avp ) { /* build a new avp with new name, but old value */

1 0

git:master: tm: removed the defines of cfg and api functions
by Daniel-Constantin Mierla 06 May '10

06 May '10

Module: sip-router Branch: master Commit: de804eab627b01bab5f7872bc6a0bd281c5ab62a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=de804ea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 20:17:08 2010 +0200 tm: removed the defines of cfg and api functions --- modules/tm/tm.c | 46 +++++++++++++++++++++++----------------------- modules/tm/tm_load.c | 22 +++++++++++----------- modules/tm/tm_load.h | 26 -------------------------- 3 files changed, 34 insertions(+), 60 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=de8…

1 0

git:master: tm: use direct assignment to exported API
by Daniel-Constantin Mierla 06 May '10

06 May '10

Module: sip-router Branch: master Commit: f045c756a0e1da83526e709559e4287a62a0fdfe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f045c75… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 20:49:43 2010 +0200 tm: use direct assignment to exported API - non-cfg functions are exported via direct assignment, they do not follow cfg command prototype --- modules/tm/tm.c | 33 --------- modules/tm/tm_load.c | 185 +++++++++++--------------------------------------- 2 files changed, 39 insertions(+), 179 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=f04…

1 0

SF.net SVN: openser:[6005] branches/1.5/modules/dispatcher/dispatcher.c
by Daniel-Constantin Mierla 06 May '10

06 May '10

Revision: 6005 http://openser.svn.sourceforge.net/openser/?rev=6005&view=rev Author: miconda Date: 2010-05-06 17:14:28 +0000 (Thu, 06 May 2010) Log Message: ----------- - allow cfg functions from route block Modified Paths: -------------- branches/1.5/modules/dispatcher/dispatcher.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:kamailio_3.0: dispatcher(k): allow functions from route block
by Daniel-Constantin Mierla 06 May '10

06 May '10

Module: sip-router Branch: kamailio_3.0 Commit: d457367259419b776f0cde56ef35e9de9b5fffb9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d457367… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 18:51:45 2010 +0200 dispatcher(k): allow functions from route block - they do not depend on sip message itself, but script variables (cherry picked from commit 25680d4bc14a4502e118951873c6da8edfc7e9a7) --- modules_k/dispatcher/dispatcher.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 5f9901c..8b26be7 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -140,10 +140,10 @@ static int mi_child_init(void); static cmd_export_t cmds[]={ {"ds_select_dst", (cmd_function)w_ds_select_dst, 2, fixup_igp_igp, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"ds_select_domain", (cmd_function)w_ds_select_domain, 2, fixup_igp_igp, 0, REQUEST_ROUTE|FAILURE_ROUTE}, - {"ds_next_dst", (cmd_function)w_ds_next_dst, 0, ds_warn_fixup, 0, FAILURE_ROUTE}, - {"ds_next_domain", (cmd_function)w_ds_next_domain, 0, ds_warn_fixup, 0, FAILURE_ROUTE}, - {"ds_mark_dst", (cmd_function)w_ds_mark_dst0, 0, ds_warn_fixup, 0, FAILURE_ROUTE}, - {"ds_mark_dst", (cmd_function)w_ds_mark_dst1, 1, ds_warn_fixup, 0, FAILURE_ROUTE}, + {"ds_next_dst", (cmd_function)w_ds_next_dst, 0, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"ds_next_domain", (cmd_function)w_ds_next_domain, 0, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"ds_mark_dst", (cmd_function)w_ds_mark_dst0, 0, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"ds_mark_dst", (cmd_function)w_ds_mark_dst1, 1, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list0, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list1, 1, fixup_uint_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, {0,0,0,0,0,0}

1 0

git:master: dispatcher(k): allow functions from route block
by Daniel-Constantin Mierla 06 May '10

06 May '10

Module: sip-router Branch: master Commit: 25680d4bc14a4502e118951873c6da8edfc7e9a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25680d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 6 18:51:45 2010 +0200 dispatcher(k): allow functions from route block - they do not depend on sip message itself, but script variables --- modules_k/dispatcher/dispatcher.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 02ce218..48c7cd2 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -145,10 +145,10 @@ static int mi_child_init(void); static cmd_export_t cmds[]={ {"ds_select_dst", (cmd_function)w_ds_select_dst, 2, fixup_igp_igp, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"ds_select_domain", (cmd_function)w_ds_select_domain, 2, fixup_igp_igp, 0, REQUEST_ROUTE|FAILURE_ROUTE}, - {"ds_next_dst", (cmd_function)w_ds_next_dst, 0, ds_warn_fixup, 0, FAILURE_ROUTE}, - {"ds_next_domain", (cmd_function)w_ds_next_domain, 0, ds_warn_fixup, 0, FAILURE_ROUTE}, - {"ds_mark_dst", (cmd_function)w_ds_mark_dst0, 0, ds_warn_fixup, 0, FAILURE_ROUTE}, - {"ds_mark_dst", (cmd_function)w_ds_mark_dst1, 1, ds_warn_fixup, 0, FAILURE_ROUTE}, + {"ds_next_dst", (cmd_function)w_ds_next_dst, 0, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"ds_next_domain", (cmd_function)w_ds_next_domain, 0, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"ds_mark_dst", (cmd_function)w_ds_mark_dst0, 0, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + {"ds_mark_dst", (cmd_function)w_ds_mark_dst1, 1, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list0, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list1, 1, fixup_uint_null, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, {0,0,0,0,0,0}

1 0

Testing at SIPit 26
by Daniel-Constantin Mierla 06 May '10

06 May '10

Hello, anyone of you at SIPit 26 in about two weeks? http://sip-router.org/2010/05/05/testing-at-sipit-26/ http://www.kamailio.org/w/2010/05/testing-at-sipit-26/ I will be there ready to test 3.0 and devel for Kamailio and SER. If you want to test together or meet there, drop me an email. Cheers, Daniel -- Daniel-Constantin Mierla * http://www.asipto.com/

2 1

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2010