sr-dev July 2009

sr-dev@lists.kamailio.org

35 participants
328 discussions

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

[Tracker] Created: (SER-436) Ser & RTPproxy does not change the SDP vodeo port
by Anonymous (JIRA) 18 Jul '09

18 Jul '09

Ser & RTPproxy does not change the SDP vodeo port ------------------------------------------------- Key: SER-436 URL: http://tracker.iptel.org/browse/SER-436 Project: SER Issue Type: Bug Components: NAT Traversal Environment: Fedora 9 hi, I'm using ser 0.9.7 and RTPproxy 1.1 on diffrent servers. the ser.cfg is the nat-rtpproxy.cfg from the iptel site. I have 2 grandstream GXV-300 devices, each behind diffrent NAT, this setup is working fine for voice and RTP is relayed through the rtpproxy properly. The problem is that the video is not working, when ser gets the invite from device A and send it to device B, it change the audio port only but leave the video port the same as the port he got from device A. I'm not sure if it is an issue with the RTPproxy or the nat-helper module. any idea how to debug / resolve? do you aware of other versions of ser/rtpproxy that this setup should work with video? Thanks! Amos -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://tracker.iptel.org/secure/Administrators.jspa - For more information on JIRA, see: http://www.atlassian.com/software/jira

1 0

[tracker] Task closed: Fix "command out of sync" issue in db_mysql
by sip-router 18 Jul '09

18 Jul '09

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#4 - Fix "command out of sync" issue in db_mysql User who did this - Juha Heinanen (jh) Reason for closing: Fixed Additional comments about closing: Fixed by Jan a few weeks ago. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=4 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

[tracker] Task closed: modules_s/domain should export is_local API function
by sip-router 18 Jul '09

18 Jul '09

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#9 - modules_s/domain should export is_local API function User who did this - Juha Heinanen (jh) Reason for closing: Fixed Additional comments about closing: Jan included is_domain_local API function to modules_s/domain. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=9 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

RegExp RURI matching broken?!
by Nils Ohlmeier 17 Jul '09

17 Jul '09

Hi, when I try to use a regexp matching for the RURI like this (code is git master): if (uri =~ "sip:\+[0-9]+@.*") { and then send a request with an RURI like this: sip:+123456789@127.0.0.1 I get the following error message: 2(85781) : <core> [route.c:1190]: BUG: comp_str: Bad operator type 1, for ~= and the if statement is obviously not executed?! Ideas, comments and even more bug fixes are welcome :-) Regards Nils

2 3

← Newer
1
...
5
6
7
8
9
10
11
...
33
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev July 2009