sr-dev

sr-dev@lists.kamailio.org

17 participants
44270 discussions

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8cf72b2de1ca86cafe7203433ff411e837d26dfa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8cf72b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 19:23:23 2009 +0200 kex: added km_append_branch - K compatible append_branch() function --- modules_k/kex/kex_mod.c | 5 +++ modules_k/kex/km_core.c | 67 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/kex/km_core.h | 30 +++++++++++++++++++++ 3 files changed, 102 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index e4960c0..9baa48d 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -31,6 +31,7 @@ #include "../../mod_fix.h" #include "flags.h" +#include "km_core.h" #include "mi_core.h" #include "core_stats.h" @@ -63,6 +64,10 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"isbflagset", (cmd_function)w_isbflagset, 2,fixup_igp_igp, 0, ANY_ROUTE }, + {"km_append_branch", (cmd_function)w_km_append_branch, 0, 0, + 0, REQUEST_ROUTE | FAILURE_ROUTE }, + {"km_append_branch", (cmd_function)w_km_append_branch, 1, fixup_spve_null, + 0, REQUEST_ROUTE | FAILURE_ROUTE }, {0,0,0,0,0,0} }; diff --git a/modules_k/kex/km_core.c b/modules_k/kex/km_core.c new file mode 100644 index 0000000..beebb35 --- /dev/null +++ b/modules_k/kex/km_core.c @@ -0,0 +1,67 @@ +/** + * $Id$ + * + * Copyright (C) 2009 + * + * This file is part of SIP-Router.org, a free SIP server. + * + * SIP-Router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> + +#include "../../dprint.h" +#include "../../dset.h" +#include "../../flags.h" +#include "../../mod_fix.h" +#include "km_core.h" + +int w_km_append_branch(struct sip_msg *msg, char *uri, str *sq) +{ + str suri; + int ret; + int q = Q_UNSPECIFIED; + flag_t branch_flags = 0; + + getbflagsval(0, &branch_flags); + if (uri==NULL) { + ret = km_append_branch(msg, 0, &msg->dst_uri, &msg->path_vec, + q, branch_flags, msg->force_send_socket); + /* reset all branch info */ + msg->force_send_socket = 0; + setbflagsval(0, 0); + if(msg->dst_uri.s!=0) + pkg_free(msg->dst_uri.s); + msg->dst_uri.s = 0; + msg->dst_uri.len = 0; + if(msg->path_vec.s!=0) + pkg_free(msg->path_vec.s); + msg->path_vec.s = 0; + msg->path_vec.len = 0; + } else { + if(fixup_get_svalue(msg, (gparam_p)uri, &suri)!=0) + { + LM_ERR("cannot get the URI parameter\n"); + return -1; + } + ret = km_append_branch(msg, &suri, &msg->dst_uri, + &msg->path_vec, q, branch_flags, + msg->force_send_socket); + } + return ret; +} + diff --git a/modules_k/kex/km_core.h b/modules_k/kex/km_core.h new file mode 100644 index 0000000..a668c71 --- /dev/null +++ b/modules_k/kex/km_core.h @@ -0,0 +1,30 @@ +/** + * $Id$ + * + * Copyright (C) 2009 + * + * This file is part of SIP-Router.org, a free SIP server. + * + * SIP-Router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _KEX_CORE_H_ +#define _KEX_CORE_H_ + +#include "../../sr_module.h" + +int w_km_append_branch(struct sip_msg *msg, char *uri, str *s2); + +#endif

15 years, 8 months

git:master: core: wrapper to return branch iterator position

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 764bac17b074714c651d71654c6e7276a58ca5e4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=764bac1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 20:38:09 2009 +0200 core: wrapper to return branch iterator position --- dset.c | 4 ++++ dset.h | 4 ++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dset.c b/dset.c index 9409557..1770a3c 100644 --- a/dset.c +++ b/dset.c @@ -155,6 +155,10 @@ void init_branch_iterator(void) branch_iterator = 0; } +int get_branch_iterator(void) +{ + return branch_iterator; +} /* * Return the next branch from the dset diff --git a/dset.h b/dset.h index adba10e..175e0c3 100644 --- a/dset.h +++ b/dset.h @@ -53,6 +53,10 @@ int km_append_branch(struct sip_msg* msg, str* uri, str* dst_uri, str* path, */ void init_branch_iterator(void); +/* + * Return branch iterator position + */ +int get_branch_iterator(void); /* * Get the next branch in the current transaction

15 years, 8 months

git:master: tm: handling of branch flags

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cd9460b0d8023c43348bce58fe38ef3ce9a686cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd9460b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 20:40:26 2009 +0200 tm: handling of branch flags - save/restore branch upon execution of tm specific routes --- modules/tm/h_table.h | 3 +++ modules/tm/t_fwd.c | 9 +++++++++ modules/tm/t_reply.c | 9 +++++++-- modules/tm/t_reply.h | 2 +- modules/tm/t_suspend.c | 4 +++- 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 37aecc9..d38e3d6 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -70,6 +70,7 @@ #include "../../md5utils.h" #include "../../usr_avp.h" #include "../../timer.h" +#include "../../flags.h" #include "../../atomic_ops.h" #include "../../hash_func.h" #include "config.h" @@ -85,6 +86,7 @@ struct entry; struct cell; struct timer; struct retr_buf; +struct ua_client; #include "../../mem/shm_mem.h" #include "lock.h" @@ -224,6 +226,7 @@ typedef struct ua_client /* internal flags per tm uac */ unsigned int flags; #endif + flag_t branch_flags; #ifdef WITH_AS_SUPPORT /** * Resent for every rcvd 2xx reply. diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 9344e6f..46ddbfb 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -450,6 +450,7 @@ int add_uac( struct cell *t, struct sip_msg *request, str *uri, str* next_hop, else if(len==2) t->uac[branch].flags = TM_UAC_FLAG_RR|TM_UAC_FLAG_R2; #endif + getbflagsval(0, &t->uac[branch].branch_flags); membar_write(); /* to allow lockless ops (e.g. which_cancel()) we want to be sure everything above is fully written before updating branches no. */ @@ -1005,6 +1006,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , int lock_replies; str dst_uri; struct socket_info* si, *backup_si; + flag_t backup_bflags = 0; + flag_t bflags = 0; /* make -Wall happy */ @@ -1028,6 +1031,8 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , } backup_si = p_msg->force_send_socket; + getbflagsval(0, &backup_bflags); + /* if no more specific error code is known, use this */ lowest_ret=E_UNSPEC; /* branches added */ @@ -1072,6 +1077,9 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , while((current_uri.s=next_branch( &current_uri.len, &q, &dst_uri.s, &dst_uri.len, &si))) { try_new++; p_msg->force_send_socket = si; + getbflagsval(get_branch_iterator(), &bflags); + setbflagsval(0, bflags); + branch_ret=add_uac( t, p_msg, &current_uri, (dst_uri.len) ? (&dst_uri) : &current_uri, proxy, proto); @@ -1088,6 +1096,7 @@ int t_forward_nonack( struct cell *t, struct sip_msg* p_msg , clear_branches(); p_msg->force_send_socket = backup_si; + setbflagsval(0, backup_bflags); /* don't forget to clear all branches processed so far */ diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index 5cb731f..e51142c 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -730,7 +730,7 @@ void faked_env( struct cell *t,struct sip_msg *msg) int fake_req(struct sip_msg *faked_req, - struct sip_msg *shmem_msg, int extra_flags) + struct sip_msg *shmem_msg, int extra_flags, struct ua_client *uac) { /* on_negative_reply faked msg now copied from shmem msg (as opposed * to zero-ing) -- more "read-only" actions (exec in particular) will @@ -771,6 +771,8 @@ int fake_req(struct sip_msg *faked_req, faked_req->dst_uri.len); faked_req->dst_uri.s[faked_req->dst_uri.len]=0; } + if(uac) setbflagsval(0, uac->branch_flags); + else setbflagsval(0, 0); return 1; error00: @@ -836,7 +838,7 @@ int run_failure_handlers(struct cell *t, struct sip_msg *rpl, return 1; } - if (!fake_req(&faked_req, shmem_msg, extra_flags)) { + if (!fake_req(&faked_req, shmem_msg, extra_flags, &t->uac[picked_branch])) { LOG(L_ERR, "ERROR: run_failure_handlers: fake_req failed\n"); return 0; } @@ -1953,10 +1955,13 @@ int reply_received( struct sip_msg *p_msg ) backup_user_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_USER, &t->user_avps_to ); backup_domain_from = set_avp_list(AVP_TRACK_FROM | AVP_CLASS_DOMAIN, &t->domain_avps_from ); backup_domain_to = set_avp_list(AVP_TRACK_TO | AVP_CLASS_DOMAIN, &t->domain_avps_to ); + setbflagsval(0, uac->branch_flags); if (run_top_route(onreply_rt.rlist[t->on_reply], p_msg)<0) LOG(L_ERR, "ERROR: on_reply processing failed\n"); /* transfer current message context back to t */ if (t->uas.request) t->uas.request->flags=p_msg->flags; + getbflagsval(0, &uac->branch_flags); + /* restore original avp list */ set_avp_list( AVP_TRACK_FROM | AVP_CLASS_URI, backup_uri_from ); set_avp_list( AVP_TRACK_TO | AVP_CLASS_URI, backup_uri_to ); diff --git a/modules/tm/t_reply.h b/modules/tm/t_reply.h index 65b4498..c385697 100644 --- a/modules/tm/t_reply.h +++ b/modules/tm/t_reply.h @@ -160,7 +160,7 @@ void rpc_reply(rpc_t* rpc, void* c); void faked_env( struct cell *t,struct sip_msg *msg); int fake_req(struct sip_msg *faked_req, - struct sip_msg *shmem_msg, int extra_flags); + struct sip_msg *shmem_msg, int extra_flags, struct ua_client *uac); void free_faked_req(struct sip_msg *faked_req, struct cell *t); diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 1c0b729..c1dc1b1 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -109,6 +109,7 @@ int t_continue(unsigned int hash_index, unsigned int label, struct cell *t; struct sip_msg faked_req; int branch; + struct ua_client *uac =NULL; if (t_lookup_ident(&t, hash_index, label) < 0) { LOG(L_ERR, "ERROR: t_continue: transaction not found\n"); @@ -136,13 +137,14 @@ int t_continue(unsigned int hash_index, unsigned int label, * a failure rute => deadlock, because both * of them need the reply lock to be held. */ t->uac[branch].last_received=500; + uac = &t->uac[branch]; } /* else Not a huge problem, fr timer will fire, but CANCEL will not be sent. last_received will be set to 408. */ /* fake the request and the environment, like in failure_route */ - if (!fake_req(&faked_req, t->uas.request, 0 /* extra flags */)) { + if (!fake_req(&faked_req, t->uas.request, 0 /* extra flags */, uac)) { LOG(L_ERR, "ERROR: t_continue: fake_req failed\n"); UNLOCK_REPLIES(t); return -1;

15 years, 8 months

git:master: core: renamed getbflsgs to getblagsval

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d02a166db83db71b587cd1252db0b4d4954e8c93 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d02a166… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 19:21:04 2009 +0200 core: renamed getbflsgs to getblagsval - match the template of counterpart setblagsval - swapped the parameters --- dset.c | 2 +- dset.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dset.c b/dset.c index cbc636b..9409557 100644 --- a/dset.c +++ b/dset.c @@ -126,7 +126,7 @@ int resetbflag(unsigned int branch, flag_t flag) } -int getbflags(flag_t* res, unsigned int branch) +int getbflagsval(unsigned int branch, flag_t* res) { flag_t* flags; if (res == NULL) return -1; diff --git a/dset.h b/dset.h index e350238..adba10e 100644 --- a/dset.h +++ b/dset.h @@ -126,11 +126,11 @@ int isbflagset(unsigned int branch, flag_t flag); * * This function returns the value of all branch flags * combined in a single variable. - * @param res A pointer to a variable to store the result * @param branch Number of the branch (0 for the main Request-URI branch) + * @param res A pointer to a variable to store the result * @return 1 on success, -1 on failure */ -int getbflags(flag_t* res, unsigned int branch); +int getbflagsval(unsigned int branch, flag_t* res); /** * Set the value of all branch flags at once for a given branch.

15 years, 8 months

git:andrei/type_conversion: core expr eval: minor ==/!= optimization

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: 04ff69818798e2330587c4109a69d8974908b158 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04ff698… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 28 17:49:54 2009 +0200 core expr eval: minor ==/!= optimization - replace the generic RVE_EQ_OP/RVE_DIFF_OP with the type specific version (RVE_IEQ_OP/RVE_STREQ_OP...), if the type is known. --- rvalue.c | 23 +++++++++++++++++++++-- 1 files changed, 21 insertions(+), 2 deletions(-) diff --git a/rvalue.c b/rvalue.c index 36c6ef4..7e82503 100644 --- a/rvalue.c +++ b/rvalue.c @@ -2341,10 +2341,10 @@ static int rve_op_is_commutative(enum rval_expr_op op, enum rval_type type) case RVE_GTE_OP: case RVE_LT_OP: case RVE_LTE_OP: - case RVE_EQ_OP: + case RVE_CONCAT_OP: return 0; case RVE_DIFF_OP: - case RVE_CONCAT_OP: + case RVE_EQ_OP: #if !defined(UNDEF_EQ_ALWAYS_FALSE) && !defined(UNDEF_EQ_UNDEF_TRUE) return 1; #else @@ -2838,6 +2838,25 @@ static int rve_optimize(struct rval_expr* rve) rve->fpos.e_line, rve->fpos.e_col); } } + /* e1 EQ_OP e2 -> change op if we know e1 basic type + e1 DIFF_OP e2 -> change op if we know e2 basic type */ + if (rve->op==RVE_EQ_OP || rve->op==RVE_DIFF_OP){ + l_type=rve_guess_type(rve->left.rve); + if (l_type==RV_INT){ + rve->op=(rve->op==RVE_EQ_OP)?RVE_IEQ_OP:RVE_IDIFF_OP; + DBG("FIXUP RVE (%d,%d-%d,%d): changed ==/!= into interger" + " ==/!=\n", + rve->fpos.s_line, rve->fpos.s_col, + rve->fpos.e_line, rve->fpos.e_col); + }else if (l_type==RV_STR){ + rve->op=RVE_CONCAT_OP; + rve->op=(rve->op==RVE_EQ_OP)?RVE_STREQ_OP:RVE_STRDIFF_OP; + DBG("FIXUP RVE (%d,%d-%d,%d): changed ==/!= into string" + " ==/!=\n", + rve->fpos.s_line, rve->fpos.s_col, + rve->fpos.e_line, rve->fpos.e_col); + } + } /* $v * 0 => 0; $v * 1 => $v (for *, /, &, |, &&, ||, +, -) */ if (rve_opt_01(rve, type)==1){

15 years, 8 months

git:andrei/type_conversion: core expr eval: fix assoc., commut and 0 adding for +, ==

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: 3c8fc182ae386713f15e6a0362924e72b257c31e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3c8fc18… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 28 18:34:03 2009 +0200 core expr eval: fix assoc., commut and 0 adding for +, == - fix associativity for the generic plus: because of the non-fixed argument types (can work with strings integers or both in the same type), RVE_PLUS_OP is associative _only_ if the operand types match. Non-assoc. example: "a" + 1 + "2" (can be "a12" or "a3"). Instead of adding extra checks for the same type, rely on the optimizer having already replaced RVE_PLUS_OP with RVE_IPLUS_OP or RVE_CONCAT_OP => RVE_PLUS_OP will be used only when the operands types are mixed or cannot be determined (e.g. AVP), or when script optimizations are turned off (-O0). - fix commutativity for the generic plus. Similar to the above. Non-commut. example: 1 + "2" == 3, but "2" + 1 == "21". - fix commutativity for the generic == and !=. Non. commut. example: 0 == "" , but "" != 0. Similar fix as above, relying on the optimizer and the type specific operators: RVE_IEQ_OP, RVE_IDIFF_OP, RVE_STREQ_OP and RVE_STRDIFF_OP. - fix $v + 0 / 0 + $v -> $v optimizations. Because of the generic plus and recent changes that allow int + str, even if the result is an int (left side operant is integer), 0 + $v can be different from $v. E.g.: 0+"1" == 1, which is different from "1". --- rvalue.c | 37 +++++++++++++++++++++++++++---------- 1 files changed, 27 insertions(+), 10 deletions(-) diff --git a/rvalue.c b/rvalue.c index 7e82503..9a74cda 100644 --- a/rvalue.c +++ b/rvalue.c @@ -2281,6 +2281,9 @@ static int rve_op_is_assoc(enum rval_expr_op op) case RVE_MINUS_OP: return 0; case RVE_PLUS_OP: + /* the generic plus is not assoc, e.g. + "a" + 1 + "2" => "a12" in one case and "a3" in the other */ + return 0; case RVE_IPLUS_OP: case RVE_CONCAT_OP: case RVE_MUL_OP: @@ -2308,7 +2311,7 @@ static int rve_op_is_assoc(enum rval_expr_op op) /** returns true if the operator is commutative. */ -static int rve_op_is_commutative(enum rval_expr_op op, enum rval_type type) +static int rve_op_is_commutative(enum rval_expr_op op) { switch(op){ case RVE_NONE_OP: @@ -2325,7 +2328,10 @@ static int rve_op_is_commutative(enum rval_expr_op op, enum rval_type type) case RVE_MINUS_OP: return 0; case RVE_PLUS_OP: - return type==RV_INT; /* commutative only for INT*/ + /* non commut. when diff. type + (e.g 1 + "2" != "2" + 1 ) => non commut. in general + (specific same type versions are covered by IPLUS & CONCAT) */ + return 0; case RVE_IPLUS_OP: case RVE_MUL_OP: case RVE_BAND_OP: @@ -2345,11 +2351,11 @@ static int rve_op_is_commutative(enum rval_expr_op op, enum rval_type type) return 0; case RVE_DIFF_OP: case RVE_EQ_OP: -#if !defined(UNDEF_EQ_ALWAYS_FALSE) && !defined(UNDEF_EQ_UNDEF_TRUE) - return 1; -#else + /* non. commut. in general, only for same type e.g.: + "" == 0 diff. 0 == "" ( "" == "0" and 0 == 0) + same type versions are covered by IEQ, IDIFF, STREQ, STRDIFF + */ return 0 /* asymmetrical undef handling */; -#endif } return 0; } @@ -2658,8 +2664,19 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) case RVE_PLUS_OP: case RVE_IPLUS_OP: /* we must make sure that this is an int PLUS - (because "foo"+0 is valid => "foo0") */ - if ((i==0) && ((op==RVE_IPLUS_OP)||(rve_type==RV_INT))){ + (because "foo"+0 is valid => "foo0") + Even if overall type is RV_INT, it's still not safe + to optimize a generic PLUS: 0 + $v is not always equivalent + to $v (e.g. 0+"1" ==1 != "1") => optimize only if + IPLUS (always safe since it converts to int first) or + if generic PLUS and result is integer (rve_type) and + expression is of the form $v+ct (and not ct+$v). + TODO: dropping PLUS_OP all together and relying on the + optimizer replacing safe PLUS_OP with IPLUS_OP or CONCAT_OP + will simplify things. + */ + if ((i==0) && ((op==RVE_IPLUS_OP)|| + (rve_type==RV_INT && ct_rve==rve->right.rve))){ /* $v + 0 -> $v * 0 + $v -> $v */ rve_destroy(ct_rve); @@ -2908,7 +2925,7 @@ static int rve_optimize(struct rval_expr* rve) trv->v.s.len, trv->v.s.s, rve->op); ret=1; }else if (rve_is_constant(rve->left.rve->left.rve) && - rve_op_is_commutative(rve->op, type)){ + rve_op_is_commutative(rve->op)){ /* op(op(a, $v), b) => op(op(a, b), $v) */ /* rv= op(a, b) */ tmp_rve.op=rve->op; @@ -2950,7 +2967,7 @@ static int rve_optimize(struct rval_expr* rve) if ((rve->op==rve->right.rve->op) && rve_op_is_assoc(rve->op)){ /* op(a, op(...)) */ if (rve_is_constant(rve->right.rve->right.rve) && - rve_op_is_commutative(rve->op, type)){ + rve_op_is_commutative(rve->op)){ /* op(a, op($v, b)) => op(op(a, b), $v) */ /* rv= op(a, b) */ tmp_rve.op=rve->op;

15 years, 8 months

git:andrei/type_conversion: core: new script operators: eq, ne, ieq, ine

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: 298512a2b79ff3bd9405a63c5d05030b5ec21de3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=298512a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 28 19:48:11 2009 +0200 core: new script operators: eq, ne, ieq, ine Added operators for: - string == and string != : eq, ne - integer == and integer!= : ieq, ine They are almost equivalent to == or !=, but they force the conversion of their operands (eq to string and ieq to int), allowing among other things better type checking on startup and more optimizations. Non equiv. examples: 0 == "" (true) is not equivalent to 0 eq "" (false: it evaluates to "0" eq ""). "a" ieq "b" (true: (int)"a" is 0 and (int)"b" is 0) is not equivalent to "a" == "b" (false). Note: the names are not final, they are mostly for testing. Future releases might replace ==/!= with ieq/ine and use eq/ne for strings. --- cfg.lex | 8 ++++++++ cfg.y | 8 +++++++- 2 files changed, 15 insertions(+), 1 deletions(-) diff --git a/cfg.lex b/cfg.lex index b1f9c55..768f3e9 100644 --- a/cfg.lex +++ b/cfg.lex @@ -248,6 +248,10 @@ MINUS "-" STRLEN "strlen" STREMPTY "strempty" DEFINED "defined" +STREQ eq +INTEQ ieq +STRDIFF ne +INTDIFF ine /* Attribute specification */ ATTR_MARK "%" @@ -772,6 +776,10 @@ EAT_ABLE [\ \t\b\r] <INITIAL>{STRLEN} { count(); return STRLEN; } <INITIAL>{STREMPTY} { count(); return STREMPTY; } <INITIAL>{DEFINED} { count(); return DEFINED; } +<INITIAL>{STREQ} { count(); return STREQ; } +<INITIAL>{INTEQ} { count(); return INTEQ; } +<INITIAL>{STRDIFF} { count(); return STRDIFF; } +<INITIAL>{INTDIFF} { count(); return INTDIFF; } <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 a281052..df3056d 100644 --- a/cfg.y +++ b/cfg.y @@ -484,7 +484,7 @@ static int case_check_default(struct case_stms* stms); %left LOG_AND %left BIN_OR %left BIN_AND -%left EQUAL_T DIFF MATCH +%left EQUAL_T DIFF MATCH INTEQ INTDIFF STREQ STRDIFF %left GT LT GTE LTE %left PLUS MINUS %left STAR SLASH @@ -1580,6 +1580,8 @@ exp: rval_expr equalop: EQUAL_T {$$=EQUAL_OP; } | DIFF {$$=DIFF_OP; } + | STREQ {$$=EQUAL_OP; } /* for expr. elems equiv. to EQUAL_T*/ + | STRDIFF {$$=DIFF_OP; } /* for expr. elems. equiv. to DIFF */ ; cmpop: GT {$$=GT_OP; } @@ -1597,6 +1599,10 @@ strop: rve_equalop: EQUAL_T {$$=RVE_EQ_OP; } | DIFF {$$=RVE_DIFF_OP; } + | INTEQ {$$=RVE_IEQ_OP; } + | INTDIFF {$$=RVE_IDIFF_OP; } + | STREQ {$$=RVE_STREQ_OP; } + | STRDIFF {$$=RVE_STRDIFF_OP; } ; rve_cmpop: GT {$$=RVE_GT_OP; }

15 years, 8 months

git:andrei/type_conversion: news: update (new operators, expr. eval behaviour a.s.o.)

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: bb4d414574c35b1ba2c0497e19313b4cd000f775 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bb4d414… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 28 19:54:03 2009 +0200 news: update (new operators, expr. eval behaviour a.s.o.) --- NEWS | 27 +++++++++++++++++++++++++++ 1 files changed, 27 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index fade123..ed1ab96 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,33 @@ $Id$ sip-router changes core: + - new operators eq, ne for string compares and ieq, ine for interger + compares. The names are not yet final (use them at your own risk). + Future version might use ==/!= only for ints (ieq/ine) and eq/ne for + strings (under debate). + They are almost equivalent to == or !=, but they force the conversion + of their operands (eq to string and ieq to int), allowing among other + things better type checking on startup and more optimizations. + Non equiv. examples: 0 == "" (true) is not equivalent to 0 eq "" + (false: it evaluates to "0" eq ""). "a" ieq "b" (true: (int)"a" is 0 + and (int)"b" is 0) is not equivalent to "a" == "b" (false). + Note: internally == and != are converted on startup to eq/ne/ieq/ine + whenever possible (both operand types can be safely determined at + start time and they are the same). + - try to guess what the user wanted when operators that support multiple + types are used on different typed operands. In general convert the + the right operand to the type of the left operand and then perform the + operation. Exception: the left operand is undef. + This applies to the following operators: +, == and !=. + Special case: undef as left operand: + For +: undef + expr -> undef is converted to string => "" + expr. + For == and !=: undef == expr -> undef is converted to type_of expr. + If expr is undef, then undef == undef is true (internally is converted + to string). + - expression evaluation changes: auto-convert to interger or string + in function of the operators: + int(undef)==0, int("")==0, int("123")==123, int("abc")==0 + str(undef)=="", str(123)=="123". - 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

15 years, 8 months

git:andrei/type_conversion: core expr eval: internal == & != int and str only versions

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: 783ad9b3e0ebdee05a8e1f710c0e14da777c9ada URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=783ad9b… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 28 17:39:35 2009 +0200 core expr eval: internal == & != int and str only versions - added RVE_IEQ_OP and RVE_IDIFF_OP - internal integer only (force argument conversion to int) operators - added RVE_STREQ and RVE_STRDIFF_OP - internal string only (force argument conversion to str) operators --- rvalue.c | 111 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++----- rvalue.h | 6 +++ 2 files changed, 108 insertions(+), 9 deletions(-) diff --git a/rvalue.c b/rvalue.c index 2961ee9..36c6ef4 100644 --- a/rvalue.c +++ b/rvalue.c @@ -38,7 +38,7 @@ * UNDEF_EQ_UNDEF_TRUE : undef == something false except for undef==undef * which is true * no UNDEF_EQ* define : undef == expr => convert undef to typeof(expr) - * and perorm normal ==. undef == undef will be + * and perform normal ==. undef == undef will be * converted to string and it will be true * ("" == "") * NOTE: expr == undef, with defined(expr) is always evaluated this way: @@ -411,6 +411,10 @@ enum rval_type rve_guess_type( struct rval_expr* rve) case RVE_LTE_OP: case RVE_EQ_OP: case RVE_DIFF_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: case RVE_IPLUS_OP: case RVE_STRLEN_OP: case RVE_STREMPTY_OP: @@ -471,6 +475,10 @@ int rve_is_constant(struct rval_expr* rve) case RVE_LTE_OP: case RVE_EQ_OP: case RVE_DIFF_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: case RVE_PLUS_OP: case RVE_IPLUS_OP: case RVE_CONCAT_OP: @@ -523,6 +531,10 @@ static int rve_op_unary(enum rval_expr_op op) case RVE_LTE_OP: case RVE_EQ_OP: case RVE_DIFF_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: case RVE_PLUS_OP: case RVE_IPLUS_OP: case RVE_CONCAT_OP: @@ -585,6 +597,8 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, case RVE_GTE_OP: case RVE_LT_OP: case RVE_LTE_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: case RVE_IPLUS_OP: *type=RV_INT; if (rve_check_type(&type1, rve->left.rve, bad_rve, bad_t, exp_t)){ @@ -665,6 +679,30 @@ int rve_check_type(enum rval_type* type, struct rval_expr* rve, } } break; + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: + *type=RV_INT; + if (rve_check_type(&type1, rve->left.rve, bad_rve, bad_t, exp_t)){ + if (rve_check_type(&type2, rve->right.rve, bad_rve, bad_t, + exp_t)){ + if ((type2!=type1) && (type1!=RV_NONE) && + (type2!=RV_NONE) && + !(type1==RV_STR && type2==RV_INT)){ + if (bad_rve) *bad_rve=rve->right.rve; + if (bad_t) *bad_t=type2; + if (exp_t) *exp_t=type1; + return 0; + } + 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_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: @@ -1136,9 +1174,11 @@ inline static int int_intop2(int* res, enum rval_expr_op op, int v1, int v2) *res=v1 <= v2; break; case RVE_EQ_OP: + case RVE_IEQ_OP: *res=v1 == v2; break; case RVE_DIFF_OP: + case RVE_IDIFF_OP: *res=v1 != v2; break; case RVE_CONCAT_OP: @@ -1157,12 +1197,19 @@ inline static int int_intop2(int* res, enum rval_expr_op op, int v1, int v2) inline static int bool_strop2( enum rval_expr_op op, int* res, str* s1, str* s2) { - if (s1->len!=s2->len) - *res= op==RVE_DIFF_OP; - else if (memcmp(s1->s, s2->s, s1->len)==0) - *res= op==RVE_EQ_OP; - else - *res= op==RVE_DIFF_OP; + switch(op){ + case RVE_EQ_OP: + case RVE_STREQ_OP: + *res= (s1->len==s2->len) && (memcmp(s1->s, s2->s, s1->len)==0); + break; + case RVE_DIFF_OP: + case RVE_STRDIFF_OP: + *res= (s1->len!=s2->len) || (memcmp(s1->s, s2->s, s1->len)!=0); + break; + default: + BUG("rv unsupported intop %d\n", op); + return -1; + } return 0; } @@ -1593,6 +1640,8 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, case RVE_GTE_OP: case RVE_LT_OP: case RVE_LTE_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: if (unlikely( (ret=rval_expr_eval_int(h, msg, &i1, rve->left.rve)) <0) ) break; @@ -1735,6 +1784,21 @@ int rval_expr_eval_int( struct run_act_ctx* h, struct sip_msg* msg, case RVE_DEFINED_OP: ret=int_rve_defined(h, msg, res, rve->left.rve); break; + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: + if (unlikely((rv1=rval_expr_eval(h, msg, rve->left.rve))==0)){ + ret=-1; + break; + } + if (unlikely((rv2=rval_expr_eval(h, msg, rve->right.rve))==0)){ + rval_destroy(rv1); + ret=-1; + break; + } + ret=rval_str_lop2(h, msg, res, rve->op, rv1, 0, rv2, 0); + rval_destroy(rv1); + rval_destroy(rv2); + break; case RVE_STRLEN_OP: case RVE_STREMPTY_OP: if (unlikely((rv1=rval_expr_eval(h, msg, rve->left.rve))==0)){ @@ -1815,7 +1879,11 @@ int rval_expr_eval_rvint( struct run_act_ctx* h, case RVE_LTE_OP: case RVE_EQ_OP: case RVE_DIFF_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: case RVE_IPLUS_OP: + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: @@ -1913,7 +1981,11 @@ struct rvalue* rval_expr_eval(struct run_act_ctx* h, struct sip_msg* msg, case RVE_LTE_OP: case RVE_EQ_OP: case RVE_DIFF_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: case RVE_IPLUS_OP: + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: case RVE_STRLEN_OP: case RVE_STREMPTY_OP: case RVE_DEFINED_OP: @@ -2168,6 +2240,10 @@ struct rval_expr* mk_rval_expr2(enum rval_expr_op op, struct rval_expr* rve1, case RVE_IPLUS_OP: case RVE_EQ_OP: case RVE_DIFF_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: case RVE_CONCAT_OP: break; default: @@ -2220,6 +2296,10 @@ static int rve_op_is_assoc(enum rval_expr_op op) case RVE_LTE_OP: case RVE_EQ_OP: case RVE_DIFF_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: return 0; } return 0; @@ -2250,18 +2330,26 @@ static int rve_op_is_commutative(enum rval_expr_op op, enum rval_type type) case RVE_MUL_OP: case RVE_BAND_OP: case RVE_BOR_OP: - return 1; case RVE_LAND_OP: case RVE_LOR_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: return 1; case RVE_GT_OP: case RVE_GTE_OP: case RVE_LT_OP: case RVE_LTE_OP: case RVE_EQ_OP: + return 0; case RVE_DIFF_OP: case RVE_CONCAT_OP: - return 0; +#if !defined(UNDEF_EQ_ALWAYS_FALSE) && !defined(UNDEF_EQ_UNDEF_TRUE) + return 1; +#else + return 0 /* asymmetrical undef handling */; +#endif } return 0; } @@ -2633,6 +2721,7 @@ static int rve_opt_01(struct rval_expr* rve, enum rval_type rve_type) } break; case RVE_EQ_OP: + case RVE_STREQ_OP: if (rv->v.s.len==0){ /* $v == "" -> strempty($v) "" == $v -> strempty ($v) */ @@ -2973,6 +3062,10 @@ int fix_rval_expr(void** p) case RVE_IPLUS_OP: case RVE_EQ_OP: case RVE_DIFF_OP: + case RVE_IEQ_OP: + case RVE_IDIFF_OP: + case RVE_STREQ_OP: + case RVE_STRDIFF_OP: case RVE_CONCAT_OP: ret=fix_rval_expr((void**)&rve->left.rve); if (ret<0) return ret; diff --git a/rvalue.h b/rvalue.h index e99d1f8..f7fdcc1 100644 --- a/rvalue.h +++ b/rvalue.h @@ -23,6 +23,8 @@ * History: * -------- * 2008-11-30 initial version (andrei) + * 2009-04-28 added string and interger versions for the EQ and DIFF + * operators (andrei) */ #ifndef _rvalue_h_ @@ -59,6 +61,8 @@ enum rval_expr_op{ RVE_GTE_OP, /* 2 members, returns left >= right */ RVE_LT_OP, /* 2 members, returns left < right */ RVE_LTE_OP, /* 2 members, returns left <= right */ + RVE_IEQ_OP, /* 2 members, int == version, returns left == right */ + RVE_IDIFF_OP,/* 2 members, int != version, returns left != right */ RVE_IPLUS_OP, /* 2 members, integer +, returns int(a)+int(b) */ /* common int & str */ RVE_PLUS_OP, /* generic plus (int or str) returns left + right */ @@ -68,6 +72,8 @@ enum rval_expr_op{ 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) */ + RVE_STREQ_OP, /* 2 members, string == , returns left == right (bool)*/ + RVE_STRDIFF_OP,/* 2 members, string != , returns left != right (bool)*/ /* avp, pvars a.s.o */ RVE_DEFINED_OP, /* one member, returns is_defined(val) (bool) */ };

15 years, 8 months

git:master: kex: script and branch flags operations

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 313f52655841f1abf4c0db585699cd31e9494a3f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=313f526… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 28 16:35:28 2009 +0200 kex: script and branch flags operations - K script and branch flags operations included in kex module - the parameters must be now enclosed in quotes - the parameters can be now integer value or Pseudo-Variable with integer value - the optional 'branch' parameter for branch flags parameters is now the second, for a more logical parameter mapping with the version without this parameter --- modules_k/kex/flags.c | 144 +++++++++++++++++++++++++++++++++++++++++++++++ modules_k/kex/flags.h | 35 +++++++++++ modules_k/kex/kex_mod.c | 29 +++++++++- 3 files changed, 205 insertions(+), 3 deletions(-) diff --git a/modules_k/kex/flags.c b/modules_k/kex/flags.c new file mode 100644 index 0000000..ae539d1 --- /dev/null +++ b/modules_k/kex/flags.c @@ -0,0 +1,144 @@ +/** + * $Id$ + * + * Copyright (C) 2009 + * + * This file is part of SIP-Router.org, a free SIP server. + * + * SIP-Router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> + +#include "../../dprint.h" +#include "../../flags.h" +#include "../../dset.h" +#include "../../mod_fix.h" +#include "flags.h" + +int w_issflagset(struct sip_msg *msg, char *flag, str *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) + { + LM_ERR("no flag value\n"); + return -1; + } + if(fval<0 || fval>31) + return -1; + return issflagset((flag_t)fval); +} + +int w_resetsflag(struct sip_msg *msg, char *flag, str *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) + { + LM_ERR("no flag value\n"); + return -1; + } + if(fval<0 || fval>31) + return -1; + return resetsflag((flag_t)fval); +} + +int w_setsflag(struct sip_msg *msg, char *flag, char *s2) +{ + int fval=0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) + { + LM_ERR("no flag value\n"); + return -1; + } + if(fval<0 || fval>31) + return -1; + return setsflag((flag_t)fval); +} + +int w_isbflagset(struct sip_msg *msg, char *flag, str *idx) +{ + int fval=0; + int ival=0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) + { + LM_ERR("no flag value\n"); + return -1; + } + if(fval<0 || fval>31) + return -1; + if(idx!=0) + { + if(fixup_get_ivalue(msg, (gparam_p)idx, &ival)!=0) + { + LM_ERR("no idx value\n"); + return -1; + } + if(ival<0) + return -1; + } + return isbflagset(ival, (flag_t)fval); +} + +int w_resetbflag(struct sip_msg *msg, char *flag, str *idx) +{ + int fval=0; + int ival=0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) + { + LM_ERR("no flag value\n"); + return -1; + } + if(fval<0 || fval>31) + return -1; + if(idx!=0) + { + if(fixup_get_ivalue(msg, (gparam_p)idx, &ival)!=0) + { + LM_ERR("no idx value\n"); + return -1; + } + if(ival<0) + return -1; + } + return resetbflag(ival, (flag_t)fval); + +} + +int w_setbflag(struct sip_msg *msg, char *flag, char *idx) +{ + int fval=0; + int ival=0; + if(fixup_get_ivalue(msg, (gparam_p)flag, &fval)!=0) + { + LM_ERR("no flag value\n"); + return -1; + } + if(fval<0 || fval>31) + return -1; + if(idx!=0) + { + if(fixup_get_ivalue(msg, (gparam_p)idx, &ival)!=0) + { + LM_ERR("no idx value\n"); + return -1; + } + if(ival<0) + return -1; + } + return setbflag(ival, (flag_t)fval); +} + diff --git a/modules_k/kex/flags.h b/modules_k/kex/flags.h new file mode 100644 index 0000000..d0dbad4 --- /dev/null +++ b/modules_k/kex/flags.h @@ -0,0 +1,35 @@ +/** + * $Id$ + * + * Copyright (C) 2009 + * + * This file is part of SIP-Router.org, a free SIP server. + * + * SIP-Router is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _KEX_FLAGS_H_ +#define _KEX_FLAGS_H_ + +#include "../../sr_module.h" + +int w_issflagset(struct sip_msg *msg, char *flag, str *s2); +int w_resetsflag(struct sip_msg *msg, char *flag, str *s2); +int w_setsflag(struct sip_msg *msg, char *flag, char *s2); +int w_isbflagset(struct sip_msg *msg, char *flag, str *idx); +int w_resetbflag(struct sip_msg *msg, char *flag, str *idx); +int w_setbflag(struct sip_msg *msg, char *flag, char *idx); + +#endif diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index c9c3ae3..e4960c0 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -3,9 +3,9 @@ * * Copyright (C) 2009 * - * This file is part of Kamailio, a free SIP server. + * This file is part of SIP-Router.org, a free SIP server. * - * Kamailio is free software; you can redistribute it and/or modify + * SIP-Router is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version @@ -26,7 +26,11 @@ #include "../../sr_module.h" #include "../../dprint.h" +#include "../../flags.h" +#include "../../dset.h" +#include "../../mod_fix.h" +#include "flags.h" #include "mi_core.h" #include "core_stats.h" @@ -38,10 +42,28 @@ MODULE_VERSION /** module functions */ static int mod_init(void); - void destroy(void); static cmd_export_t cmds[]={ + {"setsflag", (cmd_function)w_setsflag, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"resetsflag", (cmd_function)w_resetsflag, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"issflagset", (cmd_function)w_issflagset, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"setbflag", (cmd_function)w_setbflag, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"setbflag", (cmd_function)w_setbflag, 2,fixup_igp_igp, + 0, ANY_ROUTE }, + {"resetbflag", (cmd_function)w_resetbflag, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"resetbflag", (cmd_function)w_resetbflag, 2,fixup_igp_igp, + 0, ANY_ROUTE }, + {"isbflagset", (cmd_function)w_isbflagset, 1,fixup_igp_null, + 0, ANY_ROUTE }, + {"isbflagset", (cmd_function)w_isbflagset, 2,fixup_igp_igp, + 0, ANY_ROUTE }, + {0,0,0,0,0,0} }; @@ -93,3 +115,4 @@ void destroy(void) return; } +

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev