sr-dev March 2010

sr-dev@lists.kamailio.org

24 participants
359 discussions

git:kamailio_3.0: makefile: fix modules config overwrite

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 1cae9198b490c833a44091974811caec8d8feef5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1cae919… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 4 13:16:06 2010 +0100 makefile: fix modules config overwrite A config file provided by a module was installed even if a previous version was already installed, overwriting the old version. Now if a file with the same name already exists, the module config file will be installed with a .sample extension added (so only .sample will be overwritten, never an active .cfg). Reported-by: Klaus Darilion klaus.mailinglists pernau at Closes FlySpray#38 . (cherry picked from commit 6c0de64647038072ba1959ead39dcc601fd6292c) --- Makefile.modules | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.modules b/Makefile.modules index 1f226ba..27cd0cd 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -16,6 +16,8 @@ # inside modules or libs) (andrei) # 2009-10-01 added support for automatically installing extra utils, # scripts and cfg files (andrei) +# 2010-03-04 don't overwrite already installed .cfgs, save the .cfg as +# .sample in this case (andrei) # # @@ -209,10 +211,17 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) @for r in $(MOD_INSTALL_CFGS) ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ + n=`basename "$$r"` ; \ $(call try_err, $(INSTALL_TOUCH) \ - $(cfg_prefix)/$(cfg_dir)/`basename "$$r"` ); \ + "$(cfg_prefix)/$(cfg_dir)/$$n.sample" ); \ $(call try_err,\ - $(INSTALL_CFG) "$$r" $(cfg_prefix)/$(cfg_dir) ); \ + $(INSTALL_CFG) "$$r" \ + "$(cfg_prefix)/$(cfg_dir)/$$n.sample"); \ + if [ -z "${skip_cfg_install}" -a \ + ! -f "$(cfg_prefix)/$(cfg_dir)$$n" ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$$n.sample \ + $(cfg_prefix)/$(cfg_dir)$$n; \ + fi ; \ else \ echo "ERROR: $$r not found" ; \ if [ ${err_fail} = 1 ] ; then \

14 years, 8 months

git:sr_3.0: makefile: fix modules config overwrite

by Andrei Pelinescu-Onciul

Module: sip-router Branch: sr_3.0 Commit: e0c8ec8642eb683f06455f0b516754f1465aa2db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e0c8ec8… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 4 13:16:06 2010 +0100 makefile: fix modules config overwrite A config file provided by a module was installed even if a previous version was already installed, overwriting the old version. Now if a file with the same name already exists, the module config file will be installed with a .sample extension added (so only .sample will be overwritten, never an active .cfg). Reported-by: Klaus Darilion klaus.mailinglists pernau at Closes FlySpray#38 . (cherry picked from commit 6c0de64647038072ba1959ead39dcc601fd6292c) --- Makefile.modules | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.modules b/Makefile.modules index 1f226ba..27cd0cd 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -16,6 +16,8 @@ # inside modules or libs) (andrei) # 2009-10-01 added support for automatically installing extra utils, # scripts and cfg files (andrei) +# 2010-03-04 don't overwrite already installed .cfgs, save the .cfg as +# .sample in this case (andrei) # # @@ -209,10 +211,17 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) @for r in $(MOD_INSTALL_CFGS) ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ + n=`basename "$$r"` ; \ $(call try_err, $(INSTALL_TOUCH) \ - $(cfg_prefix)/$(cfg_dir)/`basename "$$r"` ); \ + "$(cfg_prefix)/$(cfg_dir)/$$n.sample" ); \ $(call try_err,\ - $(INSTALL_CFG) "$$r" $(cfg_prefix)/$(cfg_dir) ); \ + $(INSTALL_CFG) "$$r" \ + "$(cfg_prefix)/$(cfg_dir)/$$n.sample"); \ + if [ -z "${skip_cfg_install}" -a \ + ! -f "$(cfg_prefix)/$(cfg_dir)$$n" ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$$n.sample \ + $(cfg_prefix)/$(cfg_dir)$$n; \ + fi ; \ else \ echo "ERROR: $$r not found" ; \ if [ ${err_fail} = 1 ] ; then \

14 years, 8 months

git:master: makefile: fix modules config overwrite

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 6c0de64647038072ba1959ead39dcc601fd6292c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c0de64… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 4 13:16:06 2010 +0100 makefile: fix modules config overwrite A config file provided by a module was installed even if a previous version was already installed, overwriting the old version. Now if a file with the same name already exists, the module config file will be installed with a .sample extension added (so only .sample will be overwritten, never an active .cfg). Reported-by: Klaus Darilion klaus.mailinglists pernau at Closes FlySpray#38 . --- Makefile.modules | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile.modules b/Makefile.modules index 1f226ba..27cd0cd 100644 --- a/Makefile.modules +++ b/Makefile.modules @@ -16,6 +16,8 @@ # inside modules or libs) (andrei) # 2009-10-01 added support for automatically installing extra utils, # scripts and cfg files (andrei) +# 2010-03-04 don't overwrite already installed .cfgs, save the .cfg as +# .sample in this case (andrei) # # @@ -209,10 +211,17 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) @for r in $(MOD_INSTALL_CFGS) ; do \ if [ -n "$$r" ]; then \ if [ -f "$$r" ]; then \ + n=`basename "$$r"` ; \ $(call try_err, $(INSTALL_TOUCH) \ - $(cfg_prefix)/$(cfg_dir)/`basename "$$r"` ); \ + "$(cfg_prefix)/$(cfg_dir)/$$n.sample" ); \ $(call try_err,\ - $(INSTALL_CFG) "$$r" $(cfg_prefix)/$(cfg_dir) ); \ + $(INSTALL_CFG) "$$r" \ + "$(cfg_prefix)/$(cfg_dir)/$$n.sample"); \ + if [ -z "${skip_cfg_install}" -a \ + ! -f "$(cfg_prefix)/$(cfg_dir)$$n" ]; then \ + mv -f $(cfg_prefix)/$(cfg_dir)$$n.sample \ + $(cfg_prefix)/$(cfg_dir)$$n; \ + fi ; \ else \ echo "ERROR: $$r not found" ; \ if [ ${err_fail} = 1 ] ; then \

14 years, 8 months

Present and Future of SIP Routing 2010 London

by Daniel-Constantin Mierla

Hello, I am pleased to announce a dedicated event in London, Tuesday, March 9 afternoon, where to present the version 3.0 and latest developments in Kamailio and SIP Router projects. The event includes as well presentations from various players in the VoIP and SIP market, more details at: http://www.kamailio.org/mos/view/Present-and-Future-of-SIP-Routing-2010-Lon… It is a free event, the number of seats is limited, room being available courtesy of Sun Microsystems (address 55 King William St, London EC4), therefore the first come first serve policy is applied. You can also enroll for a presentation, just send a short description about the topic in the registration email. Hope to see many of you in London next week, Daniel -- Daniel-Constantin Mierla Kamailio SIP Router Masterclass, Berlin, March 22-26, 2010 * http://www.asipto.com/index.php/sip-router-masterclass/

14 years, 8 months

git:master: doc: fix links & path for ctl & xmlrpc

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: bf27310504572fa0811762bf138711c57b93f070 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bf27310… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 4 10:52:50 2010 +0100 doc: fix links & path for ctl & xmlrpc ctl & xmlrpc were moved from modules_s/ to modules/, but the links to them in the docs were not updated. --- doc/rpc/ser_rpc.txt | 2 +- doc/rpc/ser_rpc.xml | 6 +++--- modules/ctl/README | 2 +- modules/ctl/doc/ctl.xml | 4 ++-- modules/xmlrpc/doc/xmlrpc.xml | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/rpc/ser_rpc.txt b/doc/rpc/ser_rpc.txt index b2c5337..b41d1f7 100644 --- a/doc/rpc/ser_rpc.txt +++ b/doc/rpc/ser_rpc.txt @@ -610,4 +610,4 @@ cessing */ 1.5. Examples using xmlrpc - See the xmlrpc module documentation: modules_s/xmlrpc/README. + See the xmlrpc module documentation: modules/xmlrpc/README. diff --git a/doc/rpc/ser_rpc.xml b/doc/rpc/ser_rpc.xml index 698bc9c..9ce6fef 100644 --- a/doc/rpc/ser_rpc.xml +++ b/doc/rpc/ser_rpc.xml @@ -31,11 +31,11 @@ <para> The RPC transports are implemented by writting a RPC transport module. The most used transport modules are - <ulink url='http://sip-router.org/docbook/sip-router/branch/master/modules_s/ctl/ctl.ht…'> + <ulink url='http://sip-router.org/docbook/sip-router/branch/master/modules/ctl/ctl.html'> <emphasis>ctl</emphasis> </ulink> and - <ulink url='http://sip-router.org/docbook/sip-router/branch/master/modules_s/xmlrpc/xml…'> + <ulink url='http://sip-router.org/docbook/sip-router/branch/master/modules/xmlrpc/xmlrp…'> <emphasis>xmlrpc</emphasis> </ulink>. The first one implements a ser-proprietary fast and space efficient @@ -881,7 +881,7 @@ static void rpc_register(rpc_t* rpc) <section id="rpc.xmlrpc_examples"> <title>Examples using xmlrpc</title> <para>See the <varname>xmlrpc</varname> module documentation: - <ulink url='http://sip-router.org/docbook/sip-router/branch/master/modules_s/xmlrpc/xml…'>modules_s/xmlrpc/README</ulink>. + <ulink url='http://sip-router.org/docbook/sip-router/branch/master/modules/xmlrpc/xmlrp…'>modules/xmlrpc/README</ulink>. </para> </section> diff --git a/modules/ctl/README b/modules/ctl/README index 25de811..555fa67 100644 --- a/modules/ctl/README +++ b/modules/ctl/README @@ -67,7 +67,7 @@ $ sercmd ps very fast to parse (as opposed to XML-rpc). The binrpc encoding format is fully documented inside - modules_s/ctl/binrpc.h. + modules/ctl/binrpc.h. 1.3. Parameters diff --git a/modules/ctl/doc/ctl.xml b/modules/ctl/doc/ctl.xml index 9910b2c..cee4c36 100644 --- a/modules/ctl/doc/ctl.xml +++ b/modules/ctl/doc/ctl.xml @@ -84,8 +84,8 @@ $ &sercmd; ps </para> <para> The binrpc encoding format is fully documented inside - <ulink url='http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_…' > - modules_s/ctl/binrpc.h</ulink>. + <ulink url='http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules/…' > + modules/ctl/binrpc.h</ulink>. </para> </section> diff --git a/modules/xmlrpc/doc/xmlrpc.xml b/modules/xmlrpc/doc/xmlrpc.xml index 81cf02a..3e32b86 100644 --- a/modules/xmlrpc/doc/xmlrpc.xml +++ b/modules/xmlrpc/doc/xmlrpc.xml @@ -670,7 +670,7 @@ Content-Length: 276 make ser close the tcp connection after each request. </para> <para> - The <ulink url='http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_…'> + The <ulink url='http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules/…'> examples/xmlrpc_test.py </ulink> provides a very simple example of using xmlrpclib with a Transport class that works. @@ -728,14 +728,14 @@ route[XMLRPC]{ <para> <itemizedlist> <listitem><para> - <ulink url='http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_…'> + <ulink url='http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules/…'> <emphasis>examples/xmlrpc_test.pl</emphasis> </ulink> (basic perl application that builds and sends an <emphasis>XMLRPC</emphasis> request from its commandline parameters). </para></listitem> <listitem><para> - <ulink url='http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules_…'> + <ulink url='http://git.sip-router.org/cgi-bin/gitweb.cgi?p=sip-router;a=blob;f=modules/…'> <emphasis>examples/xmlrpc_test.py</emphasis> </ulink> (basic python application that builds and sends an <emphasis>XMLRPC</emphasis> request from its commandline

14 years, 8 months

git:master: removed duplicate modules_s/tls

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: bd78ecaac7644c8989123f5b5398043260115536 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd78eca… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Mar 4 10:07:48 2010 +0100 removed duplicate modules_s/tls The up-to-date tls module is modules/tls. --- modules_s/tls/Makefile | 22 - modules_s/tls/README | 573 --------------------- modules_s/tls/README.TLS | 414 --------------- modules_s/tls/doc/Makefile | 4 - modules_s/tls/doc/certs_howto.xml | 94 ---- modules_s/tls/doc/functions.xml | 17 - modules_s/tls/doc/history.xml | 22 - modules_s/tls/doc/params.xml | 473 ----------------- modules_s/tls/doc/tls.xml | 146 ------ modules_s/tls/fixed_c_zlib.h | 247 --------- modules_s/tls/ser-tls.cfg | 25 - modules_s/tls/ser_cert.sh | 199 ------- modules_s/tls/tls.cfg | 61 --- modules_s/tls/tls_config.c | 374 -------------- modules_s/tls/tls_config.h | 47 -- modules_s/tls/tls_domain.c | 678 ------------------------ modules_s/tls/tls_domain.h | 158 ------ modules_s/tls/tls_init.c | 621 ---------------------- modules_s/tls/tls_init.h | 79 --- modules_s/tls/tls_locking.c | 173 ------- modules_s/tls/tls_locking.h | 33 -- modules_s/tls/tls_mod.c | 400 --------------- modules_s/tls/tls_mod.h | 56 -- modules_s/tls/tls_rpc.c | 145 ------ modules_s/tls/tls_rpc.h | 38 -- modules_s/tls/tls_select.c | 686 ------------------------- modules_s/tls/tls_select.h | 39 -- modules_s/tls/tls_server.c | 1026 ------------------------------------- modules_s/tls/tls_server.h | 79 --- modules_s/tls/tls_util.c | 100 ---- modules_s/tls/tls_util.h | 76 --- modules_s/tls/tls_verify.c | 126 ----- modules_s/tls/tls_verify.h | 42 -- modules_s/tls/todo.txt | 4 - 34 files changed, 0 insertions(+), 7277 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bd7…

14 years, 8 months

git:kamailio_3.0: core: parse_to display name multi-token no-quotes fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: b2ee4178b4fe2d4b7385346cbc2c38f309183931 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b2ee417… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Mar 3 19:24:08 2010 +0100 core: parse_to display name multi-token no-quotes fix Fix for properly returning a non-quoted display name that is composed of several tokens (contains spaces). The previous version would set the display name to the first token, in this case (e.g. Foo Bar <sip:foo@bar> resulted in display_name="Foo" instead of "Foo Bar"). Reported-by: Ronald Voermans ronald voermans nu Closes FlySpray#39 . (cherry picked from commit 907686c0c4c1141af175d692251b8e1fab28b64e) --- parser/parse_to.c | 39 +++++++++++++++++++++++++++++++++------ 1 files changed, 33 insertions(+), 6 deletions(-) diff --git a/parser/parse_to.c b/parser/parse_to.c index a8f3883..30ac170 100644 --- a/parser/parse_to.c +++ b/parser/parse_to.c @@ -27,8 +27,13 @@ * History: * --------- * 2003-04-26 ZSW (jiri) + * 2010-03-03 fix multi-token no-quotes display name (andrei) */ +/** Parser :: Parse To: header. + * @file + * @ingroup parser + */ #include "parse_to.h" #include <stdlib.h> @@ -41,7 +46,7 @@ enum { START_TO, DISPLAY_QUOTED, E_DISPLAY_QUOTED, DISPLAY_TOKEN, - S_URI_ENCLOSED, URI_ENCLOSED, E_URI_ENCLOSED, + DISPLAY_TOKEN_SP, S_URI_ENCLOSED, URI_ENCLOSED, E_URI_ENCLOSED, URI_OR_TOKEN, MAYBE_URI_END, END, F_CR, F_LF, F_CRLF }; @@ -532,6 +537,10 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) to_b->uri.s= 0; to_b->display.len = 0; to_b->display.s = 0; + to_b->tag_value.len = 0; + to_b->tag_value.s = 0; + to_b->param_lst = 0; + to_b->last_param = 0; foo=0; for( tmp=buffer; tmp<end; tmp++) @@ -556,6 +565,10 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) foo = tmp; status = MAYBE_URI_END; break; + case DISPLAY_TOKEN: + foo = tmp; + status = DISPLAY_TOKEN_SP; + break; } break; case '\n': @@ -565,12 +578,17 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) foo = tmp; status = MAYBE_URI_END; case MAYBE_URI_END: - case DISPLAY_TOKEN: + case DISPLAY_TOKEN_SP: case E_DISPLAY_QUOTED: case END: saved_status=status; status=F_LF; break; + case DISPLAY_TOKEN: + foo=tmp; + saved_status=DISPLAY_TOKEN_SP; + status=F_LF; + break; case F_CR: status=F_CRLF; break; @@ -592,12 +610,17 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) foo = tmp; status = MAYBE_URI_END; case MAYBE_URI_END: - case DISPLAY_TOKEN: + case DISPLAY_TOKEN_SP: case E_DISPLAY_QUOTED: case END: saved_status=status; status=F_CR; break; + case DISPLAY_TOKEN: + foo=tmp; + saved_status=DISPLAY_TOKEN_SP; + status=F_CR; + break; case F_CRLF: case F_CR: case F_LF: @@ -652,10 +675,13 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) status = S_URI_ENCLOSED; break; case URI_OR_TOKEN: - case DISPLAY_TOKEN: + case DISPLAY_TOKEN: + to_b->display.len=tmp-to_b->display.s; + status = S_URI_ENCLOSED; + break; + case DISPLAY_TOKEN_SP: case MAYBE_URI_END: - /* deal with the incorrect displayname<uri>.. */ - to_b->display.len=(foo?foo:tmp)-to_b->display.s; + to_b->display.len=foo-to_b->display.s; status = S_URI_ENCLOSED; break; case F_CRLF: @@ -756,6 +782,7 @@ char* parse_to(char* buffer, char *end, struct to_body *to_b) status=URI_ENCLOSED; break; case MAYBE_URI_END: + case DISPLAY_TOKEN_SP: status = DISPLAY_TOKEN; case DISPLAY_QUOTED: case DISPLAY_TOKEN:

14 years, 8 months

git:kamailio_3.0: core: msg_parse minor 64bit warning fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: f9b3beab6c5066ef18ad4d0a347b7410e2c8c240 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9b3bea… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 26 15:21:50 2010 +0100 core: msg_parse minor 64bit warning fix (cherry picked from commit c0e9cb82abe293937e5b95fa1347afdc118d9ac2) --- parser/msg_parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/msg_parser.c b/parser/msg_parser.c index 0c56211..aa19ed0 100644 --- a/parser/msg_parser.c +++ b/parser/msg_parser.c @@ -336,7 +336,7 @@ int parse_headers(struct sip_msg* msg, hdr_flags_t flags, int next) switch (hf->type){ case HDR_ERROR_T: LOG(L_INFO,"ERROR: bad header field [%.*s]\n", - (end-tmp>20)?20:(end-tmp), tmp); + (end-tmp>20)?20:(int)(end-tmp), tmp); goto error; case HDR_EOH_T: msg->eoh=tmp; /* or rest?*/

14 years, 8 months

git:kamailio_3.0: tls: TLS_MALLOC_DBG can now be set on make cfg

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 462dbe484d6f8d796092b1ab634caf954112d3d5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=462dbe4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Feb 26 13:39:55 2010 +0100 tls: TLS_MALLOC_DBG can now be set on make cfg Enabling tls extra malloc debugging info, does not require anymore editing tls_init.c. It can be enabled at cfg time (make cfg extra_defs=-DTLS_MALLOC_DBG) or at compile/re-compile time ( make -C modules/tls clean; make -C modules/tls extra_defs=-DTLS_MALLOC_DBG). When TLS_MALLOC_DBG is enabled, an extra warning will be printed at compile time. NO_TLS_MALLOC_DBG takes precedence over TLS_MALLOC_DBG. (cherry picked from commit 9bc19d4994f20aa354092aba9ae784de91547fc6) --- modules/tls/tls_init.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tls/tls_init.c b/modules/tls/tls_init.c index b0f07f9..5c8e832 100644 --- a/modules/tls/tls_init.c +++ b/modules/tls/tls_init.c @@ -115,12 +115,16 @@ int tls_force_run = 0; /* ignore some start-up sanity checks, use it const SSL_METHOD* ssl_methods[TLS_USE_SSLv23 + 1]; +#ifdef NO_TLS_MALLOC_DBG #undef TLS_MALLOC_DBG /* extra malloc debug info from openssl */ +#endif /* NO_TLS_MALLOC_DBG */ + /* * Wrappers around SER shared memory functions * (which can be macros) */ #ifdef TLS_MALLOC_DBG +#warning "tls module compiled with malloc debugging info (extra overhead)" #include <execinfo.h> /*

14 years, 8 months

git:kamailio_3.0: tm: onreply_route: fix cleanup after DROP

by Andrei Pelinescu-Onciul

Module: sip-router Branch: kamailio_3.0 Commit: 95ed848096c03dee4f9d0cf458a1d8e15e836dee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95ed848… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Feb 22 18:01:26 2010 +0100 tm: onreply_route: fix cleanup after DROP After a DROP in the onreply_route the avp lists where not restored to their original values and the possible msg flags changes in the script were dropped. (cherry picked from commit ba15378ef66a11d3cbd6862aa2bfb060d099ca03) --- modules/tm/t_reply.c | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 7c5c78e..69d22a2 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -2038,13 +2038,6 @@ int reply_received( struct sip_msg *p_msg ) LOCK_REPLIES( t ); replies_locked=1; run_top_route(onreply_rt.rlist[t->on_reply], p_msg, &ctx); - if ((ctx.run_flags&DROP_R_F) && (msg_status<200)) { - if (unlikely(replies_locked)) { - replies_locked = 0; - UNLOCK_REPLIES( t ); - } - goto done; - } /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; getbflagsval(0, &uac->branch_flags); @@ -2059,6 +2052,16 @@ int reply_received( struct sip_msg *p_msg ) #ifdef WITH_XAVP xavp_set_list(backup_xavps); #endif + /* handle a possible DROP in the script, but only if this + is not a final reply (final replies already stop the timers + and droping them might leave a transaction living forever) */ + if ((ctx.run_flags&DROP_R_F) && (msg_status<200)) { + if (unlikely(replies_locked)) { + replies_locked = 0; + UNLOCK_REPLIES( t ); + } + goto done; + } } #ifdef USE_DST_BLACKLIST /* add temporary to the blacklist the source of a 503 reply */

14 years, 8 months

← Newer
1
...
29
30
31
32
33
34
35
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2010