sr-dev

sr-dev@lists.kamailio.org

13 participants
44204 discussions

git:andrei/type_conversion: core expr eval: str automatic conversion to int

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/type_conversion Commit: 54b54c1fcf1f5f6967859890cf345a70cc0aab7f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54b54c1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Apr 28 12:00:04 2009 +0200 core expr eval: str automatic conversion to int (int)"" = 0 (int)"<number>" = <number> (e.g. (int)"123" = 123) (int)"<non-numeric>" = 0 (e.g. (int)"abc" = 0) --- rvalue.c | 44 +++++++++++++++++++++++++++++++++++++------- 1 files changed, 37 insertions(+), 7 deletions(-) diff --git a/rvalue.c b/rvalue.c index 259d921..e815c24 100644 --- a/rvalue.c +++ b/rvalue.c @@ -24,6 +24,9 @@ * -------- * 2008-12-01 initial version (andrei) * 2009-04-24 added support for defined, strempty, strlen (andrei) + * 2009-04-28 int and str automatic conversions: (int)undef=0, + * (str)undef="", (int)""=0, (int)"123"=123, (int)"abc"=0 + * (andrei) */ #include "rvalue.h" @@ -686,12 +689,19 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, avp_t* r_avp; int_str avp_val; pv_value_t pval; + str tmp; + str* s; + int r; + int destroy_pval; + destroy_pval=0; + s=0; switch(rv->type){ case RV_INT: *i=rv->v.l; break; case RV_STR: + s=&rv->v.s; goto rv_str; case RV_BEXPR: *i=eval_expr(h, rv->v.bexpr, msg); @@ -707,14 +717,23 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, *i=0; break; case RV_SEL: + r=run_select(&tmp, &rv->v.sel, msg); + if (unlikely(r!=0)){ + if (r<0) + goto eval_error; + else /* i>0 => undefined */ + goto undef; + } + s=&tmp; goto rv_str; case RV_AVP: if (unlikely(cache && cache->cache_type==RV_CACHE_AVP)){ if (likely(cache->val_type==RV_INT)){ *i=cache->c.avp_val.n; - }else if (cache->val_type==RV_STR) + }else if (cache->val_type==RV_STR){ + s=&cache->c.avp_val.s; goto rv_str; - else if (cache->val_type==RV_NONE) + }else if (cache->val_type==RV_NONE) goto undef; else goto error_cache; }else{ @@ -722,6 +741,7 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, &avp_val, rv->v.avps.index); if (likely(r_avp)){ if (unlikely(r_avp->flags & AVP_VAL_STR)){ + s=&avp_val.s; goto rv_str; }else{ *i=avp_val.n; @@ -736,9 +756,10 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, if (likely((cache->val_type==RV_INT) || (cache->c.pval.flags & PV_VAL_INT))){ *i=cache->c.pval.ri; - }else if (cache->val_type==RV_STR) + }else if (cache->val_type==RV_STR){ + s=&cache->c.pval.rs; goto rv_str; - else if (cache->val_type==RV_NONE) + }else if (cache->val_type==RV_NONE) goto undef; else goto error_cache; }else{ @@ -748,7 +769,8 @@ int rval_get_int(struct run_act_ctx* h, struct sip_msg* msg, *i=pval.ri; pv_value_destroy(&pval); }else if (likely(pval.flags & PV_VAL_STR)){ - pv_value_destroy(&pval); + destroy_pval=1; /* we must pv_value_destroy() later*/ + s=&pval.rs; goto rv_str; }else{ /* no PV_VAL_STR and no PV_VAL_INT => undef @@ -775,8 +797,16 @@ error_cache: BUG("invalid cached value:cache type %d, value type %d\n", cache?cache->cache_type:0, cache?cache->val_type:0); rv_str: - /* rv is of string type => error */ - /* ERR("string in int expression\n"); */ + /* rv is of string type => try to convert it to int */ + /* if "" => 0 (most likely case) */ + if (likely(s->len==0)) *i=0; + else if (unlikely(str2sint(s, i)!=0)){ + /* error converting to int => non numeric => 0 */ + *i=0; + } + if (destroy_pval) + pv_value_destroy(&pval); + return 0; error: *i=0; return -1;

15 years, 8 months

git:master: use pcre-config when available, based on patch #2781237 from Jinke Jiang

by Henning Westerholt

Module: sip-router Branch: master Commit: 019f41eba69e8f5f7a80cd8882b87b0d6f0a183b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=019f41e… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Mon Apr 27 17:42:32 2009 +0200 use pcre-config when available, based on patch #2781237 from Jinke Jiang --- modules/dialplan/Makefile | 17 +++++++++++++++-- modules_k/lcr/Makefile | 17 +++++++++++++++-- modules_k/regex/Makefile | 17 +++++++++++++++-- 3 files changed, 45 insertions(+), 6 deletions(-) diff --git a/modules/dialplan/Makefile b/modules/dialplan/Makefile index aeb0c6f..87b4acd 100644 --- a/modules/dialplan/Makefile +++ b/modules/dialplan/Makefile @@ -5,8 +5,21 @@ include ../../Makefile.defs auto_gen= NAME=dialplan.so -DEFS+=-I$(LOCALBASE)/include -LIBS=-L$(LOCALBASE)/lib -lpcre + +BUILDER = $(shell which pcre-config) + +ifeq ($(BUILDER),) + PCREDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \ + -I/usr/sfw/include + PCRELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \ + -L/opt/lib -lpcre +else + PCREDEFS = $(shell pcre-config --cflags) + PCRELIBS = $(shell pcre-config --libs) +endif + +DEFS+=$(PCREDEFS) +LIBS=$(PCRELIBS) DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/lcr/Makefile b/modules_k/lcr/Makefile index 240a68f..67b5aa3 100644 --- a/modules_k/lcr/Makefile +++ b/modules_k/lcr/Makefile @@ -7,8 +7,21 @@ include ../../Makefile.defs auto_gen= NAME=lcr.so -DEFS+=-I$(LOCALBASE)/include -LIBS=-L$(LOCALBASE)/lib -lpcre + +BUILDER = $(shell which pcre-config) + +ifeq ($(BUILDER),) + PCREDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \ + -I/usr/sfw/include + PCRELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \ + -L/opt/lib -lpcre +else + PCREDEFS = $(shell pcre-config --cflags) + PCRELIBS = $(shell pcre-config --libs) +endif + +DEFS+=$(PCREDEFS) +LIBS=$(PCRELIBS) DEFS+=-DOPENSER_MOD_INTERFACE diff --git a/modules_k/regex/Makefile b/modules_k/regex/Makefile index 6934d0a..cc03890 100644 --- a/modules_k/regex/Makefile +++ b/modules_k/regex/Makefile @@ -3,8 +3,21 @@ include ../../Makefile.defs auto_gen= NAME=regex.so -DEFS+=-I$(LOCALBASE)/include -LIBS=-L$(LOCALBASE)/lib -lpcre + +BUILDER = $(shell which pcre-config) + +ifeq ($(BUILDER),) + PCREDEFS=-I$(LOCALBASE)/include -I/usr/local/include -I/opt/include \ + -I/usr/sfw/include + PCRELIBS=-L$(LOCALBASE)/lib -L/usr/local/lib -L/usr/sfw/lib \ + -L/opt/lib -lpcre +else + PCREDEFS = $(shell pcre-config --cflags) + PCRELIBS = $(shell pcre-config --libs) +endif + +DEFS+=$(PCREDEFS) +LIBS=$(PCRELIBS) DEFS+=-DOPENSER_MOD_INTERFACE

15 years, 8 months

git:master: dialog: fixes for sip-router

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f6a66b4266af7811520c4cc6300a0d9d30411ee5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f6a66b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 27 17:30:33 2009 +0200 dialog: fixes for sip-router - use TMCB structures for temporary workaround of missing dialog_ctx field (hint by Andrei Pelinescu-Onciul). To be replaced by something more generic and not bound to a specific implementation. - check uac flags for RR --- modules_k/dialog/dlg_handlers.c | 25 ++++++++++++++++++++----- modules_k/dialog/dlg_handlers.h | 2 ++ modules_k/dialog/dlg_profile.c | 12 +++++++++++- 3 files changed, 33 insertions(+), 6 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 082e835..995cdab 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -207,7 +207,9 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, /* was the 200 OK received or local generated */ skip_recs = dlg->from_rr_nb + ((t->relayed_reply_branch>=0)? - (t->uac[t->relayed_reply_branch].added_rr):0); + ((t->uac[t->relayed_reply_branch].flags&TM_UAC_FLAG_R2)?2: + ((t->uac[t->relayed_reply_branch].flags&TM_UAC_FLAG_RR)?1:0)) + :0); } if(msg->record_route){ @@ -267,7 +269,7 @@ static void dlg_onreply(struct cell* t, int type, struct tmcb_params *param) return; } - if (type==TMCB_TRANS_DELETED) + if (type==TMCB_DESTROY) event = DLG_EVENT_TDEL; else if (param->code<200) event = DLG_EVENT_RPL1xx; @@ -427,10 +429,15 @@ void unref_new_dialog(void *dialog) struct tmcb_params p; p.param = (void*)&dialog; - dlg_onreply(0, TMCB_TRANS_DELETED, &p); + dlg_onreply(0, TMCB_DESTROY, &p); } +void dlg_tmcb_dummy(struct cell* t, int type, struct tmcb_params *param) +{ + return; +} + int dlg_new_dialog(struct sip_msg *msg, struct cell *t) { struct dlg_cell *dlg; @@ -498,7 +505,7 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) } if ( d_tmb.register_tmcb( msg, t, - TMCB_RESPONSE_PRE_OUT|TMCB_RESPONSE_FWDED, + TMCB_RESPONSE_READY|TMCB_RESPONSE_FWDED, dlg_onreply, (void*)dlg, unref_new_dialog)<0 ) { LM_ERR("failed to register TMCB\n"); goto error; @@ -511,8 +518,16 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) if (_dlg_ctx.to_bye!=0) dlg->dflags |= DLG_FLAG_TOBYE; - if (t) + if (t) { + if ( d_tmb.register_tmcb( msg, t, TMCB_MAX, + dlg_tmcb_dummy, (void*)dlg, 0)<0 ) { + LM_ERR("failed cache in T the shortcut to dlg\n"); + goto error; + } + } +#if 0 t->dialog_ctx = (void*) dlg; +#endif run_create_callbacks( dlg, msg); diff --git a/modules_k/dialog/dlg_handlers.h b/modules_k/dialog/dlg_handlers.h index d777103..9936088 100644 --- a/modules_k/dialog/dlg_handlers.h +++ b/modules_k/dialog/dlg_handlers.h @@ -63,4 +63,6 @@ int pv_get_dlg_lifetime(struct sip_msg *msg, pv_param_t *param, int pv_get_dlg_status(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); + +void dlg_tmcb_dummy(struct cell* t, int type, struct tmcb_params *param); #endif diff --git a/modules_k/dialog/dlg_profile.c b/modules_k/dialog/dlg_profile.c index 9980423..06c0583 100644 --- a/modules_k/dialog/dlg_profile.c +++ b/modules_k/dialog/dlg_profile.c @@ -42,6 +42,7 @@ #include "../../route.h" #include "../../modules/tm/tm_load.h" #include "dlg_hash.h" +#include "dlg_handlers.h" #include "dlg_profile.h" @@ -323,6 +324,7 @@ int profile_cleanup( struct sip_msg *msg, void *param ) static struct dlg_cell *get_current_dialog(struct sip_msg *msg) { struct cell *trans; + struct tm_callback* x; if (route_type==REQUEST_ROUTE) { /* use the per-process static holder */ @@ -338,7 +340,15 @@ static struct dlg_cell *get_current_dialog(struct sip_msg *msg) trans = d_tmb.t_gett(); if (trans==NULL || trans==T_UNDEFINED) return NULL; - return (struct dlg_cell*)trans->dialog_ctx; + x=(struct tm_callback*)(trans->tmcb_hl.first); + while(x){ + membar_depends(); + if (x->types==TMCB_MAX && x->callback==dlg_tmcb_dummy){ + return (struct dlg_cell*)(x->param); + } + x=x->next; + } + return NULL; } }

15 years, 8 months

git:master: tm: aliased TMCB_RESPONSE_READY to TMCB_RESPONSE_OUT

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d4c72479d57911da6f7fca32cd8054b320a54e48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d4c7247… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 27 16:12:40 2009 +0200 tm: aliased TMCB_RESPONSE_READY to TMCB_RESPONSE_OUT --- modules/tm/t_hooks.h | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index de20c51..48b0d59 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -115,6 +115,8 @@ struct cell; #endif #define TMCB_MAX ((1<<(TMCB_MAX_N+1))-1) +/* response ready - might need to be executed before sending reply out */ +#define TMCB_RESPONSE_READY TMCB_RESPONSE_OUT /* * Caution: most of the callbacks work with shmem-ized messages

15 years, 8 months

git:master: tm: new flags field in ua_client structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 388683b5ccc232066e13bb7a2504f1fb3c86a126 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=388683b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 27 16:50:54 2009 +0200 tm: new flags field in ua_client structure - if enabled, it stores various states of the uac, for now: RR and double RR indicators --- modules/tm/h_table.h | 12 ++++++++++++ modules/tm/t_fwd.c | 7 +++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index 1710584..37aecc9 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -192,6 +192,13 @@ typedef struct ua_server /* User Agent Client content */ +#define TM_UAC_FLAGS +#ifdef TM_UAC_FLAGS +/* UAC internal flags */ +#define TM_UAC_FLAG_RR 1 /* Record-Route applied */ +#define TM_UAC_FLAG_R2 2 /* 2nd Record-Route applied */ +#endif + typedef struct ua_client { /* if we store a reply (branch picking), this is where it is */ @@ -212,6 +219,11 @@ typedef struct ua_client str uri; /* if we don't store, we at least want to know the status */ int last_received; + +#ifdef TM_UAC_FLAGS + /* internal flags per tm uac */ + unsigned int flags; +#endif #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 23ebd2e..9344e6f 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -443,6 +443,13 @@ int add_uac( struct cell *t, struct sip_msg *request, str *uri, str* next_hop, t->uac[branch].uri.s=t->uac[branch].request.buffer+ request->first_line.u.request.method.len+1; t->uac[branch].uri.len=uri->len; +#ifdef TM_UAC_FLAGS + len = count_applied_lumps(request->add_rm, HDR_RECORDROUTE_T); + if(len==1) + t->uac[branch].flags = TM_UAC_FLAG_RR; + else if(len==2) + t->uac[branch].flags = TM_UAC_FLAG_RR|TM_UAC_FLAG_R2; +#endif membar_write(); /* to allow lockless ops (e.g. which_cancel()) we want to be sure everything above is fully written before updating branches no. */

15 years, 8 months

git:master: core: added function to count applied lumps

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b05f7d8fac58035cddfea6341d4317c1bc26b0e6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b05f7d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 27 14:25:31 2009 +0200 core: added function to count applied lumps - new defines to set/test lump flag --- data_lump.c | 19 ++++++++++++++++++ lump_struct.h | 10 ++++++-- msg_translator.c | 56 ++++++++++++++++++++++++++++++++++------------------- 3 files changed, 62 insertions(+), 23 deletions(-) diff --git a/data_lump.c b/data_lump.c index 1a6c484..4174e30 100644 --- a/data_lump.c +++ b/data_lump.c @@ -596,3 +596,22 @@ void del_nonshm_lump( struct lump** lump_list ) } } +unsigned int count_applied_lumps(struct lump *ll, int type) +{ + unsigned int n = 0; + struct lump *l = 0; + + for(l=ll; l; l=l->next) { + if (l->op==LUMP_NOP && l->type==type) { + if (l->after && l->after->op==LUMP_ADD_OPT) { + if (LUMP_IS_COND_TRUE(l->after)) { + n++; + } + } else { + n++; + } + } + } + return n; +} + diff --git a/lump_struct.h b/lump_struct.h index 39f826b..c097c6e 100644 --- a/lump_struct.h +++ b/lump_struct.h @@ -75,8 +75,11 @@ enum lump_conditions { COND_FALSE, /* always false */ proto = protocol (tcp, udp, tls) */ -enum lump_flag { LUMPFLAG_NONE=0, LUMPFLAG_DUPED=1, LUMPFLAG_SHMEM=2, LUMPFLAG_BRANCH=4 }; +enum lump_flag { LUMPFLAG_NONE=0, LUMPFLAG_DUPED=1, LUMPFLAG_SHMEM=2, + LUMPFLAG_BRANCH=4, LUMPFLAG_COND_TRUE=8 }; +#define LUMP_SET_COND_TRUE(_lump) (_lump)->flags |= LUMPFLAG_COND_TRUE +#define LUMP_IS_COND_TRUE(_lump) ((_lump)->flags & LUMPFLAG_COND_TRUE) struct lump{ enum _hdr_types_t type; /* HDR_VIA_T, HDR_OTHER_T (0), ... */ @@ -123,7 +126,8 @@ struct lump{ /* frees the content of a lump struct */ void free_lump(struct lump* l); -/*frees an entire lump list, recursively */ +/* frees an entire lump list, recursively */ void free_lump_list(struct lump* lump_list); - +/* count applied lumps in a list having a specific type */ +unsigned int count_applied_lumps(struct lump *ll, int type); #endif diff --git a/msg_translator.c b/msg_translator.c index 86ae002..3256048 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -487,7 +487,7 @@ char* clen_builder( struct sip_msg* msg, int *clen_len, int diff, /* checks if a lump opt condition * returns 1 if cond is true, 0 if false */ -static inline int lump_check_opt( enum lump_conditions cond, +static inline int lump_check_opt( struct lump *l, struct sip_msg* msg, struct dest_info* snd_i ) @@ -511,10 +511,11 @@ static inline int lump_check_opt( enum lump_conditions cond, proto=msg->rcv.proto; \ } \ - switch(cond){ + switch(l->u.cond){ case COND_FALSE: return 0; case COND_TRUE: + LUMP_SET_COND_TRUE(l); return 1; case COND_IF_DIFF_REALMS: get_ip_port_proto; @@ -526,28 +527,43 @@ static inline int lump_check_opt( enum lump_conditions cond, #endif (ip_addr_cmp(ip, &snd_i->send_sock->address))) return 0; - else return 1; + else { + LUMP_SET_COND_TRUE(l); + return 1; + } case COND_IF_DIFF_AF: get_ip_port_proto; - if (ip->af!=snd_i->send_sock->address.af) return 1; - else return 0; + if (ip->af!=snd_i->send_sock->address.af) { + LUMP_SET_COND_TRUE(l); + return 1; + } else return 0; case COND_IF_DIFF_PROTO: get_ip_port_proto; - if (proto!=snd_i->send_sock->proto) return 1; - else return 0; + if (proto!=snd_i->send_sock->proto) { + LUMP_SET_COND_TRUE(l); + return 1; + } else return 0; case COND_IF_DIFF_PORT: get_ip_port_proto; - if (port!=snd_i->send_sock->port_no) return 1; - else return 0; + if (port!=snd_i->send_sock->port_no) { + LUMP_SET_COND_TRUE(l); + return 1; + } else return 0; case COND_IF_DIFF_IP: get_ip_port_proto; if (ip_addr_cmp(ip, &snd_i->send_sock->address)) return 0; - else return 1; + else { + LUMP_SET_COND_TRUE(l); + return 1; + } case COND_IF_RAND: - return (rand()>=RAND_MAX/2); + if(rand()>=RAND_MAX/2) { + LUMP_SET_COND_TRUE(l); + return 1; + } else return 0; default: LOG(L_CRIT, "BUG: lump:w_check_opt: unknown lump condition %d\n", - cond); + l->u.cond); } return 0; /* false */ } @@ -778,7 +794,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, for(t=lumps;t;t=t->next){ /* skip if this is an OPT lump and the condition is not satisfied */ - if ((t->op==LUMP_ADD_OPT)&& !lump_check_opt(t->u.cond, msg, send_info)) + if ((t->op==LUMP_ADD_OPT)&& !lump_check_opt(t, msg, send_info)) continue; for(r=t->before;r;r=r->before){ switch(r->op){ @@ -791,7 +807,7 @@ static inline int lumps_len(struct sip_msg* msg, struct lump* lumps, case LUMP_ADD_OPT: /* skip if this is an OPT lump and the condition is * not satisfied */ - if (!lump_check_opt(r->u.cond, msg, send_info)) + if (!lump_check_opt(r, msg, send_info)) goto skip_before; break; default: @@ -847,7 +863,7 @@ skip_before: case LUMP_ADD_OPT: /* skip if this is an OPT lump and the condition is * not satisfied */ - if (!lump_check_opt(r->u.cond, msg, send_info)) + if (!lump_check_opt(r, msg, send_info)) goto skip_after; break; default: @@ -1200,7 +1216,7 @@ static inline void process_lumps( struct sip_msg* msg, /* skip if this is an OPT lump and the condition is * not satisfied */ if ((t->op==LUMP_ADD_OPT) && - (!lump_check_opt(t->u.cond, msg, send_info))) + (!lump_check_opt(t, msg, send_info))) continue; /* just add it here! */ /* process before */ @@ -1217,7 +1233,7 @@ static inline void process_lumps( struct sip_msg* msg, case LUMP_ADD_OPT: /* skip if this is an OPT lump and the condition is * not satisfied */ - if (!lump_check_opt(r->u.cond, msg, send_info)) + if (!lump_check_opt(r, msg, send_info)) goto skip_before; break; default: @@ -1258,7 +1274,7 @@ skip_before: case LUMP_ADD_OPT: /* skip if this is an OPT lump and the condition is * not satisfied */ - if (!lump_check_opt(r->u.cond, msg, send_info)) + if (!lump_check_opt(r, msg, send_info)) goto skip_after; break; default: @@ -1299,7 +1315,7 @@ skip_after: case LUMP_ADD_OPT: /* skip if this is an OPT lump and the condition is * not satisfied */ - if (!lump_check_opt(r->u.cond, msg, send_info)) + if (!lump_check_opt(r, msg, send_info)) goto skip_nop_before; break; default: @@ -1328,7 +1344,7 @@ skip_nop_before: case LUMP_ADD_OPT: /* skip if this is an OPT lump and the condition is * not satisfied */ - if (!lump_check_opt(r->u.cond, msg, send_info)) + if (!lump_check_opt(r, msg, send_info)) goto skip_nop_after; break; default:

15 years, 8 months

commit & push into master / public branches

by Andrei Pelinescu-Onciul

When updating your local branch (e.g. master) with the repository version, please always add --rebase to git pull (e.g. git pull --ff --rebase origin master). This will avoid generating confusing useless merge messages (like Merge branch 'master' of ssh://git.sip-router.org/sip-router). Example: $ git push origin master:master To ssh://git.sip-router.org/sip-router ! [rejected] master -> master (non-fast forward) error: failed to push some refs to 'ssh://git.sip-router.org/sip-router' # failed because the local master branch is not up to date # => update it $ git pull --ff --rebase origin master # retry the push $ git push origin master:master As an alternative, git can be configured to always rebase when pull-ing on a certain local branch, e.g. for master: git config branch.master.rebase true See https://sip-router.org/wiki/git/commit-into-master for more detailed info. Andrei

15 years, 8 months

git:master: port from branch 1.5, r5802

by Henning Westerholt

Module: sip-router Branch: master Commit: 643189177d93b5036beda2481457e079a451c512 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6431891… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Thu Apr 23 13:45:56 2009 +0200 port from branch 1.5, r5802 fix crash when no content-length is present, related to bug #2753152 --- modules_k/nathelper/nhelpr_funcs.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/nathelper/nhelpr_funcs.c b/modules_k/nathelper/nhelpr_funcs.c index 1df4c53..788153c 100644 --- a/modules_k/nathelper/nhelpr_funcs.c +++ b/modules_k/nathelper/nhelpr_funcs.c @@ -169,6 +169,11 @@ int extract_body(struct sip_msg *msg, str *body ) * parcing as get_body() parsed all headers and Conten-Length * body header is automaticaly parsed when found. */ + if (msg->content_length==0) { + LM_ERR("failed to get the content length in message\n"); + goto error; + } + body->len = get_content_length(msg); if (body->len==0) { LM_ERR("message body has length zero\n");

15 years, 8 months

git:master: pv: regenerate readme

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 12a8f3f8fcd8956ec7c968d7a1e2895035d05cba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=12a8f3f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 27 13:15:22 2009 +0200 pv: regenerate readme --- modules_k/pv/README | 154 ++++++++++++++++++++++++++++++----------- modules_k/pv/doc/pv_admin.xml | 55 ++++++++++++++- 2 files changed, 166 insertions(+), 43 deletions(-) diff --git a/modules_k/pv/README b/modules_k/pv/README index 19ba9a5..9c6ef99 100644 --- a/modules_k/pv/README +++ b/modules_k/pv/README @@ -12,66 +12,101 @@ Daniel-Constantin Mierla <daniel(a)asipto.com> Copyright � 2008 Daniel-Constantin Mierla (asipto.com) - __________________________________________________________ + __________________________________________________________________ Table of Contents 1. Admin Guide - 1.1. Overview - 1.2. Dependencies + 1. Overview + 2. Dependencies - 1.2.1. Kamailio Modules - 1.2.2. External Libraries or Applications + 2.1. Kamailio Modules + 2.2. External Libraries or Applications - 1.3. Exported Parameters + 3. Exported Parameters - 1.3.1. shvset (string) - 1.3.2. varset (string) + 3.1. shvset (string) + 3.2. varset (string) - 1.4. Exported Functions - 1.5. MI Commands + 4. Exported Functions - 1.5.1. shv_set - 1.5.2. shv_get + 4.1. pv_isset(pvar) + 4.2. pv_unset(pvar) + + 5. MI Commands + + 5.1. shv_set + 5.2. shv_get List of Examples 1.1. shvset parameter usage 1.2. varset parameter usage - 1.3. shv_set usage - 1.4. shv_get usage + 1.3. pv_isset usage + 1.4. pv_unset usage + 1.5. shv_set usage + 1.6. shv_get usage Chapter 1. Admin Guide -1.1. Overview + Table of Contents + + 1. Overview + 2. Dependencies + + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + + 3. Exported Parameters + + 3.1. shvset (string) + 3.2. varset (string) + + 4. Exported Functions - This module collects the core pseudo-variables that can be used - in configuration file. They are listed in Dokuwiki: + 4.1. pv_isset(pvar) + 4.2. pv_unset(pvar) + + 5. MI Commands + + 5.1. shv_set + 5.2. shv_get + +1. Overview + + This module collects the core pseudo-variables that can be used in + configuration file. They are listed in Dokuwiki: http://www.kamailio.org/dokuwiki/, in Pseudo-Variables section -1.2. Dependencies +2. Dependencies -1.2.1. Kamailio Modules + 2.1. Kamailio Modules + 2.2. External Libraries or Applications + +2.1. Kamailio Modules The following modules must be loaded before this module: * No dependencies on other Kamailio modules. -1.2.2. External Libraries or Applications +2.2. External Libraries or Applications - The following libraries or applications must be installed - before running Kamailio with this module loaded: + The following libraries or applications must be installed before + running Kamailio with this module loaded: * None. -1.3. Exported Parameters +3. Exported Parameters + + 3.1. shvset (string) + 3.2. varset (string) -1.3.1. shvset (string) +3.1. shvset (string) - Set the value of a shared variable ($shv(name)). The parameter - can be set many times. + Set the value of a shared variable ($shv(name)). The parameter can be + set many times. - The value of the parameter has the format: _name_ '=' _type_ - ':' _value_ + The value of the parameter has the format: _name_ '=' _type_ ':' + _value_ * _name_: shared variable name * _type_: type of the value + "i": integer value @@ -86,13 +121,13 @@ modparam("pv", "shvset", "debug=i:1") modparam("pv", "shvset", "pstngw=s:sip:10.10.10.10") ... -1.3.2. varset (string) +3.2. varset (string) - Set the value of a script variable ($var(name)). The parameter - can be set many times. + Set the value of a script variable ($var(name)). The parameter can be + set many times. - The value of the parameter has the format: _name_ '=' _type_ - ':' _value_ + The value of the parameter has the format: _name_ '=' _type_ ':' + _value_ * _name_: shared variable name * _type_: type of the value + "i": integer value @@ -107,13 +142,48 @@ modparam("pv", "varset", "init=i:1") modparam("pv", "varset", "gw=s:sip:11.11.11.11;transport=tcp") ... -1.4. Exported Functions +4. Exported Functions + + 4.1. pv_isset(pvar) + 4.2. pv_unset(pvar) + +4.1. pv_isset(pvar) + + Return true if a PV value is different than 'null'. + + Meaning of the parameters is as follows: + * pvar - pvar identifier. + + This function can be used from ANY_ROUTE. + + Example 1.3. pv_isset usage +... +if(pv_isset("$avp("s:x")")) +{ + ... +} +... + +4.2. pv_unset(pvar) + + Unset the value of the PV (e.g., delete AVP, set to null). + + Meaning of the parameters is as follows: + * pvar - pvar identifier. + + This function can be used from ANY_ROUTE. + + Example 1.4. pv_unset usage +... +pv_unset("$avp("s:x")"); +... - None +5. MI Commands -1.5. MI Commands + 5.1. shv_set + 5.2. shv_get -1.5.1. shv_set +5.1. shv_set Set the value of a shared variable ($shv(name)). @@ -131,25 +201,25 @@ modparam("pv", "varset", "gw=s:sip:11.11.11.11;transport=tcp") _value_ _empty_line_ - Example 1.3. shv_set usage + Example 1.5. shv_set usage ... $ kamctl fifo shv_set debug int 0 ... -1.5.2. shv_get +5.2. shv_get Get the value of a shared variable ($shv(name)). Parameters: - * _name_: shared variable name. If this parameter is missing, - all shared variables are returned. + * _name_: shared variable name. If this parameter is missing, all + shared variables are returned. MI FIFO Command Format: :shv_get:_reply_fifo_file_ _name_ _empty_line_ - Example 1.4. shv_get usage + Example 1.6. shv_get usage ... $ kamctl fifo shv_get debug $ kamctl fifo shv_get diff --git a/modules_k/pv/doc/pv_admin.xml b/modules_k/pv/doc/pv_admin.xml index 501b086..f8b50ad 100644 --- a/modules_k/pv/doc/pv_admin.xml +++ b/modules_k/pv/doc/pv_admin.xml @@ -127,8 +127,61 @@ modparam("pv", "varset", "gw=s:sip:11.11.11.11;transport=tcp") </section> <section> <title>Exported Functions</title> - <para>None</para> + <section> + <title><function moreinfo="none">pv_isset(pvar)</function></title> + <para> + Return true if a PV value is different than 'null'. + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>pvar</emphasis> - pvar identifier. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pv_isset</function> usage</title> + <programlisting format="linespecific"> +... +if(pv_isset("$avp("s:x")")) +{ + ... +} +... +</programlisting> + </example> + </section> + <section> + <title><function moreinfo="none">pv_unset(pvar)</function></title> + <para> + Unset the value of the PV (e.g., delete AVP, set to null). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>pvar</emphasis> - pvar identifier. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>pv_unset</function> usage</title> + <programlisting format="linespecific"> +... +pv_unset("$avp("s:x")"); +... +</programlisting> + </example> + </section> </section> + <section> <title><acronym>MI</acronym> Commands</title> <section>

15 years, 8 months

git:master: define ANY_ROUTE

by Daniel-Constantin Mierla

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

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