sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

git:master: core: pv - added wrapper to set function
by Daniel-Constantin Mierla 27 Apr '09

27 Apr '09

Module: sip-router Branch: master Commit: 858146a9910ae2e434fb1de3840678cf8b684ce2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=858146a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 27 13:04:04 2009 +0200 core: pv - added wrapper to set function - wrapper for PV set function that takes in consideration cases of altering the msg context --- pvapi.c | 11 +++++++++++ pvar.h | 5 +++++ 2 files changed, 16 insertions(+), 0 deletions(-) diff --git a/pvapi.c b/pvapi.c index ed6a239..87de64a 100644 --- a/pvapi.c +++ b/pvapi.c @@ -35,6 +35,7 @@ #include "ut.h" #include "dprint.h" #include "hashes.h" +#include "route.h" #include "pvar.h" #define is_in_str(p, in) (p<in->s+in->len && *p) @@ -920,6 +921,16 @@ int pv_get_spec_value(struct sip_msg* msg, pv_spec_p sp, pv_value_t *value) return ret; } +int pv_set_spec_value(struct sip_msg* msg, pv_spec_p sp, int op, + pv_value_t *value) +{ + if(sp==NULL || !pv_is_w(sp)) + return 0; /* no op */ + if(pv_alter_context(sp) && is_route_type(LOCAL_ROUTE)) + return 0; /* no op */ + return sp->setf(msg, &sp->pvp, op, value); +} + /** * */ diff --git a/pvar.h b/pvar.h index e1a51a5..bb98ef0 100644 --- a/pvar.h +++ b/pvar.h @@ -134,6 +134,9 @@ typedef int (*pv_parse_name_f)(pv_spec_p sp, str *in); typedef int (*pv_parse_index_f)(pv_spec_p sp, str *in); typedef int (*pv_init_param_f)(pv_spec_p sp, int param); +#define pv_alter_context(pv) ((pv)->type==PVT_CONTEXT \ + || (pv)->type==PVT_BRANCH) + /*! \brief * PV spec format: * - $class_name @@ -166,6 +169,8 @@ typedef struct _pv_elem char* pv_parse_spec2(str *in, pv_spec_p sp, int silent); #define pv_parse_spec(in, sp) pv_parse_spec2((in), (sp), 0) int pv_get_spec_value(struct sip_msg* msg, pv_spec_p sp, pv_value_t *value); +int pv_set_spec_value(struct sip_msg* msg, pv_spec_p sp, int op, + pv_value_t *value); int pv_printf(struct sip_msg* msg, pv_elem_p list, char *buf, int *len); int pv_elem_free_all(pv_elem_p log); void pv_value_destroy(pv_value_t *val);

1 0

git:master: define ANY_ROUTE
by Daniel-Constantin Mierla 27 Apr '09

27 Apr '09

Module: sip-router Branch: master Commit: 16b47a9a8830fc5c9d2b310536a7a881e233b9ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16b47a9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 27 13:00:44 2009 +0200 define ANY_ROUTE - defined as 0xffffffff to match any route type --- route.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/route.h b/route.h index 221fb4c..cb86ba4 100644 --- a/route.h +++ b/route.h @@ -52,6 +52,7 @@ #define ONSEND_ROUTE (1 << 4) #define ERROR_ROUTE (1 << 5) #define LOCAL_ROUTE (1 << 6) +#define ANY_ROUTE (0xFFFFFFFF) /* The value of this variable is one of the route types defined above and it * determines the type of the route being executed, module functions can use

1 0

git:master: added $null
by Daniel-Constantin Mierla 27 Apr '09

27 Apr '09

Module: sip-router Branch: master Commit: 371332203b371aedd28c6611a00ea8355bc0d6b3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3713322… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 27 11:57:05 2009 +0200 added $null - PV representation of K 'null' keyword - can be used for assignemts to unset the PV (for easier K-compatibility reason, e.g., $ru = $null) - do not use it in logical expressions (avoid: if($avp(abc)==$null) ; use instead: if(! defined $avp(abc)) --- modules_k/pv/pv.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 11d9d90..b74fe12 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -199,6 +199,9 @@ static pv_export_t mod_pvs[] = { {{"ml", (sizeof("ml")-1)}, /* */ PVT_OTHER, pv_get_msg_len, 0, 0, 0, 0, 0}, + {{"null", (sizeof("null")-1)}, /* */ + PVT_NULL, pv_get_null, 0, + 0, 0, 0, 0}, {{"od", (sizeof("od")-1)}, /* */ PVT_OTHER, pv_get_ouri_attr, 0, 0, 0, pv_init_iname, 2},

1 0

git:master: * Modules: presence
by Juha Heinanen 24 Apr '09

24 Apr '09

Module: sip-router Branch: master Commit: 59f30b6cbcf25d0ef0f517dad21fa8e711732293 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59f30b6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Apr 22 14:08:51 2009 +0300 * Modules: presence * Changed name of auth_status function to pres_auth_status. * Fixed and improved example (don't know how to generate new README). --- modules_k/presence/doc/presence_admin.xml | 15 ++++++++++----- modules_k/presence/presence.c | 6 +++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/modules_k/presence/doc/presence_admin.xml b/modules_k/presence/doc/presence_admin.xml index 057bc95..f39d676 100644 --- a/modules_k/presence/doc/presence_admin.xml +++ b/modules_k/presence/doc/presence_admin.xml @@ -455,11 +455,11 @@ if(method=="SUBSCRIBE") <section> <title> - <function moreinfo="none">auth_status(watcher_uri, presentity_uri)</function> + <function moreinfo="none">pres_auth_status(watcher_uri, presentity_uri)</function> </title> <para> The function checks if watcher is authorized to subscribe - presence of presentity. Both watcher_uri and + event 'presence' of presentity. Both watcher_uri and presentity_uri are pseudo variables. Function returns ACTIVE_STATUS, if subscription is allowed and PENDING_STATUS, TERMINATED_STATUS, or WAITING_STATUS @@ -472,11 +472,16 @@ if(method=="SUBSCRIBE") </para> <example> - <title><function>auth_status</function> usage</title> + <title><function>pres_auth_status</function> usage</title> <programlisting format="linespecific"> ... -if((method=="MESSAGE") && (auth_status("$fu", $ru"))) { - t_relay(); +if (method=="MESSAGE") { + pres_auth_status("$fu", $ru"); + if ($retcode == 1) { + t_relay(); + } else { + send_reply("403", "Forbidden"); + } } ... </programlisting> diff --git a/modules_k/presence/presence.c b/modules_k/presence/presence.c index 9aac54c..703050c 100644 --- a/modules_k/presence/presence.c +++ b/modules_k/presence/presence.c @@ -118,7 +118,7 @@ static struct mi_root* mi_cleanup(struct mi_root* cmd, void* param); static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs_array); int update_watchers_status(str pres_uri, pres_ev_t* ev, str* rules_doc); static int mi_child_init(void); -static int auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2); +static int pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2); int counter =0; int pid = 0; @@ -140,7 +140,7 @@ static cmd_export_t cmds[]= {"handle_publish", (cmd_function)handle_publish, 0,fixup_presence,0, REQUEST_ROUTE}, {"handle_publish", (cmd_function)handle_publish, 1,fixup_presence, 0, REQUEST_ROUTE}, {"handle_subscribe",(cmd_function)handle_subscribe,0,fixup_subscribe,0, REQUEST_ROUTE}, - {"auth_status", (cmd_function)auth_status, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE}, + {"pres_auth_status", (cmd_function)pres_auth_status, 2, fixup_pvar_pvar, fixup_free_pvar_pvar, REQUEST_ROUTE}, {"bind_presence", (cmd_function)bind_presence, 1, 0, 0, 0}, { 0, 0, 0, 0, 0, 0} }; @@ -1078,7 +1078,7 @@ static int update_pw_dialogs(subs_t* subs, unsigned int hash_code, subs_t** subs return 0; } -static int auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2) +static int pres_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2) { pv_spec_t *sp; pv_value_t pv_val;

4 6

git:master: tm: hooks comments update
by Andrei Pelinescu-Onciul 24 Apr '09

24 Apr '09

Module: sip-router Branch: master Commit: 89bfe93c18d4ec77ff8c1819d365bda2a85613fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=89bfe93… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 24 10:52:46 2009 +0200 tm: hooks comments update - updated description for TMCB_RESPONSE_OUT and TMCB_LOCAL_RESPONSE_OUT. --- modules/tm/t_hooks.h | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index b396737..de20c51 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -167,16 +167,27 @@ struct cell; * distinguish between the two, one would need to look at the method in * Cseq (look at t_reply.c:1630 (reply_received()) for an example). * - * TMCB_RESPONSE_OUT -- a final reply was sent out (either local - * or proxied) -- there is nothing more you can change from - * the callback, it is good for accounting-like uses. No lock is held. - * Known BUGS: it's called also for provisional replies for relayed replies. - * For local replies it's called only for the final reply. - * - * Note: the message passed to callback may also have + * TMCB_RESPONSE_OUT -- a final or provisional reply was sent out + * successfully (either a local reply or a proxied one). + * For final replies is called only for the first one (it's not called + * for retransmissions). + * For non-local replies (proxied) is called also for provisional responses + * (NOTE: this might change and in the future it might be called only + * for final replies --andrei). + * For local replies is called _only_ for the final reply. + * There is nothing more you can change from the callback, it is good for + * accounting-like uses. No lock is held. + * Known oddities: it's called for provisional replies for relayed replies, + * but not for local responses (see NOTE above). + * Note: if the send fails or via cannot be resolved, this callback is + * _not_ called. + * Note: local reply means locally generated reply (via t_reply() & friends) + * and not local transaction. + * + * Note: the message passed to the callback may also have * value FAKED_REPLY (like other reply callbacks) which - * indicates a pseudo_reply caused by a timer. Check for - * this value before deferring -- you will cause a segfault + * indicates a local reply caused by a timer, calling t_reply() a.s.o. +* Check for this value before deferring -- you will cause a segfault * otherwise. Check for t->uas.request validity too if you * need it ... locally initiated UAC transactions set it to 0. * @@ -249,9 +260,12 @@ struct cell; * transaction arrived. Message may be FAKED_REPLY. Can be called multiple * times, no lock is held. * - * TMCB_LOCAL_REPONSE_OUT -- provisional reply for localy initiated + * TMCB_LOCAL_RESPONSE_OUT -- provisional reply for localy initiated * transaction. The message may be a FAKED_REPLY and the callback might be * called multiple time quasi-simultaneously. No lock is held. + * Note: depends on tm.pass_provisional_replies. + * Note: the name is very unfortunate and it will probably be changed + * (e.g. TMCB_LOCAL_PROVISIONAL). * * TMCB_NEG_ACK_IN -- an ACK to a negative reply was received, thus ending * the transaction (this happens only when the final reply sent by tm is

1 0

git:master: tm: TMCB_RESPONSE_OUT (callback) minor fix
by Andrei Pelinescu-Onciul 24 Apr '09

24 Apr '09

Module: sip-router Branch: master Commit: 98bfba70b755c1ea3844ecfbce35bd9b7f0b11a9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=98bfba7… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 24 09:55:01 2009 +0200 tm: TMCB_RESPONSE_OUT (callback) minor fix - for local generated reply (via t_reply*()) call the TMCB_RESPONSE_OUT callback only if the send was successful (this brings it in-line with the proxied reply behaviour). Reported-by: Daniel-Constantin Mierla <miconda(a)gmail.com> --- modules/tm/t_reply.c | 26 +++++++++++--------------- 1 files changed, 11 insertions(+), 15 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index a8d1ec3..5cb731f 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -563,17 +563,10 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, /* do UAC cleanup procedures in case we generated a final answer whereas there are pending UACs */ if (code>=200) { - if ( is_local(trans) ) { - DBG("DEBUG: local transaction completed from _reply\n"); - if ( unlikely(has_tran_tmcbs(trans, TMCB_LOCAL_COMPLETED)) ) - run_trans_callbacks( TMCB_LOCAL_COMPLETED, trans, - 0, FAKED_REPLY, code); - } else { - if ( unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_OUT)) ) - run_trans_callbacks( TMCB_RESPONSE_OUT, trans, - trans->uas.request, FAKED_REPLY, code); - } - + if (unlikely(is_local(trans) && + has_tran_tmcbs(trans, TMCB_LOCAL_COMPLETED) )) + run_trans_callbacks(TMCB_LOCAL_COMPLETED, trans, + 0, FAKED_REPLY, code); cleanup_uac_timers( trans ); if (is_invite(trans)) cancel_uacs( trans, cancel_bitmap, F_CANCEL_B_KILL ); @@ -594,17 +587,20 @@ static int _reply_light( struct cell *trans, char* buf, unsigned int len, if (!trans->uas.response.dst.send_sock) { LOG(L_ERR, "ERROR: _reply_light: no resolved dst to send reply to\n"); } else { + if (likely(SEND_PR_BUFFER( rb, buf, len )>=0)){ + if (unlikely(code>=200 && !is_local(trans) && + has_tran_tmcbs(trans, TMCB_RESPONSE_OUT)) ) + run_trans_callbacks(TMCB_RESPONSE_OUT, trans, + trans->uas.request, FAKED_REPLY, code); #ifdef TMCB_ONSEND - if (SEND_PR_BUFFER( rb, buf, len )>=0) if (unlikely(has_tran_tmcbs(trans, TMCB_RESPONSE_SENT))){ INIT_TMCB_ONSEND_PARAMS(onsend_params, 0, 0, rb, &rb->dst, buf, len, TMCB_LOCAL_F, rb->branch, code); run_onsend_callbacks2(TMCB_RESPONSE_SENT, trans, &onsend_params); } -#else - SEND_PR_BUFFER( rb, buf, len ); -#endif +#endif /* TMCB_ONSEND */ + } DBG("DEBUG: reply sent out. buf=%p: %.9s..., shmem=%p: %.9s\n", buf, buf, rb->buffer, rb->buffer ); }

1 0

git:master: core: avp & pvars assignment fixes & changes
by Andrei Pelinescu-Onciul 24 Apr '09

24 Apr '09

Module: sip-router Branch: master Commit: 0789fd246548cb8287777bbe9f8322cffedc8ad4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0789fd2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 24 21:40:26 2009 +0200 core: avp & pvars assignment fixes & changes - fix: delete avps after finding their new value and not before (fixes $v=$v or $v=$avp(v) deleting $v's value) - when assigning something undefined (like a non-existing avp), delete the lvalue. E.g.: $v=$foo and $ foo undefined => delete/undefine $v An expr is undefined only if it consists only on an undefined avp or pvar. If it contains more elements it's always defined (even if all the elements are undefined). E.g: $foo and $bar are undefined => defined $foo == 0, defined $bar == 0, but defined ($foo+$bar) == 1. An avp is undefined if it doesn't exist or there is some error accessing it. A pvar is undefined if it's PV_VAL_NULL or there is an error getting it's value. --- lvalue.c | 95 +++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 64 insertions(+), 31 deletions(-) diff --git a/lvalue.c b/lvalue.c index 3c409ff..56b7496 100644 --- a/lvalue.c +++ b/lvalue.c @@ -23,6 +23,10 @@ * History: * -------- * 2008-11-30 initial version (andrei) + * 2009-04-24 delete avps after finding their new value and not before + * (fixed $avp=$avp) + * when assigning something undefined (e.g. non-existing avp), + * delete the lvalue (similar to perl) (andrei) */ #include "lvalue.h" @@ -53,19 +57,37 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, unsigned short flags; struct search_state st; int ret, v, destroy_pval; + int avp_add; + +#if 0 + #define AVP_ASSIGN_NOVAL() \ + /* unknown value => reset the avp in function of its type */ \ + flags=avp->type; \ + if (flags & AVP_VAL_STR){ \ + value.s.s=""; \ + value.s.len=0; \ + }else{ \ + value.n=0; \ + } +#endif + #define AVP_ASSIGN_NOVAL() \ + /* no value => delete avp */ \ + avp_add=0 destroy_pval=0; flags = 0; avp=&lv->lv.avps; ret=0; - /* If the left attr was specified without indexing brackets delete - * existing AVPs before adding new ones */ - if ((avp->type & AVP_INDEX_ALL) != AVP_INDEX_ALL) - delete_avp(avp->type, avp->name); + avp_add=1; + switch(rv->type){ case RV_NONE: BUG("non-intialized rval / rval expr \n"); - goto error; + /* unknown value => reset the avp in function of its type */ + flags=avp->type; + AVP_ASSIGN_NOVAL(); + ret=-1; + break; case RV_INT: value.n=rv->v.l; flags=avp->type & ~AVP_VAL_STR; @@ -96,22 +118,22 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, ret=value.n; break; case RV_SEL: + flags=avp->type|AVP_VAL_STR; v=run_select(&value.s, &rv->v.sel, msg); if (unlikely(v!=0)){ + value.s.s=""; + value.s.len=0; if (v<0){ ret=-1; - goto error; - }else { /* v>0 */ - value.s.s=""; - value.s.len=0; - } + break; + } /* v>0 */ } - flags=avp->type|AVP_VAL_STR; ret=(value.s.len>0); break; case RV_AVP: avp_mark=0; if (unlikely((rv->v.avps.type & AVP_INDEX_ALL) == AVP_INDEX_ALL)){ + /* special case: add the value to the avp */ r_avp = search_first_avp(rv->v.avps.type, rv->v.avps.name, &value, &st); while(r_avp){ @@ -136,6 +158,7 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, ret=1; goto end; }else{ + /* normal case, value is replaced */ r_avp = search_avp_by_index(rv->v.avps.type, rv->v.avps.name, &value, rv->v.avps.index); if (likely(r_avp)){ @@ -146,8 +169,11 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, AVP_NAME_RE)); ret=1; }else{ - ret=-1; - goto error; + /* on error, keep the type of the assigned avp, but + reset it to an empty value */ + AVP_ASSIGN_NOVAL(); + ret=0; + break; } } break; @@ -165,21 +191,22 @@ inline static int lval_avp_assign(struct run_act_ctx* h, struct sip_msg* msg, flags=avp->type | AVP_VAL_STR; }else if (pval.flags==PV_VAL_NONE || (pval.flags & (PV_VAL_NULL|PV_VAL_EMPTY))){ - value.s.s=""; - value.s.len=0; + AVP_ASSIGN_NOVAL(); ret=0; - flags=avp->type | AVP_VAL_STR; } }else{ /* non existing pvar */ - value.s.s=""; - value.s.len=0; + /* on error, keep the type of the assigned avp, but + reset it to an empty value */ + AVP_ASSIGN_NOVAL(); ret=0; - flags=avp->type | AVP_VAL_STR; } break; } - if (add_avp(flags & ~AVP_INDEX_ALL, avp->name, value) < 0) { + /* If the left attr was specified without indexing brackets delete + * existing AVPs before adding the new value */ + delete_avp(avp->type, avp->name); + if (avp_add && (add_avp(flags & ~AVP_INDEX_ALL, avp->name, value) < 0)) { ERR("failed to assign value to avp\n"); goto error; } @@ -218,6 +245,10 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, int v; int destroy_pval; + #define PVAR_ASSIGN_NOVAL() \ + /* no value found => "undefine" */ \ + pv_get_null(msg, 0, &pval) + destroy_pval=0; pvar=&lv->lv.pvs; if (unlikely(!pv_is_w(pvar))){ @@ -229,7 +260,9 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, switch(rv->type){ case RV_NONE: BUG("non-intialized rval / rval expr \n"); - goto error; + PVAR_ASSIGN_NOVAL(); + ret=-1; + break; case RV_INT: pval.flags=PV_TYPE_INT|PV_VAL_INT; pval.ri=rv->v.l; @@ -263,12 +296,12 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, pval.flags=PV_VAL_STR; v=run_select(&pval.rs, &rv->v.sel, msg); if (unlikely(v!=0)){ + pval.flags|=PV_VAL_EMPTY; + pval.rs.s=""; + pval.rs.len=0; if (v<0){ ret=-1; - goto error; - }else { /* v>0 */ - pval.rs.s=""; - pval.rs.len=0; + break; } } ret=(pval.rs.len)>0; @@ -287,8 +320,9 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, ret=!(!pval.ri); } }else{ - ret=-1; - goto error; + PVAR_ASSIGN_NOVAL(); + ret=0; /* avp not defined (valid case) */ + break; } break; case RV_PVAR: @@ -299,14 +333,13 @@ inline static int lval_pvar_assign(struct run_act_ctx* h, struct sip_msg* msg, }else if (pval.flags & PV_VAL_STR){ ret=(pval.rs.len>0); }else{ - ERR("no value in pvar assignment rval\n"); - ret=-1; - goto error; + /* no value / not defined (e.g. avp) -> keep the flags */ + ret=0; } }else{ ERR("non existing right pvar\n"); + PVAR_ASSIGN_NOVAL(); ret=-1; - goto error; } break; }

1 0

git:master: core expr: new internal operators
by Andrei Pelinescu-Onciul 24 Apr '09

24 Apr '09

Module: sip-router Branch: master Commit: ea1babd9d9e6e90629ad4ad091b1ab90241332fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea1babd… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 24 14:45:36 2009 +0200 core expr: new internal operators - added RVE_STRLEN_OP, RVE_STREMPTY_OP and RVE_DEFINED_OP --- rvalue.c | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++- rvalue.h | 6 ++- 2 files changed, 182 insertions(+), 3 deletions(-) diff --git a/rvalue.c b/rvalue.c index 8bd0aa2..74e8df5 100644 --- a/rvalue.c +++ b/rvalue.c @@ -23,6 +23,7 @@ * History: * -------- * 2008-12-01 initial version (andrei) + * 2009-04-24 added support for defined, strempty, strlen (andrei) */ #include "rvalue.h" @@ -390,6 +391,9 @@ enum rval_type rve_guess_type( struct rval_expr* rve) case RVE_EQ_OP: case RVE_DIFF_OP: case RVE_IPLUS_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: return RV_INT; case RVE_PLUS_OP: /* '+' evaluates to the type of the left operand */ @@ -429,6 +433,9 @@ int rve_is_constant(struct rval_expr* rve) case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: return rve_is_constant(rve->left.rve); case RVE_MINUS_OP: case RVE_MUL_OP: @@ -478,6 +485,9 @@ static int rve_op_unary(enum rval_expr_op op) case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: return 1; case RVE_MINUS_OP: case RVE_MUL_OP: @@ -610,6 +620,7 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, return 1; } } + break; case RVE_CONCAT_OP: *type=RV_STR; if (rve_check_type(&type1, rve->left.rve, bad_rve, bad_t, exp_t)){ @@ -632,6 +643,21 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, return 1; } } + break; + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: + *type=RV_INT; + if (rve_check_type(&type1, rve->left.rve, bad_rve, bad_t, exp_t)){ + if (type1==RV_INT){ + if (bad_rve) *bad_rve=rve->left.rve; + if (bad_t) *bad_t=type1; + if (exp_t) *exp_t=RV_STR; + return 0; + } + return 1; + } + break; case RVE_NONE_OP: break; } @@ -974,7 +1000,7 @@ inline static int int_intop1(int* res, enum rval_expr_op op, int v) -/** integer operation: *res= op v. +/** integer operation: *res= v1 op v2 * @return 0 on succes, \<0 on error */ inline static int int_intop2(int* res, enum rval_expr_op op, int v1, int v2) @@ -1054,6 +1080,27 @@ inline static int bool_strop2( enum rval_expr_op op, int* res, +/** integer returning operation on string: *res= op str (returns integer) + * @return 0 on succes, \<0 on error + */ +inline static int int_strop1(int* res, enum rval_expr_op op, str* s1) +{ + switch(op){ + case RVE_STRLEN_OP: + *res=s1->len; + break; + case RVE_STREMPTY_OP: + *res=(s1->len==0); + break; + default: + BUG("rv unsupported int_strop1 %d\n", op); + return -1; + } + return 0; +} + + + /** integer operation: ret= op v (returns a rvalue). * @return rvalue on success, 0 on error */ @@ -1306,6 +1353,107 @@ error: +/** integer operation on rval evaluated as string. + * Can use cached rvalues (c1 & c2). + * @return 0 success, -1 on error + */ +inline static int rval_int_strop1(struct run_act_ctx* h, + struct sip_msg* msg, + int* res, + enum rval_expr_op op, + struct rvalue* l, + struct rval_cache* c1) +{ + struct rvalue* rv1; + int ret; + + rv1=0; + ret=0; + if ((rv1=rval_convert(h, msg, RV_STR, l, c1))==0) + goto error; + ret=int_strop1(res, op, &rv1->v.s); + rval_destroy(rv1); + return ret; +error: + rval_destroy(rv1); + return 0; +} + + + +/** checks if rv is defined. + * @return 1 defined, 0 not defined, -1 on error + * Can use cached rvalues (c1). + * Note: a rv can be undefined if it's an undefined avp or pvar or + * if it's NONE + */ +inline static int rv_defined(struct run_act_ctx* h, + struct sip_msg* msg, + struct rvalue* rv, struct rval_cache* cache) +{ + avp_t* r_avp; + int_str avp_val; + pv_value_t pval; + int ret; + + ret=1; + switch(rv->type){ + case RV_AVP: + if (unlikely(cache && cache->cache_type==RV_CACHE_AVP)){ + if (cache->val_type==RV_NONE) + ret=0; + }else{ + r_avp = search_avp_by_index(rv->v.avps.type, rv->v.avps.name, + &avp_val, rv->v.avps.index); + if (unlikely(r_avp==0)){ + ret=0; + } + } + break; + case RV_PVAR: + /* PV_VAL_NULL or pv_get_spec_value error => undef */ + if (unlikely(cache && cache->cache_type==RV_CACHE_PVAR)){ + if (cache->val_type==RV_NONE) + ret=0; + }else{ + memset(&pval, 0, sizeof(pval)); + if (likely(pv_get_spec_value(msg, &rv->v.pvs, &pval)==0)){ + if ((pval.flags & PV_VAL_NULL) && + ! (pval.flags & (PV_VAL_INT|PV_VAL_STR))){ + ret=0; + } + pv_value_destroy(&pval); + }else{ + ret=0; /* in case of error, consider it undef */ + } + } + break; + case RV_NONE: + ret=0; + break; + default: + break; + } + return 1; /* defined */ +} + + +/** defined (integer) operation on rve. + * @return 1 defined, 0 not defined, -1 on error + */ +inline static int int_rve_defined(struct run_act_ctx* h, + struct sip_msg* msg, + struct rval_expr* rve) +{ + /* only a rval can be undefined, any expression consisting on more + then one rval => defined */ + if (likely(rve->op==RVE_RVAL_OP)) + return rv_defined(h, msg, &rve->left.rval, 0); + return 1; +} + + + /** evals an integer expr to an int. * * *res=(int)eval(rve) @@ -1431,6 +1579,18 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, *res=0; ret=-1; break; + case RVE_DEFINED_OP: + ret=int_rve_defined(h, msg, rve->left.rve); + break; + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + if (unlikely((rv1=rval_expr_eval(h, msg, rve->left.rve))==0)){ + ret=-1; + break; + } + ret=rval_int_strop1(h, msg, res, rve->op, rv1, 0); + rval_destroy(rv1); + break; case RVE_NONE_OP: /*default:*/ BUG("invalid rval int expression operation %d\n", rve->op); @@ -1503,6 +1663,9 @@ int rval_expr_eval_rvint( struct run_act_ctx* h, case RVE_EQ_OP: case RVE_DIFF_OP: case RVE_IPLUS_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: /* operator forces integer type */ ret=rval_expr_eval_int(h, msg, res_i, rve); *res_rv=0; @@ -1560,7 +1723,7 @@ error: * WARNING: result must be rval_destroy()'ed if non-null (it might be * a reference to another rval). The result can be modified only * if rv_chg_in_place() returns true. - * @result rvalue on success, 0 on error + * @return rvalue on success, 0 on error */ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, struct rval_expr* rve) @@ -1598,6 +1761,9 @@ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, case RVE_EQ_OP: case RVE_DIFF_OP: case RVE_IPLUS_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: /* operator forces integer type */ r=rval_expr_eval_int(h, msg, &i, rve); if (likely(r==0)){ @@ -1800,6 +1966,9 @@ struct rval_expr* mk_rval_expr1(enum rval_expr_op op, struct rval_expr* rve1, case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: break; default: BUG("unsupported unary operator %d\n", op); @@ -1874,6 +2043,9 @@ static int rve_op_is_assoc(enum rval_expr_op op) case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: /* one operand expression => cannot be assoc. */ return 0; case RVE_DIV_OP: @@ -1911,6 +2083,9 @@ static int rve_op_is_commutative(enum rval_expr_op op, enum rval_type type) case RVE_UMINUS_OP: case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: /* one operand expression => cannot be commut. */ return 0; case RVE_DIV_OP: diff --git a/rvalue.h b/rvalue.h index 88fd6f2..a9dbe0d 100644 --- a/rvalue.h +++ b/rvalue.h @@ -64,8 +64,12 @@ enum rval_expr_op{ RVE_PLUS_OP, /* generic plus (int or str) returns left + right */ RVE_EQ_OP, /* 2 members, returns left == right (int)*/ RVE_DIFF_OP, /* 2 members, returns left != right (int)*/ - RVE_CONCAT_OP,/* string concatenation, returns left . right */ /* str only */ + RVE_CONCAT_OP,/* 2 members, string concat, returns left . right (str)*/ + RVE_STRLEN_OP, /* one member, string length:, returns strlen(val) (int)*/ + RVE_STREMPTY_OP, /* one member, returns val=="" (bool) */ + /* avp, pvars a.s.o */ + RVE_DEFINED_OP, /* one member, returns is_defined(val) (bool) */ };

1 0

git:master: core: new script operators: defined, strlen, strempty
by Andrei Pelinescu-Onciul 24 Apr '09

24 Apr '09

Module: sip-router Branch: master Commit: d47990275e5f604560d7ef6d93e8f2056110d7c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d479902… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 24 21:02:05 2009 +0200 core: new script operators: defined, strlen, strempty Support for 3 new operators: defined expr - returns true if expr is defined, and false if not. Note: only a standalone avp or pvar can be undefined, everything else is defined. strlen(expr) - returns the lenght of expr evaluated as string. strempty(expr) - returns true if expr evaluates to the empty string (equivalent to expr==""). Example: if (defined $v) $len=strlen($v); else $len=0; --- NEWS | 14 ++++++++++++-- cfg.lex | 7 +++++++ cfg.y | 11 +++++++++++ 3 files changed, 30 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index ba832bf..fade123 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,14 @@ $Id$ sip-router changes core: + - new script operators: defined, strlen, strempty + defined expr - returns true if expr is defined, and false if not. + Note: only a standalone avp or pvar can be + undefined, everything else is defined. + strlen(expr) - returns the lenght of expr evaluated as string. + strempty(expr) - returns true if expr evaluates to the empty + string (equivalent to expr==""). + e.g.: if (defined $v && !strempty($v)) $len=strlen($v); - module search path support: loadpath takes now a list of directories separated by ':'. The list is searched in-order. For each directory d $d/${module_name}.so and $d/${module_name}/${module_name}.so are tried. @@ -23,11 +31,13 @@ config script changes: - support for kamailio style pvars - C-like switch()/case (integer only) - while() - - max_while_loops - maximum iterations allowed for a while, can be changed - at runtime. Default 100. build system: - multiple modules directories are now supported (defined in Makefile.dirs) +new config variables: + - max_while_loops - maximum iterations allowed for a while (can be changed + at runtime). Default 100. + diff --git a/cfg.lex b/cfg.lex index 9f42697..b1f9c55 100644 --- a/cfg.lex +++ b/cfg.lex @@ -78,6 +78,7 @@ * 2008-11-28 added support for kamailio pvars and avp/pvar guessing (andrei) * 2008-12-11 added support for "string1" "string2" (andrei) * 2009-03-10 added SET_USERPHONE action (Miklos) + * 2009-04-24 addd strlen, strempty and defined operators (andrei) */ @@ -244,6 +245,9 @@ LOG_OR "or"|"||" BIN_OR "|" PLUS "+" MINUS "-" +STRLEN "strlen" +STREMPTY "strempty" +DEFINED "defined" /* Attribute specification */ ATTR_MARK "%" @@ -765,6 +769,9 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{BIN_OR} { count(); return BIN_OR; } <INITIAL>{PLUS} { count(); return PLUS; } <INITIAL>{MINUS} { count(); return MINUS; } +<INITIAL>{STRLEN} { count(); return STRLEN; } +<INITIAL>{STREMPTY} { count(); return STREMPTY; } +<INITIAL>{DEFINED} { count(); return DEFINED; } <INITIAL>{SELECT_MARK} { count(); state = SELECT_S; BEGIN(SELECT); return SELECT_MARK; } <SELECT>{ID} { count(); addstr(&s_buf, yytext, yyleng); diff --git a/cfg.y b/cfg.y index de7643d..a281052 100644 --- a/cfg.y +++ b/cfg.y @@ -489,8 +489,13 @@ static int case_check_default(struct case_stms* stms); %left PLUS MINUS %left STAR SLASH %right NOT +%right DEFINED %left DOT +/* no precedence, they use () */ +%token STRLEN +%token STREMPTY + /* values */ %token <intval> NUMBER %token <strval> ID @@ -2247,6 +2252,9 @@ rval_expr: rval { $$=$1; | rval_expr LOG_AND rval_expr { $$=mk_rve2(RVE_LAND_OP, $1, $3);} | rval_expr LOG_OR rval_expr { $$=mk_rve2(RVE_LOR_OP, $1, $3);} | LPAREN rval_expr RPAREN { $$=$2;} + | STRLEN LPAREN rval_expr RPAREN { $$=mk_rve1(RVE_STRLEN_OP, $3);} + | STREMPTY LPAREN rval_expr RPAREN {$$=mk_rve1(RVE_STREMPTY_OP, $3);} + | DEFINED rval_expr { $$=mk_rve1(RVE_DEFINED_OP, $2);} | rve_un_op %prec NOT error { yyerror("bad expression"); } | rval_expr PLUS error { yyerror("bad expression"); } | rval_expr MINUS error { yyerror("bad expression"); } @@ -2260,6 +2268,9 @@ rval_expr: rval { $$=$1; { yyerror("bad expression"); } | rval_expr LOG_AND error { yyerror("bad expression"); } | rval_expr LOG_OR error { yyerror("bad expression"); } + | STRLEN LPAREN error RPAREN { yyerror("bad expression"); } + | STREMPTY LPAREN error RPAREN { yyerror("bad expression"); } + | DEFINED error { yyerror("bad expression"); } ; assign_action: lval assign_op rval_expr { $$=mk_action($2, 2, LVAL_ST, $1,

1 0

git:master: core expr: fixes fo RVE_STRLEN/STREMPTY/DEFINED
by Andrei Pelinescu-Onciul 24 Apr '09

24 Apr '09

Module: sip-router Branch: master Commit: cbba772cadfb6cdd79e09db8cb2c36a1fe3dc216 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbba772… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 24 19:39:51 2009 +0200 core expr: fixes fo RVE_STRLEN/STREMPTY/DEFINED - wrong return fixed - missing fixups added --- rvalue.c | 42 +++++++++++++++++++++++++----------------- 1 files changed, 25 insertions(+), 17 deletions(-) diff --git a/rvalue.c b/rvalue.c index 2179844..800a6b9 100644 --- a/rvalue.c +++ b/rvalue.c @@ -1094,6 +1094,7 @@ inline static int int_strop1(int* res, enum rval_expr_op op, str* s1) break; default: BUG("rv unsupported int_strop1 %d\n", op); + *res=0; return -1; } return 0; @@ -1355,6 +1356,7 @@ error: /** integer operation on rval evaluated as string. * Can use cached rvalues (c1 & c2). + * @param res - will be set to the result * @return 0 success, -1 on error */ inline static int rval_int_strop1(struct run_act_ctx* h, @@ -1375,38 +1377,39 @@ inline static int rval_int_strop1(struct run_act_ctx* h, rval_destroy(rv1); return ret; error: + *res=0; rval_destroy(rv1); - return 0; + return -1; } /** checks if rv is defined. - * @return 1 defined, 0 not defined, -1 on error + * @param res - set to the result 1 - defined, 0 not defined + * @return 0 on success, -1 on error * Can use cached rvalues (c1). * Note: a rv can be undefined if it's an undefined avp or pvar or * if it's NONE */ inline static int rv_defined(struct run_act_ctx* h, - struct sip_msg* msg, + struct sip_msg* msg, int* res, struct rvalue* rv, struct rval_cache* cache) { avp_t* r_avp; int_str avp_val; pv_value_t pval; - int ret; - ret=1; + *res=1; switch(rv->type){ case RV_AVP: if (unlikely(cache && cache->cache_type==RV_CACHE_AVP)){ if (cache->val_type==RV_NONE) - ret=0; + *res=0; }else{ r_avp = search_avp_by_index(rv->v.avps.type, rv->v.avps.name, &avp_val, rv->v.avps.index); if (unlikely(r_avp==0)){ - ret=0; + *res=0; } } break; @@ -1414,42 +1417,44 @@ inline static int rv_defined(struct run_act_ctx* h, /* PV_VAL_NULL or pv_get_spec_value error => undef */ if (unlikely(cache && cache->cache_type==RV_CACHE_PVAR)){ if (cache->val_type==RV_NONE) - ret=0; + *res=0; }else{ memset(&pval, 0, sizeof(pval)); if (likely(pv_get_spec_value(msg, &rv->v.pvs, &pval)==0)){ if ((pval.flags & PV_VAL_NULL) && ! (pval.flags & (PV_VAL_INT|PV_VAL_STR))){ - ret=0; + *res=0; } pv_value_destroy(&pval); }else{ - ret=0; /* in case of error, consider it undef */ + *res=0; /* in case of error, consider it undef */ } } break; case RV_NONE: - ret=0; + *res=0; break; default: break; } - return 1; /* defined */ + return 0; } /** defined (integer) operation on rve. - * @return 1 defined, 0 not defined, -1 on error + * @param res - set to 1 defined, 0 not defined + * @return - 0 on success, -1 on error */ inline static int int_rve_defined(struct run_act_ctx* h, - struct sip_msg* msg, + struct sip_msg* msg, int* res, struct rval_expr* rve) { /* only a rval can be undefined, any expression consisting on more then one rval => defined */ if (likely(rve->op==RVE_RVAL_OP)) - return rv_defined(h, msg, &rve->left.rval, 0); - return 1; + return rv_defined(h, msg, res, &rve->left.rval, 0); + *res=1; + return 0; } @@ -1580,7 +1585,7 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, ret=-1; break; case RVE_DEFINED_OP: - ret=int_rve_defined(h, msg, rve->left.rve); + ret=int_rve_defined(h, msg, res, rve->left.rve); break; case RVE_STRLEN_OP: case RVE_STREMPTY_OP: @@ -2799,6 +2804,9 @@ int fix_rval_expr(void** p) case RVE_UMINUS_OP: /* unary operators */ case RVE_BOOL_OP: case RVE_LNOT_OP: + case RVE_STRLEN_OP: + case RVE_STREMPTY_OP: + case RVE_DEFINED_OP: ret=fix_rval_expr((void**)&rve->left.rve); if (ret<0) return ret; break;

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009