sr-dev

sr-dev@lists.kamailio.org

14 participants
44814 discussions

git:andrei/cdefs2doc: doc: dump_selects.pl: fix for incomplete initializers
by Andrei Pelinescu-Onciul 18 Feb '10

18 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: 8ee1a086852a038fa80daf3d5e5534f4b67a646f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8ee1a08… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 18 13:41:10 2010 +0100 doc: dump_selects.pl: fix for incomplete initializers Some of the modules (e.g db_ops) omit the last members (flags) in the select_row_t initializer. The … [View More]

1 0

git:andrei/cdefs2doc: doc: {rpc, cfg}_list: fix makefile exclude list
by Andrei Pelinescu-Onciul 18 Feb '10

18 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: 0ddc0cebabe0973dd0a44b4fae51a02a8222d686 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0ddc0ce… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Feb 18 14:10:08 2010 +0100 doc: {rpc,cfg}_list: fix makefile exclude list - fix makefile exclude groups and files (didn't work for more then one entry) - added default list for make … [View More]all --- doc/cfg_list/Makefile | 6 ++++-- doc/cfg_list/docbook/cfg_var_list.xml | 2 +- doc/rpc_list/Makefile | 32 +++++++++++++++++++++++++++----- doc/rpc_list/docbook/rpc_list.xml | 4 ++-- 4 files changed, 34 insertions(+), 10 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index 9283a50..8d83fc3 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -13,6 +13,8 @@ docbook_output_dir=docbook # list of files contanining cfg defs in the following format: # <filename>:<cfg_grp_name> +# can be easily filled/updated by pasting the output of: +# make print-lst |sed -e 's!^ \?../..$.*$!$(COREPATH)\1 \\!' files_list=$(COREPATH)/cfg_core.c:core $(COREPATH)/tcp_options.c:tcp \ $(COREPATH)/sctp_options.c:sctp \ $(COREPATH)/modules_s/maxfwd/maxfwd.c:maxfwd \ @@ -45,8 +47,8 @@ endif gcc=gcc -I$(COREPATH)/lib -I/usr/include/libxml2 #filtered files list -flist=$(filter-out $(join $(file_exclude),%),\ - $(filter-out $(join %:,$(grp_exclude)),$(files_list)) ) +flist=$(filter-out $(addsuffix %,$(file_exclude)),\ + $(filter-out $(addprefix %:,$(grp_exclude)),$(files_list)) ) # throws an error if input is not in the format filename:grp check_fname_grp=$(if $(filter-out 2,$(words $(subst :, ,$(1)))),\ diff --git a/doc/cfg_list/docbook/cfg_var_list.xml b/doc/cfg_list/docbook/cfg_var_list.xml index 4da2a56..991e39e 100644 --- a/doc/cfg_list/docbook/cfg_var_list.xml +++ b/doc/cfg_list/docbook/cfg_var_list.xml @@ -5,7 +5,7 @@ <book id="cfg_var_list" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>RPC Exports List</title> <info><revhistory><revision> - <revnumber>sip-router git-a11ee8</revnumber> + <revnumber>sip-router git-8ee1a0</revnumber> <revremark> Automatically generated by: make -C doc/cfg_list all diff --git a/doc/rpc_list/Makefile b/doc/rpc_list/Makefile index b4e7afd..eb046cc 100644 --- a/doc/rpc_list/Makefile +++ b/doc/rpc_list/Makefile @@ -13,9 +13,31 @@ docbook_output_dir=docbook # list of files contanining rpc defs in the following format: # <filename>:<cfg_grp_name> -# one way to quickly fill it up is pasting the output of -# make print-lst|xargs echo -files_list=$(COREPATH)/core_cmd.c:core +# can be easily filled/updated by pasting the output of: +# make print-lst |sed -e 's!^ \?../..$.*$!$(COREPATH)\1 \\!' +files_list= $(COREPATH)/core_cmd.c:core \ + $(COREPATH)/modules_s/pdt/pdt.c:pdt \ + $(COREPATH)/modules_s/rls/rpc.c:rls \ + $(COREPATH)/modules_s/pike/rpc.c:pike \ + $(COREPATH)/modules_s/tls/tls_rpc.c:tls \ + $(COREPATH)/modules_s/presence_b2b/rpc.c:presence_b2b \ + $(COREPATH)/modules_s/gflags/gflags.c:gflags \ + $(COREPATH)/modules_s/dispatcher/ds_rpc.c:dispatcher \ + $(COREPATH)/modules_s/prefix_route/pr_rpc.c:prefix_route \ + $(COREPATH)/modules_s/domain/domain_rpc.c:domain \ + $(COREPATH)/modules_s/cpl-c/cpl_rpc.c:cpl-c \ + $(COREPATH)/modules_s/sl/sl_stats.c:sl \ + $(COREPATH)/modules_s/usrloc/ul_rpc.c:usrloc \ + $(COREPATH)/modules_s/pa/rpc.c:pa \ + $(COREPATH)/modules_s/ratelimit/ratelimit.c:ratelimit \ + $(COREPATH)/modules/tm/tm.c:tm \ + $(COREPATH)/modules/tls/tls_rpc.c:tls \ + $(COREPATH)/modules/lcr/lcr_rpc.c:lcr \ + $(COREPATH)/modules/ctl/ctl.c:ctl \ + $(COREPATH)/modules/cfg_rpc/cfg_rpc.c:cfg_rpc \ + $(COREPATH)/modules/db_flatstore/flat_rpc.c:db_flatstore \ + $(COREPATH)/modules/mi_rpc/mi_rpc_mod.c:mi_rpc + # list of excluded groups grp_exclude=pa @@ -44,8 +66,8 @@ endif gcc=gcc -I$(COREPATH)/lib -I/usr/include/libxml2 #filtered files list -flist=$(filter-out $(join $(file_exclude),%),\ - $(filter-out $(join %:,$(grp_exclude)),$(files_list)) ) +flist=$(filter-out $(addsuffix %,$(file_exclude)),\ + $(filter-out $(addprefix %:,$(grp_exclude)),$(files_list)) ) # throws an error if input is not in the format filename:grp check_fname_grp=$(if $(filter-out 2,$(words $(subst :, ,$(1)))),\ diff --git a/doc/rpc_list/docbook/rpc_list.xml b/doc/rpc_list/docbook/rpc_list.xml index 40a0225..16a1027 100644 --- a/doc/rpc_list/docbook/rpc_list.xml +++ b/doc/rpc_list/docbook/rpc_list.xml @@ -5,12 +5,13 @@ <book id="rpc_list" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>RPC Exports List</title> <info><revhistory><revision> - <revnumber>sip-router git-b6cfcc</revnumber> + <revnumber>sip-router git-8ee1a0</revnumber> <revremark> Automatically generated by: make -C doc/rpc_list all </revremark> </revision></revhistory></info> + <xi:include href="rpc_core.xml"/> <xi:include href="rpc_pdt.xml"/> <xi:include href="rpc_rls.xml"/> <xi:include href="rpc_pike.xml"/> @@ -30,5 +31,4 @@ <xi:include href="rpc_cfg_rpc.xml"/> <xi:include href="rpc_db_flatstore.xml"/> <xi:include href="rpc_mi_rpc.xml"/> - <xi:include href="rpc_core.xml"/> </book> [View Less]

1 0

git:bpintea/asi_binrpc2: s/CRIT(/LOG(L_CRIT, /
by Bogdan Pintea 18 Feb '10

18 Feb '10

Module: sip-router Branch: bpintea/asi_binrpc2 Commit: 885ea4b28f30635329c7178b77e42319e9c47b1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=885ea4b… Author: bpi <bpi(a)machine.office.iptego.net> Committer: bpi <bpi(a)machine.office.iptego.net> Date: Thu Feb 18 12:05:50 2010 +0100 s/CRIT(/LOG(L_CRIT, / - this makes the code compatible with CVS sip_router --- modules/binrpc/io_listener.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)… [View More]

1 0

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

17 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: becac8950fdfb89585e864bcf838ee30a59f2950 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=becac89… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 22:27:01 2010 +0100 doc: dump_cfg_defs.pl: support for docbook output Added support for generating docbook output (by using the --docbook option). --- doc/scripts/cdefs2doc/… [View More]dump_cfg_defs.pl | 107 +++++++++++++++++++++++++++++-- 1 files changed, 100 insertions(+), 7 deletions(-) diff --git a/doc/scripts/cdefs2doc/dump_cfg_defs.pl b/doc/scripts/cdefs2doc/dump_cfg_defs.pl index 1dd9759..48e199b 100755 --- a/doc/scripts/cdefs2doc/dump_cfg_defs.pl +++ b/doc/scripts/cdefs2doc/dump_cfg_defs.pl @@ -72,8 +72,12 @@ my @cfg_default; # filled with config var defaults my ($cfg_grp_name, $def_cfg_name, $cfg_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_varline="VARLINE2"; sub show_patch @@ -121,6 +125,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 @@ -136,6 +141,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) @@ -157,6 +193,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, @@ -176,6 +213,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_varline="VARLINE2"; +}elsif (defined $opt_docbook){ + $output_format_header="DOCBOOK_HEADER"; + $output_format_footer="DOCBOOK_FOOTER"; + $output_format_varline="DOCBOOK_VARLINE"; +} + if (! defined $opt_is_tu){ # file is not a gcc translation-unit dump # => we have to create one @@ -342,17 +389,17 @@ if (@cfg_defs > 0){ } # dump the configuration in txt mode if (defined $opt_force_grp_name) { - $cfg_grp_name=$opt_force_grp_name; + $cfg_grp_name=output_esc($opt_force_grp_name); }elsif (!defined $cfg_grp_name && defined $opt_grp_name) { - $cfg_grp_name=$opt_grp_name; + $cfg_grp_name=output_esc($opt_grp_name); } - $~ = "HEADER"; write; - $~ = "VARLINE2" ; + $~ = $output_format_header; write; + $~ = $output_format_varline ; for $l (@cfg_defs){ ($name, $flags, $min, $max, $desc)=@{$l}; $type=""; $extra_txt=""; - $default= ($no>0) ? $cfg_default[$i] : ""; + $default= ($no>0) ? output_esc($cfg_default[$i]) : ""; $i++; if ($min==0 && $max==0) { @@ -373,10 +420,13 @@ if (@cfg_defs > 0){ } $extra_txt.="Read-only." if ($flags & 128 ); - $desc.="."; + $extra_txt=output_esc($extra_txt); + $desc=output_esc($desc . "."); + $name=output_esc($name); # generate txt description write; } + $~ = $output_format_footer; write; }else{ die "no configuration variables found in $file\n"; } @@ -401,6 +451,9 @@ Configuration Variables@* . +format FOOTER = +. + format VARLINE = @>. @<<<<<<<<<<<<<<<<<<< - ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< $i, $name, $desc @@ -432,3 +485,43 @@ $i, (valid_grp_name $cfg_grp_name)?$cfg_grp_name . "." . $name : $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="config_vars@*"> +(valid_grp_name $cfg_grp_name) ? "." . $cfg_grp_name : "" + <title> Configuration Variables@*</title> +(valid_grp_name $cfg_grp_name) ? " for " . $cfg_grp_name : "" + + +. + +format DOCBOOK_FOOTER = +</chapter> +. + +format DOCBOOK_VARLINE = +<section id="@*"> + (valid_grp_name $cfg_grp_name)?$cfg_grp_name . "." . $name : $name + <title>@*</title> + (valid_grp_name $cfg_grp_name)?$cfg_grp_name . "." . $name : $name + <para> +~~ ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + $desc + </para> +~ <para>Default value: @*.</para> + $default +~ <para>Range: @* - @*.</para> + $min, $max +~ <para>Type: @*.</para> + $type + <para> +~~ ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< + $extra_txt + </para> +</section> + +. [View Less]

1 0

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

17 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: a11ee8f6d82543baab975cfb750412f84d1d344c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a11ee8f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 22:35:09 2010 +0100 doc: cfg_list: docbook output directory Added directory for docbook output, complete with standard doc makefile (for generating html, pdf, txt a.s.o from … [View More]

1 0

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

17 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: 34d34985de850287caf9f17fddeee015f0101f52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34d3498… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 22:31:43 2010 +0100 doc: cfg_list: support for generating docbook output - make docbook will generate the cfg lists in docbook format - make all will generate both txt and … [View More]docbook - generate docbook index file (cfg_var_list.xml) - configurable output directories (txt_output_dir and docbook_output_dir) --- doc/cfg_list/Makefile | 84 ++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 73 insertions(+), 11 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index 881f735..9283a50 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -4,6 +4,12 @@ COREPATH=../.. #include $(COREPATH)/Makefile.defs CFG2TXT=../scripts/cdefs2doc/dump_cfg_defs.pl +CFG2DOCBOOK=../scripts/cdefs2doc/dump_cfg_defs.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 cfg defs in the following format: # <filename>:<cfg_grp_name> @@ -65,7 +71,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) => cfg_grp.txt) -get_target=cfg_$(call get_grp,$(1)).txt +get_target=cfg_$(call get_grp,$(1)) define mk_rules @@ -73,17 +79,30 @@ $(call check_fname_grp, $(1)) #$$(info generating cfg_$$(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 @@ -93,22 +112,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 cfg documentation 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)/cfg_var_list.xml .PHONY: clean -clean: +clean: clean_txt clean_docbook + @rm -f $(docbook_output_dir)/cfg_var_list.xml .PHONY: proper proper: - @rm -f cfg_*.txt + @rm -f $(txt_output_dir)/cfg_*.txt + @rm -f $(docbook_output_dir)/cfg_*.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)/cfg_var_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="cfg_var_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/cfg_list $(MAKECMDGOALS)" >>$@ + @echo ' </revremark>' >>$@ + @echo ' </revision></revhistory></info>' >>$@ + @$(foreach f,$(flist),\ + echo ' <xi:include'\ + 'href="'$(call get_target,$f).xml'"/>' \ + >>$@ ; ) + @echo '</book>' >>$@ find_cfg_files_cmd= find $(COREPATH) -type f -name "*.c" \ -exec grep "cfg_def_t[ ][a-zA-Z0-9_]*\[\][ ]*=" /dev/null {} \; \ [View Less]

1 0

git:andrei/cdefs2doc: doc: cfg_list: generated docbook cfg vars lists
by Andrei Pelinescu-Onciul 17 Feb '10

17 Feb '10

Module: sip-router Branch: andrei/cdefs2doc Commit: dfd8da505d6ad20edff80289cd4553e87dfbbb00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dfd8da5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 22:39:30 2010 +0100 doc: cfg_list: generated docbook cfg vars lists --- doc/cfg_list/cfg_core.txt | 2 +- doc/cfg_list/docbook/cfg_core.xml | 424 +++++++++++… [View More]

1 0

[tracker] Task changed: 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 been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#37 - tm clone msg / free_faked_req bug User who did this: Andrei Pelinescu-Onciul (andrei) Percent Complete: 50% -> 90% Status: Assigned -> Requires testing More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37 You are … [View More]

1 0

[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) ---------- It should be fixed now, could you please re-test? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=37#comment28 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did … [View More]

1 0

git:kamailio_3.0: core: avoid non-null 0-length dst_uri, ruris and path
by Andrei Pelinescu-Onciul 17 Feb '10

17 Feb '10

Module: sip-router Branch: kamailio_3.0 Commit: 832a6bf53562ca492ecbbee86b5445ffee00c883 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=832a6bf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Feb 17 20:46:47 2010 +0100 core: avoid non-null 0-length dst_uri, ruris and path - a dst_uri or ruri that has 0 length should be equivalent to also having a null corresponding char* … [View More]pointer. sip_msg_shm_clone() will now clone this type of uris to (0,0). - set_dst_uri() called with "" (a 0-length non-zero string) is now equivalent to reset_dst_uri(). - set_path_vector() called with "" is now equivalent with reset_path_vector(). (cherry picked from commit feb3478b19452fe096f33364e6a59ec57c93efbe) --- parser/msg_parser.c | 12 ++++++++---- sip_msg_clone.c | 3 +++ 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 48f666c..0c56211 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -736,12 +736,14 @@ int set_dst_uri(struct sip_msg* msg, str* uri) { char* ptr; - if (!msg || !uri) { + if (unlikely(!msg || !uri)) { LOG(L_ERR, "set_dst_uri: Invalid parameter value\n"); return -1; } - if (msg->dst_uri.s && (msg->dst_uri.len >= uri->len)) { + if (unlikely(uri->len == 0)) { + reset_dst_uri(msg); + }else if (msg->dst_uri.s && (msg->dst_uri.len >= uri->len)) { memcpy(msg->dst_uri.s, uri->s, uri->len); msg->dst_uri.len = uri->len; } else { @@ -773,12 +775,14 @@ int set_path_vector(struct sip_msg* msg, str* path) { char* ptr; - if (!msg || !path) { + if (unlikely(!msg || !path)) { LM_ERR("invalid parameter value\n"); return -1; } - if (msg->path_vec.s && (msg->path_vec.len >= path->len)) { + if (unlikely(path->len == 0)) { + reset_path_vector(msg); + } else if (msg->path_vec.s && (msg->path_vec.len >= path->len)) { memcpy(msg->path_vec.s, path->s, path->len); msg->path_vec.len = path->len; } else { diff --git a/sip_msg_clone.c b/sip_msg_clone.c index 979e46f..7308942 100644 --- a/sip_msg_clone.c +++ b/sip_msg_clone.c @@ -513,6 +513,9 @@ struct sip_msg* sip_msg_shm_clone( struct sip_msg *org_msg, int *sip_msg_len, new_msg->add_rm = 0; new_msg->body_lumps = 0; new_msg->reply_lump = 0; + /* zero *uri.s, in case len is 0 but org_msg->*uris!=0 (just to be safe)*/ + new_msg->new_uri.s = 0; + new_msg->dst_uri.s = 0; /* new_uri */ if (org_msg->new_uri.s && org_msg->new_uri.len) { [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev