git:master: Modules/registrar : update stats even if -DSTATISTICS was not passed to the compiles( this was the default)
17 Feb
2010
17 Feb
'10
7 a.m.
Module: sip-router
Branch: master
Commit: 3303a5b1f7c4ead6b0edd21d20e65b9957359200
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3303a5b…
Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro>
Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro>
Date: Wed Feb 17 13:57:05 2010 +0200
Modules/registrar : update stats even if -DSTATISTICS was not passed to the compiles(this
was the default)
update_stat was called even if the statistics where not added to the stats framework.
---
modules_k/registrar/save.c | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/modules_k/registrar/save.c b/modules_k/registrar/save.c
index b641479..3b479f6 100644
--- a/modules_k/registrar/save.c
+++ b/modules_k/registrar/save.c
@@ -780,18 +780,16 @@ int save(struct sip_msg* _m, char* _d, char* _cflags)
goto error;
ret = (ret==0)?1:ret;
}
-#ifdef STATISTICS
+
update_stat(accepted_registrations, 1);
-#endif
+
/* Only send reply upon request, not upon reply */
if ((route_type == REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) &&
(reg_send_reply(_m) < 0))
return -1;
return ret;
error:
-#ifdef STATISTICS
update_stat(rejected_registrations, 1);
-#endif
if ((route_type == REQUEST_ROUTE) && !is_cflag_set(REG_SAVE_NORPL_FL) )
reg_send_reply(_m);
24 Feb
24 Feb
4:17 a.m.
Hello,
I get some errors when compiling registrar module from master/modules_k.
Is something missing or my local repository got broken?
reg_mod.c: In function ‘default_expires_stats_update’:
reg_mod.c:532: error: ‘default_expires_stat’ undeclared (first use in
this function)
reg_mod.c:532: error: (Each undeclared identifier is reported only once
reg_mod.c:532: error: for each function it appears in.)
reg_mod.c: In function ‘min_expires_stats_update’:
reg_mod.c:536: error: ‘min_expires_stat’ undeclared (first use in this
function)
Thanks,
Daniel
On 02/17/2010 01:00 PM, Marius Zbihlei wrote:
Module: sip-router
Branch: master
Commit: 3303a5b1f7c4ead6b0edd21d20e65b9957359200
URL:
http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3303a5b…
--
Daniel-Constantin Mierla
Kamailio SIP Router Masterclass, Berlin, March 22-26, 2010
* http://www.asipto.com/index.php/sip-router-masterclass/
5:44 a.m.
New subject: git:master: Modules/registrar : update stats even if -DSTATISTICS was not passed to the compiles( this was the default)
On Wednesday 24 February 2010, Daniel-Constantin Mierla wrote:
I get some errors when compiling registrar module from
master/modules_k.
Is something missing or my local repository got broken?
reg_mod.c: In function ‘default_expires_stats_update’:
reg_mod.c:532: error: ‘default_expires_stat’ undeclared (first use in
this function)
reg_mod.c:532: error: (Each undeclared identifier is reported only once
reg_mod.c:532: error: for each function it appears in.)
reg_mod.c: In function ‘min_expires_stats_update’:
reg_mod.c:536: error: ‘min_expires_stat’ undeclared (first use in this
function)
Hi Daniel,
in my checkout of the master branch it works. This are the definitions of this
variables in my repository:
$ grep "default_expires_stats_update"
reg_mod.h
99:extern void default_expires_stats_update(str*, str*);
config.c
51: {"default_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0,
default_expires_stats_update,
config.h
46:extern void default_expires_stats_update(str*, str*);
reg_mod.c
531:void default_expires_stats_update(str* gname, str* name){
$ grep "default_expires_stats"
reg_mod.h
99:extern void default_expires_stats_update(str*, str*);
config.c
51: {"default_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0,
default_expires_stats_update,
config.h
46:extern void default_expires_stats_update(str*, str*);
reg_mod.c
531:void default_expires_stats_update(str* gname, str* name){
Cheers,
Henning
7:01 a.m.
Hello,
On 02/24/2010 11:44 AM, Henning Westerholt wrote:
On Wednesday 24 February 2010, Daniel-Constantin
Mierla wrote:
the problem seems to be only when
compiling the kamailio flavour
make FLAVOUR=kamailio cfg
then the registrar module compilation fails.
Cheers,
Daniel
I get some errors when compiling registrar module
from master/modules_k.
Is something missing or my local repository got broken?
reg_mod.c: In function ‘default_expires_stats_update’:
reg_mod.c:532: error: ‘default_expires_stat’ undeclared (first use in
this function)
reg_mod.c:532: error: (Each undeclared identifier is reported only once
reg_mod.c:532: error: for each function it appears in.)
reg_mod.c: In function ‘min_expires_stats_update’:
reg_mod.c:536: error: ‘min_expires_stat’ undeclared (first use in this
function)
Hi Daniel,
in my checkout of the master branch it works. This are the definitions of this
variables in my repository:
$ grep "default_expires_stats_update"
reg_mod.h
99:extern void default_expires_stats_update(str*, str*);
config.c
51: {"default_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0,
default_expires_stats_update,
config.h
46:extern void default_expires_stats_update(str*, str*);
reg_mod.c
531:void default_expires_stats_update(str* gname, str* name){
$ grep "default_expires_stats"
reg_mod.h
99:extern void default_expires_stats_update(str*, str*);
config.c
51: {"default_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0,
default_expires_stats_update,
config.h
46:extern void default_expires_stats_update(str*, str*);
reg_mod.c
531:void default_expires_stats_update(str* gname, str* name){
Cheers,
Henning
--
Daniel-Constantin Mierla
Kamailio SIP Router Masterclass, Berlin, March 22-26, 2010
* http://www.asipto.com/index.php/sip-router-masterclass/
7:08 a.m.
New subject: git:master: Modules/registrar : update stats even if -DSTATISTICS was not passed to the compiles( this was the default)
On Wednesday 24 February 2010, Daniel-Constantin Mierla wrote:
Hi Daniel,
indeed, i can confirm this. Marius is in vacation at the moment, i'll look
later today into this.
Cheers,
Henning
in my checkout
of the master branch it works.
the problem seems to be only when compiling the kamailio flavour
make FLAVOUR=kamailio cfg
then the registrar module compilation fails.
7:29 a.m.
Hello,
On 02/24/2010 01:08 PM, Henning Westerholt wrote:
On Wednesday 24 February 2010, Daniel-Constantin
Mierla wrote:
Hi Daniel,
indeed, i can confirm this. Marius is in vacation at the moment, i'll look
later today into this.
ok. kamailio flavour enables some compile flags (e.g., statistics), so
it is very likely to be caused by those.
Cheers,
Daniel
--
Daniel-Constantin Mierla
Kamailio SIP Router Masterclass, Berlin, March 22-26, 2010
* http://www.asipto.com/index.php/sip-router-masterclass/
in my
checkout of the master branch it works.
the problem seems to be only when compiling the kamailio flavour
make FLAVOUR=kamailio cfg
then the registrar module compilation fails.
9:09 a.m.
New subject: git:master: Modules/registrar : update stats even if -DSTATISTICS was not passed to the compiles( this was the default)
On Wednesday 24 February 2010, Daniel-Constantin Mierla wrote:
ok. kamailio flavour enables some compile flags (e.g.,
statistics), so
it is very likely to be caused by those.
Hi Daniel,
there was some wrong definition related to the statistics, it should compile
again now.
Cheers,
Henning
5426
days inactive
5433
days old
6 comments
3 participants
participants (3)
-
Daniel-Constantin Mierla -
Henning Westerholt -
Marius Zbihlei