sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: srdb1: keep PID per DB connection

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: f138cce2c0968872f26538983e06a128a1b41344 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f138cce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 1 23:30:34 2010 +0100 srdb1: keep PID per DB connection - print warning when PID mismatches - it is cross-process shared DB connection - initial patch by Robert Verspuy --- lib/srdb1/db_id.c | 6 ++++++ lib/srdb1/db_id.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index d55c586..c8db30f 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -30,6 +30,7 @@ #include "db_id.h" #include "../../dprint.h" #include "../../mem/mem.h" +#include "../../pt.h" #include "../../ut.h" #include <stdlib.h> #include <string.h> @@ -241,6 +242,7 @@ struct db_id* new_db_id(const str* url) LM_ERR("error while parsing database URL: '%.*s' \n", url->len, url->s); goto err; } + ptr->pid = my_pid(); return ptr; @@ -274,6 +276,10 @@ unsigned char cmp_db_id(const struct db_id* id1, const struct db_id* id2) } if (strcasecmp(id1->host, id2->host)) return 0; if (strcmp(id1->database, id2->database)) return 0; + if(id1->pid!=id2->pid) { + LM_WARN("identical DB URLs, but different DB connection pid\n"); + return 0; + } return 1; } diff --git a/lib/srdb1/db_id.h b/lib/srdb1/db_id.h index 025855f..20ab846 100644 --- a/lib/srdb1/db_id.h +++ b/lib/srdb1/db_id.h @@ -40,6 +40,7 @@ struct db_id { char* host; /**< Host or IP, case insensitive */ unsigned short port; /**< Port number */ char* database; /**< Database, case sensitive */ + int pid; /**< Process ID (detect cross connections) */ };

14 years, 2 months

git:kamailio_3.0: drouting: do not call init child for PROC_INIT

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: 405466638c9cc6231614979f2e89e500d2a7a2fc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4054666… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 30 23:16:19 2010 +0100 drouting: do not call init child for PROC_INIT - avoid opening a database connection before forking - reported by several people in context of Postgress async lib calls (cherry picked from commit 907936449b2543966a5b3b2fe821d406c2293799) --- modules_k/drouting/drouting.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index a5cacf2..28a9d80 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -410,7 +410,7 @@ error: static int dr_child_init(int rank) { /* only workers needs DB connection */ - if (rank==PROC_MAIN || rank==PROC_TCP_MAIN) + if (rank==PROC_MAIN || rank==PROC_TCP_MAIN || rank==PROC_INIT) return 0; /* init DB connection */

14 years, 2 months

git:3.1: drouting: do not call init child for PROC_INIT

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 1e204f4bbcc84271f509838182539476577fc77a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e204f4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 30 23:16:19 2010 +0100 drouting: do not call init child for PROC_INIT - avoid opening a database connection before forking - reported by several people in context of Postgress async lib calls (cherry picked from commit 907936449b2543966a5b3b2fe821d406c2293799) --- modules_k/drouting/drouting.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index 45f36c2..aa09ef4 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -411,7 +411,7 @@ error: static int dr_child_init(int rank) { /* only workers needs DB connection */ - if (rank==PROC_MAIN || rank==PROC_TCP_MAIN) + if (rank==PROC_MAIN || rank==PROC_TCP_MAIN || rank==PROC_INIT) return 0; /* init DB connection */

14 years, 2 months

git:master: drouting: do not call init child for PROC_INIT

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 907936449b2543966a5b3b2fe821d406c2293799 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9079364… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 30 23:16:19 2010 +0100 drouting: do not call init child for PROC_INIT - avoid opening a database connection before forking - reported by several people in context of Postgress async lib calls --- modules_k/drouting/drouting.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index 45f36c2..aa09ef4 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -411,7 +411,7 @@ error: static int dr_child_init(int rank) { /* only workers needs DB connection */ - if (rank==PROC_MAIN || rank==PROC_TCP_MAIN) + if (rank==PROC_MAIN || rank==PROC_TCP_MAIN || rank==PROC_INIT) return 0; /* init DB connection */

14 years, 2 months

invalid type (3) or nul (0) version columns for trusted (kamailio 3.1 latest from git)

by Robert Verspuy

I've got a strange issue with the latest kamailio. I also had this problem with kamailio 3.0.3 downloaded from the webpage. I can start kamailio, but after a while (sometimes within one minuten, sometimes after an hour), I get the following log errors: Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [db.c:387]: invalid type (3) or nul (0) version columns for trusted Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [db.c:405]: querying version for table trusted Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: permissions [trusted.c:249]: error during table version check. Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [sr_module.c:832]: init_mod_child(): Error while initializing module permissions (//lib/kamailio/modules_k/permissions.so) Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [pt.c:481]: ERROR: fork_tcp_process(): init_child failed for process 10, pid 26621, "tcp receiver child=0" Oct 12 15:46:24 sp01 /sbin/kamailio[26621]: ERROR: <core> [tcp_main.c:4811]: ERROR: tcp_main: fork failed: Success Oct 12 15:46:24 sp01 /sbin/kamailio[26625]: : <core> [pass_fd.c:103]: ERROR: recv_all: 1st recv on 21 failed: Connection reset by peer Oct 12 15:46:24 sp01 /sbin/kamailio[26625]: : <core> [tcp_main.c:3323]: ERROR: handle_tcp_child: read from tcp child 0 (pid 26621, no 10) Connection reset by peer [104] Oct 12 15:46:24 sp01 /sbin/kamailio[26625]: : <core> [pass_fd.c:293]: ERROR: receive_fd: EOF on 19 Oct 12 15:46:24 sp01 /sbin/kamailio[26611]: ALERT: <core> [main.c:738]: child process 26621 exited normally, status=255 Oct 12 15:46:24 sp01 /sbin/kamailio[26611]: INFO: <core> [main.c:756]: INFO: terminating due to SIGCHLD Oct 12 15:46:24 sp01 /sbin/kamailio[26625]: INFO: <core> [main.c:807]: INFO: signal 15 received Looking at the error message, it thinks that the column type of table_version in the table version is a string (type 3), and it should be an int (type 1). But in the database it really is an int. When I run kamailio with debugging on level 5, I see that it's trying to run the "select table_version from version where table_name='trusted'" several times when kamailio starts (for every child thread). And then minutes, of even an hour later, it suddenly continues with that check, but based on a database response from another query. This is the "select password from subscriber ....etc...". And that column is indeed an string. I'm using PostgreSQL 8.4 as server, but maybe someone has seen this before, or now where I have to start looking? I first saw it yesterday when started to use the permissions module. I only see this with the trusted table, And always it uses the "select password from subscriber ... " response when giving this error. So is this an error in the permissions module / trusted.c file? or something in auth_db that's not freeing the response correctly? Strange thing is, that is sometimes happens very quick, and sometimes it can take an half hour or hour. I can mail the full log if anybody is interested and thinks he/she can help me. With kind regards, Robert Verspuy -- *Exa-Omicron* Patroonsweg 10 3892 DB Zeewolde Tel.: 088-OMICRON (66 427 66) http://www.exa-omicron.nl

14 years, 2 months

[kamailio 3.1.0]PostgreSQL + Permissions + DRouting: Concurrent db access fault on returning result set

by Giorgio Maria Santini

Hello everybody, We need to deploy kamailio with both drouting and permissions modules enabled. We are using kamailio 3.1.0 and we found, probably, a bug in one of the two modules (we don't know where) that cause kamailio to quit for an invalid table_version founded for table Permissions. First, I want to say that in table version there is the right record: kamailio=# select * from version where table_name='trusted'; LOG: statement: select * from version where table_name='trusted'; table_name | table_version ------------+--------------- trusted | 5 (1 row) Then, debugging I've found that kamailio do the right query, but returns a wrong recordset. Here a little snapshot of the debug: 1(2615) DEBUG: <core> [db.c:294]: connection 0x82bc910 found in pool 1(2615) DEBUG: db_postgres [km_dbase.c:149]: 0x82bc8f8 PQsendQuery(select gwid,address,strip,pri_prefix,type,attrs from dr_gateways ) ... .... 2(2616) DEBUG: db_postgres [km_dbase.c:149]: 0x82a74e8 PQsendQuery(select table_version from version where table_name='trusted') 2(2616) DEBUG: <core> [db_res.c:116]: allocate 28 bytes for result set at 0x82a7598 LOG: statement: select gwid,address,strip,pri_prefix,type,attrs from dr_gateways 2(2616) DEBUG: db_postgres [km_dbase.c:403]: 0x82a74e8 PQresultStatus(PGRES_TUPLES_OK) PQgetResult(0x870c010) 2(2616) DEBUG: db_postgres [km_res.c:108]: 6 columns returned from the query instead of saying "1 columns returned from the query" it returns the number of columns of the query launched in the other thread, I think. In this case "select gwid,address,strip,pri_prefix,type,attrs from dr_gateway" but it's not always the same query, sometimes returns the query of the usrloc, or other else. The strange is that it's happen only when Permissions and Drouting modules are enabled together. If I remove one of this, not depending on which one I choose, everything works ok. We absolutely need both modules working together, but this errors (a bug??) destroys our dreams of success :) Here is the complete log: 0(2614) DEBUG: db_postgres [km_pg_con.c:72]: opening connection: postgres://xxxx:xxxx@192.168.190.150:5432/kamailio 0(2614) DEBUG: db_postgres [km_pg_con.c:80]: PQsetdbLogin(0x8702520) 0(2614) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (-127): permissions 0(2614) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (-127): ldap 0(2614) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (-127): alias_db 0(2614) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (-127): domain 0(2614) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (-127): presence 0(2614) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (-127): presence_xml 0(2614) DEBUG: presence_xml [presence_xml.c:300]: [-127] pid [2614] 0(2614) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (-127): nathelper 0(2614) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (-127): mediaproxy 1(2615) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (1): mi_fifo 1(2615) DEBUG: <core> [sr_module.c:791]: DEBUG: init_mod_child (1): tm 1(2615) DEBUG: tm [callid.c:131]: DEBUG: callid: '5c94ff7d-2615(a)192.168.190.185' 1(2615) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (1): avpops 1(2615) DEBUG: <core> [db.c:294]: connection 0x82a7358 found in pool 1(2615) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (1): usrloc 1(2615) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (1): registrar 1(2615) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (1): uri_db 1(2615) DEBUG: <core> [db.c:294]: connection 0x82a7408 found in pool 1(2615) DEBUG: <core> [sr_module.c:791]: DEBUG: init_mod_child (1): ctl 1(2615) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (1): acc 1(2615) DEBUG: <core> [db.c:294]: connection 0x82bc668 found in pool 1(2615) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (1): drouting 1(2615) DEBUG: <core> [db.c:294]: connection 0x82bc910 found in pool 1(2615) DEBUG: db_postgres [km_dbase.c:149]: 0x82bc8f8 PQsendQuery(select gwid,address,strip,pri_prefix,type,attrs from dr_gateways ) 1(2615) DEBUG: <core> [db_res.c:116]: allocate 28 bytes for result set at 0x82a74e8 2(2616) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (2): mi_fifo 2(2616) DEBUG: <core> [sr_module.c:791]: DEBUG: init_mod_child (2): tm 2(2616) DEBUG: tm [callid.c:131]: DEBUG: callid: '5c94ff7d-2616(a)192.168.190.185' 2(2616) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (2): avpops 2(2616) DEBUG: <core> [db.c:294]: connection 0x82a7358 found in pool 2(2616) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (2): usrloc 2(2616) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (2): registrar 2(2616) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (2): uri_db 2(2616) DEBUG: <core> [db.c:294]: connection 0x82a7408 found in pool 2(2616) DEBUG: <core> [sr_module.c:791]: DEBUG: init_mod_child (2): ctl 2(2616) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (2): acc 2(2616) DEBUG: <core> [db.c:294]: connection 0x82bc668 found in pool 2(2616) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (2): drouting 2(2616) DEBUG: <core> [db.c:294]: connection 0x82bc910 found in pool 2(2616) DEBUG: <core> [sr_module.c:807]: DEBUG: init_mod_child (2): permissions 2(2616) DEBUG: <core> [db.c:294]: connection 0x82a7500 found in pool 2(2616) DEBUG: db_postgres [km_val.c:158]: PQescapeStringConn: in: 7 chars, out: 7 chars 2(2616) DEBUG: db_postgres [km_dbase.c:149]: 0x82a74e8 PQsendQuery(select table_version from version where table_name='trusted') 2(2616) DEBUG: <core> [db_res.c:116]: allocate 28 bytes for result set at 0x82a7598 LOG: statement: select gwid,address,strip,pri_prefix,type,attrs from dr_gateways 2(2616) DEBUG: db_postgres [km_dbase.c:403]: 0x82a74e8 PQresultStatus(PGRES_TUPLES_OK) PQgetResult(0x870c010) 2(2616) DEBUG: db_postgres [km_res.c:108]: 6 columns returned from the query 2(2616) DEBUG: <core> [db_res.c:153]: allocate 24 bytes for result names at 0x82a75c0 2(2616) DEBUG: <core> [db_res.c:163]: allocate 24 bytes for result types at 0x82a75e0 2(2616) DEBUG: db_postgres [km_res.c:126]: allocate 8 bytes for RES_NAMES[0] at 0x82a7600 2(2616) DEBUG: db_postgres [km_res.c:133]: RES_NAMES(0x82a7600)[0]=[gwid] 2(2616) DEBUG: db_postgres [km_res.c:140]: use DB1_INT result type 2(2616) DEBUG: db_postgres [km_res.c:126]: allocate 8 bytes for RES_NAMES[1] at 0x82a7610 2(2616) DEBUG: db_postgres [km_res.c:133]: RES_NAMES(0x82a7610)[1]=[address] 2(2616) DEBUG: db_postgres [km_res.c:166]: use DB1_STRING result type 2(2616) DEBUG: db_postgres [km_res.c:126]: allocate 8 bytes for RES_NAMES[2] at 0x82a7620 2(2616) DEBUG: db_postgres [km_res.c:133]: RES_NAMES(0x82a7620)[2]=[strip] 2(2616) DEBUG: db_postgres [km_res.c:140]: use DB1_INT result type 2(2616) DEBUG: db_postgres [km_res.c:126]: allocate 8 bytes for RES_NAMES[3] at 0x82a7630 2(2616) DEBUG: db_postgres [km_res.c:133]: RES_NAMES(0x82a7630)[3]=[pri_prefix] 2(2616) DEBUG: db_postgres [km_res.c:166]: use DB1_STRING result type 2(2616) DEBUG: db_postgres [km_res.c:126]: allocate 8 bytes for RES_NAMES[4] at 0x82a7640 2(2616) DEBUG: db_postgres [km_res.c:133]: RES_NAMES(0x82a7640)[4]=[type] 2(2616) DEBUG: db_postgres [km_res.c:140]: use DB1_INT result type 2(2616) DEBUG: db_postgres [km_res.c:126]: allocate 8 bytes for RES_NAMES[5] at 0x82a7650 2(2616) DEBUG: db_postgres [km_res.c:133]: RES_NAMES(0x82a7650)[5]=[attrs] 2(2616) DEBUG: db_postgres [km_res.c:166]: use DB1_STRING result type 2(2616) DEBUG: db_postgres [km_res.c:222]: allocate for 6 columns 24 bytes in row buffer at 0x82a7660 2(2616) DEBUG: <core> [db_res.c:182]: allocate 8 bytes for rows at 0x82a7680 2(2616) DEBUG: db_postgres [km_res.c:242]: PQgetvalue(0x82a74e8,0,0)=[1] 2(2616) DEBUG: db_postgres [km_res.c:251]: [0][0] Column[gwid]=[1] 2(2616) DEBUG: db_postgres [km_res.c:242]: PQgetvalue(0x82a74e8,0,1)=[192.168.190.150] 2(2616) DEBUG: db_postgres [km_res.c:251]: [0][1] Column[address]=[192.168.190.150] 2(2616) DEBUG: db_postgres [km_res.c:242]: PQgetvalue(0x82a74e8,0,2)=[2] 2(2616) DEBUG: db_postgres [km_res.c:251]: [0][2] Column[strip]=[2] 2(2616) DEBUG: db_postgres [km_res.c:242]: PQgetvalue(0x82a74e8,0,3)=[88] 2(2616) DEBUG: db_postgres [km_res.c:251]: [0][3] Column[pri_prefix]=[88] 2(2616) DEBUG: db_postgres [km_res.c:242]: PQgetvalue(0x82a74e8,0,4)=[0] 2(2616) DEBUG: db_postgres [km_res.c:251]: [0][4] Column[type]=[0] 2(2616) DEBUG: db_postgres [km_res.c:242]: PQgetvalue(0x82a74e8,0,5)=[] 2(2616) DEBUG: <core> [db_row.c:119]: allocate 120 bytes for row values at 0x82c17f8 2(2616) DEBUG: <core> [db_val.c:73]: converting INT [1] 2(2616) DEBUG: <core> [db_val.c:117]: converting STRING [192.168.190.150] 2(2616) DEBUG: <core> [db_val.c:127]: allocate 16 bytes memory for STRING at 0x82a7690 2(2616) DEBUG: <core> [db_val.c:73]: converting INT [2] 2(2616) DEBUG: <core> [db_val.c:117]: converting STRING [88] 2(2616) DEBUG: <core> [db_val.c:127]: allocate 3 bytes memory for STRING at 0x82c1878 2(2616) DEBUG: <core> [db_val.c:73]: converting INT [0] 2(2616) DEBUG: <core> [db_val.c:56]: converting NULL value 2(2616) DEBUG: db_postgres [km_res.c:266]: freeing row buffer at 0x82a7660 2(2616) DEBUG: db_postgres [km_dbase.c:302]: PQclear(0x870c010) result set 2(2616) DEBUG: <core> [db_res.c:79]: freeing 6 columns 2(2616) DEBUG: <core> [db_res.c:83]: freeing RES_NAMES[0] at 0x82a7600 2(2616) DEBUG: <core> [db_res.c:83]: freeing RES_NAMES[1] at 0x82a7610 2(2616) DEBUG: <core> [db_res.c:83]: freeing RES_NAMES[2] at 0x82a7620 2(2616) DEBUG: <core> [db_res.c:83]: freeing RES_NAMES[3] at 0x82a7630 2(2616) DEBUG: <core> [db_res.c:83]: freeing RES_NAMES[4] at 0x82a7640 2(2616) DEBUG: <core> [db_res.c:83]: freeing RES_NAMES[5] at 0x82a7650 2(2616) DEBUG: <core> [db_res.c:92]: freeing result names at 0x82a75c0 2(2616) DEBUG: <core> [db_res.c:97]: freeing result types at 0x82a75e0 2(2616) DEBUG: <core> [db_res.c:52]: freeing 1 rows 2(2616) DEBUG: <core> [db_row.c:68]: free VAL_STRING[1] '192.168.190.150' at 0x82a7690 2(2616) DEBUG: <core> [db_row.c:68]: free VAL_STRING[3] '88' at 0x82c1878 2(2616) DEBUG: <core> [db_row.c:97]: freeing row values at 0x82c17f8 2(2616) DEBUG: <core> [db_res.c:60]: freeing rows at 0x82a7680 2(2616) DEBUG: <core> [db_res.c:134]: freeing result set at 0x82a7598 2(2616) ERROR: <core> [db.c:408]: invalid version 1 for table trusted found, expected 5 (check table structure and table "version") 2(2616) ERROR: permissions [trusted.c:249]: error during table version check. 2(2616) DEBUG: <core> [db_pool.c:97]: connection still kept in the pool 2(2616) ERROR: <core> [sr_module.c:811]: init_mod_child(): Error while initializing module permissions 2(2616) ERROR: <core> [pt.c:332]: ERROR: fork_process(): init_child failed for process 2, pid 2616, "" 2(2616) : <core> [main.c:1439]: main_loop: Cannot fork Here is a snapshot of the configuration: #!ifdef WITH_SQL loadmodule "db_postgres.so" #loadmodule "sqlops" #!endif loadmodule "mi_fifo.so" loadmodule "kex.so" loadmodule "tm.so" loadmodule "tmx.so" loadmodule "sl.so" loadmodule "rr.so" loadmodule "pv.so" loadmodule "avpops.so" loadmodule "maxfwd.so" loadmodule "usrloc.so" loadmodule "registrar.so" loadmodule "textops.so" loadmodule "uri_db.so" loadmodule "siputils.so" loadmodule "xlog.so" loadmodule "sanity.so" loadmodule "ctl.so" loadmodule "mi_rpc.so" loadmodule "acc.so" loadmodule "enum.so" # ----------------- drouting module ------------------------------- loadmodule "drouting.so" # ----------------- permissions module ------------------------------- loadmodule "permissions.so" ... ... ... # ----- drouting params ----- modparam("drouting", "sort_order", 0) modparam("drouting", "use_domain", 1) modparam("drouting","db_url", "postgres://XXXX:YYYY@192.168.190.150:5432/kamailio") # ------ permissions ---- modparam("permissions", "default_allow_file", "/usr/local/etc/kamailio/permissions.allow") modparam("permissions", "default_deny_file", "/usr/local/etc/kamailio/permissions.deny") modparam("permissions", "db_url", "postgres://XXXX:YYYY@192.168.190.150:5432/kamailio") #modparam("permissions", "db_mode", 1) Commenting loadmodule "drouting.so" or loadmodule "permissions.so"(and modparam) lets all things work perfectly. Together, the error rise :( Thanks a Lot, Giorgio Maria Santini

14 years, 2 months

git:master: app_lua: doc updated with dispatcher sub-module

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 95f58d8c8bde444adf5078328714526cc5a9cca1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=95f58d8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 28 12:45:49 2010 +0100 app_lua: doc updated with dispatcher sub-module --- modules/app_lua/README | 2 ++ modules/app_lua/doc/app_lua_admin.xml | 6 ++++++ 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/README b/modules/app_lua/README index ae9cf02..8b45ce2 100644 --- a/modules/app_lua/README +++ b/modules/app_lua/README @@ -130,6 +130,8 @@ modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") * auth - register functions from auth module under 'sr.auth'. * auth_db - register functions from auth_db module under 'sr.auth_db'. + * dispatcher - register functions from dispatcher module under + 'sr.dispatcher'. * maxfwd - register functions from maxfwd module under 'sr.maxfwd'. * registrar - register functions from registrar module under 'sr.registrar'. diff --git a/modules/app_lua/doc/app_lua_admin.xml b/modules/app_lua/doc/app_lua_admin.xml index 5590569..70d92bf 100644 --- a/modules/app_lua/doc/app_lua_admin.xml +++ b/modules/app_lua/doc/app_lua_admin.xml @@ -123,6 +123,12 @@ modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") </listitem> <listitem> <para> + <emphasis>dispatcher</emphasis> - register functions from + dispatcher module under 'sr.dispatcher'. + </para> + </listitem> + <listitem> + <para> <emphasis>maxfwd</emphasis> - register functions from maxfwd module under 'sr.maxfwd'. </para>

14 years, 2 months

git:master: kex: documented is_myself(uri) function

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: be7c489da642888827a50c732f9b37bd57e52e14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=be7c489… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 28 13:39:02 2010 +0100 kex: documented is_myself(uri) function --- modules_k/kex/README | 37 ++++++++++++++++++++++++++++++------- modules_k/kex/doc/kex_admin.xml | 30 ++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 7 deletions(-) diff --git a/modules_k/kex/README b/modules_k/kex/README index 2c971f2..5f044e1 100644 --- a/modules_k/kex/README +++ b/modules_k/kex/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2009 Daniel-Constantin Mierla + Copyright © 2009 Daniel-Constantin Mierla __________________________________________________________________ Table of Contents @@ -37,6 +37,7 @@ Daniel-Constantin Mierla 3.9. resetdsturi() 3.10. isdsturiset() 3.11. pv_printf(var, str) + 3.12. is_myself(uri) 4. Exported MI Functions @@ -60,6 +61,7 @@ Daniel-Constantin Mierla 1.9. >resetdsturi usage 1.10. >isdsturiset usage 1.11. >pv_printf usage + 1.12. >is_myself usage Chapter 1. Admin Guide @@ -84,6 +86,7 @@ Chapter 1. Admin Guide 3.9. resetdsturi() 3.10. isdsturiset() 3.11. pv_printf(var, str) + 3.12. is_myself(uri) 4. Exported MI Functions @@ -129,6 +132,7 @@ Chapter 1. Admin Guide 3.9. resetdsturi() 3.10. isdsturiset() 3.11. pv_printf(var, str) + 3.12. is_myself(uri) 3.1. setsflag(flag) @@ -320,6 +324,25 @@ pv_printf("$ru", "sip:$rU@$fd"); pv_printf("$avp(x)", "From: $fU - To: $tU"); ... +3.12. is_myself(uri) + + Check if the parameter matches the 'myself' condition (i.e., is a local + IP or domain). + + Meaning of the parameters is as follows: + * uri - Valid SIP URI or IP address to check against the list of + local IP addresses or domains. The parameter value can contain + pseudo-variables. + + This function can be used from ANY_ROUTE. + + Example 1.12. >is_myself usage +... +if(is_myself("$fu")) { + ... +} +... + 4. Exported MI Functions 4.1. arg @@ -329,7 +352,7 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); 4.5. version 4.6. which -4.1. arg +4.1. arg Print command line arguments. @@ -341,7 +364,7 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); :arg:_reply_fifo_file_ _empty_line_ -4.2. kill +4.2. kill Kill the application. @@ -353,7 +376,7 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); :kill:_reply_fifo_file_ _empty_line_ -4.3. pwd +4.3. pwd Print working directory. @@ -365,7 +388,7 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); :pwd:_reply_fifo_file_ _empty_line_ -4.4. uptime +4.4. uptime Print uptime. @@ -377,7 +400,7 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); :uptime:_reply_fifo_file_ _empty_line_ -4.5. version +4.5. version Print version information. @@ -389,7 +412,7 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); :version:_reply_fifo_file_ _empty_line_ -4.6. which +4.6. which Print list of available MI commands. diff --git a/modules_k/kex/doc/kex_admin.xml b/modules_k/kex/doc/kex_admin.xml index 43475f3..41435eb 100644 --- a/modules_k/kex/doc/kex_admin.xml +++ b/modules_k/kex/doc/kex_admin.xml @@ -377,6 +377,36 @@ pv_printf("$avp(x)", "From: $fU - To: $tU"); </programlisting> </example> </section> + <section> + <title><function moreinfo="none">is_myself(uri)</function></title> + <para> + Check if the parameter matches the 'myself' condition (i.e., is + a local IP or domain). + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para> + <emphasis>uri</emphasis> - Valid SIP URI or IP address to + check against the list of local IP addresses or domains. + The parameter value can contain pseudo-variables. + </para> + </listitem> + </itemizedlist> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>>is_myself</function> usage</title> + <programlisting format="linespecific"> +... +if(is_myself("$fu")) { + ... +} +... +</programlisting> + </example> + </section> </section> <section>

14 years, 2 months

git:master: app_lua: exported disptacher API to Lua

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ef59a1b1176687c3b4cbe5f1639f83eefbea3feb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef59a1b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 28 12:38:44 2010 +0100 app_lua: exported disptacher API to Lua --- modules/app_lua/app_lua_exp.c | 174 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 174 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index ae86ab2..a062221 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -39,6 +39,7 @@ #include "../../modules_k/auth_db/api.h" #include "../../modules_k/maxfwd/api.h" #include "../../modules_k/registrar/api.h" +#include "../../modules_k/dispatcher/api.h" #include "app_lua_api.h" @@ -50,6 +51,7 @@ #define SR_LUA_EXP_MOD_AUTH_DB (1<<5) #define SR_LUA_EXP_MOD_MAXFWD (1<<6) #define SR_LUA_EXP_MOD_REGISTRAR (1<<7) +#define SR_LUA_EXP_MOD_DISPATCHER (1<<8) /** * @@ -67,6 +69,11 @@ static auth_api_s_t _lua_authb; static auth_db_api_t _lua_auth_dbb; /** + * dispatcher + */ +static dispatcher_api_t _lua_dispatcherb; + +/** * maxfwd */ static maxfwd_api_t _lua_maxfwdb; @@ -1072,6 +1079,158 @@ static const luaL_reg _sr_registrar_Map [] = { /** * */ +static int lua_sr_dispatcher_select(lua_State *L) +{ + int ret; + int setid; + int algid; + int mode; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_DISPATCHER)) + { + LM_WARN("weird: dispatcher function executed but module" + " not registered\n"); + return app_lua_return_error(L); + } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + if(lua_gettop(L)==3) + { + setid = lua_tointeger(L, -3); + algid = lua_tointeger(L, -2); + mode = lua_tointeger(L, -1); + } else if(lua_gettop(L)==2) { + setid = lua_tointeger(L, -2); + algid = lua_tointeger(L, -1); + mode = 0; + } else { + LM_WARN("invalid number of parameters from Lua\n"); + return app_lua_return_error(L); + } + ret = _lua_dispatcherb.select(env_L->msg, setid, algid, mode); + + return app_lua_return_int(L, ret); +} + +/** + * + */ +static int lua_sr_dispatcher_next(lua_State *L) +{ + int ret; + int mode; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_DISPATCHER)) + { + LM_WARN("weird: dispatcher function executed but module" + " not registered\n"); + return app_lua_return_error(L); + } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + mode = 0; + if(lua_gettop(L)==1) + { + /* mode given as parameter */ + mode = lua_tointeger(L, -1); + } + ret = _lua_dispatcherb.next(env_L->msg, mode); + + return app_lua_return_int(L, ret); +} + +/** + * + */ +static int lua_sr_dispatcher_mark(lua_State *L) +{ + int ret; + int mode; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_DISPATCHER)) + { + LM_WARN("weird: dispatcher function executed but module" + " not registered\n"); + return app_lua_return_error(L); + } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + mode = 0; + if(lua_gettop(L)==1) + { + /* mode given as parameter */ + mode = lua_tointeger(L, -1); + } + ret = _lua_dispatcherb.mark(env_L->msg, mode); + + return app_lua_return_int(L, ret); +} + +/** + * + */ +static int lua_sr_dispatcher_is_from(lua_State *L) +{ + int ret; + int mode; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_DISPATCHER)) + { + LM_WARN("weird: dispatcher function executed but module" + " not registered\n"); + return app_lua_return_error(L); + } + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + mode = -1; + if(lua_gettop(L)==1) + { + /* mode given as parameter */ + mode = lua_tointeger(L, -1); + } + ret = _lua_dispatcherb.is_from(env_L->msg, mode); + + return app_lua_return_int(L, ret); +} + +/** + * + */ +static const luaL_reg _sr_dispatcher_Map [] = { + {"select", lua_sr_dispatcher_select}, + {"next", lua_sr_dispatcher_next}, + {"mark", lua_sr_dispatcher_mark}, + {"is_from", lua_sr_dispatcher_is_from}, + {NULL, NULL} +}; + +/** + * + */ int lua_sr_exp_init_mod(void) { if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL) @@ -1160,6 +1319,16 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded registrar api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_DISPATCHER) + { + /* bind the DISPATCHER API */ + if (dispatcher_load_api(&_lua_dispatcherb) < 0) + { + LM_ERR("cannot bind to DISPATCHER API\n"); + return -1; + } + LM_DBG("loaded dispatcher api\n"); + } return 0; } @@ -1197,6 +1366,9 @@ int lua_sr_exp_register_mod(char *mname) } else if(len==9 && strcmp(mname, "registrar")==0) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_REGISTRAR; return 0; + } else if(len==10 && strcmp(mname, "dispatcher")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_DISPATCHER; + return 0; } return -1; @@ -1223,5 +1395,7 @@ void lua_sr_exp_openlibs(lua_State *L) luaL_openlib(L, "sr.maxfwd", _sr_maxfwd_Map, 0); if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_REGISTRAR) luaL_openlib(L, "sr.registrar", _sr_registrar_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_DISPATCHER) + luaL_openlib(L, "sr.dispatcher", _sr_dispatcher_Map, 0); }

14 years, 2 months

git:master: kex: added new function is_myself(uri)

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 8a88206ee66227657f827290df0e46119eedcd8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8a88206… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Nov 28 12:59:16 2010 +0100 kex: added new function is_myself(uri) - return true if given parameter matches 'myself' condition, the parameter can be a static string or pseduo-variables holding an IP or a SIP URI --- modules_k/kex/kex_mod.c | 38 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 38 insertions(+), 0 deletions(-) diff --git a/modules_k/kex/kex_mod.c b/modules_k/kex/kex_mod.c index d86cfbd..d0d7525 100644 --- a/modules_k/kex/kex_mod.c +++ b/modules_k/kex/kex_mod.c @@ -26,9 +26,11 @@ #include "../../sr_module.h" #include "../../dprint.h" +#include "../../forward.h" #include "../../flags.h" #include "../../dset.h" #include "../../mod_fix.h" +#include "../../parser/parse_uri.h" #include "flags.h" #include "km_core.h" @@ -42,6 +44,8 @@ MODULE_VERSION /** parameters */ /** module functions */ +int w_is_myself(struct sip_msg *msg, char *uri, str *s2); + static int mod_init(void); static void destroy(void); @@ -78,6 +82,8 @@ static cmd_export_t cmds[]={ 0, ANY_ROUTE }, {"avp_printf", (cmd_function)w_pv_printf, 2, pv_printf_fixup, 0, ANY_ROUTE }, + {"is_myself", (cmd_function)w_is_myself, 1, fixup_spve_null, + 0, ANY_ROUTE }, {0,0,0,0,0,0} }; @@ -128,3 +134,35 @@ static void destroy(void) } +/** + * + */ +int w_is_myself(struct sip_msg *msg, char *uri, str *s2) +{ + int ret; + str suri; + struct sip_uri puri; + + if(fixup_get_svalue(msg, (gparam_p)uri, &suri)!=0) + { + LM_ERR("cannot get the URI parameter\n"); + return -1; + } + if(suri.len>4 && (strncmp(suri.s, "sip:", 4)==0 + || strncmp(suri.s, "sips:", 5)==0)) + { + if(parse_uri(suri.s, suri.len, &puri)!=0) + { + LM_ERR("failed to parse uri [%.*s]\n", suri.len, suri.s); + return -1; + } + ret = check_self(&puri.host, (puri.port.s)?puri.port_no:0, + (puri.transport_val.s)?puri.proto:0); + } else { + ret = check_self(&suri, 0, 0); + } + if(ret!=1) + return -1; + return 1; +} +

14 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev