sr-dev March 2010

sr-dev@lists.kamailio.org

24 participants
359 discussions

git:master: permissions(k): added allow_source_address()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9fba21f14a07bc504d41b57c206b0628821fe920 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9fba21f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 28 19:33:41 2010 +0200 permissions(k): added allow_source_address() - it is equivalent of allow_source_address("1") - 1 is the default group id value in database --- modules_k/permissions/README | 11 ++++++----- modules_k/permissions/doc/permissions_admin.xml | 5 +++-- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/modules_k/permissions/README b/modules_k/permissions/README index 3642796..760c3ab 100644 --- a/modules_k/permissions/README +++ b/modules_k/permissions/README @@ -68,7 +68,7 @@ Juha Heinanen 4.5. allow_register(allow_file, deny_file) 4.6. allow_uri(basename, pvar) 4.7. allow_address(group_id, ip_addr_pvar, port_pvar) - 4.8. allow_source_address(group_id) + 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_trusted([src_ip_pvar, proto_pvar]) @@ -159,7 +159,7 @@ Chapter 1. Admin Guide 4.5. allow_register(allow_file, deny_file) 4.6. allow_uri(basename, pvar) 4.7. allow_address(group_id, ip_addr_pvar, port_pvar) - 4.8. allow_source_address(group_id) + 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_trusted([src_ip_pvar, proto_pvar]) @@ -593,7 +593,7 @@ modparam("permissions", "peer_tag_avp", "$avp(i:707)") 4.5. allow_register(allow_file, deny_file) 4.6. allow_uri(basename, pvar) 4.7. allow_address(group_id, ip_addr_pvar, port_pvar) - 4.8. allow_source_address(group_id) + 4.8. allow_source_address([group_id]) 4.9. allow_source_address_group() 4.10. allow_trusted([src_ip_pvar, proto_pvar]) @@ -769,9 +769,10 @@ if (!allow_address("2", "$avp(i:704)", "$avp(i:705)") { }; ... -4.8. allow_source_address(group_id) +4.8. allow_source_address([group_id]) - Equal to allow_address(group_id, "$si", "$sp"). + Equal to allow_address(group_id, "$si", "$sp"). If 'group_id' is + missing, the function is equal to allow_address("1", "$si", "$sp"). This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. diff --git a/modules_k/permissions/doc/permissions_admin.xml b/modules_k/permissions/doc/permissions_admin.xml index b6e878e..0470224 100644 --- a/modules_k/permissions/doc/permissions_admin.xml +++ b/modules_k/permissions/doc/permissions_admin.xml @@ -955,10 +955,11 @@ if (!allow_address("2", "$avp(i:704)", "$avp(i:705)") { </section> <section> <title> - <function moreinfo="none">allow_source_address(group_id)</function> + <function moreinfo="none">allow_source_address([group_id])</function> </title> <para> - Equal to allow_address(group_id, "$si", "$sp"). + Equal to allow_address(group_id, "$si", "$sp"). If 'group_id' is + missing, the function is equal to allow_address("1", "$si", "$sp"). </para> <para> This function can be used from REQUEST_ROUTE, FAILURE_ROUTE.

14 years

git:master: db schema: grp of address table defaults to 1

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8f7c165ffefc44a2e054be6ec6fbd0da1cd63d92 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8f7c165… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 28 19:16:55 2010 +0200 db schema: grp of address table defaults to 1 - 0 (previous default value) is not allowed as group id --- lib/srdb1/schema/address.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/address.xml b/lib/srdb1/schema/address.xml index 10d102c..5369685 100644 --- a/lib/srdb1/schema/address.xml +++ b/lib/srdb1/schema/address.xml @@ -30,7 +30,7 @@ <name>grp</name> <type>unsigned short</type> <size>5</size> - <default>0</default> + <default>1</default> <description>Group</description> <natural/> </column>

14 years

git:master: kamctl: regenerated db definition scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 64fa789c3bc94b36e79a8d886c5c2742c8a1629d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=64fa789… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 27 23:29:01 2010 +0100 kamctl: regenerated db definition scripts - due to update of address table structure with new column 'tag' --- utils/kamctl/db_berkeley/kamailio/address | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 8 +++----- utils/kamctl/dbtext/kamailio/address | 2 +- utils/kamctl/dbtext/kamailio/version | 5 ++--- utils/kamctl/mysql/permissions-create.sql | 5 +++-- utils/kamctl/oracle/permissions-create.sql | 5 +++-- utils/kamctl/postgres/permissions-create.sql | 5 +++-- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/address b/utils/kamctl/db_berkeley/kamailio/address index e49cd3f..0b0ee35 100644 --- a/utils/kamctl/db_berkeley/kamailio/address +++ b/utils/kamctl/db_berkeley/kamailio/address @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) grp(int) ip_addr(str) mask(int) port(int) +id(int) grp(int) ip_addr(str) mask(int) port(int) tag(str) METADATA_KEY 1 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|0|NIL|32|0 +NIL|0|NIL|32|0|NIL diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 539e2ff..86f1a9a 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -13,13 +13,13 @@ acc|4 active_watchers| active_watchers|9 address| -address|3 +address|4 aliases| aliases|1004 -carrierfailureroute| -carrierfailureroute|2 carrier_name| carrier_name|1 +carrierfailureroute| +carrierfailureroute|2 carrierroute| carrierroute|3 cpl| @@ -88,8 +88,6 @@ subscriber| subscriber|6 trusted| trusted|5 -uacreg| -uacreg|1 uri| uri|1 userblacklist| diff --git a/utils/kamctl/dbtext/kamailio/address b/utils/kamctl/dbtext/kamailio/address index 8d58a84..070e156 100644 --- a/utils/kamctl/dbtext/kamailio/address +++ b/utils/kamctl/dbtext/kamailio/address @@ -1 +1 @@ -id(int,auto) grp(int) ip_addr(string) mask(int) port(int) +id(int,auto) grp(int) ip_addr(string) mask(int) port(int) tag(string,null) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 788c7c0..8647481 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -1,10 +1,10 @@ table_name(string) table_version(int) acc:4 active_watchers:9 -address:3 +address:4 aliases:1004 -carrierfailureroute:2 carrier_name:1 +carrierfailureroute:2 carrierroute:3 cpl:1 dbaliases:1 @@ -39,7 +39,6 @@ sip_trace:2 speed_dial:2 subscriber:6 trusted:5 -uacreg:1 uri:1 userblacklist:1 usr_preferences:2 diff --git a/utils/kamctl/mysql/permissions-create.sql b/utils/kamctl/mysql/permissions-create.sql index f3be981..4d71642 100644 --- a/utils/kamctl/mysql/permissions-create.sql +++ b/utils/kamctl/mysql/permissions-create.sql @@ -9,12 +9,13 @@ CREATE TABLE trusted ( CREATE INDEX peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','3'); +INSERT INTO version (table_name, table_version) values ('address','4'); CREATE TABLE address ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, grp SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL, ip_addr VARCHAR(15) NOT NULL, mask TINYINT DEFAULT 32 NOT NULL, - port SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL + port SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL, + tag VARCHAR(64) ) ENGINE=MyISAM; diff --git a/utils/kamctl/oracle/permissions-create.sql b/utils/kamctl/oracle/permissions-create.sql index c6045d0..6caad1a 100644 --- a/utils/kamctl/oracle/permissions-create.sql +++ b/utils/kamctl/oracle/permissions-create.sql @@ -17,13 +17,14 @@ BEGIN map2users('trusted'); END; / CREATE INDEX trusted_peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','3'); +INSERT INTO version (table_name, table_version) values ('address','4'); CREATE TABLE address ( id NUMBER(10) PRIMARY KEY, grp NUMBER(5) DEFAULT 0 NOT NULL, ip_addr VARCHAR2(15), mask NUMBER(5) DEFAULT 32 NOT NULL, - port NUMBER(5) DEFAULT 0 NOT NULL + port NUMBER(5) DEFAULT 0 NOT NULL, + tag VARCHAR2(64) ); CREATE OR REPLACE TRIGGER address_tr diff --git a/utils/kamctl/postgres/permissions-create.sql b/utils/kamctl/postgres/permissions-create.sql index 5514ef5..e7bee3b 100644 --- a/utils/kamctl/postgres/permissions-create.sql +++ b/utils/kamctl/postgres/permissions-create.sql @@ -9,12 +9,13 @@ CREATE TABLE trusted ( CREATE INDEX trusted_peer_idx ON trusted (src_ip); -INSERT INTO version (table_name, table_version) values ('address','3'); +INSERT INTO version (table_name, table_version) values ('address','4'); CREATE TABLE address ( id SERIAL PRIMARY KEY NOT NULL, grp SMALLINT DEFAULT 0 NOT NULL, ip_addr VARCHAR(15) NOT NULL, mask SMALLINT DEFAULT 32 NOT NULL, - port SMALLINT DEFAULT 0 NOT NULL + port SMALLINT DEFAULT 0 NOT NULL, + tag VARCHAR(64) );

14 years

git:master: db schema (k) - address table structure update

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a549e66e612829bfaf13e581872ea49bddd6c205 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a549e66… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 27 23:28:01 2010 +0100 db schema (k) - address table structure update - added tag column used by allow_address() from permissions module - version of the table increased --- lib/srdb1/schema/address.xml | 14 ++++++++++++-- 1 files changed, 12 insertions(+), 2 deletions(-) diff --git a/lib/srdb1/schema/address.xml b/lib/srdb1/schema/address.xml index 8c7fd7b..10d102c 100644 --- a/lib/srdb1/schema/address.xml +++ b/lib/srdb1/schema/address.xml @@ -9,7 +9,7 @@ <table id="address" xmlns:db="http://docbook.org/ns/docbook"> <name>address</name> - <version>3</version> + <version>4</version> <type db="mysql">&MYSQL_TABLE_TYPE;</type> <description> <db:para>This table is used by the permissions module. More information is available at: &KAMAILIO_MOD_DOC;permissions.html @@ -46,7 +46,7 @@ <name>mask</name> <type>char</type> <default>32</default> - <description>Network mask</description> + <description>Network mask - integer equal or less than 32</description> </column> <column> @@ -56,4 +56,14 @@ <default>0</default> <description>Port</description> </column> + + <column> + <name>tag</name> + <type>string</type> + <size>64</size> + <null/> + <description>Tag - string value returned in config variable + upon address matching</description> + </column> + </table>

14 years

git:master: permissions(k): tag support for allow_address

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cd93b6afcc6592b4ab8b45040af7f61caa0c1c70 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cd93b6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 27 23:26:24 2010 +0100 permissions(k): tag support for allow_address - new column tag holding a string that is returned in config file upon matching the address - similar to tag for allow_trusted() - reuses the avp and column name from allow_trusted() --- modules_k/permissions/README | 10 ++- modules_k/permissions/address.c | 17 +++-- modules_k/permissions/doc/permissions_admin.xml | 9 ++- modules_k/permissions/hash.c | 80 +++++++++++++++++++++-- modules_k/permissions/hash.h | 6 +- 5 files changed, 103 insertions(+), 19 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=cd9…

14 years

[tracker] Comment added: Extending TM timeout/408 handling

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#55 - Extending TM timeout/408 handling User who did this - Iñaki Baz Castillo (ibc) ---------- Please ignore the first solution I suggested ("giving lowest priority to locally generated 408 if such 408 was raised by fr_timer expiration") as finally I would get a 408 in failure_route anyway and I couldn't know the cause of such 408 (received from downstream, fr_inv_timer expiration, or fr_timer expiration). I'd just would like to do failover if fr_timer expired, so inspecting the 408 doesn't help me. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=55#comment65 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.

14 years

[tracker] Comment added: Extending TM timeout/408 handling

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#55 - Extending TM timeout/408 handling User who did this - Iñaki Baz Castillo (ibc) ---------- Another possible solution: 3) Generate local 503 if fr_timer expires. According to RFC 3261 there are two posibilities if the transport layer fails: - Timeout, no response, so 408 is locally generaged. - Transport error so 503 is locally generated. Transport error can occur in both TCP and UDP: - In TCP means that the TCP connection failed. - In UDP means that the UAC received a ICMP indicating "UDP port 5060 unreachable". The transport error for UDP is not handled by TM as it doesn't rely on the received ICMP. Also it seems that such ICMP mechanism is not interoperable between different TCP/IP stacks. Anyhow, I would suggest that when fr_timer expires (in UDP) a locally generated 503 could make sense. Why not? If there is no response at all for a transaction then there is some kind of network issue or perhaps the remote server is down/congested. 503 seems suitable for me, even if RFC 3261 doesn't state it. PS: As far as I know, other SIP stacks uses internal codes (like 7XX) to indicate such kind of errors (transport error, transport timeout...). I think something like that is a real need even if RFC 3261 didn't consider it (as they didn't consider NAT). ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=55#comment64 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.

14 years

[tracker] Assignee added: Extending TM timeout/408 handling

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#55 - Extending TM timeout/408 handling User who did this - Iñaki Baz Castillo (ibc) http://sip-router.org/tracker/index.php?do=details&task_id=55 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.

14 years

[tracker] Task opened: Extending TM timeout/408 handling

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 - Iñaki Baz Castillo (ibc) Attached to Project - sip-router Summary - Extending TM timeout/408 handling Task Type - Bug Report Category - tm Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Low Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi, let's suppose the following case: SR receives an INVITE and performs serial or parallel forking to gw1 and gw2. Three cases: case a) - gw1 replies 480. - gw2 replies 408. case b) - gw1 replies 480. - gw2 replies 180 and fr_inv_timer expires so a local 408 is generated. case c) - gw1 replies 480. - gw2 replies nothing and fr_timer expires so a local 408 is generated. In any case, after the transaction fails I handle the winning response in failure_route in which I get a 408. But there is no way to determine which of the above 3 cases took place. For cases "a" and "b" the 408 could be a good choice (also the 480) but in case "c" I'd strongly prefer using the 480. But there is no way, in failure_route, to determine if our case is "a", "b" or "c". A non reliable pseudo-workaround is setting a transaction flag(RINGIN_RECEIVED) so when inspecting the 408 in failure_route we can "determine" if fr_timer expired (case "c") or not (cases "a" or "b"). This is not reliable as the flag could be set by other branch in which 1XX was received. Possible solutions: 1) When TM chooses the winning response it must give lowest priority to locally generated 408 if such 408 was raised by fr_timer expiration, so for the above cases the winning response would be: a) 408 b) 408 c) 480 or: 2) When fr_timer expires a new status code is locally generated, i.e. 478 "No response received at all". Such code would have lowest priority. Opinions? More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=55 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.

14 years

[tracker] Comment added: Received replies should get higher preference than locally generated ones

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#54 - Received replies should get higher preference than locally generated ones User who did this - Iñaki Baz Castillo (ibc) ---------- Andrei, IMHO what you suggest it's reasonable and would cover most of the needs. However I still consider special the 408 handling (local-fr_time, local-fr_inv_timer, received) so I will open a new report for it. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=54#comment63 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.

14 years

← Newer
1
2
3
4
5
6
7
8
...
36
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2010