sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:andrei/cdefs2doc: doc: dump_rpcs.pl: support for docbook output

by Andrei Pelinescu-Onciul

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> + +.

14 years, 11 months

git:andrei/cdefs2doc: doc: rpc_list: support for generating docbook output

by Andrei Pelinescu-Onciul

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 {} \; \

14 years, 11 months

[tracker] Task opened: memory manager bug? (Attachment added)

by sip-router

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.

14 years, 11 months

[tracker] Assignee added: memory manager bug?

by sip-router

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.

14 years, 11 months

git:master: Modules_k/ registrar Other module variables added to configuration framework

by Marius Zbihlei

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 */

14 years, 11 months

git:master: modules_k:registrar Implementing cfg framework for registrar

by Marius Zbihlei

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…

14 years, 11 months

git:andrei/blst_send_flags: core: cfg script support for blacklist ignore masks

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/blst_send_flags Commit: 0e055147442c58c2d029702fa618e448da9cf98f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e05514… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 09:58:21 2010 +0100 core: cfg script support for blacklist ignore masks The blacklist ignore mask can now be set from the script (not only at runtime): dst_blacklist_udp_imask dst_blacklist_tcp_imask dst_blacklist_tls_imask dst_blacklist_sctp_imask E.g. dst_blacklist_udp_imask=16 Possible values: 0 -disabled 2 - send error 4 - connect error 8 - icmp (reserverd for future use) 16 - transaction timeout 32 - administratively prohibited (manually set) --- cfg.lex | 13 +++++++++++++ cfg.y | 33 ++++++++++++++++++++++++++++++--- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/cfg.lex b/cfg.lex index 61e694e..799b606 100644 --- a/cfg.lex +++ b/cfg.lex @@ -80,6 +80,7 @@ * 2009-03-10 added SET_USERPHONE action (Miklos) * 2009-04-24 add strlen, strempty and defined operators (andrei) * 2009-03-07 RETCODE, it's now a core pvar (andrei) + * 2010-02-17 added DST_BLST_{UDP,TCP,TLS,SCTP}_IMASK (andrei) */ @@ -343,6 +344,10 @@ USE_DST_BLST use_dst_blacklist DST_BLST_MEM dst_blacklist_mem DST_BLST_TTL dst_blacklist_expire|dst_blacklist_ttl DST_BLST_GC_INT dst_blacklist_gc_interval +DST_BLST_UDP_IMASK dst_blacklist_udp_imask +DST_BLST_TCP_IMASK dst_blacklist_tcp_imask +DST_BLST_TLS_IMASK dst_blacklist_tls_imask +DST_BLST_SCTP_IMASK dst_blacklist_sctp_imask PORT port @@ -680,6 +685,14 @@ EAT_ABLE [\ \t\b\r] return DST_BLST_TTL; } <INITIAL>{DST_BLST_GC_INT} { count(); yylval.strval=yytext; return DST_BLST_GC_INT; } +<INITIAL>{DST_BLST_UDP_IMASK} { count(); yylval.strval=yytext; + return DST_BLST_UDP_IMASK; } +<INITIAL>{DST_BLST_TCP_IMASK} { count(); yylval.strval=yytext; + return DST_BLST_TCP_IMASK; } +<INITIAL>{DST_BLST_TLS_IMASK} { count(); yylval.strval=yytext; + return DST_BLST_TLS_IMASK; } +<INITIAL>{DST_BLST_SCTP_IMASK} { count(); yylval.strval=yytext; + return DST_BLST_SCTP_IMASK; } <INITIAL>{PORT} { count(); yylval.strval=yytext; return PORT; } <INITIAL>{STAT} { count(); yylval.strval=yytext; return STAT; } <INITIAL>{MAXBUFFER} { count(); yylval.strval=yytext; return MAXBUFFER; } diff --git a/cfg.y b/cfg.y index 234b2d0..22c6dd4 100644 --- a/cfg.y +++ b/cfg.y @@ -96,6 +96,7 @@ * 2009-01-26 case/switch() support (andrei) * 2009-03-10 added SET_USERPHONE action (Miklos) * 2009-05-04 switched if to rval_expr (andrei) + * 2010-02-17 added blacklist imask (DST_BLST_*_IMASK) support (andrei) */ %{ @@ -398,6 +399,10 @@ extern char *finame; %token DST_BLST_MEM %token DST_BLST_TTL %token DST_BLST_GC_INT +%token DST_BLST_UDP_IMASK +%token DST_BLST_TCP_IMASK +%token DST_BLST_TLS_IMASK +%token DST_BLST_SCTP_IMASK %token PORT %token STAT @@ -834,14 +839,36 @@ assign_stm: | DNS_CACHE_DEL_NONEXP error { yyerror("boolean value expected"); } | DST_BLST_INIT EQUAL NUMBER { IF_DST_BLACKLIST(dst_blacklist_init=$3); } | DST_BLST_INIT error { yyerror("boolean value expected"); } - | USE_DST_BLST EQUAL NUMBER { IF_DST_BLACKLIST(default_core_cfg.use_dst_blacklist=$3); } + | USE_DST_BLST EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.use_dst_blacklist=$3); + } | USE_DST_BLST error { yyerror("boolean value expected"); } - | DST_BLST_MEM EQUAL NUMBER { IF_DST_BLACKLIST(default_core_cfg.blst_max_mem=$3); } + | DST_BLST_MEM EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_max_mem=$3); + } | DST_BLST_MEM error { yyerror("boolean value expected"); } - | DST_BLST_TTL EQUAL NUMBER { IF_DST_BLACKLIST(default_core_cfg.blst_timeout=$3); } + | DST_BLST_TTL EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_timeout=$3); + } | DST_BLST_TTL error { yyerror("boolean value expected"); } | DST_BLST_GC_INT EQUAL NUMBER { IF_DST_BLACKLIST(blst_timer_interval=$3);} | DST_BLST_GC_INT error { yyerror("boolean value expected"); } + | DST_BLST_UDP_IMASK EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_udp_imask=$3); + } + | DST_BLST_UDP_IMASK error { yyerror("number(flags) expected"); } + | DST_BLST_TCP_IMASK EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_tcp_imask=$3); + } + | DST_BLST_TCP_IMASK error { yyerror("number(flags) expected"); } + | DST_BLST_TLS_IMASK EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_tls_imask=$3); + } + | DST_BLST_TLS_IMASK error { yyerror("number(flags) expected"); } + | DST_BLST_SCTP_IMASK EQUAL NUMBER { + IF_DST_BLACKLIST(default_core_cfg.blst_sctp_imask=$3); + } + | DST_BLST_SCTP_IMASK error { yyerror("number(flags) expected"); } | PORT EQUAL NUMBER { port_no=$3; } | STAT EQUAL STRING { #ifdef STATS

14 years, 11 months

git:andrei/blst_send_flags: NEWS: mentioned blacklist ignore masks

by Andrei Pelinescu-Onciul

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)

14 years, 11 months

git:master: dispatcher(k): basic framework for load dispatching

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 59c31fe72e95d60f42752bfcae3a18563b2c9700 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59c31fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Feb 12 14:03:24 2010 +0100 dispatcher(k): basic framework for load dispatching - a lightweight system to do a fair distrubution based on load - no dependency on dialog, by using an internal table of active calls with minimal info, to keep the module suitable for small devices and have good performances - not completed, requires xavp support for a compact info structure to be carried in transaction for each failover step --- modules_k/dispatcher/dispatch.c | 94 ++++++++++++- modules_k/dispatcher/dispatch.h | 6 + modules_k/dispatcher/dispatcher.c | 10 ++ modules_k/dispatcher/ds_ht.c | 278 +++++++++++++++++++++++++++++++++++++ modules_k/dispatcher/ds_ht.h | 67 +++++++++ 5 files changed, 453 insertions(+), 2 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=59c…

14 years, 11 months

git:andrei/blst_send_flags: blst: global config variables for ignoring blacklist events

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/blst_send_flags Commit: 0f9e9908055fe15d26d953f5477559254ef37436 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f9e990… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 15 21:37:28 2010 +0100 blst: global config variables for ignoring blacklist events Blacklist events can now be ignored on a per protocol basis, by setting the corresponding new config variable: dst_blacklist_udp_imask dst_blacklist_tcp_imask dst_blacklist_tls_imask dst_blacklist_sctp_imask E.g.: sercmd cfg.set_now_int core dst_blacklist_tcp_imask 6 (ignore send and connect errors on tcp when deciding whether or not to blacklist) --- cfg_core.c | 15 ++++++++++++++- cfg_core.h | 4 ++++ dst_blacklist.c | 36 ++++++++++++++++++++++++++++++++++++ dst_blacklist.h | 12 +++++++++--- 4 files changed, 63 insertions(+), 4 deletions(-) diff --git a/cfg_core.c b/cfg_core.c index edebb9b..6f91740 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -54,6 +54,10 @@ struct cfg_group_core default_core_cfg = { 0, /* dst blacklist is disabled by default */ DEFAULT_BLST_TIMEOUT, DEFAULT_BLST_MAX_MEM, + 0, /* blst_udp_imask */ + 0, /* blst_tcp_imask */ + 0, /* blst_tls_imask */ + 0, /* blst_sctp_imask */ #endif /* resolver */ #ifdef USE_IPV6 @@ -114,7 +118,16 @@ cfg_def_t core_cfg_def[] = { {"dst_blacklist_expire", CFG_VAR_INT, 0, 0, 0, 0, "how much time (in s) a blacklisted destination is kept in the list"}, {"dst_blacklist_mem", CFG_VAR_INT, 0, 0, blst_max_mem_fixup, 0, - "maximum shared memory amount (in KB) used for keeping the blacklisted destinations"}, + "maximum shared memory amount (in KB) used for keeping the blacklisted" + " destinations"}, + {"dst_blacklist_udp_imask", CFG_VAR_INT, 0, 0, 0, blst_reinit_ign_masks, + "blacklist event ignore mask for UDP"}, + {"dst_blacklist_tcp_imask", CFG_VAR_INT, 0, 0, 0, blst_reinit_ign_masks, + "blacklist event ignore mask for TCP"}, + {"dst_blacklist_tls_imask", CFG_VAR_INT, 0, 0, 0, blst_reinit_ign_masks, + "blacklist event ignore mask for TLS"}, + {"dst_blacklist_sctp_imask", CFG_VAR_INT, 0, 0, 0, blst_reinit_ign_masks, + "blacklist event ignore mask for SCTP"}, #endif /* resolver */ #ifdef USE_DNS_CACHE diff --git a/cfg_core.h b/cfg_core.h index b37aacc..9fa26f6 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -54,6 +54,10 @@ struct cfg_group_core { unsigned int blst_timeout; /* blacklist entry ttl */ unsigned int blst_max_mem; /* maximum memory used for the blacklist entries */ + unsigned int blst_udp_imask; /* ignore mask for udp */ + unsigned int blst_tcp_imask; /* ignore mask for tcp */ + unsigned int blst_tls_imask; /* ignore mask for tls */ + unsigned int blst_sctp_imask; /* ignore mask for sctp */ #endif /* resolver */ int dns_try_ipv6; diff --git a/dst_blacklist.c b/dst_blacklist.c index 2c3653b..0e22727 100644 --- a/dst_blacklist.c +++ b/dst_blacklist.c @@ -136,6 +136,9 @@ struct dst_blst_lst_head* dst_blst_hash=0; struct t_dst_blacklist_stats* dst_blacklist_stats=0; #endif +/* blacklist per protocol event ignore mask array */ +unsigned blst_proto_imask[PROTO_LAST+1]; + #ifdef DST_BLACKLIST_HOOKS /* there 2 types of callbacks supported: on add new entry to the blacklist @@ -296,6 +299,26 @@ inline static int blacklist_run_hooks(struct blst_callbacks_lst *cb_lst, #endif /* DST_BLACKLIST_HOOKS */ +/** init per protocol blacklist event ignore masks. + * @return 0 on success, < 0 on error. + */ +int blst_init_ign_masks() +{ + if ((PROTO_UDP > PROTO_LAST) || (PROTO_TCP > PROTO_LAST) || + (PROTO_TLS > PROTO_LAST) || (PROTO_SCTP > PROTO_LAST)){ + BUG("protocol array too small\n"); + return -1; + } + blst_proto_imask[PROTO_UDP]=cfg_get(core, core_cfg, blst_udp_imask); + blst_proto_imask[PROTO_TCP]=cfg_get(core, core_cfg, blst_tcp_imask); + blst_proto_imask[PROTO_TLS]=cfg_get(core, core_cfg, blst_tls_imask); + blst_proto_imask[PROTO_SCTP]=cfg_get(core, core_cfg, blst_sctp_imask); + blst_proto_imask[PROTO_NONE]=blst_proto_imask[PROTO_UDP]; + return 0; +} + + + inline static void blst_destroy_entry(struct dst_blst_entry* e) { shm_free(e); @@ -478,6 +501,10 @@ int init_dst_blacklist() goto error; } } + if (blst_init_ign_masks() < 0){ + ret=E_BUG; + goto error; + } return 0; error: destroy_dst_blacklist(); @@ -1197,5 +1224,14 @@ int blst_max_mem_fixup(void *handle, str *gname, str *name, void **val) return 0; } + + +/** re-inint per child blst_proto_ign_mask array. */ +void blst_reinit_ign_masks(str* gname, str* name) +{ + blst_init_ign_masks(); +} + + #endif /* USE_DST_BLACKLIST */ diff --git a/dst_blacklist.h b/dst_blacklist.h index 175ce78..c079167 100644 --- a/dst_blacklist.h +++ b/dst_blacklist.h @@ -65,6 +65,9 @@ #define DST_BLACKLIST_ADD_CB 1 #define DST_BLACKLIST_SEARCH_CB 2 + +extern unsigned blst_proto_imask[PROTO_LAST+1]; + #ifdef DST_BLACKLIST_HOOKS struct blacklist_hook{ /* WARNING: msg might be NULL, and it might point to shared memory @@ -109,14 +112,15 @@ int dst_blacklist_force_su_to( unsigned char err_flags, /** checks if blacklist should be used. * @param err_flags - blacklist reason - * @param si - filled dst_info structure pointer. + * @param si - filled dest_info structure pointer. * @return 1 if blacklist is enabled (core_cfg) and the event/error * is not in the ignore list. * 0 otherwise */ #define should_blacklist(err_flags, si) \ (cfg_get(core, core_cfg, use_dst_blacklist) && \ - ((err_flags) & (si)->send_flags.blst_imask)) + ((err_flags) & ~blst_proto_imask[(unsigned)((si)->proto)] & \ + ~(si)->send_flags.blst_imask )) /** checks if blacklist should be used, long version. @@ -130,7 +134,7 @@ int dst_blacklist_force_su_to( unsigned char err_flags, */ #define should_blacklist_su(err_flags, snd_flags, proto, su) \ (cfg_get(core, core_cfg, use_dst_blacklist) && \ - ((err_flags) & \ + ((err_flags) & ~blst_proto_imask[(unsigned)(proto)] & \ ~((snd_flags)?((snd_flags_t*)(snd_flags))->blst_imask:0))) @@ -205,4 +209,6 @@ int use_dst_blacklist_fixup(void *handle, str *gname, str *name, void **val); /* KByte to Byte conversion */ int blst_max_mem_fixup(void *handle, str *gname, str *name, void **val); +void blst_reinit_ign_masks(str* gname, str* name); + #endif

14 years, 11 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev