sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
318 discussions

[tracker] Comment added: tm:branch-failure event_route is not executed on all branch failures
by sip-router 19 May '13

19 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#296 - tm:branch-failure event_route is not executed on all branch failures User who did this - Daniel-Constantin Mierla (miconda) ---------- Commenting here because it's easier to follow the discussion. You said: > i have xlog info statement in the beginning of both and neither was executed: The failure route is executed by timer process after fr_timer. Here is what I get: 1(70905) DEBUG: tm [t_fwd.c:1573]: t_send_branch(): t_send_branch: send to 127.0.0.1:10 (2) failed 1(70905) ERROR: tm [t_fwd.c:1592]: t_send_branch(): ERROR: t_send_branch: sending request on branch 0 failed 1(70905) ERROR: tm [t_fwd.c:1595]: t_send_branch(): putting branch 0 on hold ... 3(70907) ERROR: <script>: ==== failure route block 3(70907) DEBUG: tm [t_reply.c:1806]: relay_reply(): DEBUG: relay_reply: branch=0, save=0, relay=0 icode=908 The log error realated to 'putting branch 0 on hold' is for debugging purposes, should be made info or dbg -- I added to see that the branch is put on timer. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=296#comment877 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: uac: reorder fileds in uac structure
by Daniel-Constantin Mierla 19 May '13

19 May '13

Module: sip-router Branch: master Commit: 45d4e808f0551a5eeb832574327a2b5b7aecf2c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=45d4e80… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 19 23:18:19 2013 +0200 uac: reorder fileds in uac structure --- modules/uac/uac_send.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/uac/uac_send.c b/modules/uac/uac_send.c index 91ad56c..2374b3a 100644 --- a/modules/uac/uac_send.c +++ b/modules/uac/uac_send.c @@ -50,6 +50,8 @@ typedef struct _uac_send_info { str s_turi; char b_furi[MAX_URI_SIZE]; str s_furi; + char b_callid[128]; + str s_callid; char b_hdrs[MAX_UACH_SIZE]; str s_hdrs; char b_body[MAX_UACB_SIZE]; @@ -61,8 +63,6 @@ typedef struct _uac_send_info { char b_apasswd[64]; str s_apasswd; unsigned int onreply; - char b_callid[128]; - str s_callid; } uac_send_info_t; static struct _uac_send_info _uac_req; @@ -638,7 +638,7 @@ int uac_req_send(struct sip_msg *msg, char *s1, char *s2) /* Callback parameter */ uac_r.cbp = (void*)tp; } - uac_r.callid = (_uac_req.s_callid.len <= 0) ? NULL : &_uac_req.s_callid; + uac_r.callid = (_uac_req.s_callid.len <= 0) ? NULL : &_uac_req.s_callid; ret = tmb.t_request(&uac_r, /* UAC Req */ &_uac_req.s_ruri, /* Request-URI */ (_uac_req.s_turi.len<=0)?&_uac_req.s_ruri:&_uac_req.s_turi, /* To */

1 0

git:master: dialog: remove unnecessary tm uac struct init
by Daniel-Constantin Mierla 19 May '13

19 May '13

Module: sip-router Branch: master Commit: b867893d0bbdda0c926a7cd0b6b3a46d4324631e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b867893… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 19 23:15:42 2013 +0200 dialog: remove unnecessary tm uac struct init --- modules/dialog/dlg_req_within.c | 2 -- modules/dialog/dlg_transfer.c | 2 -- 2 files changed, 0 insertions(+), 4 deletions(-) diff --git a/modules/dialog/dlg_req_within.c b/modules/dialog/dlg_req_within.c index bdd09eb..0d8a821 100644 --- a/modules/dialog/dlg_req_within.c +++ b/modules/dialog/dlg_req_within.c @@ -308,7 +308,6 @@ static inline int send_bye(struct dlg_cell * cell, int dir, str *hdrs) goto err; } - memset(&uac_r,'\0', sizeof(uac_req_t)); set_uac_req(&uac_r, &met, hdrs, NULL, dialog_info, TMCB_LOCAL_COMPLETED, bye_reply_cb, (void*)iuid); result = d_tmb.t_request_within(&uac_r); @@ -372,7 +371,6 @@ int dlg_send_ka(dlg_cell_t *dlg, int dir, str *hdrs) goto err; } - memset(&uac_r,'\0', sizeof(uac_req_t)); set_uac_req(&uac_r, &met, hdrs, NULL, di, TMCB_LOCAL_COMPLETED, dlg_ka_cb, (void*)iuid); result = d_tmb.t_request_within(&uac_r); diff --git a/modules/dialog/dlg_transfer.c b/modules/dialog/dlg_transfer.c index 7245435..80c5c39 100644 --- a/modules/dialog/dlg_transfer.c +++ b/modules/dialog/dlg_transfer.c @@ -140,7 +140,6 @@ void dlg_refer_tm_callback(struct cell *t, int type, struct tmcb_params *ps) goto error; } - memset(&uac_r, '\0', sizeof(uac_req_t)); set_uac_req(&uac_r, &met, NULL, NULL, dialog_info, 0, NULL, NULL); result = d_tmb.t_request_within(&uac_r); @@ -198,7 +197,6 @@ static int dlg_refer_callee(dlg_transfer_ctx_t *dtc) memcpy(hdrs.s+23+dlg_bridge_controller.len+CRLF_LEN+dtc->to.len+CRLF_LEN, dlg_bridge_controller.s, dlg_bridge_controller.len); - memset(&uac_r, '\0', sizeof(uac_req_t)); set_uac_req(&uac_r, &met, &hdrs, NULL, dialog_info, TMCB_LOCAL_COMPLETED, dlg_refer_tm_callback, (void*)dtc); result = d_tmb.t_request_within(&uac_r);

1 0

git:master: tm: initialize the uac structure to 0 for local generated requests
by Daniel-Constantin Mierla 19 May '13

19 May '13

Module: sip-router Branch: master Commit: 94833f8b8b94398566991713730b66a792b57056 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94833f8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 19 23:09:52 2013 +0200 tm: initialize the uac structure to 0 for local generated requests - safer for adding new fields to it not set via set_uac_req() --- modules/tm/uac.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules/tm/uac.h b/modules/tm/uac.h index 69376b4..9843d15 100644 --- a/modules/tm/uac.h +++ b/modules/tm/uac.h @@ -65,6 +65,7 @@ typedef struct uac_req { #define set_uac_req(_req, \ _m, _h, _b, _dlg, _cb_flags, _cb, _cbp) \ do { \ + memset((_req), 0, sizeof(uac_req_t)); \ (_req)->method = (_m); \ (_req)->headers = (_h); \ (_req)->body = (_b); \

1 0

git:master: seat: removed no longer necessary init of tm uac struct
by Daniel-Constantin Mierla 19 May '13

19 May '13

Module: sip-router Branch: master Commit: 97a899e37acda1ef0c70a009f4fd9d221ee8a58e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=97a899e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 19 23:16:55 2013 +0200 seat: removed no longer necessary init of tm uac struct --- modules/seas/seas_action.c | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/seas/seas_action.c b/modules/seas/seas_action.c index d1267d5..c5c534d 100644 --- a/modules/seas/seas_action.c +++ b/modules/seas/seas_action.c @@ -1093,8 +1093,9 @@ int ac_uac_req(as_p the_as,unsigned char processor_id,unsigned int flags,char *a this is the same as (TMCB_DONT_ACK|TMCB_LOCAL_RESPONSE_OUT) in Kamailio */ - memset(&uac_r,0, sizeof(uac_req_t)); - set_uac_req(&uac_r, &(my_msg->first_line.u.request.method), &headers, &body, my_dlg,TMCB_DONT_ACK|TMCB_LOCAL_RESPONSE_OUT, uac_cb, (void*)the_param); + set_uac_req(&uac_r, &(my_msg->first_line.u.request.method), &headers, + &body, my_dlg,TMCB_DONT_ACK|TMCB_LOCAL_RESPONSE_OUT, uac_cb, + (void*)the_param); ret=seas_f.tmb.t_request_within(&uac_r);

1 0

[tracker] Comment added: tm:branch-failure event_route is not executed on all branch failures
by sip-router 19 May '13

19 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#296 - tm:branch-failure event_route is not executed on all branch failures User who did this - Daniel-Constantin Mierla (miconda) ---------- With the last commit, tm will consider the branches that failed to be sent for failure routing blocks. At this moment such branch will fail after fr_timer (improvements to be added in the future), reply status code is 408. However, branch failure route does not seem to be executed for the branches that don't get the negative reply from the network (e.g., case of local timeout, even for UDP), no branch failure route execution). Didn't have time to analyze properly, i'll have to see where Hugh added its execution. For the moment, the failure_route[] blocks seems to be executed ok. Note that t_relay() will return true in such case. To enable this feature, you have to set module parameter failure_exec_mode to 1. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=296#comment876 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.

2 1

git:master: tm: new parameter - failure_exec_mode
by Daniel-Constantin Mierla 19 May '13

19 May '13

Module: sip-router Branch: master Commit: a53580d39c2fadf2ddc6f9805f15ac833cfd4c20 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a53580d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 19 14:55:52 2013 +0200 tm: new parameter - failure_exec_mode - specify whether to consider or not execution of failure routing blocks for braches that had local delivery error (e.g., no open tcp connection and set_forward_no_connect() used in config) --- modules/tm/README | 96 ++++++++++++++++++++++++++------------------- modules/tm/doc/params.xml | 21 ++++++++++ modules/tm/t_fwd.c | 17 ++++++++ modules/tm/t_reply.c | 4 +- modules/tm/tm.c | 3 + 5 files changed, 98 insertions(+), 43 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a53…

1 0

git:master: tm: use - instead if _ in branch-failure examples
by Daniel-Constantin Mierla 19 May '13

19 May '13

Module: sip-router Branch: master Commit: 90c69665edcfc9aebf265f280375251306442b98 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=90c6966… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 19 10:03:02 2013 +0200 tm: use - instead if _ in branch-failure examples - it is what is expected by module --- modules/tm/README | 1559 +++++++++++++++++++++--------------------- modules/tm/doc/functions.xml | 7 +- 2 files changed, 779 insertions(+), 787 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=90c…

1 0

git:master: tm: added icode to uac_client structure
by Daniel-Constantin Mierla 19 May '13

19 May '13

Module: sip-router Branch: master Commit: 78669def2790205270032f9a750b19cc86f3d560 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78669de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 19 10:22:10 2013 +0200 tm: added icode to uac_client structure - store internal processing code, to give hints of what happened - could be used to map sip warning codes http://www.iana.org/assignments/sip-parameters/sip-parameters.xml#sip-param… - delivery failure on case of no connection mapped temporarly to 908 --- modules/tm/h_table.h | 3 +++ modules/tm/t_fwd.c | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index a3d22da..744f979 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -241,6 +241,9 @@ typedef struct ua_client #endif /* per branch flags */ flag_t branch_flags; + /* internal processing code - (mapping over sip warning codes) + * - storing the code giving a clue of what happened internally */ + int icode; #ifdef WITH_AS_SUPPORT /** * Resent for every rcvd 2xx reply. diff --git a/modules/tm/t_fwd.c b/modules/tm/t_fwd.c index 8d4308e..78d88f2 100644 --- a/modules/tm/t_fwd.c +++ b/modules/tm/t_fwd.c @@ -1585,6 +1585,7 @@ int t_send_branch( struct cell *t, int branch, struct sip_msg* p_msg , } } #endif + uac->icode = 908; /* internal code set to delivery failure */ LOG(L_ERR, "ERROR: t_send_branch: sending request on branch %d " "failed\n", branch); if (proxy) { proxy->errors++; proxy->ok=0; }

1 0

git:master: tm: keep uac_client structure aligned on 32b
by Daniel-Constantin Mierla 19 May '13

19 May '13

Module: sip-router Branch: master Commit: cbcf86a036e6f8607f783ce18491121b0d58d2b0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbcf86a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun May 19 10:16:40 2013 +0200 tm: keep uac_client structure aligned on 32b - otherwise it may create troubles on restrictive archs --- modules/tm/h_table.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.h b/modules/tm/h_table.h index f3bca52..a3d22da 100644 --- a/modules/tm/h_table.h +++ b/modules/tm/h_table.h @@ -239,6 +239,7 @@ typedef struct ua_client /* internal flags per tm uac */ unsigned int flags; #endif + /* per branch flags */ flag_t branch_flags; #ifdef WITH_AS_SUPPORT /** @@ -256,6 +257,8 @@ typedef struct ua_client unsigned short on_branch_failure; /* the onreply_route to be processed if registered to do so */ unsigned short on_reply; + /* unused - keep the structure aligned to 32b */ + unsigned short on_unused; }ua_client_type;

1 0

← Newer
1
...
13
14
15
16
17
18
19
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2013