sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: benchmark: scalars converted to unsigned long long
by Daniel-Constantin Mierla 19 May '09

19 May '09

Module: sip-router Branch: master Commit: 21698992bf3e046e4bd127cb0f02a7be4390ecfc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2169899… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 19 10:42:38 2009 +0300 benchmark: scalars converted to unsigned long long - should fix issue with printing negative values --- modules_k/benchmark/benchmark.c | 2 +- modules_k/benchmark/benchmark.h | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules_k/benchmark/benchmark.c b/modules_k/benchmark/benchmark.c index 1b4ede3..bca072a 100644 --- a/modules_k/benchmark/benchmark.c +++ b/modules_k/benchmark/benchmark.c @@ -335,7 +335,7 @@ int _bm_log_timer(unsigned int id) { LM_GEN1(bm_mycfg->loglevel, "benchmark (timer %s [%d]): %llu [" " msgs/total/min/max/avg - LR:" - " %i/%lld/%lld/%lld/%f | GB: %lld/%lld/%lld/%lld/%f]\n", + " %i/%llu/%llu/%llu/%f | GB: %llu/%llu/%llu/%llu/%f]\n", bm_mycfg->tindex[id]->name, id, tdiff, diff --git a/modules_k/benchmark/benchmark.h b/modules_k/benchmark/benchmark.h index d58a151..cc4e68e 100644 --- a/modules_k/benchmark/benchmark.h +++ b/modules_k/benchmark/benchmark.h @@ -58,14 +58,14 @@ typedef struct benchmark_timer unsigned int id; int enabled; bm_timeval_t *start; /* Current timer run */ - long long calls; /* Number of runs of this timer */ - long long sum; /* Accumulated runtime of this timer */ - long long last_sum; /* Accumulated runtime since last logging */ - long long last_max; /* Minimum in current period (between + unsigned long long calls; /* Number of runs of this timer */ + unsigned long long sum; /* Accumulated runtime of this timer */ + unsigned long long last_sum; /* Accumulated runtime since last logging */ + unsigned long long last_max; /* Minimum in current period (between granularity) */ - long long last_min; /* Maximum ... */ - long long global_max; /* Global minimum, since start */ - long long global_min; /* ... maximum ... */ + unsigned long long last_min; /* Maximum ... */ + unsigned long long global_max; /* Global minimum, since start */ + unsigned long long global_min; /* ... maximum ... */ struct benchmark_timer *next; } benchmark_timer_t;

1 0

git:master: presence: fixes related to f2db mode
by Daniel-Constantin Mierla 19 May '09

19 May '09

Module: sip-router Branch: master Commit: 3a0e8503d3abd1bb320e76b694280efd7a8d3db6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3a0e850… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue May 19 09:24:11 2009 +0300 presence: fixes related to f2db mode - reported by Juha Heinanen --- modules_k/presence/hash.c | 5 ++++- modules_k/presence/subscribe.c | 22 +++++++++++----------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/modules_k/presence/hash.c b/modules_k/presence/hash.c index 11e5fc9..874fe03 100644 --- a/modules_k/presence/hash.c +++ b/modules_k/presence/hash.c @@ -261,7 +261,10 @@ int insert_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs) } new_rec->expires+= (int)time(NULL); - new_rec->db_flag= INSERTDB_FLAG; + if(fallback2db==0) + new_rec->db_flag= INSERTDB_FLAG; + else + new_rec->db_flag= NO_UPDATEDB_FLAG; lock_get(&htable[hash_code].lock); diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index cfec2c8..f05300a 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -362,18 +362,18 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, if(update_shtable(subs_htable, hash_code, subs, REMOTE_TYPE)< 0) { - if(fallback2db) + if(fallback2db==0) { - /* update in database table */ - if(update_subs_db(subs, REMOTE_TYPE)< 0) - { - LM_ERR("updating subscription in database table\n"); - goto error; - } + LM_ERR("updating subscription record in hash table\n"); + goto error; } - else + } + if(fallback2db!=0) + { + /* update in database table */ + if(update_subs_db(subs, REMOTE_TYPE)< 0) { - LM_ERR("updating subscription record in hash table\n"); + LM_ERR("updating subscription in database table\n"); goto error; } } @@ -1509,7 +1509,7 @@ void update_db_subs(db1_con_t *db,db_func_t dbf, shtable_t hash_table, while(s) { printf_subs(s); - if(s->expires < (int)time(NULL)- 50) + if(s->expires < (int)time(NULL)- expires_offset) { LM_DBG("Found expired record\n"); if(!no_lock) @@ -1834,7 +1834,7 @@ int restore_db_subs(void) pa_dbf.free_result(pa_db, result); /* delete all records */ - if(pa_dbf.delete(pa_db, 0,0,0,0)< 0) + if(fallback2db==0 && pa_dbf.delete(pa_db, 0,0,0,0)< 0) { LM_ERR("deleting all records from database table\n"); return -1;

1 0

git:master: core: increased verbosity of error log message
by Nils Ohlmeier 19 May '09

19 May '09

Module: sip-router Branch: master Commit: 8416baf77f30258f34d2de0aa169ad5bb8841561 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8416baf… Author: Nils Ohlmeier <nils(a)iptel.org> Committer: Nils Ohlmeier <nils(a)iptel.org> Date: Tue May 19 02:18:59 2009 +0200 core: increased verbosity of error log message - added size information to an error log message of the config framework --- cfg/cfg.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cfg/cfg.c b/cfg/cfg.c index c52323c..d6b803b 100644 --- a/cfg/cfg.c +++ b/cfg/cfg.c @@ -130,9 +130,9 @@ int cfg_declare(char *group_name, cfg_def_t *def, void *values, int def_size, /* minor validation */ if (size != def_size) { - LOG(L_ERR, "ERROR: register_cfg_def(): the specified size of the config " - "structure does not equal with the calculated size, check whether " - "the variable types are correctly defined!\n"); + LOG(L_ERR, "ERROR: register_cfg_def(): the specified size (%i) of the config " + "structure does not equal with the calculated size (%i), check whether " + "the variable types are correctly defined!\n", def_size, size); goto error; }

1 0

git:master: make: excluded modules with radius dependency
by Nils Ohlmeier 19 May '09

19 May '09

Module: sip-router Branch: master Commit: 61ecd1118194f5cdbf718fb6072498cabd7bbcd2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61ecd11… Author: Nils Ohlmeier <nils(a)iptel.org> Committer: Nils Ohlmeier <nils(a)iptel.org> Date: Tue May 19 02:07:13 2009 +0200 make: excluded modules with radius dependency - excluded and moved misc_radius and peering modules to the radius module group to allow to build the basic set of modules without dependency on radius library being installed. --- Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 160f1c4..ca97f78 100644 --- a/Makefile +++ b/Makefile @@ -155,7 +155,7 @@ module_group_mysql=acc_db auth_db avp_db db_ops uri_db domain lcr msilo mysql\ speeddial # For radius -module_group_radius=acc_radius auth_radius avp_radius +module_group_radius=acc_radius auth_radius avp_radius misc_radius peering # For presence module_group_presence=dialog pa presence_b2b rls xcap @@ -190,7 +190,7 @@ else db_unixodbc memcached mi_xmlrpc \ nat_traversal perlvdb purple seas siptrace \ snmpstats uac_redirect xmpp \ - carrierroute + carrierroute misc_radius peering # excluded because they do not compile (remove them only after they are # fixed) -- andrei exclude_modules+= avpops bdb dbtext iptrtpproxy pa rls

1 0

git:master: core: bug fix in PV printing related to static buffer
by Henning Westerholt 18 May '09

18 May '09

Module: sip-router Branch: master Commit: 103ffecf7e6a7bf84da10a3917e3df81b6964e4b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=103ffec… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 18 19:29:30 2009 +0200 core: bug fix in PV printing related to static buffer fix a bug in the PV printing (for k). The code allocated a static buffer, but failed to proper initialize it with zero. Thus in certain cases old data from previous PV evaluation is returned. is returned --- sr_module.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/sr_module.c b/sr_module.c index a3e51e6..1ab8868 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1360,6 +1360,7 @@ int get_str_fparam(str* dst, struct sip_msg* msg, fparam_t* param) avp_t* avp; pv_value_t pv_val; static char pve_buf[256]; /* ugly hack needed for PVE */ + memset(pve_buf, 0, sizeof(pve_buf)); switch(param->type) { case FPARAM_REGEX:

1 0

git:master: test: port dbtext default modules load and cr on postgres
by Henning Westerholt 18 May '09

18 May '09

Module: sip-router Branch: master Commit: 33c24da95f38c5fee6b8ad129c953a6a924064cb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=33c24da… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu May 14 16:51:40 2009 +0200 test: port dbtext default modules load and cr on postgres --- test/unit/15.sh | 6 +++--- test/unit/23.sh | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/test/unit/15.sh b/test/unit/15.sh index bb5e8c0..3938e98 100755 --- a/test/unit/15.sh +++ b/test/unit/15.sh @@ -28,11 +28,11 @@ if ! (check_kamailio); then exit 0 fi ; -echo "loadmodule \"../modules/db_text/db_text.so\"" >> $CFG +echo "loadmodule \"../../modules_k/db_text/db_text.so\"" >> $CFG cat 2.cfg >> $CFG -echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../scripts/dbtext/kamailio\")" >> $CFG +echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../scripts/dbtext/kamailio\")" >> $CFG -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 diff --git a/test/unit/23.sh b/test/unit/23.sh index e19a719..9bddb9a 100755 --- a/test/unit/23.sh +++ b/test/unit/23.sh @@ -32,7 +32,7 @@ CFG=13.cfg cp $CFG $CFG.bak # setup config -echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG +echo "loadmodule \"../../modules/db_postgres/db_postgres.so\"" >> $CFG echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG echo "modparam(\"carrierroute\", \"db_url\", \"postgres://openserro:openserro@localhost/openser\")" >> $CFG @@ -51,17 +51,15 @@ insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('20','2','','10','1','0','host6'); insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('21','3','','10','1','0','premium.host.local');" -../$BIN -w . -f $CFG > /dev/null +$BIN -w . -f $CFG > /dev/null ret=$? sleep 1 -cd ../scripts - TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX` if [ "$ret" -eq 0 ] ; then - ./$CTL fifo cr_dump_routes > $TMPFILE + $CTL fifo cr_dump_routes > $TMPFILE ret=$? fi ; @@ -100,8 +98,6 @@ delete from carrierroute where carrier=1; delete from carrierroute where carrier=2; delete from carrierroute where carrier=3;" -cd ../test - mv $CFG.bak $CFG rm $TMPFILE

1 0

git:master: test: further portings to sr and small extensions
by Henning Westerholt 18 May '09

18 May '09

Module: sip-router Branch: master Commit: 19f5d9800f49c47de0a83cf9bc4fbadb1643d78c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=19f5d98… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon May 18 15:41:29 2009 +0200 test: further portings to sr and small extensions --- test/unit/16.sh | 4 ++-- test/unit/17.sh | 12 +++++------- test/unit/2.cfg | 6 +++--- test/unit/26.cfg | 43 ++++++++++++++++++++----------------------- test/unit/26.sh | 23 +++++++++++------------ test/unit/30.cfg | 19 ++++++++++--------- test/unit/30.sh | 6 ++---- test/unit/37.sh | 10 +++------- test/unit/42.sh | 8 +++----- test/unit/include/common | 7 ++++--- 10 files changed, 63 insertions(+), 75 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=19f…

1 0

misc_radius and peering module
by Nils Ohlmeier 18 May '09

18 May '09

Hello, when I call 'make modules' as described in the wiki on a current copy of the GIT repository the build process tries to build the misc_radius and peering modules from the modules directory. But both of them fail to build because of the missing radiusclient-ng.h header on my system (recent Gentoo Linux). Is this a bug in the build system, or is it now with sip-router intended behavior that modules with external dependencies are tried to build? Thanks Nils

2 1

kamailio and/or ser 3.0 with sip router core
by Daniel-Constantin Mierla 15 May '09

15 May '09

Hello, long awaited period of SIP Router integration phase is more and more approaching the end. Apart of 4 modules that are not integrated yet from Kamailio - seas, siptrace, uac_redirect and nat_traversal (work being undertaken) -- the rest of 88 modules are ready for http://sip-router.org core. I have created a page to collect guidelines for the default Kamailio configuration file used with sip-router. I invite all of you to test it, not only this one, but your private configs as well. http://sip-router.org/wiki/migration/kamailio-3.0-config Feel free to add to the wiki page or post questions about it to sr-users(a)lists.sip-router.org. This is a new list created for users of sip-router project, you can subscribe to it at: http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-users At this stage, sip router can be used with modules from both Kamailio (OpenSER) and SER projects, mixed in same instance at the same time. Therefore you can choose the best ones that fit your needs. For Kamailio (OpenSER) users there is a page that tries to collect new features they got from SER side (still a lot to add there, hope ser developers will contribute what they find missing). Another page collects links for ser and kamailio users to find what the other project brings: http://sip-router.org/wiki/migration/new-features-for-k-users http://sip-router.org/wiki/features/inherited-features It was not only integration work in the past months, sip router has quite a bunch of brand new feature. The wiki page to collect the summary is available at: http://sip-router.org/wiki/features/new-in-devel Jan just set online documentation portal, available for web browsing: http://sip-router.org/docbook/sip-router/branch/master/ Common modules are located in directory 'modules' while kamailio and ser specific modules can be found under module_k and modules_s. Project's wiki portal got also good content and it is under heavy work -- note that everyone can contribute to wiki: http://sip-router.org/wiki Couple of core and tm features are not yet integrated or not exactly as they were in Kamailio. Please report the ones you are missing in your config at: http://sip-router.org/wiki/devel/kamailio-integration#tm_and_core_extensions It is the place that should set the priority rank for integration. I hope that in 1-2 months time frame to get into beta stage and prepare a stable release. Many thanks for those that allocated resources to make things evolve to this stage and many thanks in advance for those that will start testing and help improving the sip router project. Beware that is still very early stage and not recommended for production. Cheers, Daniel PS. Codename 3.0 refers to Kamailio (OpenSER) or SER using sip router core, there is not a stable release yet. -- Daniel-Constantin Mierla http://www.asipto.com/

2 3

git:master: pv: propagation of assignment with $null
by Daniel-Constantin Mierla 15 May '09

15 May '09

Module: sip-router Branch: master Commit: 44056bf12de08624ef57812b36d12c055cd7f0b9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44056bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 15 14:57:31 2009 +0300 pv: propagation of assignment with $null --- modules_k/pv/pv_core.c | 22 +++++++++++----------- 1 files changed, 11 insertions(+), 11 deletions(-) diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 6571876..9103d81 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -1581,7 +1581,7 @@ int pv_set_scriptvar(struct sip_msg* msg, pv_param_t *param, LM_ERR("error - cannot find svar\n"); goto error; } - if(val == NULL) + if((val==NULL) || (val->flags&PV_VAL_NULL)) { avp_val.n = 0; set_var_value((script_var_t*)param->pvn.u.dname, &avp_val, 0); @@ -1616,7 +1616,7 @@ int pv_set_dsturi(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if((val==NULL) || (val->flags&PV_VAL_NULL)) { reset_dst_uri(msg); return 1; @@ -1642,7 +1642,7 @@ int pv_set_ruri(struct sip_msg* msg, pv_param_t *param, struct run_act_ctx h; char backup; - if(msg==NULL || param==NULL || val==NULL) + if(msg==NULL || param==NULL || val==NULL || (val->flags&PV_VAL_NULL)) { LM_ERR("bad parameters\n"); return -1; @@ -1687,7 +1687,7 @@ int pv_set_ruri_user(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if((val==NULL) || (val->flags&PV_VAL_NULL)) { memset(&act, 0, sizeof(act)); act.type = SET_USER_T; @@ -1735,7 +1735,7 @@ int pv_set_ruri_host(struct sip_msg* msg, pv_param_t *param, struct run_act_ctx h; char backup; - if(msg==NULL || param==NULL || val==NULL) + if(msg==NULL || param==NULL || val==NULL || (val->flags&PV_VAL_NULL)) { LM_ERR("bad parameters\n"); return -1; @@ -1780,7 +1780,7 @@ int pv_set_ruri_port(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if(val == NULL || (val->flags&PV_VAL_NULL)) { memset(&act, 0, sizeof(act)); act.type = SET_PORT_T; @@ -1824,7 +1824,7 @@ error: int pv_set_branch(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val) { - if(msg==NULL || param==NULL || val==NULL) + if(msg==NULL || param==NULL || val==NULL || (val->flags&PV_VAL_NULL)) { LM_ERR("bad parameters\n"); return -1; @@ -1862,7 +1862,7 @@ int pv_set_force_sock(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val==NULL) + if(val==NULL || (val->flags&PV_VAL_NULL)) { msg->force_send_socket = NULL; return 0; @@ -1906,7 +1906,7 @@ int pv_set_mflags(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if(val == NULL || (val->flags&PV_VAL_NULL)) { msg->flags = 0; return 0; @@ -1932,7 +1932,7 @@ int pv_set_sflags(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if(val == NULL || (val->flags&PV_VAL_NULL)) { setsflagsval(0); return 0; @@ -1959,7 +1959,7 @@ int pv_set_bflags(struct sip_msg* msg, pv_param_t *param, return -1; } - if(val == NULL) + if(val == NULL || (val->flags&PV_VAL_NULL)) { setbflagsval(0, 0); return 0;

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009