sr-dev March 2014

sr-dev@lists.kamailio.org

29 participants
298 discussions

[tracker] Comment added: Crash in asynchronous processing
by sip-router 02 Mar '14

02 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#400 - Crash in asynchronous processing User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you try with latest version from branch 4.1 or master? I pushed a patch that should fix this one as well. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=400#comment1320 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: Coredump on using jsonrpc_request
by sip-router 02 Mar '14

02 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#404 - Coredump on using jsonrpc_request User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you try with latest version from branch 4.1 or master? I pushed a patch for it. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=404#comment1319 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:4.1: tm: declare variable at the top of function declaration in t_suspend()
by Daniel-Constantin Mierla 02 Mar '14

02 Mar '14

Module: sip-router Branch: 4.1 Commit: 47836d773820da8aabe4a6ecb1dada285be1aa08 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=47836d7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 2 10:19:25 2014 +0100 tm: declare variable at the top of function declaration in t_suspend() - compliant with older versions of C standards - simpliefied log messages (cherry picked from commit dce7353674ea3d93ade93c89bbb4652e7ec624be) --- modules/tm/t_suspend.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index b22e3be..29a94d7 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -63,18 +63,17 @@ int t_suspend(struct sip_msg *msg, { struct cell *t; int branch; + int sip_msg_len; t = get_t(); if (!t || t == T_UNDEFINED) { - LOG(L_ERR, "ERROR: t_suspend: " \ - "transaction has not been created yet\n"); + LM_ERR("transaction has not been created yet\n"); return -1; } if (t->flags & T_CANCELED) { /* The transaction has already been canceled */ - LOG(L_DBG, "DEBUG: t_suspend: " \ - "trying to suspend an already canceled transaction\n"); + LM_DBG("trying to suspend an already canceled transaction\n"); ser_error = E_CANCELED; return 1; } @@ -87,7 +86,7 @@ int t_suspend(struct sip_msg *msg, ) { if (!t_reply( t, msg , 100 , cfg_get(tm, tm_cfg, tm_auto_inv_100_r))) - DBG("SER: ERROR: t_suspend (100)\n"); + LM_DBG("suspending request processing - sending 100 reply\n"); } if ((t->nr_of_outgoings==0) && /* if there had already been @@ -95,8 +94,7 @@ int t_suspend(struct sip_msg *msg, saved as well */ save_msg_lumps(t->uas.request, msg) ) { - LOG(L_ERR, "ERROR: t_suspend: " \ - "failed to save the message lumps\n"); + LM_ERR("failed to save the message lumps\n"); return -1; } /* save the message flags */ @@ -104,12 +102,11 @@ int t_suspend(struct sip_msg *msg, /* add a blind UAC to let the fr timer running */ if (add_blind_uac() < 0) { - LOG(L_ERR, "ERROR: t_suspend: " \ - "failed to add the blind UAC\n"); + LM_ERR("failed to add the blind UAC\n"); return -1; } - }else{ - LOG(L_DBG,"DEBUG: t_suspend_reply: This is a suspend on reply - setting msg flag to SUSPEND\n"); + } else { + LM_DBG("this is a suspend on reply - setting msg flag to SUSPEND\n"); msg->msg_flags |= FL_RPL_SUSPENDED; /* this is a reply suspend find which branch */ @@ -118,24 +115,23 @@ int t_suspend(struct sip_msg *msg, "failed find UAC branch\n"); return -1; } - LOG(L_DBG,"DEBUG: t_suspend_reply:Found a a match with branch id [%d]\n", branch); - - LOG(L_DBG,"DEBUG: t_suspend_reply:Cloning reply message to t->uac[branch].reply\n"); + LM_DBG("found a a match with branch id [%d] - " + "cloning reply message to t->uac[branch].reply\n", branch); - int sip_msg_len = 0; + sip_msg_len = 0; t->uac[branch].reply = sip_msg_cloner( msg, &sip_msg_len ); if (! t->uac[branch].reply ) { - LOG(L_ERR, "ERROR: t_suspend_reply: can't alloc' clone memory\n"); + LOG(L_ERR, "can't alloc' clone memory\n"); return -1; } t->uac[branch].end_reply = ((char*)t->uac[branch].reply) + sip_msg_len; - LOG(L_DBG,"DEBUG: t_suspend_reply: Saving transaction data\n"); + LM_DBG("saving transaction data\n"); t->uac[branch].reply->flags = msg->flags; } - *hash_index = t->hash_index; + *hash_index = t->hash_index; *label = t->label;

1 0

git:4.1: tm: execute FAILURE_CB_TYPE callbacks for resuming suspended request
by Daniel-Constantin Mierla 02 Mar '14

02 Mar '14

Module: sip-router Branch: 4.1 Commit: 0c3d4e2199023b6d8d2e78806f6b0f56b8687a85 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0c3d4e2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 2 09:51:40 2014 +0100 tm: execute FAILURE_CB_TYPE callbacks for resuming suspended request - suspended request creates the transaction and a branch, callbacks cannot executed anymore for request and branch route execution - otherwise it results in crashes, reported by FS#400 and FS#404 (cherry picked from commit 78c8eb1fa4b118661262fd6add9a0e9f60ca8cd1) --- modules/tm/t_suspend.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 789d25a..b22e3be 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -166,6 +166,7 @@ int t_continue(unsigned int hash_index, unsigned int label, int branch; struct ua_client *uac =NULL; int ret; + int cb_type; if (t_lookup_ident(&t, hash_index, label) < 0) { LOG(L_ERR, "ERROR: t_continue: transaction not found\n"); @@ -189,10 +190,10 @@ int t_continue(unsigned int hash_index, unsigned int label, * that we are executing post a suspend */ /* which route block type were we in when we were suspended */ - int cb_type = REQUEST_CB_TYPE; + cb_type = FAILURE_CB_TYPE;; switch (t->async_backup.backup_route) { case REQUEST_ROUTE: - cb_type = REQUEST_CB_TYPE; + cb_type = FAILURE_CB_TYPE; break; case FAILURE_ROUTE: cb_type = FAILURE_CB_TYPE; @@ -201,7 +202,7 @@ int t_continue(unsigned int hash_index, unsigned int label, cb_type = ONREPLY_CB_TYPE; break; case BRANCH_ROUTE: - cb_type = BRANCH_CB_TYPE; + cb_type = FAILURE_CB_TYPE; break; }

1 0

git:master: tm: declare variable at the top of function declaration in t_suspend()
by Daniel-Constantin Mierla 02 Mar '14

02 Mar '14

Module: sip-router Branch: master Commit: dce7353674ea3d93ade93c89bbb4652e7ec624be URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dce7353… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 2 10:19:25 2014 +0100 tm: declare variable at the top of function declaration in t_suspend() - compliant with older versions of C standards - simpliefied log messages --- modules/tm/t_suspend.c | 32 ++++++++++++++------------------ 1 files changed, 14 insertions(+), 18 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index b22e3be..29a94d7 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -63,18 +63,17 @@ int t_suspend(struct sip_msg *msg, { struct cell *t; int branch; + int sip_msg_len; t = get_t(); if (!t || t == T_UNDEFINED) { - LOG(L_ERR, "ERROR: t_suspend: " \ - "transaction has not been created yet\n"); + LM_ERR("transaction has not been created yet\n"); return -1; } if (t->flags & T_CANCELED) { /* The transaction has already been canceled */ - LOG(L_DBG, "DEBUG: t_suspend: " \ - "trying to suspend an already canceled transaction\n"); + LM_DBG("trying to suspend an already canceled transaction\n"); ser_error = E_CANCELED; return 1; } @@ -87,7 +86,7 @@ int t_suspend(struct sip_msg *msg, ) { if (!t_reply( t, msg , 100 , cfg_get(tm, tm_cfg, tm_auto_inv_100_r))) - DBG("SER: ERROR: t_suspend (100)\n"); + LM_DBG("suspending request processing - sending 100 reply\n"); } if ((t->nr_of_outgoings==0) && /* if there had already been @@ -95,8 +94,7 @@ int t_suspend(struct sip_msg *msg, saved as well */ save_msg_lumps(t->uas.request, msg) ) { - LOG(L_ERR, "ERROR: t_suspend: " \ - "failed to save the message lumps\n"); + LM_ERR("failed to save the message lumps\n"); return -1; } /* save the message flags */ @@ -104,12 +102,11 @@ int t_suspend(struct sip_msg *msg, /* add a blind UAC to let the fr timer running */ if (add_blind_uac() < 0) { - LOG(L_ERR, "ERROR: t_suspend: " \ - "failed to add the blind UAC\n"); + LM_ERR("failed to add the blind UAC\n"); return -1; } - }else{ - LOG(L_DBG,"DEBUG: t_suspend_reply: This is a suspend on reply - setting msg flag to SUSPEND\n"); + } else { + LM_DBG("this is a suspend on reply - setting msg flag to SUSPEND\n"); msg->msg_flags |= FL_RPL_SUSPENDED; /* this is a reply suspend find which branch */ @@ -118,24 +115,23 @@ int t_suspend(struct sip_msg *msg, "failed find UAC branch\n"); return -1; } - LOG(L_DBG,"DEBUG: t_suspend_reply:Found a a match with branch id [%d]\n", branch); - - LOG(L_DBG,"DEBUG: t_suspend_reply:Cloning reply message to t->uac[branch].reply\n"); + LM_DBG("found a a match with branch id [%d] - " + "cloning reply message to t->uac[branch].reply\n", branch); - int sip_msg_len = 0; + sip_msg_len = 0; t->uac[branch].reply = sip_msg_cloner( msg, &sip_msg_len ); if (! t->uac[branch].reply ) { - LOG(L_ERR, "ERROR: t_suspend_reply: can't alloc' clone memory\n"); + LOG(L_ERR, "can't alloc' clone memory\n"); return -1; } t->uac[branch].end_reply = ((char*)t->uac[branch].reply) + sip_msg_len; - LOG(L_DBG,"DEBUG: t_suspend_reply: Saving transaction data\n"); + LM_DBG("saving transaction data\n"); t->uac[branch].reply->flags = msg->flags; } - *hash_index = t->hash_index; + *hash_index = t->hash_index; *label = t->label;

1 0

git:master: tm: execute FAILURE_CB_TYPE callbacks for resuming suspended request
by Daniel-Constantin Mierla 02 Mar '14

02 Mar '14

Module: sip-router Branch: master Commit: 78c8eb1fa4b118661262fd6add9a0e9f60ca8cd1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78c8eb1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 2 09:51:40 2014 +0100 tm: execute FAILURE_CB_TYPE callbacks for resuming suspended request - suspended request creates the transaction and a branch, callbacks cannot executed anymore for request and branch route execution - otherwise it results in crashes, reported by FS#400 and FS#404 --- modules/tm/t_suspend.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/tm/t_suspend.c b/modules/tm/t_suspend.c index 789d25a..b22e3be 100644 --- a/modules/tm/t_suspend.c +++ b/modules/tm/t_suspend.c @@ -166,6 +166,7 @@ int t_continue(unsigned int hash_index, unsigned int label, int branch; struct ua_client *uac =NULL; int ret; + int cb_type; if (t_lookup_ident(&t, hash_index, label) < 0) { LOG(L_ERR, "ERROR: t_continue: transaction not found\n"); @@ -189,10 +190,10 @@ int t_continue(unsigned int hash_index, unsigned int label, * that we are executing post a suspend */ /* which route block type were we in when we were suspended */ - int cb_type = REQUEST_CB_TYPE; + cb_type = FAILURE_CB_TYPE;; switch (t->async_backup.backup_route) { case REQUEST_ROUTE: - cb_type = REQUEST_CB_TYPE; + cb_type = FAILURE_CB_TYPE; break; case FAILURE_ROUTE: cb_type = FAILURE_CB_TYPE; @@ -201,7 +202,7 @@ int t_continue(unsigned int hash_index, unsigned int label, cb_type = ONREPLY_CB_TYPE; break; case BRANCH_ROUTE: - cb_type = BRANCH_CB_TYPE; + cb_type = FAILURE_CB_TYPE; break; }

1 0

git:master: tm: 487 Request Terminated has priority when transaction is cancelled and no reply received from downstream
by Daniel-Constantin Mierla 01 Mar '14

01 Mar '14

Module: sip-router Branch: master Commit: 6c3725d5535e0b5bff5c63251d37e7139f92321c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c3725d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 1 10:46:57 2014 +0100 tm: 487 Request Terminated has priority when transaction is cancelled and no reply received from downstream - for cancel_b_method 1, timeout was sent back even when transaction was canceled --- modules/tm/t_reply.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_reply.c b/modules/tm/t_reply.c index f6fc568..7fb66b8 100644 --- a/modules/tm/t_reply.c +++ b/modules/tm/t_reply.c @@ -1845,8 +1845,13 @@ enum rps relay_reply( struct cell *t, struct sip_msg *p_msg, int branch, * or a stored message */ relayed_msg = branch==relay ? p_msg : t->uac[relay].reply; if (relayed_msg==FAKED_REPLY) { - relayed_code = branch==relay - ? msg_status : t->uac[relay].last_received; + if(t->flags & T_CANCELED) { + /* transaction canceled - send 487 */ + relayed_code = 487; + } else { + relayed_code = branch==relay + ? msg_status : t->uac[relay].last_received; + } /* use to_tag from the original request, or if not present, * generate a new one */ if (relayed_code>=180 && t->uas.request->to

1 0

[tracker] Comment added: mtree mt_summary display incorrectly, or memory leak?
by sip-router 01 Mar '14

01 Mar '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#398 - mtree mt_summary display incorrectly, or memory leak? User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you try with master or an older version with the next patch: - http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94bad44… If all is fine, then I will backport. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=398#comment1318 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 March 2014