sr-dev November 2010

sr-dev@lists.kamailio.org

17 participants
108 discussions

invalid type (3) or nul (0) version columns for trusted (kamailio 3.1 latest from git)
by Robert Verspuy 30 Nov '10

30 Nov '10

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 … [View More]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 [View Less]

3 9

[kamailio 3.1.0]PostgreSQL + Permissions + DRouting: Concurrent db access fault on returning result set
by Giorgio Maria Santini 30 Nov '10

30 Nov '10

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'; … [View More]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 [View Less]

2 1

git:master: kex: added new function is_myself(uri)
by Daniel-Constantin Mierla 28 Nov '10

28 Nov '10

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 … [View More]

1 0

git:master: app_lua: exported disptacher API to Lua
by Daniel-Constantin Mierla 28 Nov '10

28 Nov '10

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 … [View More]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); } [View Less]

1 0

git:master: kex: documented is_myself(uri) function
by Daniel-Constantin Mierla 28 Nov '10

28 Nov '10

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 ++… [View More]++++++++++++++++++++++++++++ 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> [View Less]

1 0

git:master: app_lua: doc updated with dispatcher sub-module
by Daniel-Constantin Mierla 28 Nov '10

28 Nov '10

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 … [View More]

1 0

about contact params
by Juha Heinanen 27 Nov '10

27 Nov '10

i noticed that if i add ;alias param to contact header that does not surround its contact uri in <>s like this: Contact: sip:foo@bar;alias=value then some sip entities interpret ;alias as header param rather than uri param. so i went and added <>s if they are not present resulting to this: Contact: <sip:foo@bar;alias=value> i have tried to figure out from rfc3261 what kind of param ;alias is in the first example, but have not found the answer. looks like it is … [View More]

3 11

git:master: dispatcher(k): exported inter-module API
by Daniel-Constantin Mierla 26 Nov '10

26 Nov '10

Module: sip-router Branch: master Commit: 86e03df9b1dbac5be70747bcd9f57a97fe5256c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86e03df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Nov 27 00:04:17 2010 +0100 dispatcher(k): exported inter-module API --- modules_k/dispatcher/api.h | 75 +++++++++++++++++++++++++++++++++++++ modules_k/dispatcher/dispatch.c | … [View More]13 ++++++ modules_k/dispatcher/dispatcher.c | 3 + 3 files changed, 91 insertions(+), 0 deletions(-) diff --git a/modules_k/dispatcher/api.h b/modules_k/dispatcher/api.h new file mode 100644 index 0000000..7171b0c --- /dev/null +++ b/modules_k/dispatcher/api.h @@ -0,0 +1,75 @@ +/** + * $Id$ + * + * dispatcher module + * + * Copyright (C) 2004-2006 FhG Fokus + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +/*! \file + * \ingroup dispatcher + * \brief Dispatcher :: API + */ + +#ifndef _DISPATCHER_API_H_ +#define _DISPATCHER_API_H_ + +#include "../../sr_module.h" + +typedef int (*ds_select_dst_f)(struct sip_msg *msg, int set, + int alg, int mode); +typedef int (*ds_next_dst_f)(struct sip_msg *msg, int mode); +typedef int (*ds_mark_dst_f)(struct sip_msg *msg, int mode); + +typedef int (*ds_is_from_list_f)(struct sip_msg *_m, int group); + +typedef struct dispatcher_api { + ds_select_dst_f select; + ds_next_dst_f next; + ds_mark_dst_f mark; + ds_is_from_list_f is_from; +} dispatcher_api_t; + +typedef int (*bind_dispatcher_f)(dispatcher_api_t* api); +int bind_dispatcher(dispatcher_api_t* api); + +/** + * @brief Load the dispatcher API + */ +static inline int dispatcher_load_api(dispatcher_api_t *api) +{ + bind_dispatcher_f binddispatcher; + + binddispatcher = (bind_dispatcher_f)find_export("bind_dispatcher", 0, 0); + if(binddispatcher == 0) { + LM_ERR("cannot find bind_dispatcher\n"); + return -1; + } + if(binddispatcher(api)<0) + { + LM_ERR("cannot bind dispatcher api\n"); + return -1; + } + return 0; +} + + +#endif + diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 46b7b03..bcd7f7c 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -71,6 +71,7 @@ #include "../../str.h" #include "ds_ht.h" +#include "api.h" #include "dispatch.h" #define DS_TABLE_VERSION 1 @@ -2374,3 +2375,15 @@ void ds_ht_timer(unsigned int ticks, void *param) return; } +int bind_dispatcher(dispatcher_api_t* api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->select = ds_select_dst; + api->next = ds_next_dst; + api->mark = ds_mark_dst; + api->is_from = ds_is_from_list; + return 0; +} diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 59fe0bb..ab412a6 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -66,6 +66,7 @@ #include "ds_ht.h" #include "dispatch.h" #include "config.h" +#include "api.h" MODULE_VERSION @@ -180,6 +181,8 @@ static cmd_export_t cmds[]={ 0, 0, ANY_ROUTE}, {"ds_load_update", (cmd_function)w_ds_load_update, 0, 0, 0, ANY_ROUTE}, + {"bind_dispatcher", (cmd_function)bind_dispatcher, 0, + 0, 0, 0}, {0,0,0,0,0,0} }; [View Less]

1 0

git:master: htable: exported inter-module API
by Daniel-Constantin Mierla 26 Nov '10

26 Nov '10

Module: sip-router Branch: master Commit: 6b2081df15344300ccdeda67c5447a512920fe98 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b2081d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 26 22:42:46 2010 +0100 htable: exported inter-module API --- modules_k/htable/api.c | 128 +++++++++++++++++++++++++++++++++++++++++++++ modules_k/htable/api.h | 73 ++++++++++++… [View More]+++++++++++++ modules_k/htable/htable.c | 18 +++--- 3 files changed, 210 insertions(+), 9 deletions(-) diff --git a/modules_k/htable/api.c b/modules_k/htable/api.c new file mode 100644 index 0000000..4a2d0df --- /dev/null +++ b/modules_k/htable/api.c @@ -0,0 +1,128 @@ +/** + * $Id$ + * + * Copyright (C) 2008 Elena-Ramona Modroiu (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * openser is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * openser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include <stdio.h> +#include <string.h> +#include <stdlib.h> + +#include "../../dprint.h" + +#include "ht_api.h" +#include "api.h" + +/** + * + */ +int ht_api_set_cell(str *hname, str *name, int type, + int_str *val, int mode) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + return ht_set_cell(ht, name, type, val, mode); +} + +/** + * + */ +int ht_api_del_cell(str *hname, str *name) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + return ht_del_cell(ht, name); +} + +/** + * + */ +int ht_api_set_cell_expire(str *hname, str *name, + int type, int_str *val) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + return ht_set_cell_expire(ht, name, type, val); +} + +/** + * + */ +int ht_api_get_cell_expire(str *hname, str *name, + unsigned int *val) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + return ht_get_cell_expire(ht, name, val); +} + +/** + * + */ +int ht_api_rm_cell_re(str *hname, str *sre, int mode) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + if(ht_rm_cell_re(sre, ht, mode /* 0 - name; 1 - value */)<0) + return -1; + return 0; +} + +/** + * + */ +int ht_api_count_cells_re(str *hname, str *sre, int mode) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + if(ht_count_cells_re(sre, ht, mode /* 0 - name; 1 - value */)<0) + return -1; + return 0; +} + +/** + * + */ +int bind_htable(htable_api_t* api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->set = ht_api_set_cell; + api->rm = ht_api_del_cell; + api->set_expire = ht_api_set_cell_expire; + api->get_expire = ht_api_get_cell_expire; + api->rm_re = ht_api_rm_cell_re; + api->count_re = ht_api_count_cells_re; + return 0; +} + diff --git a/modules_k/htable/api.h b/modules_k/htable/api.h new file mode 100644 index 0000000..868abf2 --- /dev/null +++ b/modules_k/htable/api.h @@ -0,0 +1,73 @@ +/** + * $Id$ + * + * Copyright (C) 2008 Elena-Ramona Modroiu (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * openser is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * openser is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _HT_MOD_API_H_ +#define _HT_MOD_API_H_ + +#include "../../sr_module.h" +#include "../../usr_avp.h" + +typedef int (*ht_api_set_cell_f)(str *hname, str *name, int type, + int_str *val, int mode); +typedef int (*ht_api_del_cell_f)(str *hname, str *name); + +typedef int (*ht_api_set_cell_expire_f)(str *hname, str *name, + int type, int_str *val); +typedef int (*ht_api_get_cell_expire_f)(str *hname, str *name, + unsigned int *val); + +typedef int (*ht_api_rm_cell_re_f)(str *hname, str *sre, int mode); +typedef int (*ht_api_count_cells_re_f)(str *hname, str *sre, int mode); + +typedef struct htable_api { + ht_api_set_cell_f set; + ht_api_del_cell_f rm; + ht_api_set_cell_expire_f set_expire; + ht_api_get_cell_expire_f get_expire; + ht_api_rm_cell_re_f rm_re; + ht_api_count_cells_re_f count_re; +} htable_api_t; + +typedef int (*bind_htable_f)(htable_api_t* api); +int bind_htable(htable_api_t* api); + +/** + * @brief Load the Sanity API + */ +static inline int htable_load_api(htable_api_t *api) +{ + bind_htable_f bindhtable; + + bindhtable = (bind_htable_f)find_export("bind_htable", 0, 0); + if(bindhtable == 0) { + LM_ERR("cannot find bind_htable\n"); + return -1; + } + if(bindhtable(api)<0) + { + LM_ERR("cannot bind htable api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 85d238b..ac01e32 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -42,6 +42,7 @@ #include "ht_api.h" #include "ht_db.h" #include "ht_var.h" +#include "api.h" MODULE_VERSION @@ -86,15 +87,14 @@ static mi_export_t mi_cmds[] = { static cmd_export_t cmds[]={ - {"sht_print", (cmd_function)ht_print, 0, 0, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | ERROR_ROUTE | LOCAL_ROUTE}, - {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_rm, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | ERROR_ROUTE | LOCAL_ROUTE}, - {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_rm, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | ERROR_ROUTE | LOCAL_ROUTE}, + {"sht_print", (cmd_function)ht_print, 0, 0, 0, + ANY_ROUTE}, + {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_rm, 0, + ANY_ROUTE}, + {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_rm, 0, + ANY_ROUTE}, + {"bind_htable", (cmd_function)bind_htable, 0, 0, 0, + ANY_ROUTE}, {0,0,0,0,0,0} }; [View Less]

1 0

[tracker] Comment added: $Ts returns wrong timestamp
by sip-router 26 Nov '10

26 Nov '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#105 - $Ts returns wrong timestamp User who did this - Alex Hermann (axlh) ---------- Ok, that explains the first case in technical terms. Logically i still find it strange the $Ts in failure_route is not the same as the one in request_route because it is supposed to handle the same message/request. The 2nd case of the timestamp being from an entirely different message is a bit more worrying. Besides … [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2010