sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

git:master: tm: t_cehck_trans() allowed inside all onreply routes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 4363ade72cb75d0975edb124295de3223e696431 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4363ade… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 8 10:59:37 2011 +0100 tm: t_cehck_trans() allowed inside all onreply routes - starting with v3.0 there is the option to enable a function only for core onreply route or tm onreply route - t_check_trans() was enabled only for tm - this patch enables it also for core onreply route - reported by Alex Hermann --- modules/tm/tm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index e8ef946..05e3670 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -461,7 +461,7 @@ static cmd_export_t cmds[]={ {"t_save_lumps", w_t_save_lumps, 0, 0, REQUEST_ROUTE}, {"t_check_trans", w_t_check_trans, 0, 0, - REQUEST_ROUTE|TM_ONREPLY_ROUTE|BRANCH_ROUTE }, + REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE }, {"t_load_contacts", t_load_contacts, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE},

13 years, 2 months

[tracker] User took ownership: t_check_trans is not allowed in onreply_route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#117 - t_check_trans is not allowed in onreply_route More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=117 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.

13 years, 2 months

[tracker] Assignee added: t_check_trans is not allowed in onreply_route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#117 - t_check_trans is not allowed in onreply_route User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=117 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.

13 years, 2 months

[tracker] Task opened: t_check_trans is not allowed in onreply_route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alex Hermann (axlh) Attached to Project - sip-router Summary - t_check_trans is not allowed in onreply_route Task Type - Bug Report Category - tm Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - Documentation for t_check_trans() says: "For a SIP Reply it returns true if the reply belongs to an existing transaction and false otherwise." But when the function is used in onreply_route, an error results: 0(3406) : <core> [cfg.y:3412]: parse error in config file /etc/proxy/kamailio.cfg, line 256, column 26: Command cannot be used in the block onreply_route { if not t_lookup_request() { # <<< line 256 xlog("L_ERROR", "Dropped reply without transaction"); drop(); exit; } return; } This used to work in kamailio 1.5. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=117 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.

13 years, 2 months

git:master: * modules_k/nathelper: add_contact_alias() fix

by Juha Heinanen

Module: sip-router Branch: master Commit: 998ae20b26360383386d5f677ec87301e6b3ba23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=998ae20… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Mar 8 09:42:18 2011 +0200 * modules_k/nathelper: add_contact_alias() fix - add_contact_alias() is now able to add alias also to contact URI, where hostpart contains a domain name instead of an IP address. --- modules_k/nathelper/nathelper.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/modules_k/nathelper/nathelper.c b/modules_k/nathelper/nathelper.c index 52c5e5f..4f303cb 100644 --- a/modules_k/nathelper/nathelper.c +++ b/modules_k/nathelper/nathelper.c @@ -775,7 +775,7 @@ fix_nated_contact_f(struct sip_msg* msg, char* str1, char* str2) #define SALIAS_LEN (sizeof(SALIAS) - 1) /* - * Adds ;alias=ip:port param to cotact uri containing received ip:port + * Adds ;alias=ip:port param to contact uri containing received ip:port * if contact uri ip:port does not match received ip:port. */ static int @@ -806,14 +806,14 @@ add_contact_alias_f(struct sip_msg* msg, char* str1, char* str2) /* Compare source ip and port against contact uri */ if ((ip = str2ip(&(uri.host))) == NULL) { - LM_ERR("contact uri host is not an ip address\n"); - return -1; - } - if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) && - ((msg->rcv.src_port == uri.port_no) || - ((uri.port.len == 0) && (msg->rcv.src_port == 5060)))) { - LM_DBG("no need to add alias param\n"); - return 2; + LM_DBG("contact uri host is not an ip address\n"); + } else { + if (ip_addr_cmp(ip, &(msg->rcv.src_ip)) && + ((msg->rcv.src_port == uri.port_no) || + ((uri.port.len == 0) && (msg->rcv.src_port == 5060)))) { + LM_DBG("no need to add alias param\n"); + return 2; + } } /* Check if function has been called already */

13 years, 2 months

git:master: - mini bug: In case of an Reply to the Options-Ping, the Flags should be of course removed.

by Carsten Bock

Module: sip-router Branch: master Commit: 5bb9a711cfb11b049864964ff914e784306f5446 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5bb9a71… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Mon Mar 7 21:48:20 2011 +0100 - mini bug: In case of an Reply to the Options-Ping, the Flags should be of course removed. --- modules_k/dispatcher/dispatch.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index f957880..93274f7 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -2071,6 +2071,7 @@ int ds_set_state(int group, str *address, int state, int type) " to active: It is already administratively deactivated!\n"); return 0; } + type = 0; } if(type)

13 years, 2 months

[tracker] Task opened: invalid via branch param value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Juha Heinanen (jh) Attached to Project - sip-router Summary - invalid via branch param value Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Medium Priority - Normal Reported Version - 3.1 Due in Version - Undecided Due Date - Undecided Details - if syn_branch is not assigned any value in config, invalid via branch param value 0 is used when message (for example ACK to 200 OK) is forwarded by sr. please replace this default branch param value 0 with a valid one, for example z9hG4bK74b76. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=116 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.

13 years, 2 months

[tracker] Assignee added: invalid via branch param value

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#116 - invalid via branch param value User who did this - Juha Heinanen (jh) http://sip-router.org/tracker/index.php?do=details&task_id=116 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.

13 years, 2 months

git:master: - do not reactivate a gateway in probing mode, when it has been deactivated.

by Carsten Bock

Module: sip-router Branch: master Commit: e8cd119aa0e70033f58d51c46ddbcd5f2f37915e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8cd119… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Mon Mar 7 21:24:03 2011 +0100 - do not reactivate a gateway in probing mode, when it has been deactivated. --- modules_k/dispatcher/dispatch.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 36a362c..f957880 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -2039,7 +2039,6 @@ int ds_set_state(int group, str *address, int state, int type) && strncasecmp(idx->dlist[i].uri.s, address->s, address->len)==0) { - /* remove the Probing/Inactive-State? Set the fail-count to 0. */ if (state == DS_PROBING_DST) { if (type) { @@ -2064,6 +2063,15 @@ int ds_set_state(int group, str *address, int state, int type) idx->dlist[i].failure_count = 0; state &= ~DS_RESET_FAIL_DST; } + + /* Type 2 means reply from OPTIONS-Ping */ + if (type == 2) { + if (idx->dlist[i].flags & DS_INACTIVE_DST) { + LM_INFO("Ignoring the request to set this destination" + " to active: It is already administratively deactivated!\n"); + return 0; + } + } if(type) idx->dlist[i].flags |= state; @@ -2307,7 +2315,7 @@ static void ds_options_callback( struct cell *t, int type, /* Set the according entry back to "Active": * remove the Probing/Inactive Flag and reset the failure counter. */ if (ds_set_state(group, &uri, - DS_INACTIVE_DST|DS_PROBING_DST|DS_RESET_FAIL_DST, 0) != 0) + DS_INACTIVE_DST|DS_PROBING_DST|DS_RESET_FAIL_DST, 2) != 0) { LM_ERR("Setting the state failed (%.*s, group %d)\n", uri.len, uri.s, group);

13 years, 2 months

git:master: - When calling ds_mark_dst("a"), reset the failure counter as-well

by Carsten Bock

Module: sip-router Branch: master Commit: e68230ddb4ad8f5b5befef73cc42466355cc279c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e68230d… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Mon Mar 7 21:06:37 2011 +0100 - When calling ds_mark_dst("a"), reset the failure counter as-well - updated docs --- modules_k/dispatcher/dispatch.c | 2 +- modules_k/dispatcher/dispatcher.c | 4 ++-- modules_k/dispatcher/doc/dispatcher.xml | 4 ++-- modules_k/dispatcher/doc/dispatcher_admin.xml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index d49b4dc..36a362c 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1995,7 +1995,7 @@ int ds_mark_dst(struct sip_msg *msg, int mode) if(mode==1) { ret = ds_set_state(group, &avp_value.s, - DS_INACTIVE_DST|DS_PROBING_DST, 0); + DS_INACTIVE_DST|DS_PROBING_DST|DS_RESET_FAIL_DST, 0); } else if(mode==2) { ret = ds_set_state(group, &avp_value.s, DS_PROBING_DST, 1); if (ret == 0) ret = ds_set_state(group, &avp_value.s, diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 8ed44bc..0b8b8c8 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -170,9 +170,9 @@ static cmd_export_t cmds[]={ {"ds_next_domain", (cmd_function)w_ds_next_domain, 0, ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, {"ds_mark_dst", (cmd_function)w_ds_mark_dst0, 0, - ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, {"ds_mark_dst", (cmd_function)w_ds_mark_dst1, 1, - ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE}, + ds_warn_fixup, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list0, 0, 0, 0, REQUEST_ROUTE|FAILURE_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE}, {"ds_is_from_list", (cmd_function)w_ds_is_from_list1, 1, diff --git a/modules_k/dispatcher/doc/dispatcher.xml b/modules_k/dispatcher/doc/dispatcher.xml index 821f263..29c0105 100644 --- a/modules_k/dispatcher/doc/dispatcher.xml +++ b/modules_k/dispatcher/doc/dispatcher.xml @@ -26,9 +26,9 @@ <editor> <firstname>Carsten</firstname> <surname>Bock</surname> - <affiliation><orgname>BASIS AudioNet GmbH</orgname></affiliation> + <affiliation><orgname>ng-voice.com</orgname></affiliation> <address> - <email>bock(a)basis-audionet.de</email> + <email>carsten(a)ng-voice.com</email> </address> </editor> </authorgroup> diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index 960832d..47cc96c 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -905,7 +905,7 @@ ds_select_dst("1", "$var(a)"); </listitem> <listitem> <para><emphasis>"a", "A" or "1"</emphasis> - the last destination - should be set to active.</para> + should be set to active and the error-counter should set to "0".</para> </listitem> <listitem> <para><emphasis>"p", "P" or "2"</emphasis> - the last destination

13 years, 2 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011