sr-dev January 2010

sr-dev@lists.kamailio.org

28 participants
289 discussions

git:bpintea/asi_binrpc2: removed use of debugging macros that were left out when importing the file
by Bogdan Pintea 14 Jan '10

14 Jan '10

Module: sip-router Branch: bpintea/asi_binrpc2 Commit: c276bbf107abaa70b1089364c5ce764a3dba5397 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c276bbf… Author: bpi <bpi(a)machine.office.iptego.net> Committer: bpi <bpi(a)machine.office.iptego.net> Date: Thu Jan 14 22:33:35 2010 +0100 removed use of debugging macros that were left out when importing the file into ser project --- list.h | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/list.h b/list.h index d712253..f810072 100644 --- a/list.h +++ b/list.h @@ -443,7 +443,6 @@ struct { \ } while (0) #define TAILQ_INSERT_AFTER(head, listelm, elm, field) do { \ - QMD_TAILQ_CHECK_NEXT(listelm, field); \ if ((TAILQ_NEXT((elm), field) = TAILQ_NEXT((listelm), field)) != NULL)\ TAILQ_NEXT((elm), field)->field.tqe_prev = \ &TAILQ_NEXT((elm), field); \ @@ -458,7 +457,6 @@ struct { \ } while (0) #define TAILQ_INSERT_BEFORE(listelm, elm, field) do { \ - QMD_TAILQ_CHECK_PREV(listelm, field); \ (elm)->field.tqe_prev = (listelm)->field.tqe_prev; \ TAILQ_NEXT((elm), field) = (listelm); \ *(listelm)->field.tqe_prev = (elm); \ @@ -481,7 +479,6 @@ struct { \ } while (0) #define TAILQ_INSERT_TAIL(head, elm, field) do { \ - QMD_TAILQ_CHECK_TAIL(head, field); \ TAILQ_NEXT((elm), field) = NULL; \ (elm)->field.tqe_prev = (head)->tqh_last; \ *(head)->tqh_last = (elm); \ @@ -499,8 +496,6 @@ struct { \ (*(((struct headname *)((elm)->field.tqe_prev))->tqh_last)) #define TAILQ_REMOVE(head, elm, field) do { \ - QMD_TAILQ_CHECK_NEXT(elm, field); \ - QMD_TAILQ_CHECK_PREV(elm, field); \ if ((TAILQ_NEXT((elm), field)) != NULL) \ TAILQ_NEXT((elm), field)->field.tqe_prev = \ (elm)->field.tqe_prev; \

1 0

git:bpintea/asi_binrpc2: b/f: in case of SHM OOM, new_dlg_uac() was leaking even more SHM
by Bogdan Pintea 14 Jan '10

14 Jan '10

Module: sip-router Branch: bpintea/asi_binrpc2 Commit: 26c6d4dbdbe552ca8a041c1e6beb22d4bbd818c2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26c6d4d… Author: bpi <bpi(a)machine.office.iptego.net> Committer: bpi <bpi(a)machine.office.iptego.net> Date: Thu Jan 14 22:34:45 2010 +0100 b/f: in case of SHM OOM, new_dlg_uac() was leaking even more SHM --- modules/tm/dlg.c | 35 +++++++++++++++++------------------ 1 files changed, 17 insertions(+), 18 deletions(-) diff --git a/modules/tm/dlg.c b/modules/tm/dlg.c index c18f5c2..8012c1d 100644 --- a/modules/tm/dlg.c +++ b/modules/tm/dlg.c @@ -320,41 +320,40 @@ int new_dlg_uac(str* _cid, str* _ltag, unsigned int _lseq, str* _luri, str* _rur return -1; } - res = (dlg_t*)shm_malloc(sizeof(dlg_t)); - if (res == 0) { - LOG(L_ERR, "new_dlg_uac(): No memory left\n"); - return -2; + if (! (res = (dlg_t*)shm_malloc(sizeof(dlg_t)))) { + ERR("out of shm mem.\n"); + return -1; + } else { + memset(res, 0, sizeof(dlg_t)); } - - /* Clear everything */ - memset(res, 0, sizeof(dlg_t)); /* Make a copy of Call-ID */ - if (str_duplicate(&res->id.call_id, _cid) < 0) return -3; + if (str_duplicate(&res->id.call_id, _cid) < 0) goto failed; /* Make a copy of local tag (usually From tag) */ - if (str_duplicate(&res->id.loc_tag, _ltag) < 0) return -4; + if (str_duplicate(&res->id.loc_tag, _ltag) < 0) goto failed; /* Make a copy of local URI (usually From) */ - if (str_duplicate(&res->loc_uri, _luri) < 0) return -5; + if (str_duplicate(&res->loc_uri, _luri) < 0) goto failed; /* Make a copy of remote URI (usually To) */ - if (str_duplicate(&res->rem_uri, _ruri) < 0) return -6; + if (str_duplicate(&res->rem_uri, _ruri) < 0) goto failed; /* Make a copy of local sequence (usually CSeq) */ res->loc_seq.value = _lseq; /* And mark it as set */ res->loc_seq.is_set = 1; - *_d = res; - - if (calculate_hooks(*_d) < 0) { - LOG(L_ERR, "new_dlg_uac(): Error while calculating hooks\n"); - /* FIXME: free everything here */ - shm_free(res); - return -2; + if (calculate_hooks(res) < 0) { + ERR("failed calculating hooks\n"); + goto failed; } #ifdef DIALOG_CALLBACKS run_new_dlg_callbacks(DLG_CB_UAC, res, 0); #endif + *_d = res; return 0; + +failed: + free_dlg(res); + return -1; }

1 0

t_set_fr incompatibility
by jh＠tutpro.com 14 Jan '10

14 Jan '10

in sr_3.0 this works: t_set_fr("$avp(i:722)", 5000); but in kamailio_3.0 i get error: 0(27178) : <core> [cfg.y:3326]: parse error in config file /etc/sip-proxy/sip-proxy.cfg, line 1983, column 31-34: Function parameter with integer value not allowed why is that? i thought that k and sr are using the same tm module. -- juha

2 3

git:master: Fixed documentation naming of parameter in modules_k/sl module
by Marius Zbihlei 14 Jan '10

14 Jan '10

Module: sip-router Branch: master Commit: fe71e47101defb0b7e61c0aa1157cb88d6be497e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe71e47… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Thu Jan 14 13:10:22 2010 +0200 Fixed documentation naming of parameter in modules_k/sl module --- modules_k/sl/doc/sl_admin.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/sl/doc/sl_admin.xml b/modules_k/sl/doc/sl_admin.xml index cd2e1cd..540c56e 100644 --- a/modules_k/sl/doc/sl_admin.xml +++ b/modules_k/sl/doc/sl_admin.xml @@ -100,7 +100,7 @@ modparam("sl", "enable_stats", 0) </example> </section> <section> - <title><varname>load_tm</varname> (integer)</title> + <title><varname>bind_tm</varname> (integer)</title> <para> If the module should use transaction support for sending the replies. A zero value means disabled. @@ -112,9 +112,9 @@ modparam("sl", "enable_stats", 0) Default value is 1 (enabled). </para> <example> - <title>load_tm example</title> + <title>bind_tm example</title> <programlisting format="linespecific"> -modparam("sl", "load_tm", 0) +modparam("sl", "bind_tm", 0) </programlisting> </example> </section>

1 0

zoiper softphone and presence
by Joachim Vanheuverzwijn 14 Jan '10

14 Jan '10

Hello, You can add zoiper communicator to the list of supported phones on http://kamailio.net/dokuwiki/doku.php/presence:presence-module I know its a tiki, but i'm not sure its appropriate for me to add it as i am working for zoiper :) Greetings, Joachim

2 1

git:sr_3.0: Merge remote branch 'origin/andrei/shm_early_init' into sr_3.0
by Andrei Pelinescu-Onciul 13 Jan '10

13 Jan '10

Module: sip-router Branch: sr_3.0 Commit: b0853ed66ef8093bad06a3206ee257585d3a0624 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0853ed… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jan 13 17:39:01 2010 +0100 Merge remote branch 'origin/andrei/shm_early_init' into sr_3.0 * origin/andrei/shm_early_init: NEWS: notes about the shm related changes core: shm mem size can now be set in the config script core: early shm init while parsing the cfg core: moved shm init into separate files ---

1 0

git:master: Merge remote branch 'origin/sr_3.0'
by Andrei Pelinescu-Onciul 13 Jan '10

13 Jan '10

Module: sip-router Branch: master Commit: fd47b28ceaf52e99486c81ed63f12d6bdb76140b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fd47b28… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Jan 13 17:20:23 2010 +0100 Merge remote branch 'origin/sr_3.0' latest sr_3.0 fixes, after kamailio 3.0 release. * origin/sr_3.0: (58 commits) Backport of the changes (see previous commits). kex: documented missing functions kex: aliased avp_printf to pv_printf auth_diameter(k): remove redundant declaration of find_credentials, now in core - fix bug in encode_contact() - fix bug when RURI was changed before and newuri will be used - remove unused code modules_k/nathelper: removed garbage from documentation (credits to Klaus) modules_k/nathelper: improved handle_ruri_alias() documentation modules/lcr and modules_k/nathelper: fixed compiler warnings modules_k/nathelper: handle_uri_alias() alias handling fix modules_k/usrloc: changed 'Kamailio' to 'SIP Router' in user agent string. tm: safer handling for local transactions and drop_replies!=0 sctp: stats: don't increment ASSOC_SHUTDOWN on COMM_LOST sctp: SCTP_STATS_ASSOC_SHUTDOWN tm doc: local_ack_mode documentation tm: new param: local_ack_mode makefile: fix make bin & basedir core: fix parsing for avps with the same name as a pv class tls: name the certificates based on $MAIN_NAME ... Conflicts: modules/tm/README modules_k/nathelper/rtpproxy_stream.c pkg/debian/rules ---

1 0

running Qjsimple with kamailio 1.5 + tls
by mustafa samara 13 Jan '10

13 Jan '10

Hello i am trying Qjsimple 0.6.3 with Kamailio 1.5 with tls support, i make the user register successfully but when i am trying to invite another user i got the following error: " transport_srtp Failed generating random key: unspecified failure pjsua_call.c Error initializing media channel: Unknown error 259800 [status=259800] Dialog destroyed QjSimple: Error calling buddy: Unknown error 259800 [status=259800] " the sip setting as the following: protocol: tcp srtp : mandatory srtp requirements: tls also i got the same error if the sip setting as the following: protocol: tls srtp : mandatory srtp requirements: tls or: protocol: tls srtp : mandatory srtp requirements: sips any body help me please? -- Eng.Mustafa Al-Samara

1 0

git:master: cr: remove obselete cr_prime_route function, use cr_nofallback_route instead
by Henning Westerholt 13 Jan '10

13 Jan '10

Module: sip-router Branch: master Commit: 7b898cecea8e1c7f8b2a0597d5b31fe37514227c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7b898ce… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Wed Jan 13 10:59:44 2010 +0100 cr: remove obselete cr_prime_route function, use cr_nofallback_route instead --- modules/carrierroute/README | 96 ++++------------------- modules/carrierroute/carrierroute.c | 2 - modules/carrierroute/cr_func.c | 43 +---------- modules/carrierroute/cr_func.h | 24 +------ modules/carrierroute/doc/carrierroute_admin.xml | 87 +-------------------- modules/carrierroute/prime_hash.c | 45 ----------- modules/carrierroute/prime_hash.h | 8 -- 7 files changed, 19 insertions(+), 286 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=7b8…

1 0

git:andrei/cdefs2doc: doc: select doc generator fix flags processing
by Andrei Pelinescu-Onciul 12 Jan '10

12 Jan '10

Module: sip-router Branch: andrei/cdefs2doc Commit: ea1f8a283ee6a4077b70b1894c7baa260fa1852e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ea1f8a2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Jan 12 20:48:09 2010 +0100 doc: select doc generator fix flags processing - fixes based on Jan's select decoding explanations (included in the code as a comment), select.c/resolve_select() and Libor's ser_objdump (http://git.sip-router.org/cgi-bin/gitweb.cgi?p=ser;a=blob;f=ser_objdump/sel…) - '{}' are now used to mark optional parameters --- doc/scripts/cdefs2doc/dump_selects.pl | 159 +++++++++++++++++++++++++++++---- 1 files changed, 140 insertions(+), 19 deletions(-) diff --git a/doc/scripts/cdefs2doc/dump_selects.pl b/doc/scripts/cdefs2doc/dump_selects.pl index 1dccee5..4adcf20 100755 --- a/doc/scripts/cdefs2doc/dump_selects.pl +++ b/doc/scripts/cdefs2doc/dump_selects.pl @@ -141,6 +141,84 @@ sub expr_op0{ } +# constants (from select.h) +use constant { + MAX_SELECT_PARAMS => 32, + MAX_NESTED_CALLS => 4, +}; + +use constant DIVERSION_MASK => 0x00FF; +use constant { + DIVERSION => 1<<8, + SEL_PARAM_EXPECTED => 1<<9, + CONSUME_NEXT_STR => 1<<10, + CONSUME_NEXT_INT => 1<<11, + CONSUME_ALL => 1<<12, + OPTIONAL => 1<<13, + NESTED => 1<<14, + FIXUP_CALL => 1<<15, +}; + +use constant { + SEL_PARAM_INT => 0, + SEL_PARAM_STR => 1, + SEL_PARAM_DIV => 2, + SEL_PARAM_PTR => 3, +}; + + + +# Select rules (pasted from one email from Jan): +# Roughly the rules are as follows: +# * The first component of the row tells the select compiler in what state the +# row can be considered. +# * The second component tells the compiler what type of components is expected +# for the row to match. SEL_PARAM_STR means that .foo should follow, +# SEL_PARAM_INT means that [1234] should follow. +# * The third component is the string to be matched for string components and +# STR_NULL if the next expected component is an integer. +# * The fourth component is a function name. This is either the function to be +# called if this is the last rule all constrains are met, or it is the next +# state to transition into if we are not processing the last component of the +# select identifier. +# +# * The fifth rule are flags that can impose further constrains on how the +# given line is to be used. Some of them are: +# +# - CONSUME_NEXT_INT - This tells the compiler that there must be at least one +# more component following the current one, but it won't transition into the +# next state, instead the current function will "consume" the integer as +# parameters. +# +# - CONSUME_NEXT_STR - Same as previous, but the next component must be a +# string. +# - SEL_PARAM_EXPECTED - The current row must not be last and there must be +# another row to transition to. +# +# - OPTIONAL - There may or may not be another component, but in any case the +# compiler does not transition into another state (row). This can be used +# together with CONSUME_NEXT_{STR,INT} to implement optional parameters, for +# example .param could return a string of all parameters, while .param.abc +# will only return the value of parameter abc. +# +# - NESTED - When this flag is present in a rule then it means that the +# previous function should be called before the current one. The original +# idea was that all select identifiers would only resolve to one function +# call, however, it turned out to be inconvenient in some cases so we added +# this. This is typically used in selects that have URIs as components. In +# that case it is desirable to support all subcomponents for uri selects, but +# it does not make sense to reimplement them for every single case. In that +# case the uri components sets NESTED flags which causes the "parent" +# function to be called first. The "parent" function extracts only the URI +# which is then passed to the corresponding URI parsing function. The word +# NESTED here means "nested function call". +# +# - CONSUME_ALL - Any number of select identifier components may follow and +# they may be of any types. This flag causes the function on the current row +# to be called and it is up to the function to handle the remainder of the +# select identifier. + + # generate all select strings starting with a specific "root" function sub gen_selects @@ -154,32 +232,75 @@ sub gen_selects @matches = grep(${$_}[0] eq $root, @sel_exports); for $m (@matches) { + my $s=""; ($prev, $type, $name, $new_f, $flags)=@$m; - if (($flags & (1024|2048|4096)) && $name ne ""){ - if ($flags & 1024){ - $name.="[string]"; - }elsif ($flags & 2048){ - $name.="[integer]"; + if (!($flags & NESTED) || + (($flags & NESTED) && ($type !=SEL_PARAM_INT))){ + # Note: unamed NESTED params are not allowed --andrei + if ($type==SEL_PARAM_INT){ + $s.="[integer]"; }else{ - $name.="[]" + if ($name ne "") { + $s.=(($prev eq "0" || $prev eq "")?"@":".") . $name; + }elsif (!($flags & NESTED)){ + $s.=".<string>"; + } } } - if ($new_f eq "" || - $new_f eq "0" - ){ - push @ret, $name; - }else{ - if ($name eq ""){ - @sel=gen_selects($new_f); + if ( !($flags & NESTED) && + ($flags & (CONSUME_NEXT_STR|CONSUME_NEXT_INT|CONSUME_ALL)) ){ + #process params + if ($flags & OPTIONAL){ + $s.="{"; + } + # add param name + if ($flags & CONSUME_NEXT_STR){ + $s.="[\"string\"]"; + }elsif ($flags & CONSUME_NEXT_INT){ + $s.="[integer]"; }else{ - @sel=map("$name.$_", gen_selects($new_f)); + $s.=".*"; # CONSUME_ALL + } + if ($flags & OPTIONAL){ + $s.="}"; } - if (@sel > 0) { - push(@ret, $name) if (! (($flags & (512|16384)) || - ($name eq ""))); - push @ret, @sel; + } + + if (!($flags & SEL_PARAM_EXPECTED)){ + # if optional terminal add it to the list along with all the + # variants + if ($new_f eq "" || $new_f eq "0"){ + push @ret, $s; }else{ - push @ret, $name; + if ($s eq ""){ + @sel=gen_selects($new_f); + }else{ + @sel=map("$s$_", gen_selects($new_f)); + } + if (@sel > 0) { + push(@ret, $s) if (!($s eq "")); + push @ret, @sel; + }else{ + if ($flags & NESTED) { + $s.="*"; + } + push @ret, $s; + } + } + }else{ + # non-terminal + if (!($new_f eq "" || $new_f eq "0")){ + if ($s eq ""){ + @sel=gen_selects($new_f); + }else{ + @sel=map("$s$_", gen_selects($new_f)); + } + if (@sel > 0) { + push @ret, @sel; + }elsif ($flags & NESTED){ + $s.="*"; + push @ret, $s; + } } } }

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2010