August 2013 - sr-dev - kamailio.org

[tracker] Comment added: SCA - Primary line appearance hangs when secondary is picked up.
by sip-router 21 Aug '13

21 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#329 - SCA - Primary line appearance hangs when secondary is picked up. User who did this - Andrew Mortensen (admorten) ---------- Yes, bundling the module from the admorten/sca branch with 4.0.3 should work just fine. I'll close the ticket. Thanks for confirming the fix. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=329#comment1058 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] Comment added: SCA - Primary line appearance hangs when secondary is picked up.
by sip-router 21 Aug '13

21 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#329 - SCA - Primary line appearance hangs when secondary is picked up. User who did this - Kevin Scott Adams (TheGrandWazoo) ---------- Andrew, I create my own RPM's, so can I replace the 4.0.3 module/sca with the admorten/sca module/sca or does it depend on that tree? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=329#comment1057 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] Comment added: SCA - Primary line appearance hangs when secondary is picked up.
by sip-router 21 Aug '13

21 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#329 - SCA - Primary line appearance hangs when secondary is picked up. User who did this - Kevin Scott Adams (TheGrandWazoo) ---------- I have tested with the latest snapshot (sip-router-admorten.sca-cf5f743.tar.gz) of the admorten/sca branch and concur that this is fixed. It is a beautiful thing. Thanks. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=329#comment1056 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

Is Kamailio's presence module support pidf-diff+xml format?
by Evgeny Vinnik 21 Aug '13

21 Aug '13

Is Kamailio's presence module support pidf-diff+xml (RFC 5262 aka Partial PIDF) format? Did anyone tried to implement parsing of such format? It just I have an issue with an RCS client, which updates presence information in the Partial PIDF format.

1 0

git:master: kamailio.cfg: use is_first_hop() for adding alias parameter to contact uri
by Daniel-Constantin Mierla 21 Aug '13

21 Aug '13

Module: sip-router Branch: master Commit: fe24ed17b0620bd9446d741ea3f65b7b0cb8b765 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe24ed1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Aug 21 11:20:07 2013 +0200 kamailio.cfg: use is_first_hop() for adding alias parameter to contact uri - done for natted devices --- etc/kamailio.cfg | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index c8ac439..b800e4b 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -757,7 +757,8 @@ route[NATDETECT] { if (is_method("REGISTER")) { fix_nated_register(); } else { - add_contact_alias(); + if(is_first_hop()) + add_contact_alias(); } setflag(FLT_NATS); } @@ -789,7 +790,8 @@ route[NATMANAGE] { } if (is_reply()) { if(isbflagset(FLB_NATB)) { - add_contact_alias(); + if(is_first_hop()) + add_contact_alias(); } } #!endif

3 2

[tracker] Task closed: avpops: avp_check, allow avp as second parameter on re operation
by sip-router 21 Aug '13

21 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#333 - avpops: avp_check, allow avp as second parameter on re operation User who did this - Víctor Seva (linuxmaniac) Reason for closing: Implemented More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=333 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] User took ownership: avpops: avp_check, allow avp as second parameter on re operation
by sip-router 21 Aug '13

21 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Víctor Seva has taken ownership of the following task: FS#333 - avpops: avp_check, allow avp as second parameter on re operation More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=333 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

git:master: avpops: allow use of avps as second parameter on re operation at avp_check function
by Victor Seva 21 Aug '13

21 Aug '13

Module: sip-router Branch: master Commit: bbecaa597aa4fb3fa08773cd6cd9b8558c7ce3a8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bbecaa5… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Wed Aug 21 11:04:08 2013 +0200 avpops: allow use of avps as second parameter on re operation at avp_check function --- modules/avpops/avpops.c | 35 +++++++++++++++-------------------- modules/avpops/avpops_impl.c | 20 ++++++++++++++++---- 2 files changed, 31 insertions(+), 24 deletions(-) diff --git a/modules/avpops/avpops.c b/modules/avpops/avpops.c index 4de02a1..674469b 100644 --- a/modules/avpops/avpops.c +++ b/modules/avpops/avpops.c @@ -683,28 +683,23 @@ static int fixup_check_avp(void** param, int param_no) /* if REGEXP op -> compile the expresion */ if (ap->ops&AVPOPS_OP_RE) { - if ( (ap->opd&AVPOPS_VAL_STR)==0 ) + if ( (ap->opd&AVPOPS_VAL_STR)!=0 ) { - LM_ERR("regexp operation requires string value\n"); - return E_UNSPEC; - } - re = pkg_malloc(sizeof(regex_t)); - if (re==0) - { - LM_ERR("no more pkg mem\n"); - return E_OUT_OF_MEM; - } - LM_DBG("compiling regexp <%.*s>\n", ap->u.s.len, ap->u.s.s); - if (regcomp(re, ap->u.s.s, - REG_EXTENDED|REG_ICASE|REG_NEWLINE)) - { - pkg_free(re); - LM_ERR("bad re <%.*s>\n", ap->u.s.len, ap->u.s.s); - return E_BAD_RE; + re = (regex_t*) pkg_malloc(sizeof(regex_t)); + if (re==0) + { + LM_ERR("no more pkg mem\n"); + return E_OUT_OF_MEM; + } + LM_DBG("compiling regexp <%.*s>\n", ap->u.s.len, ap->u.s.s); + if (regcomp(re, ap->u.s.s,REG_EXTENDED|REG_ICASE|REG_NEWLINE)) + { + pkg_free(re); + LM_ERR("bad re <%.*s>\n", ap->u.s.len, ap->u.s.s); + return E_BAD_RE; + } + ap->u.s.s = (char*)re; } - /* free the string and link the regexp */ - // pkg_free(ap->sval.p.s); - ap->u.s.s = (char*)re; } else if (ap->ops&AVPOPS_OP_FM) { if ( !( ap->opd&AVPOPS_VAL_PVAR || (!(ap->opd&AVPOPS_VAL_PVAR) && ap->opd&AVPOPS_VAL_STR) ) ) diff --git a/modules/avpops/avpops_impl.c b/modules/avpops/avpops_impl.c index 81a8053..7dcd371 100644 --- a/modules/avpops/avpops_impl.c +++ b/modules/avpops/avpops_impl.c @@ -1069,6 +1069,8 @@ int ops_check_avp( struct sip_msg* msg, struct fis_param* src, int flags; pv_value_t xvalue; char backup; + regex_t re_temp; + regex_t *re; /* look if the required avp(s) is/are present */ if(src->u.sval.type==PVT_AVP) @@ -1228,14 +1230,24 @@ cycle2: if (strncasecmp(avp_val.s.s,check_val.s.s,n)>=0) return 1; } else if (val->ops&AVPOPS_OP_RE) { + if (val->opd&AVPOPS_VAL_PVAR) { + LM_DBG("compiling regexp <%.*s>\n", check_val.s.len, check_val.s.s); + if (regcomp(&re_temp, check_val.s.s,REG_EXTENDED|REG_ICASE|REG_NEWLINE)) + { + LM_ERR("bad re <%.*s>\n", check_val.s.len, check_val.s.s); + goto next; + } + re = &re_temp; + } + else re = (regex_t*)check_val.s.s; backup = avp_val.s.s[avp_val.s.len]; avp_val.s.s[avp_val.s.len] = '\0'; - if (regexec((regex_t*)check_val.s.s, avp_val.s.s, 1, &pmatch,0)==0) - { - avp_val.s.s[avp_val.s.len] = backup; - return 1; + rt=regexec(re, avp_val.s.s, 1, &pmatch,0); + if (val->opd&AVPOPS_VAL_PVAR) { + regfree(re); } avp_val.s.s[avp_val.s.len] = backup; + if (rt==0) return 1; } else if (val->ops&AVPOPS_OP_FM){ backup = avp_val.s.s[avp_val.s.len]; avp_val.s.s[avp_val.s.len] = '\0';

1 0

[tracker] Comment added: avpops: avp_check, allow avp as second parameter on re operation
by sip-router 21 Aug '13

21 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#333 - avpops: avp_check, allow avp as second parameter on re operation User who did this - Daniel-Constantin Mierla (miconda) ---------- Looks ok can be pushed to git. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=333#comment1055 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] Comment added: avpops: avp_check, allow avp as second parameter on re operation (Attachment added)
by sip-router 21 Aug '13

21 Aug '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#333 - avpops: avp_check, allow avp as second parameter on re operation User who did this - Víctor Seva (linuxmaniac) ---------- Patch reworked. - pgk_malloc only if the parameter is a string - use a local variable regex_t to compile the avp content at runtime - regfree the compile regex if pvar Thanks! ---------- One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=333#comment1054 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