sr-dev

sr-dev@lists.kamailio.org

4 participants
44681 discussions

git:master: tm: AS added needed membar
by Andrei Pelinescu-Onciul 20 Jul '09

20 Jul '09

Module: sip-router Branch: master Commit: f0ab0db3b66fcc7912065ee960aff71615e9ce3e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f0ab0db… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 20 10:16:10 2009 +0200 tm: AS added needed membar When compiled with -DWITH_AS_SUPPORT build_local_ack() needed a membar_write_atomic_op() before setting the new local ack retr. buf pointer (this will force the local_ack content to be fully written before replacing the pointer and it's need on some non-x86 archs.). --- modules/tm/t_reply.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index ba06cd1..ea5db73 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -414,6 +414,10 @@ static char *build_local_ack(struct sip_msg* rpl, struct cell *trans, } /* set the new buffer, but only if not already set (concurrent 2xx) */ + /* a memory write barrier is needed to make sure the local_ack + content is fully written, before we try to add it to the transaction + -- andrei */ + membar_write_atomic_op(); if ((old_lack = (struct retr_buf *)atomic_cmpxchg_long( (void *)&trans->uac[0].local_ack, 0, (long)local_ack))) { /* buffer already set: trash current and use the winning one */

1 0

git:master: dispatcher(k): safety checks for duri
by Daniel-Constantin Mierla 19 Jul '09

19 Jul '09

Module: sip-router Branch: master Commit: 1ff6c9a7fbbc9369d0d240587b21857a4888c47a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ff6c9a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 19 17:37:22 2009 +0200 dispatcher(k): safety checks for duri - due to usage of SR append_branch() instead of km_append_branch(), duri has to be checked before giving inner fields as parameters --- modules_k/dispatcher/dispatch.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index b26c2f8..ff260f9 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1061,7 +1061,8 @@ static inline int ds_update_dst(struct sip_msg *msg, str *uri, int mode) } if(ds_append_branch!=0 && route_type==FAILURE_ROUTE) { - if (append_branch(msg, 0, 0, duri->s, duri->len, Q_UNSPECIFIED, 0)!=1 ) + if (append_branch(msg, 0, 0, (duri)?duri->s:0, (duri)?duri->len:0, + Q_UNSPECIFIED, 0)!=1 ) { LM_ERR("append_branch action failed\n"); return -1;

1 0

crash with dialog module
by jh＠tutpro.com 19 Jul '09

19 Jul '09

i have never used k dialog module because it is by far the buggies module that k has. now i ventured to try and, by no surprise, i crashed sr before a single message went through. looks like it started to play with db although i had not defined any. -- juha (gdb) where #0 0x00000000 in ?? () #1 0xb728bba4 in dlg_connect_db (db_url=0xb72ab574) at dlg_db_handler.c:119 #2 0xb72885e8 in child_init (rank=2) at dialog.c:576 #3 0x080e0f1b in init_mod_child (m=0x8231b20, rank=2) at sr_module.c:808 #4 0x080e0e90 in init_mod_child (m=0x8231d10, rank=2) at sr_module.c:785 #5 0x080e0e90 in init_mod_child (m=0x8231e20, rank=2) at sr_module.c:785 #6 0x080e0e90 in init_mod_child (m=0x8231ef8, rank=2) at sr_module.c:785 #7 0x080e0e90 in init_mod_child (m=0x82320e8, rank=2) at sr_module.c:785 #8 0x080e0e90 in init_mod_child (m=0x8232248, rank=2) at sr_module.c:785 #9 0x080e0e90 in init_mod_child (m=0x8232450, rank=2) at sr_module.c:785 #10 0x080e0e90 in init_mod_child (m=0x8232a70, rank=2) at sr_module.c:785 #11 0x080e0e90 in init_mod_child (m=0x8232c18, rank=2) at sr_module.c:785 #12 0x080a0b75 in fork_process (child_id=2, desc=0xbfd5db7c "udp receiver child=1 sock=192.98.101.10:5060", make_sock=1) at pt.c:329 #13 0x08088119 in main_loop () at main.c:1307 #14 0x0808ae4f in main (argc=-2082109099, argv=0x7d8928ec) at main.c:2108

3 7

git:master: dialog(k): fixed db initialization
by Daniel-Constantin Mierla 19 Jul '09

19 Jul '09

Module: sip-router Branch: master Commit: fd5621f188d23d89bc4e475e3bc1e7964a065a90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd5621f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jul 19 17:19:25 2009 +0200 dialog(k): fixed db initialization - child init DB initialization condition properly tests the db mode - reported by Juha Heinanen --- modules_k/dialog/dialog.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 657f859..8f26aca 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -570,7 +570,7 @@ static int child_init(int rank) if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); } - if ( ((dlg_db_mode==DB_MODE_REALTIME || DB_MODE_DELAYED) && + if ( ((dlg_db_mode==DB_MODE_REALTIME || dlg_db_mode==DB_MODE_DELAYED) && (rank>0 || rank==PROC_TIMER)) || (dlg_db_mode==DB_MODE_SHUTDOWN && (rank==PROC_MAIN)) ) { if ( dlg_connect_db(&db_url) ) {

1 0

w: timer runs faster
by Daniel-Constantin Mierla 18 Jul '09

18 Jul '09

I see pretty many warnings of this type: 4(22966) WARNING: <core> [timer.c:448]: WARNING: our timer runs faster then real-time (1570000 ms / 25120 ticks our time .-> 1569937 ms / 25118 ticks real time) 4(22966) WARNING: <core> [timer.c:448]: WARNING: our timer runs faster then real-time (1005000 ms / 16080 ticks our time .-> 1002398 ms / 16038 ticks real time) is it something to ignore? Cheers, Daniel -- Daniel-Constantin Mierla http://www.asipto.com/index.php/sip-router-bootcamp/

2 2

git:master: makefile: don't install tls certs & cfg by default
by Andrei Pelinescu-Onciul 18 Jul '09

18 Jul '09

Module: sip-router Branch: master Commit: 3390d4cf787b58f440ecd46dcb05910b060f8dc4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3390d4c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jul 18 11:24:19 2009 +0200 makefile: don't install tls certs & cfg by default Install tls certs & cfg only if the tls module is installed (moved certs & cfg installation from the main Makefile to the tls module Makefile). --- Makefile | 4 ++-- modules/tls/Makefile | 9 +++++++++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 32b8b2b..7a478c7 100644 --- a/Makefile +++ b/Makefile @@ -803,8 +803,8 @@ install-cfg: $(cfg_prefix)/$(cfg_dir) # TLS configuration $(INSTALL_TOUCH) $(cfg_prefix)/$(cfg_dir)/tls.cfg - $(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir) - modules/tls/$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) + #$(INSTALL_CFG) modules/tls/tls.cfg $(cfg_prefix)/$(cfg_dir) + #modules/tls/$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) install-bin: $(bin_prefix)/$(bin_dir) $(NAME) $(INSTALL_TOUCH) $(bin_prefix)/$(bin_dir)/$(NAME) diff --git a/modules/tls/Makefile b/modules/tls/Makefile index 30dacf4..213a484 100644 --- a/modules/tls/Makefile +++ b/modules/tls/Makefile @@ -16,6 +16,15 @@ LIBS+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/ssl/lib -lssl -lcrypto \ # have to add -lz -lkrb5 (zlib and kerberos5). # E.g.: make TLS_HOOKS=1 TLS_EXTRA_LIBS="-lz -lkrb5" +$(cfg_prefix)/$(cfg_dir): + mkdir -p $(cfg_prefix)/$(cfg_dir) + +install-cfg: $(cfg_prefix)/$(cfg_dir) + $(INSTALL_CFG) tls.cfg $(cfg_prefix)/$(cfg_dir) + ./$(SCR_NAME)_cert.sh -d $(cfg_prefix)/$(cfg_dir) + +install: install-cfg + DEFS+=-DOPENSER_MOD_INTERFACE

1 0

git:master: core: script engine cleanups
by Andrei Pelinescu-Onciul 18 Jul '09

18 Jul '09

Module: sip-router Branch: master Commit: aa9fa735a88363d9a452a4b84dcd25b516d731cd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa9fa73… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jul 18 11:05:05 2009 +0200 core: script engine cleanups Use named enums for action types, expression types, expressions left operands, expression right operands and action parameter types. This should avoid future type mismatching bugs (like trying to compare a left expr. operand type with a type that can exist only on the right part) by triggering compile time warnings. For extra protection the expression left operands and right operands possible value do not overlap anymore. --- action.c | 3 ++- route.c | 8 ++++++-- route_struct.c | 13 +++++++++++-- route_struct.h | 53 ++++++++++++++++++++++++++++++++++++++--------------- 4 files changed, 57 insertions(+), 20 deletions(-) diff --git a/action.c b/action.c index a793263..848ec59 100644 --- a/action.c +++ b/action.c @@ -1202,9 +1202,10 @@ match_cleanup: else ret=v; break; - +/* default: LOG(L_CRIT, "BUG: do_action: unknown type %d\n", a->type); +*/ } skip: return ret; diff --git a/route.c b/route.c index 7c01a3b..fc25c64 100644 --- a/route.c +++ b/route.c @@ -623,6 +623,7 @@ int fix_actions(struct action* a) struct proxy_l* p; char *tmp; int ret; + int i; union cmd_export_u* cmd; str s; struct hostent* he; @@ -886,7 +887,6 @@ int fix_actions(struct action* a) case MODULEX_T: cmd = t->val[0].u.data; if (cmd && cmd->c.fixup) { - int i; DBG("fixing %s()\n", cmd->c.name); if (t->val[1].u.number==0) { ret = cmd->c.fixup(0, 0); @@ -976,6 +976,9 @@ int fix_actions(struct action* a) (unsigned int)t->val[0].u.number); } break; + default: + /* no fixup required for the rest */ + break; } } return 0; @@ -1699,10 +1702,11 @@ inline static int eval_elem(struct run_act_ctx* h, struct expr* e, case PVAR_O: ret=comp_pvar(e->op, e->l.param, e->r_type, &e->r, msg, h); break; - +/* default: LOG(L_CRIT, "BUG: eval_elem: invalid operand %d\n", e->l_type); +*/ } return ret; error: diff --git a/route_struct.c b/route_struct.c index 7fce4b8..9f4d6b2 100644 --- a/route_struct.c +++ b/route_struct.c @@ -113,7 +113,8 @@ error: return 0; } -struct expr* mk_elem(int op, int ltype, void* lparam, int rtype, void* rparam) +struct expr* mk_elem(int op, expr_l_type ltype, void* lparam, + expr_r_type rtype, void* rparam) { struct expr * e; e=(struct expr*)pkg_malloc(sizeof (struct expr)); @@ -131,7 +132,15 @@ error: } -struct action* mk_action(int type, int count/* of couples {type,val} */, .../* int type1, void *val1 [, int type2, void *val2, ...] */) { +/** create an action structure (parser use). + * @param type - type of the action + * @param count - count of couples {param_type,val} + * @param ... - count {param_type, val} pairs, where param_type is + * action_param_type. + * @return new action structure on success (pkg_malloc'ed) or 0 on error. + */ +struct action* mk_action(enum action_type type, int count, ...) +{ va_list args; int i; struct action* a; diff --git a/route_struct.h b/route_struct.h index 340cbf6..090388c 100644 --- a/route_struct.h +++ b/route_struct.h @@ -60,15 +60,26 @@ */ -enum { EXP_T=1, ELEM_T }; -enum { LOGAND_OP=1, LOGOR_OP, NOT_OP, BINAND_OP, BINOR_OP }; -enum { EQUAL_OP=10, MATCH_OP, GT_OP, LT_OP, GTE_OP, LTE_OP, DIFF_OP, NO_OP }; -enum { METHOD_O=1, URI_O, FROM_URI_O, TO_URI_O, SRCIP_O, SRCPORT_O, - DSTIP_O, DSTPORT_O, PROTO_O, AF_O, MSGLEN_O, DEFAULT_O, ACTION_O, +/* expression type */ +enum expr_type { EXP_T=1, ELEM_T }; +enum expr_op { + /* expression operator if type==EXP_T */ + LOGAND_OP=1, LOGOR_OP, NOT_OP, BINAND_OP, BINOR_OP, + /* expression operator if type==ELEM_T */ + EQUAL_OP=10, MATCH_OP, GT_OP, LT_OP, GTE_OP, LTE_OP, DIFF_OP, NO_OP +}; +/* expression left member "special" type (if type==ELEM_T) + (start at 51 for debugging purposes: it's better to not overlap with + expr_r_type) +*/ +enum _expr_l_type{ + METHOD_O=51, URI_O, FROM_URI_O, TO_URI_O, SRCIP_O, SRCPORT_O, + DSTIP_O, DSTPORT_O, PROTO_O, AF_O, MSGLEN_O, ACTION_O, NUMBER_O, AVP_O, SNDIP_O, SNDPORT_O, TOIP_O, TOPORT_O, SNDPROTO_O, SNDAF_O, RETCODE_O, SELECT_O, PVAR_O, RVEXP_O}; - -enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, +/* action types */ +enum action_type{ + FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, SET_HOST_T, SET_HOSTPORT_T, SET_USER_T, SET_USERPASS_T, SET_PORT_T, SET_URI_T, SET_HOSTPORTTRANS_T, SET_HOSTALL_T, SET_USERPHONE_T, @@ -96,7 +107,10 @@ enum { FORWARD_T=1, SEND_T, DROP_T, LOG_T, ERROR_T, ROUTE_T, EXEC_T, ADD_T, UDP_MTU_TRY_PROTO_T }; -enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, +/* parameter types for actions or types for expression right operands + (WARNING right operands only, not working for left operands) */ +enum _operand_subtype{ + NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, EXPR_ST, ACTIONS_ST, MODEXP_ST, MODFIXUP_ST, URIHOST_ST, URIPORT_ST, MYSELF_ST, STR_ST, SOCKID_ST, SOCKETINFO_ST, ACTION_ST, AVP_ST, SELECT_ST, PVAR_ST, @@ -105,6 +119,10 @@ enum { NOSUBTYPE=0, STRING_ST, NET_ST, NUMBER_ST, IP_ST, RE_ST, PROXY_ST, BLOCK_ST, JUMPTABLE_ST, CONDTABLE_ST, MATCH_CONDTABLE_ST }; +typedef enum _expr_l_type expr_l_type; +typedef enum _operand_subtype expr_r_type; +typedef enum _operand_subtype action_param_type; + /* run flags */ #define EXIT_R_F 1 #define RETURN_R_F 2 @@ -134,15 +152,16 @@ union exp_op { }; struct expr{ - int type; /* exp, exp_elem */ - int op; /* and, or, not | ==, =~ */ - int l_type, r_type; + enum expr_type type; /* exp, exp_elem */ + enum expr_op op; /* and, or, not | ==, =~ */ + expr_l_type l_type; + expr_r_type r_type; union exp_op l; union exp_op r; }; typedef struct { - int type; + action_param_type type; union { long number; char* string; @@ -160,16 +179,20 @@ typedef struct { #define MAX_ACTIONS (2+6) struct action{ - int type; /* forward, drop, log, send ...*/ + enum action_type type; /* forward, drop, log, send ...*/ int count; struct action* next; action_u_t val[MAX_ACTIONS]; }; struct expr* mk_exp(int op, struct expr* left, struct expr* right); -struct expr* mk_elem(int op, int ltype, void* lparam, int rtype, void* rparam); +struct expr* mk_elem(int op, expr_l_type ltype, void* lparam, + expr_r_type rtype, void* rparam); + +/* @param type - type of the action + @param count - count of couples {type,val} (variable number of parameters)*/ +struct action* mk_action(enum action_type type, int count, ...); -struct action* mk_action(int type, int count/* of couples {type,val} */, .../* int type1, void *val1 [, int type2, void *val2, ...] */); struct action* append_action(struct action* a, struct action* b); void print_action(struct action* a);

1 0

method test fails
by jh＠tutpro.com 18 Jul '09

18 Jul '09

i have this piece of config code: if (method == "SUBSCRIBE") { xlog("L_INFO", "Method $rm $ru is SUSBCRIBE\n"); ... exit; }; xlog("L_INFO", "Method $rm $ru NOT is SUSBCRIBE\n"); and here is what i get to syslog: Jul 18 09:54:27 localhost /usr/sbin/sip-router[17556]: INFO: Method SUBSCRIBE sip:jh@test.fi NOT is SUSBCRIBE looks like method test has got broken. -- juha

2 3

git:master: core: expr string length fixup fix
by Andrei Pelinescu-Onciul 18 Jul '09

18 Jul '09

Module: sip-router Branch: master Commit: 009a8756c1accb2406adecf3e1b20f315f51a24d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=009a875… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat Jul 18 10:05:16 2009 +0200 core: expr string length fixup fix - moved the string length fixup before the rve/rval optimisations: the string length fixup was executed after the rve/rval optimisations and would try to re-calculate the length of the string (which was already filled in by the optimizer). However the rval optimizer did not 0-terminate strings => this second re-calculation was wrong. - the rve/rval optimiser 0 terminates strings (although not strictly needed it's better for debugging and would avoid problems similar to the above one). - don't try to fix a string in the left side of an expression, there can be no strings there (and by chance METHOD_O==STRING_ST). Reported-by: Juha Heinanen jh at tutpro com --- route.c | 30 +++++++++++++----------------- 1 files changed, 13 insertions(+), 17 deletions(-) diff --git a/route.c b/route.c index effb608..7c01a3b 100644 --- a/route.c +++ b/route.c @@ -435,6 +435,7 @@ static int exp_optimize_right(struct expr* exp) if (exp->r.str.s){ exp->r.str.len=rval->v.s.len; memcpy(exp->r.str.s, rval->v.s.s, rval->v.s.len); + exp->r.str.s[exp->r.str.len]=0; exp->r_type=STRING_ST; rval_destroy(rval); pkg_free(rve); @@ -503,6 +504,7 @@ int fix_expr(struct expr* exp) { regex_t* re; int ret; + int len; ret=E_BUG; if (exp==0){ @@ -525,8 +527,17 @@ int fix_expr(struct expr* exp) exp->op); } }else if (exp->type==ELEM_T){ - /* first fix & optimize rve/rvals (they might be optimized - to non-rvals, e.g. string, avp a.s.o) */ + /* first calculate lengths of strings (only right side, since + left side can never be a string) */ + if (exp->r_type==STRING_ST) { + if (exp->r.string) len = strlen(exp->r.string); + else len = 0; + exp->r.str.s = exp->r.string; + exp->r.str.len = len; + } + /* then fix & optimize rve/rvals (they might be optimized + to non-rvals, e.g. string, avp a.s.o and needs to be done + before MATCH_OP and other fixups) */ if (exp->l_type==RVEXP_O){ if ((ret=fix_rval_expr(&exp->l.param))<0){ ERR("Unable to fix left rval expression\n"); @@ -544,21 +555,6 @@ int fix_expr(struct expr* exp) exp_optimize_right(exp); } - /* Calculate lengths of strings */ - if (exp->l_type==STRING_ST) { - int len; - if (exp->l.string) len = strlen(exp->l.string); - else len = 0; - exp->l.str.s = exp->l.string; - exp->l.str.len = len; - } - if (exp->r_type==STRING_ST) { - int len; - if (exp->r.string) len = strlen(exp->r.string); - else len = 0; - exp->r.str.s = exp->r.string; - exp->r.str.len = len; - } if (exp->op==MATCH_OP){ /* right side either has to be string, in which case

1 0

[tracker] Task closed: Compilation on OpenSUSE only is LDAP and H350 modules are removed
by sip-router 18 Jul '09

18 Jul '09

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#5 - Compilation on OpenSUSE only is LDAP and H350 modules are removed User who did this - Andrei Pelinescu-Onciul (andrei) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=5 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev