sr-dev May 2014

sr-dev@lists.kamailio.org

34 participants
238 discussions

git:4.1: presence_dialoginfo: interetate through all 'dialog' nodes of xml document

by Daniel-Constantin Mierla

Module: sip-router Branch: 4.1 Commit: cc4a7c67f24d105a119ea492ce53f017369af296 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cc4a7c6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 8 08:40:28 2014 +0200 presence_dialoginfo: interetate through all 'dialog' nodes of xml document - PUBLISH request can carry info for many dialogs - reported and patch by Klaus Feichtinger (cherry picked from commit 7a827a612f93b9dd938f9b78c0de3ac2d98a0c77) --- modules/presence_dialoginfo/notify_body.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/presence_dialoginfo/notify_body.c b/modules/presence_dialoginfo/notify_body.c index 7f74b1f..db8834b 100644 --- a/modules/presence_dialoginfo/notify_body.c +++ b/modules/presence_dialoginfo/notify_body.c @@ -111,6 +111,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) xmlNodePtr confirmed_node = NULL; xmlNodePtr proceed_node = NULL; xmlNodePtr trying_node = NULL; + xmlNodePtr next_node = NULL; char *state = NULL; @@ -214,7 +215,8 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) goto error; } if (p_root->children) { - for (node = p_root->children; node; node = node->next) { + for (node = p_root->children; node; node = next_node) { + next_node = node->next; if (node->type == XML_ELEMENT_NODE) { LM_DBG("node type: Element, name: %s\n", node->name); /* we do not copy the node, but unlink it and then add it ot the new node

10 years, 7 months

git:master: presence_dialoginfo: interetate through all 'dialog' nodes of xml document

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7a827a612f93b9dd938f9b78c0de3ac2d98a0c77 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a827a6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu May 8 08:40:28 2014 +0200 presence_dialoginfo: interetate through all 'dialog' nodes of xml document - PUBLISH request can carry info for many dialogs - reported and patch by Klaus Feichtinger --- modules/presence_dialoginfo/notify_body.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/modules/presence_dialoginfo/notify_body.c b/modules/presence_dialoginfo/notify_body.c index 7f74b1f..db8834b 100644 --- a/modules/presence_dialoginfo/notify_body.c +++ b/modules/presence_dialoginfo/notify_body.c @@ -111,6 +111,7 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) xmlNodePtr confirmed_node = NULL; xmlNodePtr proceed_node = NULL; xmlNodePtr trying_node = NULL; + xmlNodePtr next_node = NULL; char *state = NULL; @@ -214,7 +215,8 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) goto error; } if (p_root->children) { - for (node = p_root->children; node; node = node->next) { + for (node = p_root->children; node; node = next_node) { + next_node = node->next; if (node->type == XML_ELEMENT_NODE) { LM_DBG("node type: Element, name: %s\n", node->name); /* we do not copy the node, but unlink it and then add it ot the new node

10 years, 7 months

Possible bug in xml body aggregation of presence_dialoginfo, presence_conference and presence_xml modules?

by Klaus Feichtinger

Hello, It seems that current implementation of the listed modules has a bug in the "agregate_xmls" function in the "notify_body.c" files. Current implementation is "allowing" a single event entry in the XML body of the NOTIFY messages only. This is caused by "unlinking the XML node" in the for loop "for (node = p_root->children; node; node = node->next) {". After unlinking it cannot point to another node. Therefore, it will never enter the aggregation loop again and stop adding XML childs.... That´s the reason why we have the problem that DB "body" entries of the presentity table, which include more than one event entry (e.g. dialog), cannot be fully added to SIP NOTIFY messages. It is always inserting the first event entry only. We have tested a workaround with up to three (3) dialog entries (with module presence_dialoginfo) in a single message body. This is working fine! According RFC4235 it is allowed using more than onle dialog entry in a single message body. Therefore, I´d like to ask, if the current behaviour can be seen as "bug" or not? regards, Klaus

10 years, 7 months

new tmx function t_reuse_branch()

by Juha Heinanen

as per daniel's suggestion, i wrote a new tmx function t_reuse_branch(), which can currently be called from branch-failure route: /** * Creates new "main" branch by making copy of branch-failure branch. * Currently the following branch attributes are included: * request-uri, ruid, path, instance, and branch flags. */ static int w_t_reuse_branch(struct sip_msg* msg, char *p1, char *p2) { struct cell *t; int branch; if (msg == NULL) return -1; /* first get the transaction */ if (_tmx_tmb.t_check(msg, 0) == -1) return -1; if ((t = _tmx_tmb.t_gett()) == 0) { LM_ERR("no transaction\n"); return -1; } switch (get_route_type()) { case BRANCH_FAILURE_ROUTE: /* use the reason of the winning reply */ if ((branch = _tmx_tmb.t_get_picked_branch()) < 0) { LM_CRIT("no picked branch (%d) for a final response" " in MODE_ONFAILURE\n", branch); return -1; } rewrite_uri(msg, &(t->uac[branch].uri)); set_ruid(msg, &(t->uac[branch].ruid)); if (t->uac[branch].path.len) { set_path_vector(msg, &(t->uac[branch].path)); } else { reset_path_vector(msg); } setbflagsval(0, t->uac[branch].flags); set_instance(msg, &(t->uac[branch].instance)); return 1; default: LM_ERR("unsupported route_type %d\n", get_route_type()); return -1; } } the new "main" branch does not include destination uri and socket, because i didn't find them in struct ua_client. unless someone adds them to struct ua_clients, they thus need to be set separately from htable after calling t_reuse_branch(). is it ok that i commit the above function to tmx module? in addition, i would like to add $T_reply_bf (branch flags) pv, since i need to test some of the branch flags in other parts of branch-failure route. -- juha

10 years, 7 months

Forcing TCP connection reuse doesn't use the failure_route when the connection has gone.

by Waite, Hugh

I have an edge-proxy which accepts TCP connections from clients. When I know that the clients are behind NATs (for example), I use the set_forward_no_connect() function to force connection reuse and avoid timeouts. In the case where the connection has already gone, the system sends a "477 Unfortunately error on sending to next hop occurred (477/TM)" response back to the registrar. These connections are using outbound, so I would like to convert this into a "430 Flow Failed" response to the registrar, but the 477 response doesn't seem to trigger the onreply_route or failure_route. Is there a way of trapping and handling this failure? If not, do we need more flexibility in handling this particular tcp_send error (or other similar ones)? Other systems may wish to try additional destinations from the failure route. Snippets of my cfg and logs are below. The con_reuse flag is checked in tcp_send at tcp_main.c:1846 Regards, Hugh route[RELAY] { xlog("L_INFO", "$rm: route[RELAY]\n"); loose_route(); $var(lr_ret) = $rc; if ($var(lr_ret) == 2) { xlog("L_INFO", "$rm: loose route with outbound\n"); t_on_failure("FAIL_OUTBOUND"); set_forward_no_connect(); if (t_relay() < 0) { xlog("L_WARN", "$rm: loose route with outbound failed\n"); sl_send_reply("500", "Something bad happened"); } exit; } . . . } May 1 17:01:08 kamailio-cep[28226]: INFO: <script>: INVITE: Routing logic starts here May 1 17:01:08 kamailio-cep[28226]: INFO: <script>: INVITE: route[REQINIT] May 1 17:01:08 kamailio-cep[28226]: INFO: <script>: INVITE: route[INITIAL_REQUEST] May 1 17:01:08 kamailio-cep[28226]: INFO: <script>: INVITE: route[RECORD_ROUTE] May 1 17:01:08 kamailio-cep[28226]: INFO: <script>: INVITE: route[RELAY] May 1 17:01:08 kamailio-cep[28226]: INFO: <script>: INVITE: loose route with outbound May 1 17:01:08 kamailio-cep[28226]: ERROR: tm [../../forward.h:219]: msg_send(): msg_send: ERROR: tcp_send failed May 1 17:01:08 kamailio-cep[28226]: ERROR: tm [t_fwd.c:1609]: t_send_branch(): ERROR: t_send_branch: sending request on branch 0 failed May 1 17:01:08 kamailio-cep[28226]: INFO: <script>: ACK: Routing logic starts here May 1 17:01:08 kamailio-cep[28226]: INFO: <script>: ACK: route[REQINIT] ________________________________ This e-mail and any attachment is for authorised use by the intended recipient(s) only. It may contain proprietary material, confidential information and/or be subject to legal privilege. It should not be copied, disclosed to, retained or used by, any other party. If you are not an intended recipient then please promptly delete this e-mail and any attachment and all copies and inform the sender. Thank you for understanding.

10 years, 7 months

another app_perl issue

by James Cloos

This is probably due to changes in perl. The docs for app_perl use sl_send_reply() and xlog() as examples for the explicit and implicit Kamailio::moduleFunction() methods. Neither work. For sl_send_reply, one gets errors of the form: ERROR: app_perl [kamailioxs.xs:255]: moduleFunc(): function 'sl_send_reply' \ called, but not available. ERROR: app_perl [kamailioxs.xs:978]: XS_Kamailio__Message_moduleFunction(): \ calling module function 'sl_send_reply' failed. Missing loadmodule? even though the modules is loaded and sl_send_reply works fine in the .cfg. Xlog, OTOH, generates: ERROR: app_perl [kamailioxs.xs:280]: moduleFunc (): Module function 'xlog' \ is unsafe. Call is refused. ERROR: app_perl [kamailioxs.xs:978]: XS_Kamailio__Message_moduleFunction(): \ calling module function 'xlog' failed. Missing loadmodule? Removing «use strict» from the script does not prevent the «is unsafe» error. Using Kamailio::log() works, albeit with superfluous verbosity. -JimC -- James Cloos <cloos(a)jhcloos.com> OpenPGP: 0x997A9F17ED7DAEA6

10 years, 7 months

[tracker] Task closed: DNS SRV lookup in rewritehost port fails

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#426 - DNS SRV lookup in rewritehost port fails User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=426 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.

10 years, 7 months

git:master: core/mem: f_malloc - simplified join in realloc

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2b2569ea4e4d2af817e8e021408d551a99572f59 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2b2569e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 23:44:22 2014 +0200 core/mem: f_malloc - simplified join in realloc - restore proper usage counters --- mem/f_malloc.c | 38 +++++++++----------------------------- 1 files changed, 9 insertions(+), 29 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 4c3576a..053b589 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -72,7 +72,7 @@ #define FRAG_OVERHEAD (sizeof(struct fm_frag)) #define INIT_OVERHEAD \ - (ROUNDUP(sizeof(struct fm_block))+sizeof(struct fm_frag)) + (ROUNDUP(sizeof(struct fm_block))+2*sizeof(struct fm_frag)) @@ -287,9 +287,6 @@ void fm_split_frag(struct fm_block* qm, struct fm_frag* frag, n=FRAG_NEXT(frag); n->size=rest-FRAG_OVERHEAD; FRAG_CLEAR_USED(n); /* never used */ - /* new frag overhead */ - qm->real_used+=FRAG_OVERHEAD; - qm->used-=FRAG_OVERHEAD; #ifdef DBG_F_MALLOC /* frag created by malloc, mark it*/ n->file=file; @@ -298,6 +295,7 @@ void fm_split_frag(struct fm_block* qm, struct fm_frag* frag, n->check=ST_CHECK_PATTERN; #endif /* reinsert n in free list*/ + qm->used-=FRAG_OVERHEAD; fm_insert_free(qm, n); }else{ /* we cannot split this fragment any more => alloc all of it*/ @@ -393,8 +391,8 @@ struct fm_frag* fm_search_defrag(struct fm_block* qm, unsigned long size) fm_extract_free(qm, nxt); frag->size += nxt->size + FRAG_OVERHEAD; - /* join - one frag less, remove overhead */ - qm->real_used -= FRAG_OVERHEAD; + /* join - one frag less, add overhead to used */ + qm->used += FRAG_OVERHEAD; if( frag->size >size ) return frag; @@ -553,7 +551,8 @@ static void fm_join_frag(struct fm_block* qm, struct fm_frag* f) #endif /* F_MALLOC_HASH_BITMAP */ /* join */ f->size+=n->size+FRAG_OVERHEAD; - qm->real_used-=FRAG_OVERHEAD; + qm->real_used+=n->size; + qm->used+=n->size + FRAG_OVERHEAD; } #endif /*MEM_JOIN_FREE*/ @@ -633,12 +632,10 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size) #endif { struct fm_frag *f; - struct fm_frag **pf; unsigned long diff; unsigned long orig_size; struct fm_frag *n; void *ptr; - int hash; #ifdef DBG_F_MALLOC MDBG("fm_realloc(%p, %p, %lu) called from %s: %s(%d)\n", qm, p, size, @@ -688,28 +685,11 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size) n=FRAG_NEXT(f); if (((char*)n < (char*)qm->last_frag) && (n->prv_free) && ((n->size+FRAG_OVERHEAD)>=diff)){ - /* join */ /* detach n from the free list */ - hash=GET_HASH(n->size); - pf=n->prv_free; - if (*pf==0){ - /* not found, bad! */ - LOG(L_CRIT, "BUG: fm_realloc: could not find %p in free " - "list (hash=%ld)\n", n, GET_HASH(n->size)); - abort(); - } - /* detach */ - *pf=n->u.nxt_free; - if(n->u.nxt_free) n->u.nxt_free->prv_free = pf; - qm->ffrags--; - qm->free_hash[hash].no--; -#ifdef F_MALLOC_HASH_BITMAP - if (qm->free_hash[hash].no==0) - fm_bmp_reset(qm, hash); -#endif /* F_MALLOC_HASH_BITMAP */ - /* join */ + fm_extract_free(qm, n); + /* join */ f->size+=n->size+FRAG_OVERHEAD; - qm->real_used-=FRAG_OVERHEAD; + qm->used+=FRAG_OVERHEAD; /* split it if necessary */ if (f->size > size){

10 years, 7 months

git:master: core/mem: f_malloc - groupped few updates of usage stats in insert free function

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a7d59baca2d03b48f020b10adf6e6e614494a35e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a7d59ba… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat May 3 22:13:16 2014 +0200 core/mem: f_malloc - groupped few updates of usage stats in insert free function --- mem/f_malloc.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-) diff --git a/mem/f_malloc.c b/mem/f_malloc.c index 026ff39..4c3576a 100644 --- a/mem/f_malloc.c +++ b/mem/f_malloc.c @@ -289,6 +289,7 @@ void fm_split_frag(struct fm_block* qm, struct fm_frag* frag, FRAG_CLEAR_USED(n); /* never used */ /* new frag overhead */ qm->real_used+=FRAG_OVERHEAD; + qm->used-=FRAG_OVERHEAD; #ifdef DBG_F_MALLOC /* frag created by malloc, mark it*/ n->file=file; @@ -342,8 +343,8 @@ struct fm_block* fm_malloc_init(char* address, unsigned long size, int type) qm=(struct fm_block*)start; memset(qm, 0, sizeof(struct fm_block)); qm->size=size; - qm->used = size; - qm->real_used=size + init_overhead; + qm->used = size - init_overhead; + qm->real_used=size; qm->max_real_used=init_overhead; qm->type = type; size-=init_overhead; @@ -678,10 +679,6 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size) #else fm_split_frag(qm, f, size); #endif - /* fm_split frag already adds FRAG_OVERHEAD for the newly created - free frag, so here we only need orig_size-f->size for real used */ - qm->real_used-=(orig_size-f->size); - qm->used-=(orig_size-f->size); }else if (f->size<size){ /* grow */ #ifdef DBG_F_MALLOC @@ -723,8 +720,6 @@ void* fm_realloc(struct fm_block* qm, void* p, unsigned long size) fm_split_frag(qm, f, size); #endif } - qm->real_used+=(f->size-orig_size); - qm->used+=(f->size-orig_size); }else{ /* could not join => realloc */ #ifdef DBG_F_MALLOC

10 years, 7 months

git:master: pkg/kamailio/deb: update version to 4.2.0~dev6

by Victor Seva

Module: sip-router Branch: master Commit: b14bfbfd85e9cc112d15e7b01728e4197bb48353 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b14bfbf… Author: Victor Seva <linuxmaniac(a)torreviejawireless.org> Committer: Victor Seva <linuxmaniac(a)torreviejawireless.org> Date: Sat May 3 21:50:15 2014 +0200 pkg/kamailio/deb: update version to 4.2.0~dev6 --- pkg/kamailio/deb/debian/changelog | 6 ++++++ pkg/kamailio/deb/jessie/changelog | 6 ++++++ pkg/kamailio/deb/precise/changelog | 6 ++++++ pkg/kamailio/deb/squeeze/changelog | 6 ++++++ pkg/kamailio/deb/wheezy/changelog | 6 ++++++ 5 files changed, 30 insertions(+), 0 deletions(-) diff --git a/pkg/kamailio/deb/debian/changelog b/pkg/kamailio/deb/debian/changelog index 3bc62df..984af2a 100644 --- a/pkg/kamailio/deb/debian/changelog +++ b/pkg/kamailio/deb/debian/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev6) unstable; urgency=medium + + * update version to 4.2.0~dev6 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 03 May 2014 21:49:21 +0200 + kamailio (4.2.0~dev5) unstable; urgency=medium * update version to 4.2.0~dev5 diff --git a/pkg/kamailio/deb/jessie/changelog b/pkg/kamailio/deb/jessie/changelog index 3bc62df..984af2a 100644 --- a/pkg/kamailio/deb/jessie/changelog +++ b/pkg/kamailio/deb/jessie/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev6) unstable; urgency=medium + + * update version to 4.2.0~dev6 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 03 May 2014 21:49:21 +0200 + kamailio (4.2.0~dev5) unstable; urgency=medium * update version to 4.2.0~dev5 diff --git a/pkg/kamailio/deb/precise/changelog b/pkg/kamailio/deb/precise/changelog index 3bc62df..984af2a 100644 --- a/pkg/kamailio/deb/precise/changelog +++ b/pkg/kamailio/deb/precise/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev6) unstable; urgency=medium + + * update version to 4.2.0~dev6 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 03 May 2014 21:49:21 +0200 + kamailio (4.2.0~dev5) unstable; urgency=medium * update version to 4.2.0~dev5 diff --git a/pkg/kamailio/deb/squeeze/changelog b/pkg/kamailio/deb/squeeze/changelog index 3bc62df..984af2a 100644 --- a/pkg/kamailio/deb/squeeze/changelog +++ b/pkg/kamailio/deb/squeeze/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev6) unstable; urgency=medium + + * update version to 4.2.0~dev6 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 03 May 2014 21:49:21 +0200 + kamailio (4.2.0~dev5) unstable; urgency=medium * update version to 4.2.0~dev5 diff --git a/pkg/kamailio/deb/wheezy/changelog b/pkg/kamailio/deb/wheezy/changelog index 3bc62df..984af2a 100644 --- a/pkg/kamailio/deb/wheezy/changelog +++ b/pkg/kamailio/deb/wheezy/changelog @@ -1,3 +1,9 @@ +kamailio (4.2.0~dev6) unstable; urgency=medium + + * update version to 4.2.0~dev6 + + -- Victor Seva <linuxmaniac(a)torreviejawireless.org> Sat, 03 May 2014 21:49:21 +0200 + kamailio (4.2.0~dev5) unstable; urgency=medium * update version to 4.2.0~dev5

10 years, 7 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2014