sr-dev March 2010

sr-dev@lists.kamailio.org

24 participants
359 discussions

[tracker] Comment added: Cfg parsing error for alias/listen and custom global parameter
by sip-router 29 Mar '10

29 Mar '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#56 - Cfg parsing error for alias/listen and custom global parameter User who did this - Iñaki Baz Castillo (ibc) ---------- Doesn't the grammar parser split the parameter declarations into lines? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=56#comment66 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: modules_k/textops: added starts_with() function
by Juha Heinanen 29 Mar '10

29 Mar '10

Module: sip-router Branch: master Commit: 92e8377974d77851a68655df10b388cd53a1aaba URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92e8377… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Mar 29 14:28:17 2010 +0300 modules_k/textops: added starts_with() function Added starts_with() function in order to avoid use of regexs for this common test. --- modules_k/textops/README | 128 ++++++++++++++++++------------ modules_k/textops/doc/textops.xml | 5 + modules_k/textops/doc/textops_admin.xml | 25 ++++++ modules_k/textops/textops.c | 29 +++++++ 4 files changed, 136 insertions(+), 51 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=92e…

1 0

[tracker] Task changed: Cfg parsing error for alias/listen and custom global parameter
by sip-router 29 Mar '10

29 Mar '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has been changed. The changes are listed below. For full information about what has changed, visit the URL and click the History tab. FS#56 - Cfg parsing error for alias/listen and custom global parameter User who did this: Daniel-Constantin Mierla (miconda) Task details edited: ------- Following sequence of config rises errors: <code> alias="sip.mydomain.com" myvar.msg="one" desc "One" </code> 0(4069) : <core> [cfg.y:3382]: parse error in config file kamailio.cfg, line 104, column 10: syntax error 0(4069) : <core> [cfg.y:3382]: parse error in config file kamailio.cfg, line 104, column 10: unknown config variable 0(4069) : <core> [cfg.y:3379]: parse error in config file kamailio.cfg, line 104, column 11-15: ERROR: bad config file (3 errors) Line 104 is 'myvar...' Having another core parameter in between is ok, e.g.,: <code> alias="sip.mydomain.com" port=5060 myvar.msg="one" desc "One" </code> Seems alias/listen grammar eats up to myvar.msg, considering to be host definition. ------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=56 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] Task opened: Cfg parsing error for alias/listen and custom global parameter
by sip-router 29 Mar '10

29 Mar '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Daniel-Constantin Mierla (miconda) Attached to Project - sip-router Summary - Cfg parsing error for alias/listen and custom global parameter Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Following sequence of config rises errors: alias="sip.mydomain.com" myvar.msg="one" desc "One" 0(4069) : <core> [cfg.y:3382]: parse error in config file kamailio.cfg, line 104, column 10: syntax error 0(4069) : <core> [cfg.y:3382]: parse error in config file kamailio.cfg, line 104, column 10: unknown config variable 0(4069) : <core> [cfg.y:3379]: parse error in config file kamailio.cfg, line 104, column 11-15: ERROR: bad config file (3 errors) Line 104 is 'myvar...' Having another core parameter in between is ok, e.g.,: alias="sip.mydomain.com" port=5060 myvar.msg="one" desc "One" Seems alias/listen grammar eats up to myvar.msg, considering to be host definition. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=56 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: pipelimit: added module documentation
by Daniel-Constantin Mierla 28 Mar '10

28 Mar '10

Module: sip-router Branch: master Commit: dd4c5699a1821c52c3b0b30e7e199245615e4b14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd4c569… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 28 22:32:48 2010 +0200 pipelimit: added module documentation --- modules/pipelimit/README | 327 +++++++++++++++++++++++ modules/pipelimit/doc/Makefile | 4 + modules/pipelimit/doc/pipelimit.xml | 52 ++++ modules/pipelimit/doc/pipelimit_admin.xml | 398 +++++++++++++++++++++++++++++ 4 files changed, 781 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=dd4…

1 0

git:master: permissions(k): print tag in MI commands output
by Daniel-Constantin Mierla 28 Mar '10

28 Mar '10

Module: sip-router Branch: master Commit: 71a58b4718301fbce44f2d0811d4edfc4b012ff5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=71a58b4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 28 21:02:04 2010 +0200 permissions(k): print tag in MI commands output --- modules_k/permissions/hash.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/modules_k/permissions/hash.c b/modules_k/permissions/hash.c index 1ab545c..b9bfa68 100644 --- a/modules_k/permissions/hash.c +++ b/modules_k/permissions/hash.c @@ -347,7 +347,9 @@ int addr_hash_table_insert(struct addr_list** table, unsigned int grp, str addr_str; int len; - len = sizeof(*np) + (tagv==NULL)?0:(strlen(tagv)+1); + len = sizeof(struct addr_list); + if(tagv!=NULL) + len += strlen(tagv) + 1; np = (struct addr_list *) shm_malloc(len); if (np == NULL) { @@ -452,9 +454,9 @@ int addr_hash_table_mi_print(struct addr_list** table, struct mi_node* rpl) addr.len = 4; addr.u.addr32[0] = np->ip_addr; if (addf_mi_node_child(rpl, 0, 0, 0, - "%4d <%u, %s, %u>", + "%4d <%u, %s, %u> [%s]", i, np->grp, ip_addr2a(&addr), - np->port) == 0) + np->port, (np->tag.s==NULL)?"":np->tag.s) == 0) return -1; np = np->next; } @@ -639,9 +641,10 @@ int subnet_table_mi_print(struct subnet* table, struct mi_node* rpl) addr.len = 4; addr.u.addr32[0] = htonl(ntohl(table[i].subnet) << table[i].mask); //table[i].subnet >> table[i].mask; if (addf_mi_node_child(rpl, 0, 0, 0, - "%4d <%u, %s, %u, %u>", + "%4d <%u, %s, %u, %u> [%s]", i, table[i].grp, ip_addr2a(&addr), - 32 - table[i].mask, table[i].port) == 0) { + 32 - table[i].mask, table[i].port, + (table[i].tag.s==NULL)?"":table[i].tag.s) == 0) { return -1; } }

1 0

git:master: permissions(ka): exported allow_source_address()
by Daniel-Constantin Mierla 28 Mar '10

28 Mar '10

Module: sip-router Branch: master Commit: aab8df4fbedb7cd7f7dbb8d8ef6564f721e90444 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aab8df4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 28 19:37:03 2010 +0200 permissions(ka): exported allow_source_address() - alias to allow_source_address("1"), 1 is default value for group id --- modules_k/permissions/address.c | 5 +++-- modules_k/permissions/permissions.c | 2 ++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/modules_k/permissions/address.c b/modules_k/permissions/address.c index 916f6b0..bc27be2 100644 --- a/modules_k/permissions/address.c +++ b/modules_k/permissions/address.c @@ -378,9 +378,10 @@ int allow_address(struct sip_msg* _msg, char* _addr_group, char* _addr_sp, */ int allow_source_address(struct sip_msg* _msg, char* _addr_group, char* _str2) { - int addr_group = 0; + int addr_group = 1; - if(fixup_get_ivalue(_msg, (gparam_p)_addr_group, &addr_group) !=0 ) { + if(_addr_group!=NULL + && fixup_get_ivalue(_msg, (gparam_p)_addr_group, &addr_group) !=0 ) { LM_ERR("cannot get group value\n"); return -1; } diff --git a/modules_k/permissions/permissions.c b/modules_k/permissions/permissions.c index 97cc18f..0915437 100644 --- a/modules_k/permissions/permissions.c +++ b/modules_k/permissions/permissions.c @@ -137,6 +137,8 @@ static cmd_export_t cmds[] = { fixup_free_igp_pvar_pvar, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, {"allow_source_address", (cmd_function)allow_source_address, 1, fixup_igp_null, 0, REQUEST_ROUTE | FAILURE_ROUTE}, + {"allow_source_address", (cmd_function)allow_source_address, 0, 0, 0, + REQUEST_ROUTE | FAILURE_ROUTE}, {"allow_source_address_group", (cmd_function)allow_source_address_group, 0, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE}, {0, 0, 0, 0, 0, 0}

1 0

git:master: kamctl: regenerated definition of address table
by Daniel-Constantin Mierla 28 Mar '10

28 Mar '10

Module: sip-router Branch: master Commit: 013e8236bd8ce4b9606fdf6a6c4974a91ddcac55 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=013e823… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 28 19:18:18 2010 +0200 kamctl: regenerated definition of address table - default value for grp column is 1 --- utils/kamctl/db_berkeley/kamailio/address | 2 +- utils/kamctl/db_berkeley/kamailio/version | 4 ++-- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/permissions-create.sql | 2 +- utils/kamctl/oracle/permissions-create.sql | 2 +- utils/kamctl/postgres/permissions-create.sql | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/address b/utils/kamctl/db_berkeley/kamailio/address index 0b0ee35..1292b6d 100644 --- a/utils/kamctl/db_berkeley/kamailio/address +++ b/utils/kamctl/db_berkeley/kamailio/address @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|0|NIL|32|0|NIL +NIL|1|NIL|32|0|NIL diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 86f1a9a..af0c49b 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -16,10 +16,10 @@ address| address|4 aliases| aliases|1004 -carrier_name| -carrier_name|1 carrierfailureroute| carrierfailureroute|2 +carrier_name| +carrier_name|1 carrierroute| carrierroute|3 cpl| diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 8647481..eb20308 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -3,8 +3,8 @@ acc:4 active_watchers:9 address:4 aliases:1004 -carrier_name:1 carrierfailureroute:2 +carrier_name:1 carrierroute:3 cpl:1 dbaliases:1 diff --git a/utils/kamctl/mysql/permissions-create.sql b/utils/kamctl/mysql/permissions-create.sql index 4d71642..ae6ce8b 100644 --- a/utils/kamctl/mysql/permissions-create.sql +++ b/utils/kamctl/mysql/permissions-create.sql @@ -12,7 +12,7 @@ CREATE INDEX peer_idx ON trusted (src_ip); 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, + grp SMALLINT(5) UNSIGNED DEFAULT 1 NOT NULL, ip_addr VARCHAR(15) NOT NULL, mask TINYINT DEFAULT 32 NOT NULL, port SMALLINT(5) UNSIGNED DEFAULT 0 NOT NULL, diff --git a/utils/kamctl/oracle/permissions-create.sql b/utils/kamctl/oracle/permissions-create.sql index 6caad1a..1e1b31c 100644 --- a/utils/kamctl/oracle/permissions-create.sql +++ b/utils/kamctl/oracle/permissions-create.sql @@ -20,7 +20,7 @@ CREATE INDEX trusted_peer_idx ON trusted (src_ip); 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, + grp NUMBER(5) DEFAULT 1 NOT NULL, ip_addr VARCHAR2(15), mask NUMBER(5) DEFAULT 32 NOT NULL, port NUMBER(5) DEFAULT 0 NOT NULL, diff --git a/utils/kamctl/postgres/permissions-create.sql b/utils/kamctl/postgres/permissions-create.sql index e7bee3b..602c399 100644 --- a/utils/kamctl/postgres/permissions-create.sql +++ b/utils/kamctl/postgres/permissions-create.sql @@ -12,7 +12,7 @@ CREATE INDEX trusted_peer_idx ON trusted (src_ip); 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, + grp SMALLINT DEFAULT 1 NOT NULL, ip_addr VARCHAR(15) NOT NULL, mask SMALLINT DEFAULT 32 NOT NULL, port SMALLINT DEFAULT 0 NOT NULL,

1 0

git:master: kamailio.cfg: various updates
by Daniel-Constantin Mierla 28 Mar '10

28 Mar '10

Module: sip-router Branch: master Commit: 7fae7a58cb98266f859e2483b892edd5f3110064 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fae7a5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 28 21:03:55 2010 +0200 kamailio.cfg: various updates - sample IP auth with permissions via define WITH_IPAUTH - more modularity in main route block to suggest better the parts handling SIP server types such as REGISTRAR or LOCATION - sample alias line --- etc/kamailio.cfg | 240 +++++++++++++++++++++++++++++++++++------------------- 1 files changed, 156 insertions(+), 84 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index ee63ec8..1269860 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,8 +1,6 @@ #!KAMAILIO # -# $Id$ -# -# Kamailio (OpenSER) SIP Server v3.0 - basic configuration script +# Kamailio (OpenSER) SIP Server v3.1 - default configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org # @@ -24,6 +22,12 @@ # - define WITH_AUTH # - add users using 'kamctl' # +# *** To enable IP authentication execute: +# - enable mysql +# - enable authentication +# - define WITH_IPAUTH +# - add IP addresses with group id '1' to 'address' table +# # *** To enable persistent user location execute: # - enable mysql # - define WITH_USRLOCDB @@ -86,6 +90,9 @@ children=4 based on revers DNS on IPs (default on) */ #auto_aliases=no +/* add local domain aliases */ +#alias="sip.mydomain.com" + port=5060 /* uncomment and configure the following line if you want Kamailio to @@ -143,6 +150,9 @@ loadmodule "acc.so" #!ifdef WITH_AUTH loadmodule "auth.so" loadmodule "auth_db.so" +#!ifdef WITH_IPAUTH +loadmodule "permissions.so" +#!endif #!endif /* uncomment next line for aliases support NOTE: a DB (like db_mysql) module must be also loaded */ @@ -231,6 +241,13 @@ modparam("auth_db", "password_column", "password") modparam("auth_db", "db_url", "mysql://openser:openserrw@localhost/openser") modparam("auth_db", "load_credentials", "") + +#!ifdef WITH_IPAUTH +modparam("permissions", "db_url", + "mysql://openser:openserrw@localhost/openser") +modparam("permissions", "db_mode", 1) +#!endif + #!endif # ----- alias_db params ----- @@ -279,8 +296,97 @@ modparam("usrloc", "nat_bflag", 6) # main request routing logic -route{ +route { + + # per request initial checks + route(REQINIT); + + # NAT detection + route(NAT); + + # handle requests within SIP dialogs + route(WITHINDLG); + + ### only initial requests (no To tag) + + # CANCEL processing + if (is_method("CANCEL")) + { + if (t_check_trans()) + t_relay(); + exit; + } + + t_check_trans(); + + # authentication + route(AUTH); + + # record routing for dialog forming requests (in case they are routed) + # - remove preloaded route headers + remove_hf("Route"); + if (is_method("INVITE|SUBSCRIBE")) + record_route(); + + # account only INVITEs + if (is_method("INVITE")) + { + setflag(1); # do accounting + } + + # dispatch requests to foreign domains + route(SIPOUT); + + ### requests for my local domains + + # handle presence related requests + route(PRESENCE); + + # handle registrations + route(REGISTRAR); + if ($rU==$null) + { + # request with no Username in RURI + sl_send_reply("484","Address Incomplete"); + exit; + } + + # dispatch destinations to PSTN + route(PSTN); + + # user location service + route(LOCATION); + + route(RELAY); +} + + +route[RELAY] { +#!ifdef WITH_NAT + if (check_route_param("nat=yes")) { + setbflag("6"); + } + if (isflagset(5) || isbflagset("6")) { + route(RTPPROXY); + } +#!endif + + /* example how to enable some additional event routes */ + if (is_method("INVITE")) { + #t_on_branch("BRANCH_ONE"); + t_on_reply("REPLY_ONE"); + t_on_failure("FAIL_ONE"); + } + + if (!t_relay()) { + sl_reply_error(); + } + exit; +} + +# Per SIP request initial checks +route[REQINIT] { if (!mf_process_maxfwd_header("10")) { sl_send_reply("483","Too Many Hops"); exit; @@ -291,10 +397,10 @@ route{ xlog("Malformed SIP message from $si:$sp\n"); exit; } +} - # NAT detection - route(NAT); - +# Handle requests within SIP dialogs +route[WITHINDLG] { if (has_totag()) { # sequential request withing a dialog should # take the path determined by record-routing @@ -324,45 +430,10 @@ route{ } exit; } +} - #initial requests - - # CANCEL processing - if (is_method("CANCEL")) - { - if (t_check_trans()) - t_relay(); - exit; - } - - t_check_trans(); - - # authentication - route(AUTH); - - # record routing for dialog forming requests (in case they are routed) - # - remove preloaded route headers - remove_hf("Route"); - if (is_method("INVITE|SUBSCRIBE")) - record_route(); - - # account only INVITEs - if (is_method("INVITE")) { - setflag(1); # do accounting - } - if (!uri==myself) - /* replace with following line if multi-domain support is used */ - ##if (!is_uri_host_local()) - { - append_hf("P-hint: outbound\r\n"); - route(RELAY); - } - - # requests for my domain - - if( is_method("PUBLISH|SUBSCRIBE")) - route(PRESENCE); - +# Handle SIP registrations +route[REGISTRAR] { if (is_method("REGISTER")) { if(isflagset(5)) @@ -376,15 +447,10 @@ route{ exit; } +} - if ($rU==$null) { - # request with no Username in RURI - sl_send_reply("484","Address Incomplete"); - exit; - } - - route(PSTN); - +# USER location service +route[LOCATION] { # apply DB based aliases (uncomment to enable) ##alias_db_lookup("dbaliases"); @@ -402,39 +468,17 @@ route{ } # when routing via usrloc, log the missed calls also - setflag(2); - - route(RELAY); -} - - -route[RELAY] { -#!ifdef WITH_NAT - if (check_route_param("nat=yes")) { - setbflag("6"); - } - if (isflagset(5) || isbflagset("6")) { - route(RTPPROXY); - } -#!endif - - /* example how to enable some additional event routes */ - if (is_method("INVITE")) { - #t_on_branch("BRANCH_ONE"); - t_on_reply("REPLY_ONE"); - t_on_failure("FAIL_ONE"); - } - - if (!t_relay()) { - sl_reply_error(); + if (is_method("INVITE")) + { + setflag(2); } - exit; } - # Presence server route -route[PRESENCE] -{ +route[PRESENCE] { + if(!is_method("PUBLISH|SUBSCRIBE")) + return; + #!ifdef WITH_PRESENCE if (!t_newtran()) { @@ -483,7 +527,16 @@ route[AUTH] { exit; } } else { - # authenticate if from local subscriber (uncomment to enable auth) + +#!ifdef WITH_IPAUTH + if(allow_source_address()) + { + # source IP allowed + return; + } +#!endif + + # authenticate if from local subscriber if (from_uri==myself) { if (!proxy_authorize("", "subscriber")) { @@ -505,6 +558,14 @@ route[AUTH] { consume_credentials(); # caller authenticated + } else { + # caller is not local subscriber, then check if it calls + # a local destination, otherwise deny, not an open relay here + if (!uri==myself) + { + sl_send_reply("403","Not relaying"); + exit; + } } } #!endif @@ -512,7 +573,7 @@ route[AUTH] { } # Caller NAT detection route -route[NAT]{ +route[NAT] { #!ifdef WITH_NAT force_rport(); if (nat_uac_test("19")) { @@ -540,6 +601,17 @@ route[RTPPROXY] { return; } +# Routing to foreign domains +route[SIPOUT] { + if (!uri==myself) + /* replace with following line if multi-domain support is used */ + ##if (!is_uri_host_local()) + { + append_hf("P-hint: outbound\r\n"); + route(RELAY); + } +} + # PSTN GW routing route[PSTN] { #!ifdef WITH_PSTN

1 0

git:master: permissions(k): use grp 1 in allow_source_address
by Daniel-Constantin Mierla 28 Mar '10

28 Mar '10

Module: sip-router Branch: master Commit: 254514dfec1a72fdce4d1911db1df7e6122bec19 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=254514d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 28 19:24:06 2010 +0200 permissions(k): use grp 1 in allow_source_address - example used grp 0 which is not allowed - extended the note about group id value --- modules_k/permissions/README | 38 +++++++++++----------- modules_k/permissions/doc/permissions_admin.xml | 6 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/modules_k/permissions/README b/modules_k/permissions/README index 8bdcac0..3642796 100644 --- a/modules_k/permissions/README +++ b/modules_k/permissions/README @@ -277,8 +277,8 @@ Chapter 1. Admin Guide Addresses stored in cached database table can be grouped together into one or more groups specified by a group identifier (positive integer - value). Group identifier is given as argument to allow_address and - allow_source_address functions. + value, i.e., equal or greater than 1). Group identifier is given as + argument to allow_address and allow_source_address functions. As a side effect of matching the address, non-NULL tag (see tag_col module parameter) is added as value to peer_tag AVP if peer_tag_avp @@ -597,7 +597,7 @@ modparam("permissions", "peer_tag_avp", "$avp(i:707)") 4.9. allow_source_address_group() 4.10. allow_trusted([src_ip_pvar, proto_pvar]) -4.1. allow_routing() +4.1. allow_routing() Returns true if all pairs constructed as described in Section 1.1, "Call Routing" have appropriate permissions according to the @@ -613,7 +613,7 @@ if (allow_routing()) { }; ... -4.2. allow_routing(basename) +4.2. allow_routing(basename) Returns true if all pairs constructed as described in Section 1.1, "Call Routing" have appropriate permissions according to the @@ -636,7 +636,7 @@ if (allow_routing("basename")) { }; ... -4.3. allow_routing(allow_file,deny_file) +4.3. allow_routing(allow_file,deny_file) Returns true if all pairs constructed as described in Section 1.1, "Call Routing" have appropriate permissions according to the @@ -661,7 +661,7 @@ if (allow_routing("rules.allow", "rules.deny")) { }; ... -4.4. allow_register(basename) +4.4. allow_register(basename) The function returns true if all pairs constructed as described in Section 1.2, "Registration Permissions" have appropriate permissions @@ -689,7 +689,7 @@ if (method=="REGISTER") { }; ... -4.5. allow_register(allow_file, deny_file) +4.5. allow_register(allow_file, deny_file) The function returns true if all pairs constructed as described in Section 1.2, "Registration Permissions" have appropriate permissions @@ -719,7 +719,7 @@ if (method=="REGISTER") { }; ... -4.6. allow_uri(basename, pvar) +4.6. allow_uri(basename, pvar) Returns true if the pair constructed as described in Section 1.3, "URI Permissions" have appropriate permissions according to the @@ -746,7 +746,7 @@ if (allow_uri("basename", "$avp(i:705)") { // Check URI stored in $avp(i:705) }; ... -4.7. allow_address(group_id, ip_addr_pvar, port_pvar) +4.7. allow_address(group_id, ip_addr_pvar, port_pvar) Returns true if IP address and port given as values of pvar arguments belonging to a group given as group_id argument matches an IP subnet @@ -769,7 +769,7 @@ 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"). @@ -779,12 +779,12 @@ if (!allow_address("2", "$avp(i:704)", "$avp(i:705)") { ... // Check source address/port of request -if (!allow_source_address("0")) { +if (!allow_source_address("1")) { sl_send_reply("403", "Forbidden"); }; ... -4.9. allow_source_address_group() +4.9. allow_source_address_group() Checks if source address/port is found in cached address or subnet table in any group. If yes, returns that group. If not returns -1. Port @@ -801,7 +801,7 @@ if ($var(group) != -1) { }; ... -4.10. allow_trusted([src_ip_pvar, proto_pvar]) +4.10. allow_trusted([src_ip_pvar, proto_pvar]) Checks based either on request's source address and transport protocol or source address and transport protocol given in pvar arguments, and @@ -837,7 +837,7 @@ if (allow_trusted("$si", "$proto")) { 5.5. trusted_dump 5.6. allow_uri -5.1. address_reload +5.1. address_reload Causes permissions module to re-read the contents of address database table into cache memory. In cache memory the entries are for @@ -846,35 +846,35 @@ if (allow_trusted("$si", "$proto")) { Parameters: none -5.2. address_dump +5.2. address_dump Causes permissions module to dump contents of cache memory address table. Parameters: none -5.3. subnet_dump +5.3. subnet_dump Causes permissions module to dump contents of cache memory subnet table. Parameters: none -5.4. trusted_reload +5.4. trusted_reload Causes permissions module to re-read the contents of trusted table into cache memory. Parameters: none -5.5. trusted_dump +5.5. trusted_dump Causes permissions module to dump contents of trusted table from cache memory. Parameters: none -5.6. allow_uri +5.6. allow_uri Tests if (URI, Contact) pair is allowed according to allow/deny files. The files must already have been loaded by Kamailio. diff --git a/modules_k/permissions/doc/permissions_admin.xml b/modules_k/permissions/doc/permissions_admin.xml index 56612a4..b6e878e 100644 --- a/modules_k/permissions/doc/permissions_admin.xml +++ b/modules_k/permissions/doc/permissions_admin.xml @@ -179,8 +179,8 @@ <para> Addresses stored in cached database table can be grouped together into one or more groups specified by a group - identifier (positive integer value). Group - identifier is given as argument to allow_address and + identifier (positive integer value, i.e., equal or greater than 1). + Group identifier is given as argument to allow_address and allow_source_address functions. </para> <para> @@ -969,7 +969,7 @@ if (!allow_address("2", "$avp(i:704)", "$avp(i:705)") { ... // Check source address/port of request -if (!allow_source_address("0")) { +if (!allow_source_address("1")) { sl_send_reply("403", "Forbidden"); }; ...

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2010