sr-dev February 2010

sr-dev@lists.kamailio.org

31 participants
250 discussions

[tracker] Comment added: tm clone msg / free_faked_req bug
by sip-router 17 Feb '10

17 Feb '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#37 - tm clone msg / free_faked_req bug User who did this - Andrei Pelinescu-Onciul (andrei) ---------- Thanks a lot for the very detailed report (those 60MBs helped a lot :-)). The bug looks to be tm clone_msg / set_dst_uri related. Are you by chance setting dst_uri somewhere in the script prior to t_relay/t_new to ""? How do you add the branch? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37#comment27 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:andrei/cdefs2doc: doc: rpc_list: support for generating docbook output
by Andrei Pelinescu-Onciul 17 Feb '10

17 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: e46889f5d4dd3c8a3ceff4480d1285805b1f5b0e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e46889f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 17:21:18 2010 +0100 doc: rpc_list: support for generating docbook output - make docbook will generate the rpc lists in docbook format - make all will generate both txt and docbook - generate docbook index file (rpc_list.xml) - configurable output directories (txt_output_dir and docbook_output_dir) --- doc/rpc_list/Makefile | 84 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 73 insertions(+), 11 deletions(-) diff --git a/doc/rpc_list/Makefile b/doc/rpc_list/Makefile index 18d6918..b4e7afd 100644 --- a/doc/rpc_list/Makefile +++ b/doc/rpc_list/Makefile @@ -4,6 +4,12 @@ COREPATH=../.. #include $(COREPATH)/Makefile.defs CFG2TXT=../scripts/cdefs2doc/dump_rpcs.pl +CFG2DOCBOOK=../scripts/cdefs2doc/dump_rpcs.pl + +# output directory for generated txt files +txt_output_dir=. +# output directory for generated docbook xml files +docbook_output_dir=docbook # list of files contanining rpc defs in the following format: # <filename>:<cfg_grp_name> @@ -64,7 +70,7 @@ get_grp=$(strip $(if $(grp_f_$(call get_bname,$(1))), \ $(call get_listed_grp,$(1))) ) ) # get target from file:grp (get_target(file:grp) => rpc_grp.txt) -get_target=rpc_$(call get_grp,$(1)).txt +get_target=rpc_$(call get_grp,$(1)) define mk_rules @@ -72,17 +78,30 @@ $(call check_fname_grp, $(1)) #$$(info generating rpc_$$(call get_grp,$(1)).txt: $$(call get_prereq,$(1))) -$$(call get_target,$(1)): $$(call get_prereq,$(1)) Makefile $(CFG2TXT) +$(txt_output_dir)/$$(call get_target,$(1)).txt: \ + $$(call get_prereq,$(1)) Makefile $(CFG2TXT) $(CFG2TXT) --file $$< --$(force_grp)grp=$$(call get_grp,$(1)) \ - --gcc="$(gcc)" > "$$@" || (rm -f "$$@"; exit 1) + --gcc="$(gcc)" --txt > "$$@" || (rm -f "$$@"; exit 1) + +$(docbook_output_dir)/$$(call get_target,$(1)).xml: \ + $$(call get_prereq,$(1)) Makefile $(CFG2TXT) + $(CFG2DOCBOOK) --file $$< --$(force_grp)grp=$$(call get_grp,$(1)) \ + --gcc="$(gcc)" --docbook > "$$@" || (rm -f "$$@"; exit 1) + + +clean_$$(call get_target,$(1)).txt: + rm -f "$(txt_output_dir)/$$(call get_target,$(1)).txt" +clean_$$(call get_target,$(1)).xml: + rm -f "$(docbook_output_dir)/$$(call get_target,$(1)).xml" -clean_$$(call get_target,$(1)): - rm -f "$$(call get_target,$(1))" +txt: $(txt_output_dir)/$$(call get_target,$(1)).txt -all: $$(call get_target,$(1)) +docbook: $(docbook_output_dir)/$$(call get_target,$(1)).xml -clean: clean_$$(call get_target,$(1)) +clean_txt: clean_$$(call get_target,$(1)).txt + +clean_docbook: clean_$$(call get_target,$(1)).xml endef @@ -92,22 +111,65 @@ endef # GCC:TranslationUnit module, make all won't work) .PHONY: help help: - @echo "To regenerate $(foreach f,$(flist),$(call get_target,$f) )" + @echo "To regenerate $(foreach f,$(flist),$(call get_target,$f).{txt,xml})" @echo "type: $(MAKE) all ." @echo "or to regenerate all the rpc lists by searching all" @echo " the source files for definitions, type: $(MAKE) autogen ." @echo "NOTE: you need the GCC:TranslationUnit perl module with an " @echo "extra patch applied (see $(CFG2TXT) --patch)." +.PHONY: txt +txt: + +.PHONY: docbook +docbook: + +.PHONY: clean_txt +clean_txt: + +.PHONY: clean_docbook +clean_docbook: + + .PHONY: all -all: +all: txt $(docbook_output_dir)/rpc_list.xml .PHONY: clean -clean: +clean: clean_txt clean_docbook + @rm -f $(docbook_output_dir)/rpc_list.xml .PHONY: proper proper: - @rm -f rpc_*.txt + @rm -f $(txt_output_dir)/rpc_*.txt + @rm -f $(docbook_output_dir)/rpc_*.xml + +repo_ver="sip-router"\ + "git-$(shell git rev-parse --verify --short=6 HEAD 2>/dev/null)" +ifeq ($(repo_ver),git-) +repo_ver="sip-router unknown" +endif + +$(docbook_output_dir)/rpc_list.xml: \ + $(foreach f,$(flist),$(docbook_output_dir)/$(call get_target,$f).xml) + @echo '<?xml version="1.0" encoding="UTF-8"?>' >$@ + @echo '' >>$@ + @echo '<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"' >>$@ + @echo ' "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">' >>$@ + @echo '<book id="rpc_list"'\ + 'xmlns:xi="http://www.w3.org/2001/XInclude">' >>$@ + @echo ' <title>RPC Exports List</title>' >>$@ + @echo ' <info><revhistory><revision>' >>$@ + @echo ' <revnumber>'$(repo_ver)'</revnumber>' >>$@ + @echo ' <revremark>' >>$@ + @echo " Automatically generated by:">>$@ + @echo " $(MAKE) -C doc/rpc_list $(MAKECMDGOALS)" >>$@ + @echo ' </revremark>' >>$@ + @echo ' </revision></revhistory></info>' >>$@ + @$(foreach f,$(flist),\ + echo ' <xi:include'\ + 'href="'$(call get_target,$f).xml'"/>' \ + >>$@ ; ) + @echo '</book>' >>$@ find_rpc_files_cmd= find $(COREPATH) -type f -name "*.c" \ -exec grep "rpc_export_t[ ][a-zA-Z0-9_]*\[\][ ]*=" /dev/null {} \; \

1 0

git:andrei/cdefs2doc: doc: dump_rpcs.pl: support for docbook output
by Andrei Pelinescu-Onciul 17 Feb '10

17 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: 1b86219cfd0b0a08a26e90d902303f83801ac39c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1b86219… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 17:19:11 2010 +0100 doc: dump_rpcs.pl: support for docbook output Added support for generating docbook output (by using the --docbook option). --- doc/scripts/cdefs2doc/dump_rpcs.pl | 103 +++++++++++++++++++++++++++++++++--- 1 files changed, 95 insertions(+), 8 deletions(-) diff --git a/doc/scripts/cdefs2doc/dump_rpcs.pl b/doc/scripts/cdefs2doc/dump_rpcs.pl index 7cac705..706ec80 100755 --- a/doc/scripts/cdefs2doc/dump_rpcs.pl +++ b/doc/scripts/cdefs2doc/dump_rpcs.pl @@ -66,8 +66,12 @@ my %rpc_docs; # hash containing rpc_doc_varname -> doc_string mappings my ($rpc_grp_name, $rpc_var_name); my ($opt_help, $opt_txt, $opt_is_tu, $dbg, $opt_grp_name, $opt_patch); -my $opt_force_grp_name; +my ($opt_force_grp_name, $opt_docbook); +# default output formats +my $output_format_header="HEADER"; +my $output_format_footer="FOOTER"; +my $output_format_rpcline="RPCLINE"; sub show_patch @@ -114,6 +118,7 @@ Options: is autodetected (see also -g). --gcc gcc_name - run gcc_name instead of gcc. -t | --txt - text mode output. + --docbook | --xml - docbook output (xml). -T | --tu - the input file is in raw gcc translation unit format (as produced by gcc -fdump-translation-unit -c ). If not @@ -129,6 +134,37 @@ Options: } + + +# escape a string for xml use +# params: string to be escaped +# return: escaped string +sub xml_escape{ + my $s=shift; + my %escapes = ( + '"' => '"', + "'" => ''', + '&' => '&', + '<' => '<', + '>' => '>' + ); + + $s=~s/(["'&<>])/$escapes{$1}/g; + return $s; +} + + + +# escape a string according with the output requirements +# params: string to be escaped +# return: escaped string +sub output_esc{ + return xml_escape(shift) if defined $opt_docbook; + return shift; +} + + + # eliminate casts and expressions. # (always go on the first operand) # params: node (GCC::Node) @@ -150,6 +186,7 @@ sub expr_op0{ if ($#ARGV < 0 || ! GetOptions( 'help|h|?' => \$opt_help, 'file|f=s' => \$file, 'txt|t' => \$opt_txt, + 'docbook|xml' => \$opt_docbook, 'tu|T' => \$opt_is_tu, 'source|src|s=s' => \$src_fname, 'defs|d=s'=>\$c_defs, @@ -169,6 +206,16 @@ if ($#ARGV < 0 || ! GetOptions( 'help|h|?' => \$opt_help, do { show_patch(); exit 0; } if (defined $opt_patch); do { select(STDERR); help(); exit 1 } if (!defined $file); +if (defined $opt_txt){ + $output_format_header="HEADER"; + $output_format_footer="FOOTER"; + $output_format_rpcline="RPCLINE"; +}elsif (defined $opt_docbook){ + $output_format_header="DOCBOOK_HEADER"; + $output_format_footer="DOCBOOK_FOOTER"; + $output_format_rpcline="DOCBOOK_RPCLINE"; +} + if (! defined $opt_is_tu){ # file is not a gcc translation-unit dump # => we have to create one @@ -337,23 +384,25 @@ if (@rpc_exports > 0){ } # dump the configuration in txt mode if (defined $opt_force_grp_name) { - $rpc_grp_name=$opt_force_grp_name; + $rpc_grp_name=output_esc($opt_force_grp_name); }elsif (!defined $rpc_grp_name && defined $opt_grp_name) { - $rpc_grp_name=$opt_grp_name; + $rpc_grp_name=output_esc($opt_grp_name); } - $~ = "HEADER"; write; - $~ = "RPCLINE" ; + $~ = $output_format_header; write; + $~ = $output_format_rpcline ; for $l (@rpc_exports){ ($name, $desc, $flags)=@{$l}; $extra_txt=""; $desc=(defined $rpc_docs{$desc} && $rpc_docs{$desc} ne "")? - $rpc_docs{$desc}: - "Documentation missing ($desc)."; + output_esc($rpc_docs{$desc}): + output_esc("Documentation missing ($desc)."); $i++; - $extra_txt.="Returns an array." if ($flags & 1 ); + $extra_txt.=output_esc("Returns an array.") if ($flags & 1 ); + $name=output_esc($name); # generate txt description write; } + $~ = $output_format_footer; write; }else{ die "no rpc exports found in $file\n"; } @@ -378,6 +427,9 @@ RPC Exports@* . +format FOOTER = +. + format RPCLINE = @>. @* $i, $name @@ -387,3 +439,38 @@ $i, $name $extra_txt . + +format DOCBOOK_HEADER = +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"> +<chapter id="rpc_exports@*"> +(valid_grp_name $rpc_grp_name) ? "." . $rpc_grp_name : "" + <title> +RPC Exports@* +(valid_grp_name $rpc_grp_name) ? " for " . $rpc_grp_name : "" + </title> + + +. + +format DOCBOOK_FOOTER = +</chapter> +. + + +format DOCBOOK_RPCLINE = +<section id="@*"><title>@*</title> +$name, $name +<para> +~~ ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + $desc +</para> +<para> +~~ ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + $extra_txt +</para> +</section> + +.

1 0

git:andrei/cdefs2doc: doc: rpc_list: generated docbook rpc lists
by Andrei Pelinescu-Onciul 17 Feb '10

17 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: 2b354470a3bd73db16c75d6a17f2ad205339c7fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b35447… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 17:38:05 2010 +0100 doc: rpc_list: generated docbook rpc lists --- doc/rpc_list/docbook/rpc_cfg_rpc.xml | 96 +++++++++ doc/rpc_list/docbook/rpc_core.xml | 331 +++++++++++++++++++++++++++++ doc/rpc_list/docbook/rpc_cpl-c.xml | 35 +++ doc/rpc_list/docbook/rpc_ctl.xml | 35 +++ doc/rpc_list/docbook/rpc_db_flatstore.xml | 19 ++ doc/rpc_list/docbook/rpc_dispatcher.xml | 27 +++ doc/rpc_list/docbook/rpc_domain.xml | 27 +++ doc/rpc_list/docbook/rpc_gflags.xml | 59 +++++ doc/rpc_list/docbook/rpc_lcr.xml | 35 +++ doc/rpc_list/docbook/rpc_list.xml | 34 +++ doc/rpc_list/docbook/rpc_mi_rpc.xml | 47 ++++ doc/rpc_list/docbook/rpc_pdt.xml | 36 +++ doc/rpc_list/docbook/rpc_pike.xml | 19 ++ doc/rpc_list/docbook/rpc_prefix_route.xml | 27 +++ doc/rpc_list/docbook/rpc_presence_b2b.xml | 27 +++ doc/rpc_list/docbook/rpc_ratelimit.xml | 51 +++++ doc/rpc_list/docbook/rpc_rls.xml | 19 ++ doc/rpc_list/docbook/rpc_sl.xml | 19 ++ doc/rpc_list/docbook/rpc_tls.xml | 28 +++ doc/rpc_list/docbook/rpc_tm.xml | 60 ++++++ doc/rpc_list/docbook/rpc_usrloc.xml | 77 +++++++ 21 files changed, 1108 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=2b3…

1 0

git:andrei/cdefs2doc: doc: rpc_list: docbook output directory
by Andrei Pelinescu-Onciul 17 Feb '10

17 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: b6cfcc7091eacc62f602beb41075436e09b6ad37 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6cfcc7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 17:24:46 2010 +0100 doc: rpc_list: docbook output directory Added directory for docbook output, complete with standard doc makefile (for generating html, pdf, txt a.s.o from docbook sources). --- doc/rpc_list/docbook/Makefile | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/doc/rpc_list/docbook/Makefile b/doc/rpc_list/docbook/Makefile new file mode 100644 index 0000000..c76cc9f --- /dev/null +++ b/doc/rpc_list/docbook/Makefile @@ -0,0 +1,5 @@ + +docs = rpc_list.xml +docbook_dir = ../../../docbook + +include $(docbook_dir)/Makefile

1 0

[tracker] Task opened: memory manager bug? (Attachment added)
by sip-router 17 Feb '10

17 Feb '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Klaus Darilion (klaus3000) Attached to Project - sip-router Summary - memory manager bug? Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi! Using kamailio-3.0 I encounter an abort() in the following scenario: A calls B via Kamailio. Additionally the proxy adds another branch which gets looped to the proxy and is rejected with 407. (Probably the scenario is buggy, but is it triggers a crash I think it should be debugged). I reproduced the abort with and without memory debugging (it's incredibly, just one INVITE transaction produces 60MB log file :-) One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Assignee added: memory manager bug?
by sip-router 17 Feb '10

17 Feb '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#37 - memory manager bug? User who did this - Klaus Darilion (klaus3000) http://sip-router.org/tracker/index.php?do=details&task_id=37 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: Modules_k/ registrar Other module variables added to configuration framework
by Marius Zbihlei 17 Feb '10

17 Feb '10

Module: sip-router Branch: master Commit: c2b7096ec4705252637c7e8fb13450c1c5172d17 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c2b7096… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Feb 17 13:52:48 2010 +0200 Modules_k/registrar Other module variables added to configuration framework Also added callback that modify the statistics to reflect the changes via sercmd --- modules_k/registrar/common.c | 5 +++- modules_k/registrar/config.c | 19 +++++++++++++---- modules_k/registrar/config.h | 8 +++++++ modules_k/registrar/lookup.c | 4 +- modules_k/registrar/reg_mod.c | 43 +++++++++++++++++++++------------------- modules_k/registrar/reg_mod.h | 9 +++---- modules_k/registrar/sip_msg.c | 2 +- 7 files changed, 56 insertions(+), 34 deletions(-) diff --git a/modules_k/registrar/common.c b/modules_k/registrar/common.c index 1118d7d..824b635 100644 --- a/modules_k/registrar/common.c +++ b/modules_k/registrar/common.c @@ -56,7 +56,8 @@ int extract_aor(str* _uri, str* _a) int_str avp_val; struct usr_avp *avp; str *uri; - + str realm_prefix; + memset(aor_buf, 0, MAX_AOR_LEN); if (aor_avp_name.n!=0) { avp = search_first_avp( aor_avp_type, aor_avp_name, &avp_val, 0); @@ -98,6 +99,8 @@ int extract_aor(str* _uri, str* _a) if (user_len) aor_buf[_a->len++] = '@'; /* strip prefix (if defined) */ + realm_prefix.s = cfg_get(registrar, registrar_cfg, realm_pref); + realm_prefix.len = strlen(realm_prefix.s); if (realm_prefix.len && realm_prefix.len<puri.host.len && (memcmp(realm_prefix.s, puri.host.s, realm_prefix.len)==0) ) { memcpy(aor_buf + _a->len, puri.host.s + realm_prefix.len, diff --git a/modules_k/registrar/config.c b/modules_k/registrar/config.c index 8f58478..3c56a54 100644 --- a/modules_k/registrar/config.c +++ b/modules_k/registrar/config.c @@ -39,17 +39,20 @@ struct cfg_group_registrar default_registrar_cfg = { 0, /* max_expires */ 0, /* max_contacts */ 0, /* retry_after */ - 0 /* case_sensitive */ - }; + 0, /* case_sensitive */ + Q_UNSPECIFIED, /* default_q */ + 1, /* append_branches */ + "", /* realm_pref */ + }; void *registrar_cfg = &default_registrar_cfg; cfg_def_t registrar_cfg_def[] = { - {"default_expires", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, + {"default_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0, default_expires_stats_update, "Contains number of second to expire if no expire hf or contact expire present" }, - {"min_expires", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, + {"min_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0, min_expires_stats_update, "The minimum expires value of a Contact. Value 0 disables the checking. "}, - {"max_expires", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, + {"max_expires", CFG_VAR_INT | CFG_CB_ONLY_ONCE, 0, 0, 0, max_expires_stats_update, "The maximum expires value of a Contact. Value 0 disables the checking. "}, {"max_contacts", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "The maximum number of Contacts for an AOR. Value 0 disables the checking. "}, @@ -57,5 +60,11 @@ cfg_def_t registrar_cfg_def[] = { "If you want to add the Retry-After header field in 5xx replies, set this parameter to a value grater than zero"}, {"case_sensitive", CFG_VAR_INT | CFG_ATOMIC, 0, 0, 0, 0, "If set to 1 then AOR comparison will be case sensitive. Recommended and default is 0, case insensitive"}, + {"default_q", CFG_VAR_INT | CFG_ATOMIC, -1, 1000, 0, 0, + "The parameter represents default q value for new contacts."}, /* Q_UNSPECIFIED is -1 */ + {"append_branches", CFG_VAR_INT , 0, 0, 0, 0, + "If set to 1(default), lookup will put all contacts found in msg structure"}, + {"realm_pref", CFG_VAR_STR , 0, 0, 0, 0, + "Realm prefix to be removed. Default is \"\""}, {0, 0, 0, 0, 0, 0} }; diff --git a/modules_k/registrar/config.h b/modules_k/registrar/config.h index bd30b82..1c20fd3 100644 --- a/modules_k/registrar/config.h +++ b/modules_k/registrar/config.h @@ -21,6 +21,7 @@ #ifndef _REGISTRAR_CONFIG_H #define _REGISTRAR_CONFIG_H +#include "../../qvalue.h" #include "../../cfg/cfg.h" #include "../../str.h" @@ -32,11 +33,18 @@ struct cfg_group_registrar { unsigned int max_contacts; unsigned int retry_after; unsigned int case_sensitive; + qvalue_t default_q; + unsigned int append_branches; + char* realm_pref; + char* rcv_param; }; extern struct cfg_group_registrar default_registrar_cfg; extern void *registrar_cfg; extern cfg_def_t registrar_cfg_def[]; +extern void default_expires_stats_update(str*, str*); +extern void min_expires_stats_update(str*, str*); +extern void max_expires_stats_update(str*, str*); #endif diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 67accc7..c758c84 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -45,7 +45,7 @@ #include "regtime.h" #include "reg_mod.h" #include "lookup.h" - +#include "config.h" #define allowed_method(_msg, _c) \ ( !method_filtering || ((_msg)->REQ_METHOD)&((_c)->methods) ) @@ -144,7 +144,7 @@ int lookup(struct sip_msg* _m, char* _t, char* _s) } /* Append branches if enabled */ - if (!append_branches) goto done; + if (!cfg_get(registrar, registrar_cfg, append_branches)) goto done; for( ; ptr ; ptr = ptr->next ) { if (VALID_CONTACT(ptr, act_time) && allowed_method(_m, ptr)) { diff --git a/modules_k/registrar/reg_mod.c b/modules_k/registrar/reg_mod.c index 5c6fbb6..877810b 100644 --- a/modules_k/registrar/reg_mod.c +++ b/modules_k/registrar/reg_mod.c @@ -94,10 +94,6 @@ static int fetchc_fixup(void** param, int param_no); /*! \brief Functions */ static int add_sock_hdr(struct sip_msg* msg, char *str, char *foo); - -qvalue_t default_q = Q_UNSPECIFIED; /*!< Default q value multiplied by 1000 */ -int append_branches = 1; /*!< If set to 1, lookup will put all contacts found in msg structure */ -int case_sensitive = 0; /*!< If set to 1, username in aor will be case sensitive */ int tcp_persistent_flag = -1; /*!< if the TCP connection should be kept open */ int method_filtering = 0; /*!< if the looked up contacts should be filtered based on supported methods */ int path_enabled = 0; /*!< if the Path HF should be handled */ @@ -124,8 +120,6 @@ unsigned short rcv_avp_type = 0; int_str rcv_avp_name; int reg_use_domain = 0; -char* realm_pref = ""; /*!< Realm prefix to be removed */ -str realm_prefix; int sock_flag = -1; str sock_hdr_name = {0,0}; @@ -183,11 +177,11 @@ static cmd_export_t cmds[] = { */ static param_export_t params[] = { {"default_expires", INT_PARAM, &default_registrar_cfg.default_expires }, - {"default_q", INT_PARAM, &default_q }, - {"append_branches", INT_PARAM, &append_branches }, + {"default_q", INT_PARAM, &default_registrar_cfg.default_q }, + {"append_branches", INT_PARAM, &default_registrar_cfg.append_branches }, {"case_sensitive", INT_PARAM, &default_registrar_cfg.case_sensitive }, /* {"tcp_persistent_flag",INT_PARAM, &tcp_persistent_flag }, */ - {"realm_prefix", STR_PARAM, &realm_pref }, + {"realm_prefix", STR_PARAM, &default_registrar_cfg.realm_pref }, {"min_expires", INT_PARAM, &default_registrar_cfg.min_expires }, {"max_expires", INT_PARAM, &default_registrar_cfg.max_expires }, {"received_param", STR_PARAM, &rcv_param }, @@ -261,9 +255,6 @@ static int mod_init(void) return -1; } - realm_prefix.s = realm_pref; - realm_prefix.len = strlen(realm_pref); - rcv_param.len = strlen(rcv_param.s); if(cfg_declare("registrar", registrar_cfg_def, &default_registrar_cfg, cfg_sizeof(registrar), &registrar_cfg)){ @@ -333,16 +324,17 @@ static int mod_init(void) } /* Normalize default_q parameter */ - if (default_q != Q_UNSPECIFIED) { - if (default_q > MAX_Q) { - LM_DBG("default_q = %d, lowering to MAX_Q: %d\n", default_q, MAX_Q); - default_q = MAX_Q; - } else if (default_q < MIN_Q) { - LM_DBG("default_q = %d, raising to MIN_Q: %d\n", default_q, MIN_Q); - default_q = MIN_Q; + qvalue_t dq = cfg_get(registrar, registrar_cfg, default_q); + if ( dq!= Q_UNSPECIFIED) { + if (dq > MAX_Q) { + LM_DBG("default_q = %d, lowering to MAX_Q: %d\n", dq, MAX_Q); + dq = MAX_Q; + } else if (dq < MIN_Q) { + LM_DBG("default_q = %d, raising to MIN_Q: %d\n", dq, MIN_Q); + dq = MIN_Q; } } - + cfg_get(registrar, registrar_cfg, default_q) = dq; if (bind_usrloc(&ul) < 0) { return -1; @@ -536,3 +528,14 @@ error: return -1; } +void default_expires_stats_update(str* gname, str* name){ + update_stat(default_expires_stat, cfg_get(registrar, registrar_cfg, default_expires)); +} + +void min_expires_stats_update(str* gname, str* name){ + update_stat(min_expires_stat, cfg_get(registrar, registrar_cfg, min_expires)); +} + +void max_expires_stats_update(str* gname, str* name){ + update_stat(max_expires_stat, cfg_get(registrar, registrar_cfg, max_expires)); +} diff --git a/modules_k/registrar/reg_mod.h b/modules_k/registrar/reg_mod.h index 4c420c5..477cfb4 100644 --- a/modules_k/registrar/reg_mod.h +++ b/modules_k/registrar/reg_mod.h @@ -67,15 +67,10 @@ #define REG_SAVE_REPL_FL (1<<2) #define REG_SAVE_ALL_FL ((1<<3)-1) -extern int default_expires; -extern qvalue_t default_q; -extern int append_branches; -extern int case_sensitive; extern int nat_flag; extern int tcp_persistent_flag; extern int received_avp; extern int reg_use_domain; -extern str realm_prefix; extern float def_q; extern unsigned short aor_avp_type; @@ -101,4 +96,8 @@ extern struct sl_binds slb; extern stat_var *accepted_registrations; extern stat_var *rejected_registrations; +extern void default_expires_stats_update(str*, str*); +extern void min_expires_stats_update(str*, str*); +extern void max_expires_stats_update(str*, str*); + #endif /* REG_MOD_H */ diff --git a/modules_k/registrar/sip_msg.c b/modules_k/registrar/sip_msg.c index 2e5f65c..d44e5ca 100644 --- a/modules_k/registrar/sip_msg.c +++ b/modules_k/registrar/sip_msg.c @@ -261,7 +261,7 @@ void calc_contact_expires(struct sip_msg* _m, param_t* _ep, int* _e) int calc_contact_q(param_t* _q, qvalue_t* _r) { if (!_q || (_q->body.len == 0)) { - *_r = default_q; + *_r = cfg_get(registrar, registrar_cfg, default_q); } else { if (str2q(_r, _q->body.s, _q->body.len) < 0) { rerrno = R_INV_Q; /* Invalid q parameter */

1 0

git:master: modules_k:registrar Implementing cfg framework for registrar
by Marius Zbihlei 17 Feb '10

17 Feb '10

Module: sip-router Branch: master Commit: 0d3a8dc2a4b3afac51b3b80f9cc7f22a2d1b9057 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0d3a8dc… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Feb 16 16:32:16 2010 +0200 modules_k:registrar Implementing cfg framework for registrar Started to implement cfg framework for registrar, having the possibility to change module paraments without restarting k/s --- modules_k/registrar/common.c | 4 +- modules_k/registrar/config.c | 61 ++++++++++++++++++++++++++++++++++++++++ modules_k/registrar/config.h | 42 +++++++++++++++++++++++++++ modules_k/registrar/reg_mod.c | 62 +++++++++++++++++++++-------------------- modules_k/registrar/reg_mod.h | 4 -- modules_k/registrar/reply.c | 6 ++-- modules_k/registrar/save.c | 13 +++++--- modules_k/registrar/sip_msg.c | 16 +++++----- 8 files changed, 156 insertions(+), 52 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0d3…

1 0

git:andrei/blst_send_flags: NEWS: mentioned blacklist ignore masks
by Andrei Pelinescu-Onciul 17 Feb '10

17 Feb '10

Module: sip-router Branch: andrei/blst_send_flags Commit: 6b8112b8d82f044a86fc6fce6cb1a1b869450fea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b8112b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 10:00:57 2010 +0100 NEWS: mentioned blacklist ignore masks --- NEWS | 39 ++++++++++++++++++++++++++++++++++++++- 1 files changed, 38 insertions(+), 1 deletions(-) diff --git a/NEWS b/NEWS index 3cd2de4..3896e72 100644 --- a/NEWS +++ b/NEWS @@ -3,7 +3,42 @@ Release notes for SIP Router (sr) $Id$ -sip-router changes +sip-router 3.1 chages + +core: + - global, per protocol blacklist ignore masks (via extended send_flags). + See dst_blacklist_udp_imask a.s.o (dst_blacklist_*_imask). + - per message blacklist ignore masks + +new config variables: + - dst_blacklist_udp_imask - global blacklist events ignore mask for udp + (a blacklist event/reason set in this variable will be ignored when + deciding whether or not to blacklist an udp destination). Can be set + at runtime. Default: 0 (no blacklist reason is ignored). + Possible values: 0 -disabled, 2 - send error; 4 - connect error, + 8 - icmp (reserverd), 16 - transaction timeout, + 32 - administratively prohibited (manually set). + - dst_blacklist_tcp_imask - like dst_blacklist_udp_imask, but for tcp. + - dst_blacklist_tls_imask - like dst_blacklist_tls_imask, but for tcp. + - dst_blacklist_sctp_imask -like dst_blacklist_sctp_imask, but for tcp. + +modules: + - blst: functions for ignoring blacklist events per message: + blst_set_ignore(mask): set the events in mask in the per + per message blacklist ignore mask for a request + (see dst_blacklist_udp_imask for possible values). + The basic operation is: msg_blst_ignore_mask|=mask. + blst_clear_ignore(mask): like blst_set_ignore(mask), but instead + of setting some events, it clears them + (msg_blst_ignore_mask&=~mask). + blst_rpl_set_ignore(mask): like blst_set_ignore(mask), but sets + the mask for possible local replies to the current message. + blst_rpl_clear_ignore(mask): like blst_rpl_ignore(mask), but + clears instead of setting. + + + +sip-router 3.0 changes core: - type casts operators: (int), (str). @@ -64,6 +99,8 @@ config script changes: - while() - include file support: include_file "somefile" - event route support: event_route[module_name:eventid] + - per message send_flags support (see set_forward_no_connect(), + set_forward_reply_no_connect(), set_forward_close() & set_reply_close()) build system: - multiple modules directories are now supported (defined in Makefile.dirs)

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2010