sr-dev October 2010

sr-dev@lists.kamailio.org

33 participants
336 discussions

git:kamailio_3.0: iptrtpproxy: makefile LIBS update
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: kamailio_3.0 Commit: 2ccea0649cf7a5be5a70d3ae0a307dfdac114e01 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2ccea06… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 14:01:07 2010 +0200 iptrtpproxy: makefile LIBS update Look for libipt_RTPPROXY first under /lib/xtables (default install dir) and if not found in $(iptdir)/extensions (compile dir). (cherry picked from commit 6b9f6a324851b87d37eaa1f576f3e88d5863ee2a) --- modules/iptrtpproxy/Makefile | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules/iptrtpproxy/Makefile b/modules/iptrtpproxy/Makefile index 4576575..4d6fd76 100644 --- a/modules/iptrtpproxy/Makefile +++ b/modules/iptrtpproxy/Makefile @@ -6,14 +6,17 @@ # WARNING: do not run this directly, it should be run by the master Makefile # -# define path to netfilter/iptables directory -iptdir = ~/work/netfilter/iptables +# define path to netfilter/iptables source directory +iptdir = ~/iptables include ../../Makefile.defs auto_gen= NAME=iptrtpproxy.so -LIBS += $(iptdir)/iptables.o -L $(iptdir)/libiptc -liptc \ - -L $(iptdir)/extensions -lext -INCLUDES = -I $(iptdir)/include +#LIBS += $(iptdir)/iptables.o -L $(iptdir)/libiptc -liptc \ +# -L $(iptdir)/extensions -lext +# look for libipt_RTPPROXY first under /lib/xtables (default install dir) +# and if not found in $(iptdir)/extensions (compile dir) +LIBS = -L/lib/xtables -L$(iptdir)/extensions -lipt_RTPPROXY -ldl +INCLUDES = -I$(iptdir)/include DEFS+=-DSER_MOD_INTERFACE

1 0

git:kamailio_3.0: tls: fix wrong string variable length overwrite
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: kamailio_3.0 Commit: 32361f710b1d66723a22c10bee0bb6088867c681 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32361f7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 7 16:57:33 2010 +0200 tls: fix wrong string variable length overwrite Some per-domain config string variables (cert_file, ca_file, pkey_file & cipher_list) had their length truncated to that of the corresponding variable in the parent domain. Mostly invisible since the string length was in general ignored (asciiz strings). (cherry picked from commit e63610186803cfcc0ff14d8871df8ae70df83103) --- modules/tls/tls_domain.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/modules/tls/tls_domain.c b/modules/tls/tls_domain.c index 628b3e2..80dd614 100644 --- a/modules/tls/tls_domain.c +++ b/modules/tls/tls_domain.c @@ -167,7 +167,7 @@ char* tls_domain_str(tls_domain_t* d) /* * Initialize parameters that have not been configured from - * parent domain (usualy one of default domains + * parent domain (usually one of default domains */ static int fill_missing(tls_domain_t* d, tls_domain_t* parent) { @@ -179,27 +179,36 @@ static int fill_missing(tls_domain_t* d, tls_domain_t* parent) return -1; } - if (!d->cert_file.s && - shm_asciiz_dup(&d->cert_file.s, parent->cert_file.s) < 0) return -1; - d->cert_file.len = parent->cert_file.len; + if (!d->cert_file.s) { + if (shm_asciiz_dup(&d->cert_file.s, parent->cert_file.s) < 0) + return -1; + d->cert_file.len = parent->cert_file.len; + } LOG(L_INFO, "%s: certificate='%s'\n", tls_domain_str(d), d->cert_file.s); - if (!d->ca_file.s && - shm_asciiz_dup(&d->ca_file.s, parent->ca_file.s) < 0) return -1; - d->ca_file.len = parent->ca_file.len; + if (!d->ca_file.s){ + if (shm_asciiz_dup(&d->ca_file.s, parent->ca_file.s) < 0) + return -1; + d->ca_file.len = parent->ca_file.len; + } LOG(L_INFO, "%s: ca_list='%s'\n", tls_domain_str(d), d->ca_file.s); if (d->require_cert == -1) d->require_cert = parent->require_cert; - LOG(L_INFO, "%s: require_certificate=%d\n", tls_domain_str(d), d->require_cert); + LOG(L_INFO, "%s: require_certificate=%d\n", tls_domain_str(d), + d->require_cert); - if (!d->cipher_list.s && - shm_asciiz_dup(&d->cipher_list.s, parent->cipher_list.s) < 0) return -1; - d->cipher_list.len = parent->cipher_list.len; + if (!d->cipher_list.s) { + if ( shm_asciiz_dup(&d->cipher_list.s, parent->cipher_list.s) < 0) + return -1; + d->cipher_list.len = parent->cipher_list.len; + } LOG(L_INFO, "%s: cipher_list='%s'\n", tls_domain_str(d), d->cipher_list.s); - if (!d->pkey_file.s && - shm_asciiz_dup(&d->pkey_file.s, parent->pkey_file.s) < 0) return -1; - d->pkey_file.len = parent->pkey_file.len; + if (!d->pkey_file.s) { + if (shm_asciiz_dup(&d->pkey_file.s, parent->pkey_file.s) < 0) + return -1; + d->pkey_file.len = parent->pkey_file.len; + } LOG(L_INFO, "%s: private_key='%s'\n", tls_domain_str(d), d->pkey_file.s); if (d->verify_cert == -1) d->verify_cert = parent->verify_cert;

1 0

git:kamailio_3.0: core: fix mod_register & dlflags
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: kamailio_3.0 Commit: 8b4802a29d5373bcd2f9e999d1dce7267e6c790c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8b4802a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Aug 24 11:43:36 2010 +0200 core: fix mod_register & dlflags dlflags changes in mod_register() functions were discarded resulting in modules failing to load. (cherry picked from commit 931bd29d504f01eeab738ee5dad72fe7be858adb) --- sr_module.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/sr_module.c b/sr_module.c index 351d7fa..97c13af 100644 --- a/sr_module.c +++ b/sr_module.c @@ -414,7 +414,7 @@ reload: if (((error =(char*)dlerror())==0) && mr) { /* no error call it */ new_dlflags=dlflags; - if (mr(path, &dlflags, 0, 0)!=0) { + if (mr(path, &new_dlflags, 0, 0)!=0) { LOG(L_ERR, "ERROR: load_module: %s: mod_register failed\n", path); goto error1; }

1 0

git:sr_3.0: tm: t_save_lumps() verifies the route type
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: sr_3.0 Commit: 173ec2af5eb41dcc03df4739ecaa229cb98ab6e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=173ec2a… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Sep 30 10:42:57 2010 +0200 tm: t_save_lumps() verifies the route type Even though the t_save_lumps() function is registered only for request route, in some corner case, the function might be called from failure_route. (For example a failure route executes a request route block which calls this function.) This scenario resulted in overwriting the already cloned lump list which is not allowed because of the lockless read, and also resulted in a memory leak. An extra check is also added to save_msg_lumps() to catch this bug. (cherry picked from commit a7bbaf7cd83b5d044ff8c7fff7b19c7ff392da74) --- modules/tm/sip_msg.c | 8 ++++++++ modules/tm/tm.c | 22 ++++++++++++---------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/modules/tm/sip_msg.c b/modules/tm/sip_msg.c index e7bebcc..ab093f8 100644 --- a/modules/tm/sip_msg.c +++ b/modules/tm/sip_msg.c @@ -116,6 +116,14 @@ int save_msg_lumps( struct sip_msg *shm_msg, struct sip_msg *pkg_msg) return -1; } +#ifdef EXTRA_DEBUG + membar_depends(); + if (shm_msg->add_rm || shm_msg->body_lumps || shm_msg->reply_lump) { + LOG(L_ERR, "ERROR: save_msg_lumps: BUG, trying to overwrite the already cloned lumps\n"); + return -1; + } +#endif + /* needless to clone the lumps for ACK, they will not be used again */ if (shm_msg->REQ_METHOD == METHOD_ACK) return 0; diff --git a/modules/tm/tm.c b/modules/tm/tm.c index 69106a5..ed46e53 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -1811,17 +1811,19 @@ static int w_t_save_lumps(struct sip_msg* msg, char* foo, char* bar) #ifdef POSTPONE_MSG_CLONING struct cell *t; - t=get_t(); - if (!t || t==T_UNDEFINED) { - LOG(L_ERR, "ERROR: w_t_save_lumps: transaction has not been created yet\n"); - return -1; - } + if (is_route_type(REQUEST_ROUTE)) { + t=get_t(); + if (!t || t==T_UNDEFINED) { + LOG(L_ERR, "ERROR: w_t_save_lumps: transaction has not been created yet\n"); + return -1; + } - if (save_msg_lumps(t->uas.request, msg)) { - LOG(L_ERR, "ERROR: w_t_save_lumps: " - "failed to save the message lumps\n"); - return -1; - } + if (save_msg_lumps(t->uas.request, msg)) { + LOG(L_ERR, "ERROR: w_t_save_lumps: " + "failed to save the message lumps\n"); + return -1; + } + } /* else nothing to do, the lumps have already been saved */ return 1; #else LOG(L_ERR, "ERROR: w_t_save_lumps: POSTPONE_MSG_CLONING is not defined,"

1 0

git:sr_3.0: modules/tm: fixed t_unref bug catcher
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: sr_3.0 Commit: 29895e6d04b17a44a99467fcffa2a3cba49a9db1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29895e6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Apr 19 18:28:07 2010 +0300 modules/tm: fixed t_unref bug catcher - On behalf Andrei, added one more condition to t_unref bug catcher in order to avoid invalid BUG message. (cherry picked from commit 2812bd9c426d7a186bdc9b1d5fc4766315a64290) --- modules/tm/t_lookup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/t_lookup.c b/modules/tm/t_lookup.c index c706d91..04f8a43 100644 --- a/modules/tm/t_lookup.c +++ b/modules/tm/t_lookup.c @@ -1539,7 +1539,7 @@ int t_unref( struct sip_msg* p_msg ) LOG(L_WARN, "WARNING: script writer didn't release transaction\n"); t_release_transaction(T); }else if (unlikely((kr & REQ_ERR_DELAYED) && - (kr & ~(REQ_RLSD|REQ_RPLD|REQ_ERR_DELAYED)))){ + (kr & ~(REQ_RLSD|REQ_RPLD|REQ_ERR_DELAYED|REQ_FWDED)))){ BUG("tm: t_unref: REQ_ERR DELAYED should have been caught much" " earlier for %p: %d (hex %x)\n",T, kr, kr); t_release_transaction(T);

1 0

git:sr_3.0: core: return & break are absorbed in expressions
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: sr_3.0 Commit: db863ff6c6851cec23b3a66ce7d404e2a2ad1515 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=db863ff… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 29 17:35:25 2010 +0200 core: return & break are absorbed in expressions return & break inside an expression do not cause the current route block or while/switch statement to end. E.g.: $v = { return 1; } will not end the current route, will only set $v to 1. (cherry picked from commit 65b64bca77b18f7ee964119e1b3b363d66189c3e) --- lvalue.c | 12 ++++++++---- rvalue.c | 12 ++++++++---- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/lvalue.c b/lvalue.c index 4f4e501..9b55244 100644 --- a/lvalue.c +++ b/lvalue.c @@ -100,9 +100,11 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: flags=avp->type & ~AVP_VAL_STR; - if (rv->v.action) + if (rv->v.action) { value.n=run_actions_safe(h, rv->v.action, msg); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else value.n=-1; ret=value.n; break; @@ -275,9 +277,11 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: pval.flags=PV_TYPE_INT|PV_VAL_INT; - if (rv->v.action) + if (rv->v.action) { pval.ri=run_actions_safe(h, rv->v.action, msg); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else pval.ri=0; ret=pval.ri; break; diff --git a/rvalue.c b/rvalue.c index f9ba65c..1821afd 100644 --- a/rvalue.c +++ b/rvalue.c @@ -893,9 +893,11 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, } break; case RV_ACTION_ST: - if (rv->v.action) + if (rv->v.action) { *i=(run_actions_safe(h, rv->v.action, msg)>0); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else *i=0; break; case RV_SEL: @@ -1088,9 +1090,11 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, *tmpv=rv->v.s; break; case RV_ACTION_ST: - if (rv->v.action) + if (rv->v.action) { i=(run_actions_safe(h, rv->v.action, msg)>0); - else + h->run_flags &= ~(RETURN_R_F|BREAK_R_F); /* catch return & + break in expr*/ + } else i=0; tmpv->s=int2str(i, &tmpv->len); break;

1 0

git:sr_3.0: iptrtpproxy: minor doc updates
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: sr_3.0 Commit: 110e301b7b7a6b8dedf7b8966cda799799090be9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=110e301… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 21 14:13:17 2010 +0200 iptrtpproxy: minor doc updates - minor fixes + note about setting iptdir in Makefile - README regenerated (cherry picked from commit b0f583306656a2d4d5be1e9fd5e0189675dfd676) --- modules/iptrtpproxy/README | 13 ++++++++++--- modules/iptrtpproxy/doc/iptrtpproxy.xml | 30 +++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 10 deletions(-) diff --git a/modules/iptrtpproxy/README b/modules/iptrtpproxy/README index 7854b36..4a02c94 100644 --- a/modules/iptrtpproxy/README +++ b/modules/iptrtpproxy/README @@ -32,9 +32,9 @@ Tomas Mandys It provides similar functionality as nathelper but communicates with netfilter kernel xt_RTPPROXY module using libipt_RTPPROXY userspace - library. See http://www.2p.cz/en/netfilter_rtp_proxy All RTP streams - are manipulated directly in kernel space, no data are copied from - kernel to userspace and back, it reduces load and delay. + library. All RTP streams are manipulated directly in kernel space, no + data is copied from kernel to userspace and back, it reduces load and + delay. See http://www.2p.cz/en/netfilter_rtp_proxy for more details. The ser module is written as light-weighted, there is not implemented any dialog managment as in nathelper, the reason is that such API @@ -60,6 +60,13 @@ Tomas Mandys * netfilter xt_RTPROXY & libipt_RTPPROXY, see http://www.2p.cz/en/netfilter_rtp_proxy +Note + + The module Makefile must be edited and iptdir setup to the directory + with the iptable sources (if different from ~/iptables). Alternatively + compile the module using: + make -C modules/iptrtpproxy iptdir=path_to_iptables_src + 1.3. Parameters 1.3.1. config (string) diff --git a/modules/iptrtpproxy/doc/iptrtpproxy.xml b/modules/iptrtpproxy/doc/iptrtpproxy.xml index 7c9e039..10cfcc6 100644 --- a/modules/iptrtpproxy/doc/iptrtpproxy.xml +++ b/modules/iptrtpproxy/doc/iptrtpproxy.xml @@ -1,6 +1,13 @@ <?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"> +<!DOCTYPE section PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" + "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd" + [ <!ENTITY % local.common.attrib + "xmlns:xi CDATA #FIXED 'http://www.w3.org/2001/XInclude'"> +  + <!ENTITY % docentities SYSTEM "../../../docbook/entities.xml"> + %docentities; + ] +> <section id="iptrtpproxy" xmlns:xi="http://www.w3.org/2001/XInclude"> <sectioninfo> @@ -34,11 +41,12 @@ <para> It provides similar functionality as <emphasis>nathelper</emphasis> but communicates with <emphasis>netfilter</emphasis> kernel <emphasis>xt_RTPPROXY</emphasis> module using - <emphasis>libipt_RTPPROXY</emphasis> userspace library. - See <ulink url="http://www.2p.cz/en/netfilter_rtp_proxy">http://www.2p.cz/en/netfilter_rtp_proxy</ulink> - All RTP streams are - manipulated directly in kernel space, no data are copied from - kernel to userspace and back, it reduces load and delay. + <emphasis>libipt_RTPPROXY</emphasis> userspace library. + All RTP streams are + manipulated directly in kernel space, no data is copied from + kernel to userspace and back, it reduces load and delay. + See <ulink url="http://www.2p.cz/en/netfilter_rtp_proxy"> + http://www.2p.cz/en/netfilter_rtp_proxy</ulink> for more details. </para> <para> @@ -92,6 +100,14 @@ </listitem> </itemizedlist> </para> + <note><para> + The module Makefile must be edited and iptdir setup to the directory with + the iptable sources (if different from ~/iptables). Alternatively + compile the module using: + <programlisting> + make -C modules/iptrtpproxy iptdir=path_to_iptables_src + </programlisting> + </para></note> </section> <section id="iptrtpproxy.parameters">

1 0

git:sr_3.0: core: switch(string) memleak fix
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: sr_3.0 Commit: ed34b906df35e4502145fefd118c11df772f0f03 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed34b90… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun Sep 26 21:28:47 2010 +0200 core: switch(string) memleak fix When a switch(string) is used and one of the case blocks exits the script (by drop, exit or a module function that causes the script to end), the dynamic string rvals were not cleaned up. This happened because run_actions() uses longjmp() to quickly end the script (skipping this way over the cleanups done after the run_actions() call). Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> Reported-by: C�sar Pinto Mag�n Cesar.Pinto a-e es (cherry picked from commit 6ab93de37f2f1991d3406f52ac9502a7c795ef55) --- action.c | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/action.c b/action.c index 4edf023..315cffb 100644 --- a/action.c +++ b/action.c @@ -1089,17 +1089,39 @@ sw_jt_def: regexec(mct->match[i].l.regex, s.s, 0, 0, 0) == 0) ){ if (likely(mct->jump[i])){ + /* make sure we cleanup first, in case run_actions() + exits the script directly via longjmp() */ + if (rv1){ + rval_destroy(rv1); + rval_destroy(rv); + rval_cache_clean(&c1); + }else if (rv){ + rval_destroy(rv); + rval_cache_clean(&c1); + } ret=run_actions(h, mct->jump[i], msg); h->run_flags &= ~BREAK_R_F; /* catch breaks, but let returns passthrough */ + break; } goto match_cleanup; } match_cond_def: if (mct->def){ + /* make sure we cleanup first, in case run_actions() + exits the script directly via longjmp() */ + if (rv1){ + rval_destroy(rv1); + rval_destroy(rv); + rval_cache_clean(&c1); + }else if (rv){ + rval_destroy(rv); + rval_cache_clean(&c1); + } ret=run_actions(h, mct->def, msg); h->run_flags &= ~BREAK_R_F; /* catch breaks, but let returns passthrough */ + break; } match_cleanup: if (rv1){

1 0

git:sr_3.0: core: fix end-script commands in expr. leaks
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: sr_3.0 Commit: 68b6e7e2b041813384139348091fee5a6c312052 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=68b6e7e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Sep 29 16:30:40 2010 +0200 core: fix end-script commands in expr. leaks When having commands that end the script immediately in assignments (e.g. $foo = { drop; }) or in expressions (e.g. if ($v + { drop; } > 0)), the script was terminated immediately via longjmp. However this might leave some un-freed variables. This fix introduces a safe version of run_actions() (run_actions_safe()) that will not use longjmp() to immediately end the whole script on drop, returning instead to its caller. (cherry picked from commit 28a882873f8a69a189d790e33bcd2017c253a66a) --- action.c | 30 +++++++++++++++++++++++++++++- action.h | 8 ++++++++ lvalue.c | 4 ++-- route_struct.h | 1 + rvalue.c | 4 ++-- 5 files changed, 42 insertions(+), 5 deletions(-) diff --git a/action.c b/action.c index db71a15..9a2aad7 100644 --- a/action.c +++ b/action.c @@ -1331,7 +1331,8 @@ int run_actions(struct run_act_ctx* h, struct action* a, struct sip_msg* msg) h->rec_lev--; end: /* process module onbreak handlers if present */ - if (h->rec_lev==0 && ret==0) + if (unlikely(h->rec_lev==0 && ret==0 && + !(h->run_flags & IGNORE_ON_BREAK_R_F))) for (mod=modules;mod;mod=mod->next) if ((mod->mod_interface_ver==0) && mod->exports && mod->exports->v0.onbreak_f) { @@ -1348,6 +1349,33 @@ error: } + +#ifdef USE_LONGJMP +/** safe version of run_actions(). + * It always return (it doesn't longjmp on forced script end). + * @returns 0, or 1 on success, <0 on error + * (0 if drop or break encountered, 1 if not ) */ +int run_actions_safe(struct run_act_ctx* h, struct action* a, + struct sip_msg* msg) +{ + struct run_act_ctx ctx; + int ret; + int ign_on_break; + + /* start with a fresh action context */ + init_run_actions_ctx(&ctx); + ctx.last_retcode = h->last_retcode; + ign_on_break = h->run_flags & IGNORE_ON_BREAK_R_F; + ctx.run_flags = h->run_flags | IGNORE_ON_BREAK_R_F; + ret = run_actions(&ctx, a, msg); + h->last_retcode = ctx.last_retcode; + h->run_flags = (ctx.run_flags & ~IGNORE_ON_BREAK_R_F) | ign_on_break; + return ret; +} +#endif /* USE_LONGJMP */ + + + int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx *c) { struct run_act_ctx ctx; diff --git a/action.h b/action.h index c07b9ae..c4c0856 100644 --- a/action.h +++ b/action.h @@ -61,4 +61,12 @@ int run_actions(struct run_act_ctx* c, struct action* a, struct sip_msg* msg); int run_top_route(struct action* a, sip_msg_t* msg, struct run_act_ctx* c); + +#ifdef USE_LONGJMP +int run_actions_safe(struct run_act_ctx* c, struct action* a, + struct sip_msg* msg); +#else /*! USE_LONGJMP */ +#define run_actions_safe(c, a, m) run_actions(c, a, m) +#endif /* USE_LONGJMP */ + #endif diff --git a/lvalue.c b/lvalue.c index 2db1ba9..4f4e501 100644 --- a/lvalue.c +++ b/lvalue.c @@ -101,7 +101,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, case RV_ACTION_ST: flags=avp->type & ~AVP_VAL_STR; if (rv->v.action) - value.n=run_actions(h, rv->v.action, msg); + value.n=run_actions_safe(h, rv->v.action, msg); else value.n=-1; ret=value.n; @@ -276,7 +276,7 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, case RV_ACTION_ST: pval.flags=PV_TYPE_INT|PV_VAL_INT; if (rv->v.action) - pval.ri=run_actions(h, rv->v.action, msg); + pval.ri=run_actions_safe(h, rv->v.action, msg); else pval.ri=0; ret=pval.ri; diff --git a/route_struct.h b/route_struct.h index 3f7e854..1edaad8 100644 --- a/route_struct.h +++ b/route_struct.h @@ -134,6 +134,7 @@ typedef enum _operand_subtype action_param_type; #define RETURN_R_F 2 #define BREAK_R_F 4 #define DROP_R_F 8 +#define IGNORE_ON_BREAK_R_F 256 struct cfg_pos{ diff --git a/rvalue.c b/rvalue.c index b17e664..f9ba65c 100644 --- a/rvalue.c +++ b/rvalue.c @@ -894,7 +894,7 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - *i=(run_actions(h, rv->v.action, msg)>0); + *i=(run_actions_safe(h, rv->v.action, msg)>0); else *i=0; break; @@ -1089,7 +1089,7 @@ int rval_get_tmp_str(struct run_act_ctx* h, struct sip_msg* msg, break; case RV_ACTION_ST: if (rv->v.action) - i=(run_actions(h, rv->v.action, msg)>0); + i=(run_actions_safe(h, rv->v.action, msg)>0); else i=0; tmpv->s=int2str(i, &tmpv->len);

1 0

git:sr_3.0: core: switch(string) break/return fix
by Andrei Pelinescu-Onciul 11 Oct '10

11 Oct '10

Module: sip-router Branch: sr_3.0 Commit: 1a2b3171e1b0815b81d2dea04866e6aa98f816ce URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a2b317… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 28 18:09:17 2010 +0200 core: switch(string) break/return fix Commit 6ab93de3 (switch(string) memleak fix) broke break & return from switch case statements. Reported-by: Juha Heinanen jh tutpro com (cherry picked from commit c9586e183f5fbde854ec8f27c38f58a7853e971a) --- action.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/action.c b/action.c index 315cffb..db71a15 100644 --- a/action.c +++ b/action.c @@ -1102,7 +1102,7 @@ sw_jt_def: ret=run_actions(h, mct->jump[i], msg); h->run_flags &= ~BREAK_R_F; /* catch breaks, but let returns passthrough */ - break; + goto skip; } goto match_cleanup; }

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
34
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2010