sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

git:carstenbock/rtpproxy2: Add a parameter for the type of the RTP-Timeout-Socket ( defaults to 1 for Kamailio-XMLRPC)
by Carsten Bock 31 Aug '10

31 Aug '10

Module: sip-router Branch: carstenbock/rtpproxy2 Commit: c5e22c43fc4eb52235a8e853824a2181739a876f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c5e22c4… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Mon Aug 30 16:48:49 2010 +0200 Add a parameter for the type of the RTP-Timeout-Socket (defaults to 1 for Kamailio-XMLRPC) --- modules_k/rtpproxy/doc/rtpproxy_admin.xml | 28 ++++++++++++++++++++++++++- modules_k/rtpproxy/rtpproxy.c | 30 ++++++++++++++++++---------- 2 files changed, 46 insertions(+), 12 deletions(-) diff --git a/modules_k/rtpproxy/doc/rtpproxy_admin.xml b/modules_k/rtpproxy/doc/rtpproxy_admin.xml index f23bc58..0074b6d 100644 --- a/modules_k/rtpproxy/doc/rtpproxy_admin.xml +++ b/modules_k/rtpproxy/doc/rtpproxy_admin.xml @@ -231,7 +231,6 @@ modparam("rtpproxy", "nortpproxy_str", "a=sdpmangled:yes\r\n") </programlisting> </example> </section> - </section> <section> <title><varname>timeout_socket</varname> (string)</title> <para> @@ -254,6 +253,33 @@ modparam("nathelper", "timeout_socket", "http://127.0.0.1:8000/RPC2") </programlisting> </example> </section> + <section> + <title><varname>timeout_socket_type</varname> (int)</title> + <para> + The parameter sets type of the timeout socket, which is transmitted to the RTP-Proxy. + </para> + <para> + If it is not set, type 1 (Kamailio XML-RPC-Socket) is transmitted to the RTP-Proxy. + </para> + <para> + <emphasis> + Default value is <quote>1</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>timeout_socket_type</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("nathelper", "timeout_socket_type", 42) +... +</programlisting> + </example> + <para> + <emphasis> + The only supported Type on the RTP-Proxy is currently <quote>1</quote> or <quote>0</quote> which is the default socket-type of the RTP-Proxy which is not compatible to Kamailio. + </emphasis> + </para> + </section> </section> <section> diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index 110716a..ec0ff56 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -341,6 +341,7 @@ static int *rtpp_socks = 0; unsigned int *natping_state=0; static str timeout_socket_str = {0, 0}; +static int timeout_socket_type = 1; static cmd_export_t cmds[] = { {"set_rtp_proxy_set", (cmd_function)set_rtp_proxy_set_f, 1, @@ -408,6 +409,7 @@ static param_export_t params[] = { {"rtpproxy_retr", INT_PARAM, &rtpproxy_retr }, {"rtpproxy_tout", INT_PARAM, &rtpproxy_tout }, {"timeout_socket", STR_PARAM, &timeout_socket_str.s }, + {"timeout_socket_type", INT_PARAM, &timeout_socket_type }, {0, 0, 0} }; @@ -1816,14 +1818,16 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) {";", 1}, /* separator */ {NULL, 0}, /* medianum */ {" ", 1}, /* separator */ + {NULL, 0}, /* Type of timeout-socket: 1 Kamailio-XML-RPC */ + {" ", 1}, /* separator */ {NULL, 0}, /* Timeout-Socket */ }; int iovec_param_count; char *c1p, *c2p, *bodylimit, *o1p; - char medianum_buf[20]; + char itoabuf_buf[20]; int medianum, media_multi; - str medianum_str; + str itoabuf_str; int c1p_altered; static int swap_warned = 0; @@ -2102,14 +2106,14 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) #endif if (1 || media_multi) /* XXX netch: can't choose now*/ { - snprintf(medianum_buf, sizeof medianum_buf, "%d", medianum); - medianum_str.s = medianum_buf; - medianum_str.len = strlen(medianum_buf); - STR2IOVEC(medianum_str, v[13]); - STR2IOVEC(medianum_str, v[17]); + snprintf(itoabuf_buf, sizeof itoabuf_buf, "%d", medianum); + itoabuf_str.s = itoabuf_buf; + itoabuf_str.len = strlen(itoabuf_buf); + STR2IOVEC(itoabuf_str, v[13]); + STR2IOVEC(itoabuf_str, v[17]); #ifdef EXTRA_DEBUG - LM_DBG("STR2IOVEC(medianum_str, v[13])\n"); - LM_DBG("STR2IOVEC(medianum_str, v[17])\n"); + LM_DBG("STR2IOVEC(itoabuf_str, v[13])\n"); + LM_DBG("STR2IOVEC(itoabuf_str, v[17])\n"); #endif } else { v[12].iov_len = v[13].iov_len = 0; @@ -2174,8 +2178,12 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) if (to_tag.len > 0) { iovec_param_count = 18; if (timeout_socket_str.len > 0) { - iovec_param_count = 20; - STR2IOVEC(timeout_socket_str, v[19]); + iovec_param_count = 22; + snprintf(itoabuf_buf, sizeof itoabuf_buf, "%d", timeout_socket_type); + itoabuf_str.s = itoabuf_buf; + itoabuf_str.len = strlen(itoabuf_buf); + STR2IOVEC(itoabuf_str, v[19]); + STR2IOVEC(timeout_socket_str, v[21]); } } else { iovec_param_count = 14;

1 0

git:carstenbock/rtpproxy2: The Timeout socket must be sent with Update after session confirmation.
by Carsten Bock 31 Aug '10

31 Aug '10

Module: sip-router Branch: carstenbock/rtpproxy2 Commit: 02f4eddbd34ea09c365ac8bc4af563fc308dbe07 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=02f4edd… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Thu Aug 19 15:33:30 2010 +0200 The Timeout socket must be sent with Update after session confirmation. --- modules_k/rtpproxy/rtpproxy.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/rtpproxy/rtpproxy.c b/modules_k/rtpproxy/rtpproxy.c index 909a68c..9b00538 100644 --- a/modules_k/rtpproxy/rtpproxy.c +++ b/modules_k/rtpproxy/rtpproxy.c @@ -407,7 +407,7 @@ static param_export_t params[] = { {"rtpproxy_disable_tout", INT_PARAM, &rtpproxy_disable_tout }, {"rtpproxy_retr", INT_PARAM, &rtpproxy_retr }, {"rtpproxy_tout", INT_PARAM, &rtpproxy_tout }, - {"timeout_socket_str", STR_PARAM, &timeout_socket_str.s }, + {"timeout_socket", STR_PARAM, &timeout_socket_str.s }, {0, 0, 0} }; @@ -2173,12 +2173,12 @@ force_rtp_proxy(struct sip_msg* msg, char* str1, char* str2, int offer) } if (to_tag.len > 0) { iovec_param_count = 18; - } else { - iovec_param_count = 14; if (timeout_socket_str.len > 0) { - iovec_param_count = 16; - STR2IOVEC(timeout_socket_str, v[15]); + iovec_param_count = 20; + STR2IOVEC(timeout_socket_str, v[19]); } + } else { + iovec_param_count = 14; } cp = send_rtpp_command(node, v, iovec_param_count);

1 0

testing phase for 3.1
by Daniel-Constantin Mierla 31 Aug '10

31 Aug '10

Hello, fyi, we entered in testing phase in order to prepare next major release, numbered 3.1.0. Please help to fill the wiki pages for what is new in this version and migration from 3.0.x: http://sip-router.org/wiki/install/3.0.x-to-3.1.x http://sip-router.org/wiki/features/new-in-devel Testing and feedback are very much appreciated! Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/

4 13

git:master: doc: rpc_list: parse DEFS from the modules Makefiles
by Andrei Pelinescu-Onciul 30 Aug '10

30 Aug '10

Module: sip-router Branch: master Commit: 5e67b01516fd1672e1ed5c25b270eccca4d885a1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5e67b01… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 30 13:46:33 2010 +0200 doc: rpc_list: parse DEFS from the modules Makefiles Get all the variable definitions from each module Makefile and evaluate them to get proper DEFS and INCLUDES (using sed to extract the variable definitions from the Makefiles, some hack to preserve the LFs and $(eval) to evaluate them in the current context). The DEFS and INCLUDES will be passed to the documentation generating script (dump_rpcs.pl) as extra arguments for gcc. This way the proper defines and includes will be used for each module. Fixes rpc list generation failure for modules with kamailio module interface or with non-standard include dirs. --- doc/rpc_list/Makefile | 68 ++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 65 insertions(+), 3 deletions(-) diff --git a/doc/rpc_list/Makefile b/doc/rpc_list/Makefile index 80a9783..ac6e31a 100644 --- a/doc/rpc_list/Makefile +++ b/doc/rpc_list/Makefile @@ -69,7 +69,23 @@ override force_grp= endif # command used for gcc (contains extra includes) -gcc=gcc -I$(COREPATH)/lib -I/usr/include/libxml2 +gcc=gcc +#-I$(COREPATH)/lib -I$(COREPATH) -I/usr/include/libxml2 + +# defines used by gcc +c_defs=-D__CPU_i386 -D__OS_linux -DSER_VER=2099099 -DPKG_MALLOC -DSHM_MEM \ + -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP \ + -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR \ + -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DCC_GCC_LIKE_ASM \ + -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ + -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ + -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DUSE_SCTP -DNAME='\"ser\"' \ + -DVERSION='\"2.99.99-pre3\"' -DARCH='\"i386\"' -DOS_QUOTED='\"linux\"' + + +# common makefile vars used in defs +LOCALBASE=/usr/local +SYSBASE=/usr filter_files=$(filter-out $(addsuffix %,$(file_exclude)),\ $(filter-out $(addprefix %:,$(grp_exclude)),$(1))) @@ -102,21 +118,67 @@ get_grp=$(strip $(if $(grp_f_$(call get_bname,$(1))), \ # get target from file:grp (get_target(file:grp) => rpc_grp.txt) get_target=rpc_$(call get_grp,$(1)) + +# $(LF) definition (do not remove) +define LF + + +endef + +# get all the lines containing DEFS or INCLUDES definitions from the Makefile. +# WARNING: does not work with all sed implementation (tested with GNU sed). +# It uses a hack to restore the LFs (LFs are removed by $(shell)): LFs are +# replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. +get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ + -ne '/^[\t ]*$DEFS\|INCLUDES$[\t ]*[+:]\?=.*[^\]$$/H'\ + -ne '/^[\t ]*$DEFS\|INCLUDES$[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/H'\ + -ne '$${g;s/\n/^LF^/g;p}'\ +< $(1)/Makefile )) + + +# get all the lines from the makefile containing variable definitions. +# WARNING: does not work with all sed implementation (tested with GNU sed). +# It uses a hack to restore the LFs (LFs are removed by $(shell)): LFs are +# replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. +get_make_vars=$(subst ^LF^,$(LF),$(shell sed \ + -ne '/^[\t ]*[A-Za-z0-9_-]\+[\t ]*[+:]\?=.*[^\]$$/H'\ + -ne '/^[\t ]*[A-Za-z0-9_-]\+[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/H'\ + -ne '$${g;s/\n/^LF^/g;p}'\ +< $(1)/Makefile )) + + define mk_rules $(call check_fname_grp, $(1)) #$$(info generating rpc_$$(call get_grp,$(1)).txt: $$(call get_prereq,$(1))) + +DEFS:= +INCLUDES:= +# extract all the includes and defs from the module makefile and +# evaluate them +$$(eval $$(call get_make_vars,$$(dir $$(call get_prereq,$(1))))) +# save the result in a per group e_idefs_<grp_name> var +$$(eval e_idefs_$$(call get_grp,$(1)):=$$(DEFS) $$(INCLUDES)) + +# debugging: +#$$(info eval: $$(call get_make_vars,$$(dir $$(call get_prereq,$(1))))) +#$$(info e_idefs_$$(call get_grp,$(1))=$$(e_idefs_$$(call get_grp,$(1)))) + $(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)" --txt > "$$@" || (rm -f "$$@"; exit 1) + --gcc="$(gcc)" --txt \ + --defs="$(c_defs) $$(e_idefs_$$(call get_grp,$(1)))" \ + > "$$@" || (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) + --gcc="$(gcc)" --docbook \ + --defs="$(c_defs) $$(e_idefs_$$(call get_grp,$(1)))" \ + > "$$@" || (rm -f "$$@"; exit 1) clean_$$(call get_target,$(1)).txt:

1 0

git:master: doc: select_list: parse DEFS from the modules Makefiles
by Andrei Pelinescu-Onciul 30 Aug '10

30 Aug '10

Module: sip-router Branch: master Commit: b6a87729cb1c2c22095bdd11031d7a199c979b72 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b6a8772… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 30 13:32:18 2010 +0200 doc: select_list: parse DEFS from the modules Makefiles Get all the variable definitions from each module Makefile and evaluate them to get proper DEFS and INCLUDES (using sed to extract the variable definitions, conditionals and filter-out rules from the Makefiles, some hack to preserve the LFs and $(eval) to evaluate the extracted stuff in the current context). The DEFS and INCLUDES will be passed to the documentation generating script (dump_selects.pl) as extra arguments for gcc. This way the proper defines and includes will be used for each module. Fixes select list generation failure for modules with non-standard include dirs. --- doc/select_list/Makefile | 85 +++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 80 insertions(+), 5 deletions(-) diff --git a/doc/select_list/Makefile b/doc/select_list/Makefile index e3f510e..7d43356 100644 --- a/doc/select_list/Makefile +++ b/doc/select_list/Makefile @@ -62,7 +62,23 @@ override force_grp= endif # command used for gcc (contains extra includes) -gcc=gcc -I$(COREPATH)/lib -I/usr/include/libxml2 +gcc=gcc +#-I$(COREPATH)/lib -I$(COREPATH) -I/usr/include/libxml2 + +# defines used by gcc +c_defs=-D__CPU_i386 -D__OS_linux -DSER_VER=2099099 -DPKG_MALLOC -DSHM_MEM \ + -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP \ + -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR \ + -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DCC_GCC_LIKE_ASM \ + -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ + -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ + -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DUSE_SCTP -DNAME='\"ser\"' \ + -DVERSION='\"2.99.99-pre3\"' -DARCH='\"i386\"' -DOS_QUOTED='\"linux\"' + + +# common makefile vars used in defs +LOCALBASE=/usr/local +SYSBASE=/usr filter_files=$(subst .h:,.c:, $(filter-out $(addsuffix %,$(file_exclude)),\ $(filter-out $(addprefix %:,$(grp_exclude)),$(1))) ) @@ -95,23 +111,82 @@ get_grp=$(strip $(if $(grp_f_$(call get_bname,$(1))), \ # get target from file:grp (get_target(file:grp) => select_grp) get_target=select_$(call get_grp,$(1)) + +# $(LF) definition (do not remove) +define LF + + +endef + +# get all the lines containing DEFS or INCLUDES definitions from the Makefile. +# WARNING: does not work with all sed implementation (tested with GNU sed). +# It uses a hack to restore the LFs (LFs are removed by $(shell)): LFs are +# replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. +get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ + -ne '/^[\t ]*$DEFS\|INCLUDES$[\t ]*[+:]\?=.*[^\]$$/H'\ + -ne '/^[\t ]*$DEFS\|INCLUDES$[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/H'\ + -ne '$${g;s/\n/^LF^/g;p}'\ +< $(1)/Makefile )) + + +# get all the lines from the makefile containing variable definitions. +# It will also return conditionals and try to filter out possible rules. +# WARNING: does not work with all sed implementation (tested with GNU sed). +# It uses a hack to restore the LFs (LFs are removed by $(shell)): LFs are +# replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. +get_make_vars=$(subst ^LF^,$(LF),$(shell sed -n \ + -e ': start' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]*$$$\|.*[^\]$$$/{H;d}' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]\+.*[\]$$/,/[^\]$$/{H;d}' \ + -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:$[^=]\|$$$/b eat_rule' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;d}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/{H;d}' \ + -e ': end' \ + -e '$${g;s/\n/^LF^/g;p}'\ + -e 'b' \ + -e ': eat_rule' \ + -e '$$b end' \ + -e 'n' \ + -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:$[^=]\|$$$/b eat_rule' \ + -e '/^[\t]/b eat_rule' \ + -e 'b start' \ +< $(1)/Makefile )) + + define mk_rules $(call check_fname_grp, $(1)) #$$(info generating select_$$(call get_grp,$(1)).txt: $$(call get_prereq,$(1))) + +DEFS:= +INCLUDES:= +# extract all the includes and defs from the module makefile and +# evaluate them +$$(eval $$(call get_make_vars,$$(dir $$(call get_prereq,$(1))))) +# override COREPATH (we know better) +COREPATH=../.. +# save the result in a per group e_idefs_<grp_name> var +$$(eval e_idefs_$$(call get_grp,$(1)):=$$(DEFS) $$(INCLUDES)) + +# debugging: +#$$(info eval: $$(call get_make_vars,$$(dir $$(call get_prereq,$(1))))) +#$$(info e_idefs_$$(call get_grp,$(1))=$$(e_idefs_$$(call get_grp,$(1)))) + $(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)" --txt $(CFG2TXT_EXTRA_OPTS) > "$$@" || \ - (rm -f "$$@"; exit 1) + --gcc="$(gcc)" --txt $(CFG2TXT_EXTRA_OPTS) \ + --defs="$(c_defs) $$(e_idefs_$$(call get_grp,$(1)))" \ + > "$$@" || (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 $(CFG2DOCBOOK_EXTRA_OPTS) > "$$@" || \ - (rm -f "$$@"; exit 1) + --gcc="$(gcc)" --docbook $(CFG2DOCBOOK_EXTRA_OPTS) \ + --defs="$(c_defs) $$(e_idefs_$$(call get_grp,$(1)))" \ + > "$$@" || (rm -f "$$@"; exit 1) clean_$$(call get_target,$(1)).txt:

1 0

git:master: doc: rpc_list: improve DEFS parsing
by Andrei Pelinescu-Onciul 30 Aug '10

30 Aug '10

Module: sip-router Branch: master Commit: 9dbb14fef6eb0dafff363eb3061e293de45bf7af URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9dbb14f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 30 23:02:48 2010 +0200 doc: rpc_list: improve DEFS parsing When getting all the makefile variables from the Makefiles obey also the conditionals (ifdef, ifndef) and make sure all the makefiles rules are filtered out (to avoid miss-interpreting a shell variable assignment in a rule as a makefile variable). --- doc/rpc_list/Makefile | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/doc/rpc_list/Makefile b/doc/rpc_list/Makefile index ac6e31a..bf9f5bf 100644 --- a/doc/rpc_list/Makefile +++ b/doc/rpc_list/Makefile @@ -137,13 +137,26 @@ get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ # get all the lines from the makefile containing variable definitions. +# It will also return conditionals and try to filter out possible rules. # WARNING: does not work with all sed implementation (tested with GNU sed). # It uses a hack to restore the LFs (LFs are removed by $(shell)): LFs are # replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. -get_make_vars=$(subst ^LF^,$(LF),$(shell sed \ - -ne '/^[\t ]*[A-Za-z0-9_-]\+[\t ]*[+:]\?=.*[^\]$$/H'\ - -ne '/^[\t ]*[A-Za-z0-9_-]\+[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/H'\ - -ne '$${g;s/\n/^LF^/g;p}'\ +get_make_vars=$(subst ^LF^,$(LF),$(shell sed -n \ + -e ': start' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]*$$$\|.*[^\]$$$/{H;d}' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]\+.*[\]$$/,/[^\]$$/{H;d}' \ + -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:$[^=]\|$$$/b eat_rule' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;d}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/{H;d}' \ + -e ': end' \ + -e '$${g;s/\n/^LF^/g;p}'\ + -e 'b' \ + -e ': eat_rule' \ + -e '$$b end' \ + -e 'n' \ + -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:$[^=]\|$$$/b eat_rule' \ + -e '/^[\t]/b eat_rule' \ + -e 'b start' \ < $(1)/Makefile )) @@ -159,6 +172,8 @@ INCLUDES:= # extract all the includes and defs from the module makefile and # evaluate them $$(eval $$(call get_make_vars,$$(dir $$(call get_prereq,$(1))))) +# override COREPATH (we know better) +COREPATH=../.. # save the result in a per group e_idefs_<grp_name> var $$(eval e_idefs_$$(call get_grp,$(1)):=$$(DEFS) $$(INCLUDES))

1 0

git:master: doc: cfg_list: parse DEFS from the modules Makefiles
by Andrei Pelinescu-Onciul 30 Aug '10

30 Aug '10

Module: sip-router Branch: master Commit: ab5e3984b5afe1d31ed67bbb4842184821215228 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ab5e398… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 30 13:32:18 2010 +0200 doc: cfg_list: parse DEFS from the modules Makefiles Get all the variable definitions from each module Makefile and evaluate them to get proper DEFS and INCLUDES (using sed to extract the variable definitions, conditionals and filter-out rules from the Makefiles, some hack to preserve the LFs and $(eval) to evaluate the extracted stuff in the current context). The DEFS and INCLUDES will be passed to the documentation generating script (dump_cfg_defs.pl) as extra arguments for gcc. This way the proper defines and includes will be used for each module. Fixes cfg var. list generation failure for modules with kamailio module interface or with non-standard include dirs. --- doc/cfg_list/Makefile | 81 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 78 insertions(+), 3 deletions(-) diff --git a/doc/cfg_list/Makefile b/doc/cfg_list/Makefile index 16d645a..a10aaef 100644 --- a/doc/cfg_list/Makefile +++ b/doc/cfg_list/Makefile @@ -53,7 +53,23 @@ override force_grp= endif # command used for gcc (contains extra includes) -gcc=gcc -I$(COREPATH)/lib -I/usr/include/libxml2 +gcc=gcc +#-I$(COREPATH)/lib -I$(COREPATH) -I/usr/include/libxml2 + +# defines used by gcc +c_defs=-D__CPU_i386 -D__OS_linux -DSER_VER=2099099 -DPKG_MALLOC -DSHM_MEM \ + -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP \ + -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR \ + -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DCC_GCC_LIKE_ASM \ + -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD \ + -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H \ + -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DUSE_SCTP -DNAME='\"ser\"' \ + -DVERSION='\"2.99.99-pre3\"' -DARCH='\"i386\"' -DOS_QUOTED='\"linux\"' + + +# common makefile vars used in defs +LOCALBASE=/usr/local +SYSBASE=/usr filter_files=$(filter-out $(addsuffix %,$(file_exclude)),\ $(filter-out $(addprefix %:,$(grp_exclude)),$(1))) @@ -86,21 +102,80 @@ get_grp=$(strip $(if $(grp_f_$(call get_bname,$(1))), \ # get target from file:grp (get_target(file:grp) => cfg_grp.txt) get_target=cfg_$(call get_grp,$(1)) + +# $(LF) definition (do not remove) +define LF + + +endef + +# get all the lines containing DEFS or INCLUDES definitions from the Makefile. +# WARNING: does not work with all sed implementation (tested with GNU sed). +# It uses a hack to restore the LFs (LFs are removed by $(shell)): LFs are +# replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. +get_make_idefs=$(subst ^LF^,$(LF),$(shell sed \ + -ne '/^[\t ]*$DEFS\|INCLUDES$[\t ]*[+:]\?=.*[^\]$$/H'\ + -ne '/^[\t ]*$DEFS\|INCLUDES$[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/H'\ + -ne '$${g;s/\n/^LF^/g;p}'\ +< $(1)/Makefile )) + + +# get all the lines from the makefile containing variable definitions. +# It will also return conditionals and try to filter out possible rules. +# WARNING: does not work with all sed implementation (tested with GNU sed). +# It uses a hack to restore the LFs (LFs are removed by $(shell)): LFs are +# replaced with '^LF^' and then ^LF^ is subst'ed back to a real LF. +get_make_vars=$(subst ^LF^,$(LF),$(shell sed -n \ + -e ': start' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]*$$$\|.*[^\]$$$/{H;d}' \ + -e '/^$ifeq\|ifneq\|else\|endif$[\t ]\+.*[\]$$/,/[^\]$$/{H;d}' \ + -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:$[^=]\|$$$/b eat_rule' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*[^\]$$/{H;d}' \ + -e '/^[\t ]*[A-Za-z._][A-Za-z0-9._-]*[\t ]*[+:]\?=.*\\$$/,/$^$$$\|$[^\]$$$/{H;d}' \ + -e ': end' \ + -e '$${g;s/\n/^LF^/g;p}'\ + -e 'b' \ + -e ': eat_rule' \ + -e '$$b end' \ + -e 'n' \ + -e '/^[a-zA-Z._/$$][a-zA-Z0-9._()/$$ \t-]*:$[^=]\|$$$/b eat_rule' \ + -e '/^[\t]/b eat_rule' \ + -e 'b start' \ +< $(1)/Makefile )) + + define mk_rules $(call check_fname_grp, $(1)) #$$(info generating cfg_$$(call get_grp,$(1)).txt: $$(call get_prereq,$(1))) + +DEFS:= +INCLUDES:= +# extract all the includes and defs from the module makefile and +# evaluate them +$$(eval $$(call get_make_vars,$$(dir $$(call get_prereq,$(1))))) +# save the result in a per group e_idefs_<grp_name> var +$$(eval e_idefs_$$(call get_grp,$(1)):=$$(DEFS) $$(INCLUDES)) + +# debugging: +#$$(info eval: $$(call get_make_vars,$$(dir $$(call get_prereq,$(1))))) +#$$(info e_idefs_$$(call get_grp,$(1))=$$(e_idefs_$$(call get_grp,$(1)))) + $(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)" --txt > "$$@" || (rm -f "$$@"; exit 1) + --gcc="$(gcc)" --txt \ + --defs="$(c_defs) $$(e_idefs_$$(call get_grp,$(1)))" \ + > "$$@" || (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) + --gcc="$(gcc)" --docbook \ + --defs="$(c_defs) $$(e_idefs_$$(call get_grp,$(1)))" \ + > "$$@" || (rm -f "$$@"; exit 1) clean_$$(call get_target,$(1)).txt:

1 0

git:master: doc: dump_*.pl: support for gcc 4.5
by Andrei Pelinescu-Onciul 30 Aug '10

30 Aug '10

Module: sip-router Branch: master Commit: e8b64a9db7487233e6ddea10ea7b504e0a4484f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8b64a9… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 30 13:28:17 2010 +0200 doc: dump_*.pl: support for gcc 4.5 - support for gcc 4.5 (gcc 4.5 will produce the translation unit dump file in the same directory as the output file, while older versions will always write it in the current directory). - be more verbose on gcc error (display the complete gcc command line) - cleanup temporary files even in the error case --- doc/scripts/cdefs2doc/dump_cfg_defs.pl | 17 ++++++++++++++--- doc/scripts/cdefs2doc/dump_rpcs.pl | 17 ++++++++++++++--- doc/scripts/cdefs2doc/dump_selects.pl | 17 ++++++++++++++--- 3 files changed, 42 insertions(+), 9 deletions(-) diff --git a/doc/scripts/cdefs2doc/dump_cfg_defs.pl b/doc/scripts/cdefs2doc/dump_cfg_defs.pl index 48e199b..ebf14af 100755 --- a/doc/scripts/cdefs2doc/dump_cfg_defs.pl +++ b/doc/scripts/cdefs2doc/dump_cfg_defs.pl @@ -228,9 +228,20 @@ if (! defined $opt_is_tu){ # => we have to create one $src_fname=basename($file); $tmp_file = "/tmp/" . mktemp ("dump_translation_unit_XXXXXX"); - system("$gcc -fdump-translation-unit $c_defs -c $file -o $tmp_file.o && \ - mv \"$src_fname\".001t.tu $tmp_file") == 0 or - die "$gcc failed to generate a translation unit dump from $file"; + # Note: gcc < 4.5 will produce the translation unit dump in a file in + # the current directory. gcc 4.5 will write it in the same directory as + # the output file. + system("$gcc -fdump-translation-unit $c_defs -c $file -o $tmp_file") == 0 + or die "$gcc -fdump-translation-unit $c_defs -c $file -o $tmp_file" . + " failed to generate a translation unit dump from $file"; + if (system("if [ -f \"$src_fname\".001t.tu ]; then \ + mv \"$src_fname\".001t.tu $tmp_file; \ + else mv /tmp/\"$src_fname\".001t.tu $tmp_file; fi ") != 0) { + unlink($tmp_file, "$tmp_file.o"); + die "could not find the gcc translation unit dump file" . + " ($src_fname.001t.tu) neither in the current directory" . + " or /tmp"; + }; $tu=GCC::TranslationUnit::Parser->parsefile($tmp_file); print(STDERR "src name $src_fname\n") if $dbg; unlink($tmp_file, "$tmp_file.o"); diff --git a/doc/scripts/cdefs2doc/dump_rpcs.pl b/doc/scripts/cdefs2doc/dump_rpcs.pl index 706ec80..63c222e 100755 --- a/doc/scripts/cdefs2doc/dump_rpcs.pl +++ b/doc/scripts/cdefs2doc/dump_rpcs.pl @@ -221,9 +221,20 @@ if (! defined $opt_is_tu){ # => we have to create one $src_fname=basename($file); $tmp_file = "/tmp/" . mktemp ("dump_translation_unit_XXXXXX"); - system("$gcc -fdump-translation-unit $c_defs -c $file -o $tmp_file && \ - mv \"$src_fname\".001t.tu $tmp_file") == 0 or - die "$gcc failed to generate a translation unit dump from $file"; + # Note: gcc < 4.5 will produce the translation unit dump in a file in + # the current directory. gcc 4.5 will write it in the same directory as + # the output file. + system("$gcc -fdump-translation-unit $c_defs -c $file -o $tmp_file") == 0 + or die "$gcc -fdump-translation-unit $c_defs -c $file -o $tmp_file" . + " failed to generate a translation unit dump from $file"; + if (system("if [ -f \"$src_fname\".001t.tu ]; then \ + mv \"$src_fname\".001t.tu $tmp_file; \ + else mv /tmp/\"$src_fname\".001t.tu $tmp_file; fi ") != 0) { + unlink($tmp_file, "$tmp_file.o"); + die "could not find the gcc translation unit dump file" . + " ($src_fname.001t.tu) neither in the current directory" . + " or /tmp"; + }; $tu=GCC::TranslationUnit::Parser->parsefile($tmp_file); print(STDERR "src name $src_fname\n") if $dbg; unlink($tmp_file, "$tmp_file.o"); diff --git a/doc/scripts/cdefs2doc/dump_selects.pl b/doc/scripts/cdefs2doc/dump_selects.pl index aea0018..76aa5d9 100755 --- a/doc/scripts/cdefs2doc/dump_selects.pl +++ b/doc/scripts/cdefs2doc/dump_selects.pl @@ -391,9 +391,20 @@ sub process_file # => we have to create one $src_fname=basename($file); $tmp_file = "/tmp/" . mktemp ("dump_translation_unit_XXXXXX"); - system("$gcc -fdump-translation-unit $c_defs -c $file -o $tmp_file && \ - mv \"$src_fname\".001t.tu $tmp_file") == 0 or - die "$gcc failed to generate a translation unit dump from $file"; + # Note: gcc < 4.5 will produce the translation unit dump in a file in + # the current directory. gcc 4.5 will write it in the same directory as + # the output file. + system("$gcc -fdump-translation-unit $c_defs -c $file -o $tmp_file") == 0 + or die "$gcc -fdump-translation-unit $c_defs -c $file -o $tmp_file" . + " failed to generate a translation unit dump from $file"; + if (system("if [ -f \"$src_fname\".001t.tu ]; then \ + mv \"$src_fname\".001t.tu $tmp_file; \ + else mv /tmp/\"$src_fname\".001t.tu $tmp_file; fi ") != 0) { + unlink($tmp_file, "$tmp_file.o"); + die "could not find the gcc translation unit dump file" . + " ($src_fname.001t.tu) neither in the current directory" . + " or /tmp"; + }; $tu=GCC::TranslationUnit::Parser->parsefile($tmp_file); print(STDERR "src name $src_fname\n") if $dbg; unlink($tmp_file, "$tmp_file.o");

1 0

missing build dependency?
by Juha Heinanen 30 Aug '10

30 Aug '10

when i build master on debian squeeze, i get an error docbook2x-man -s ../../doc/stylesheets/serdoc2man.xsl auth.xml make[2]: docbook2x-man: Command not found make[2]: *** [auth.7] Error 127 make[1]: [modules-man] Error 1 (ignored) should docbook2x be listed in build dependencies? -- juha

2 1

git:master: debian: added doc tools to build-depends
by Andrei Pelinescu-Onciul 30 Aug '10

30 Aug '10

Module: sip-router Branch: master Commit: 89ed370b1a8049c81f55068a280c999442c40d1d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89ed370… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Aug 30 23:19:01 2010 +0200 debian: added doc tools to build-depends Added docbook2x, xsltproc and lynx to the debian package Build-Depends. They are needed for building various parts of the documentation: docbook2x for manual pages for some ser modules, xsltproc for pdf and html and lynx for txt/README. Reported-by: Juha Heinanen jh tutpro com --- pkg/debian/changelog | 7 +++++++ pkg/debian/control | 3 ++- 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/pkg/debian/changelog b/pkg/debian/changelog index 9b4404e..a5bdbf4 100644 --- a/pkg/debian/changelog +++ b/pkg/debian/changelog @@ -1,3 +1,10 @@ +ser (2.99.0-dev1.1) unstable; urgency=low + + * Updated the build dependencies with the doc building tools: + docbook2x, xsltproc and lynx. + + -- Andrei Pelinescu - Onciul <andrei(a)ape.fokus.gmd.de> Mon, 30 Aug 2010 23:15:18 +0200 + ser (2.99.0-dev01) unstable; urgency=low * Added the ser-db-modules package, containing database using modules and diff --git a/pkg/debian/control b/pkg/debian/control index bd23d71..8bfd895 100644 --- a/pkg/debian/control +++ b/pkg/debian/control @@ -2,7 +2,8 @@ Source: ser Section: net Priority: optional Maintainer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> -Build-Depends: debhelper (>= 4), libmysqlclient-dev | libmysqlclient15-dev | libmysqlclient14-dev | libmysqlclient12-dev, libexpat1-dev, libradius-ng-dev | libradiusclient-ng-dev | libradius1-dev, libxml2-dev, libpq-dev | postgresql-dev, libcurl3-dev, libssl-dev, libreadline5-dev, libpcre3-dev, bison, flex +Build-Depends: debhelper (>= 4), libmysqlclient-dev | libmysqlclient15-dev | libmysqlclient14-dev | libmysqlclient12-dev, libexpat1-dev, libradius-ng-dev | libradiusclient-ng-dev | libradius1-dev, libxml2-dev, libpq-dev | postgresql-dev, libcurl3-dev, libssl-dev, libreadline5-dev, libpcre3-dev, bison, flex, docbook2x, + xsltproc, lynx Standards-Version: 3.5.2 Package: ser

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 August 2010