sr-dev

sr-dev@lists.kamailio.org

15 participants
45310 discussions

git:master: sqlops: documented new sqlres module parameter
by Daniel-Constantin Mierla 15 Nov '10

15 Nov '10

Module: sip-router Branch: master Commit: 26947fe82b8917d41174f0aa45665569bbd7e1dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26947fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 22:36:40 2010 +0100 sqlops: documented new sqlres module parameter --- modules_k/sqlops/README | 47 +++++++++++++++++++++++---------- modules_k/sqlops/doc/sqlops_admin.xml | 27 +++++++++++++++++- 2 files changed, 58 insertions(+), 16 deletions(-) diff --git a/modules_k/sqlops/README b/modules_k/sqlops/README index a14a40a..902f709 100644 --- a/modules_k/sqlops/README +++ b/modules_k/sqlops/README @@ -11,7 +11,7 @@ Daniel-Constantin Mierla <miconda(a)gmail.com> - Copyright � 2008 http://www.asipto.com + Copyright © 2008 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -27,6 +27,7 @@ Daniel-Constantin Mierla 3. Exported Parameters 3.1. sqlcon (str) + 3.2. sqlres (str) 4. Exported Functions @@ -40,9 +41,10 @@ Daniel-Constantin Mierla List of Examples 1.1. Set sqlcon parameter - 1.2. sql_query() usage - 1.3. sql_result_free() usage - 1.4. $dbr(result=>key) usage + 1.2. Set sqlres parameter + 1.3. sql_query() usage + 1.4. sql_result_free() usage + 1.5. $dbr(result=>key) usage Chapter 1. Admin Guide @@ -57,6 +59,7 @@ Chapter 1. Admin Guide 3. Exported Parameters 3.1. sqlcon (str) + 3.2. sqlres (str) 4. Exported Functions @@ -81,7 +84,7 @@ Chapter 1. Admin Guide * access via pseudo-variables - the content of the SQL query result is accessible via pseudo-variables. Please note that only integer and string variables are supported at the moment because of the - internal usage of "AVPs" to hold the values. So its not possible + internal usage of “AVPs” to hold the values. So it is not possible for example to return floating point or big integer values this way. * array indexes - fast access to result values via array position: @@ -108,6 +111,7 @@ Chapter 1. Admin Guide 3. Exported Parameters 3.1. sqlcon (str) + 3.2. sqlres (str) 3.1. sqlcon (str) @@ -118,7 +122,7 @@ Chapter 1. Admin Guide This parameter may be set multiple times to get many DB connections in the same configuration file. * connection_name - string specifying the name of a DB connection. - This string is used by the "sql_query()" function to refer to the + This string is used by the “sql_query()” function to refer to the DB connection. * database_url - Standardized database URL used to connect to database. @@ -131,16 +135,31 @@ modparam("sqlops","sqlcon","cb=>mysql://openser:abc@10.10.1.1/testdb") modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... +3.2. sqlres (str) + + The definition of a DB result ID. The value of the parameter can be any + string. Results IDs are also added at fixup time when sql_query() + parameters are parsed, there is no need to decalare them via module + parameter unless you want to use them from within other modules and be + available in all application processes. + + Default value is NULL. + + Example 1.2. Set sqlres parameter +... +modparam("sqlops", "sqlres", "ra") +... + 4. Exported Functions 4.1. sql_query(connection, query, result) 4.2. sql_result_free(result) -4.1. sql_query(connection, query, result) +4.1. sql_query(connection, query, result) Make a SQL query using 'connection' and store data in 'result'. * connection - the name of the connection to be used for query - (defined via the "sqlcon" parameter). + (defined via the “sqlcon” parameter). * query - SQL query string or pseudo-variables containing SQL query. * result - string name to identify the result. Will be used by $dbr(...) pseudo-variable to access result attributes. @@ -148,7 +167,7 @@ modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.2. sql_query() usage + Example 1.3. sql_query() usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -157,14 +176,14 @@ xlog("number of rows in table domain: $dbr(ra=>rows)\n"); sql_result_free("ra"); ... -4.2. sql_result_free(result) +4.2. sql_result_free(result) Free data in SQL 'result'. This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, ONREPLY_ROUTE, BRANCH_ROUTE. - Example 1.3. sql_result_free() usage + Example 1.4. sql_result_free() usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... @@ -182,10 +201,10 @@ sql_result_free("ra"); Access hash table entries. - The "result" must be the name identifying a SQL result (third parameter + The “result” must be the name identifying a SQL result (third parameter of sql_query(...)). - The "key" can be: + The “key” can be: * rows - return the number of rows in query result * cols - return the number of columns in the result. * [row,col] - return the value at position (row,col) in the result @@ -193,7 +212,7 @@ sql_result_free("ra"); integer. * colname[N] - return the name of the N-th column in the result set. - Example 1.4. $dbr(result=>key) usage + Example 1.5. $dbr(result=>key) usage ... modparam("sqlops","sqlcon","ca=>dbdriver://username:password@dbhost/dbname") ... diff --git a/modules_k/sqlops/doc/sqlops_admin.xml b/modules_k/sqlops/doc/sqlops_admin.xml index 0c0a444..997a457 100644 --- a/modules_k/sqlops/doc/sqlops_admin.xml +++ b/modules_k/sqlops/doc/sqlops_admin.xml @@ -43,8 +43,8 @@ of the SQL query result is accessible via pseudo-variables. Please note that only integer and string variables are supported at the moment because of the internal usage of <quote>AVPs</quote> to hold - the values. So its not possible for example to return floating point - or big integer values this way. + the values. So it is not possible for example to return floating + point or big integer values this way. </para> </listitem> <listitem> @@ -143,6 +143,29 @@ modparam("sqlops","sqlcon","ca=>&exampledb;") </programlisting> </example> </section> + <section> + <title><varname>sqlres</varname> (str)</title> + <para> + The definition of a DB result ID. The value of the parameter can be + any string. Results IDs are also added at fixup time when sql_query() + parameters are parsed, there is no need to decalare them via module + parameter unless you want to use them from within other modules and be + available in all application processes. + </para> + <para> + <emphasis> + Default value is NULL. + </emphasis> + </para> + <example> + <title>Set <varname>sqlres</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("sqlops", "sqlres", "ra") +... +</programlisting> + </example> + </section> </section> <section> <title>Exported Functions</title>

1 0

git:master: app_lua: exported first TM functions to Lua
by Daniel-Constantin Mierla 15 Nov '10

15 Nov '10

Module: sip-router Branch: master Commit: a0f8762f139ca907a199219e3bab7d656ca2731a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0f8762… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 19:41:20 2010 +0100 app_lua: exported first TM functions to Lua - you can call t_reply() and t_relay() natively in Lua via sr.tm.t_reply(code, reason) and sr.tm.t_relay() --- modules/app_lua/app_lua_exp.c | 113 ++++++++++++++++++++++++++++++++++++++--- 1 files changed, 105 insertions(+), 8 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index e2cd272..2cc1a91 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -31,10 +31,12 @@ #include "../../ut.h" #include "../../modules/sl/sl.h" +#include "../../modules/tm/tm_load.h" #include "app_lua_api.h" #define SR_LUA_EXP_MOD_SL (1<<0) +#define SR_LUA_EXP_MOD_TM (1<<1) /** * @@ -47,6 +49,11 @@ static unsigned int _sr_lua_exp_reg_mods = 0; static sl_api_t _lua_slb; /** + * tm + */ +static tm_api_t _lua_tmb; + +/** * */ static int lua_sr_sl_send_reply (lua_State *L) @@ -61,26 +68,27 @@ static int lua_sr_sl_send_reply (lua_State *L) if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL)) { LM_WARN("weird: sl function executed but module not registered\n"); - return 0; + return app_lua_return_false(L); } code = lua_tointeger(L, -2); - if(code<100 || code>=700) - return 0; + if(code<100 || code>=800) + return app_lua_return_false(L); txt.s = (char*)lua_tostring(L, -1); - if(txt.s!=NULL || env_L->msg==NULL) + if(txt.s!=NULL && env_L->msg!=NULL) { txt.len = strlen(txt.s); ret = _lua_slb.freply(env_L->msg, code, &txt); if(ret<0) { LM_WARN("sl send_reply returned false\n"); - return 0; + return app_lua_return_false(L); } + return app_lua_return_true(L); } - return 0; + return app_lua_return_false(L); } /** @@ -97,13 +105,13 @@ static int lua_sr_sl_get_reply_totag (lua_State *L) if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL)) { LM_WARN("weird: sl function executed but module not registered\n"); - return 0; + return app_lua_return_false(L); } ret = _lua_slb.get_reply_totag(env_L->msg, &txt); if(ret<0) { LM_WARN("sl get_reply_totag returned false\n"); - return 0; + return app_lua_return_false(L); } lua_pushlstring(L, txt.s, txt.len); return 1; @@ -121,6 +129,79 @@ static const luaL_reg _sr_sl_Map [] = { /** * */ +static int lua_sr_tm_t_reply(lua_State *L) +{ + char *txt; + int code; + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_false(L); + } + + code = lua_tointeger(L, -2); + + if(code<100 || code>=800) + return app_lua_return_false(L); + + txt = (char*)lua_tostring(L, -1); + if(txt!=NULL && env_L->msg!=NULL) + { + ret = _lua_tmb.t_reply(env_L->msg, code, txt); + if(ret<0) + { + LM_WARN("tm t_reply returned false\n"); + /* shall push FALSE to Lua ?!? */ + return app_lua_return_false(L); + } + return app_lua_return_true(L); + } + return app_lua_return_false(L); +} + +/** + * + */ +static int lua_sr_tm_t_relay(lua_State *L) +{ + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM)) + { + LM_WARN("weird: tm function executed but module not registered\n"); + return app_lua_return_false(L); + } + ret = _lua_tmb.t_relay(env_L->msg, NULL, NULL); + if(ret<0) + { + LM_WARN("tm t_relay returned false\n"); + return app_lua_return_false(L); + } + return app_lua_return_true(L); +} + + +/** + * + */ +static const luaL_reg _sr_tm_Map [] = { + {"t_reply", lua_sr_tm_t_reply}, + {"t_relay", lua_sr_tm_t_relay}, + {NULL, NULL} +}; + + +/** + * + */ int lua_sr_exp_init_mod(void) { if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL) @@ -132,6 +213,16 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded sl api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM) + { + /* bind the TM API */ + if (tm_load_api(&_lua_tmb) == -1) + { + LM_ERR("cannot bind to TM API\n"); + return -1; + } + LM_DBG("loaded tm api\n"); + } return 0; } @@ -148,7 +239,11 @@ int lua_sr_exp_register_mod(char *mname) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_SL; return 0; + } else if(len==2 && strcmp(mname, "tm")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_TM; + return 0; } + return -1; } @@ -159,6 +254,8 @@ void lua_sr_exp_openlibs(lua_State *L) { if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SL) luaL_openlib(L, "sr.sl", _sr_sl_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_TM) + luaL_openlib(L, "sr.tm", _sr_tm_Map, 0); }

1 0

git:master: tm: small wrapper for exporting API
by Daniel-Constantin Mierla 15 Nov '10

15 Nov '10

Module: sip-router Branch: master Commit: bffe87d58679020d26a650fbd0535536a0213096 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bffe87d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 19:33:05 2010 +0100 tm: small wrapper for exporting API - tm_load_api() added as wrapper to load_tm_api() to match the common pattern for naming module exporting API functions --- modules/tm/tm_load.h | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules/tm/tm_load.h b/modules/tm/tm_load.h index 5436914..e4829ac 100644 --- a/modules/tm/tm_load.h +++ b/modules/tm/tm_load.h @@ -131,10 +131,12 @@ struct tm_binds { #endif }; +typedef struct tm_binds tm_api_t; + extern int tm_init; typedef int(*load_tm_f)( struct tm_binds *tmb ); -int load_tm( struct tm_binds *tmb); +int load_tm(struct tm_binds *tmb); static inline int load_tm_api(struct tm_binds* tmb) @@ -156,4 +158,9 @@ static inline int load_tm_api(struct tm_binds* tmb) return 0; } +static inline int tm_load_api(tm_api_t *tmb) +{ + return load_tm_api(tmb); +} + #endif

1 0

git:master: app_lua: added helper functions to return true/false to Lua
by Daniel-Constantin Mierla 15 Nov '10

15 Nov '10

Module: sip-router Branch: master Commit: e15ef088980a6d6898a6a93b872fa620fab85d42 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e15ef08… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 15 19:36:25 2010 +0100 app_lua: added helper functions to return true/false to Lua --- modules/app_lua/app_lua_api.c | 24 +++++++++++++++++++++--- modules/app_lua/app_lua_api.h | 4 ++++ 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/modules/app_lua/app_lua_api.c b/modules/app_lua/app_lua_api.c index 1673f5e..c4bdfea 100644 --- a/modules/app_lua/app_lua_api.c +++ b/modules/app_lua/app_lua_api.c @@ -276,10 +276,28 @@ int lua_sr_initialized(void) */ int app_lua_return_boolean(lua_State *L, int b) { - if(b==0) - lua_pushboolean(L, 0); + if(b==SRLUA_FALSE) + lua_pushboolean(L, SRLUA_FALSE); else - lua_pushboolean(L, 1); + lua_pushboolean(L, SRLUA_TRUE); + return 1; +} + +/** + * + */ +int app_lua_return_false(lua_State *L) +{ + lua_pushboolean(L, SRLUA_FALSE); + return 1; +} + +/** + * + */ +int app_lua_return_true(lua_State *L) +{ + lua_pushboolean(L, SRLUA_TRUE); return 1; } diff --git a/modules/app_lua/app_lua_api.h b/modules/app_lua/app_lua_api.h index 51ebc15..a813a91 100644 --- a/modules/app_lua/app_lua_api.h +++ b/modules/app_lua/app_lua_api.h @@ -55,7 +55,11 @@ int app_lua_runstring(struct sip_msg *msg, char *script); int app_lua_run(struct sip_msg *msg, char *func, char *p1, char *p2, char *p3); +#define SRLUA_FALSE 0 +#define SRLUA_TRUE 1 int app_lua_return_boolean(lua_State *L, int b); +int app_lua_return_false(lua_State *L); +int app_lua_return_true(lua_State *L); void app_lua_dump_stack(lua_State *L);

1 0

git:3.1: pkg/debian: add libgeoip version requirements
by Jon Bonilla 12 Nov '10

12 Nov '10

Module: sip-router Branch: 3.1 Commit: f2ab4d53b7d22ff15e7f4d2d5d88bbcf005f5194 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2ab4d5… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Fri Nov 12 13:13:38 2010 +0100 pkg/debian: add libgeoip version requirements reported by Klaus Darilion (cherry picked from commit e1e6ddb22dc8487517a61653ea7d21d3086122cc) --- pkg/kamailio/deb/debian/control | 2 +- pkg/kamailio/deb/lucid/control | 2 +- pkg/kamailio/deb/squeeze/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 1f44925..302a40a 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -2,7 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev (>= 1.4.5) Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/deb/lucid/control b/pkg/kamailio/deb/lucid/control index 1f44925..302a40a 100644 --- a/pkg/kamailio/deb/lucid/control +++ b/pkg/kamailio/deb/lucid/control @@ -2,7 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev (>= 1.4.5) Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index ab4ad1e..22992e0 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -2,7 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev (>= 1.4.5), libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

1 0

git:master: pkg/debian: add libgeoip version requirements
by Jon Bonilla 12 Nov '10

12 Nov '10

Module: sip-router Branch: master Commit: e1e6ddb22dc8487517a61653ea7d21d3086122cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e1e6ddb… Author: Jon Bonilla <manwe(a)aholab.ehu.es> Committer: Jon Bonilla <manwe(a)aholab.ehu.es> Date: Fri Nov 12 13:13:38 2010 +0100 pkg/debian: add libgeoip version requirements reported by Klaus Darilion --- pkg/kamailio/deb/debian/control | 2 +- pkg/kamailio/deb/lucid/control | 2 +- pkg/kamailio/deb/squeeze/control | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kamailio/deb/debian/control b/pkg/kamailio/deb/debian/control index 1f44925..302a40a 100644 --- a/pkg/kamailio/deb/debian/control +++ b/pkg/kamailio/deb/debian/control @@ -2,7 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev (>= 1.4.5) Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/deb/lucid/control b/pkg/kamailio/deb/lucid/control index 1f44925..302a40a 100644 --- a/pkg/kamailio/deb/lucid/control +++ b/pkg/kamailio/deb/lucid/control @@ -2,7 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libpurple-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev, libgeoip-dev (>= 1.4.5) Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/ diff --git a/pkg/kamailio/deb/squeeze/control b/pkg/kamailio/deb/squeeze/control index ab4ad1e..22992e0 100644 --- a/pkg/kamailio/deb/squeeze/control +++ b/pkg/kamailio/deb/squeeze/control @@ -2,7 +2,7 @@ Source: kamailio Section: net Priority: optional Maintainer: Jon Bonilla <manwe(a)aholab.ehu.es> -Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev, libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev +Build-Depends: debhelper (>= 5), dpatch, libmysqlclient-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19), xsltproc, libconfuse-dev, libldap2-dev, libssl-dev, libcurl3-openssl-dev, python, libpcre3-dev, docbook-xml, libgeoip-dev (>= 1.4.5), libmemcache-dev, libreadline-dev, liblua5.1-0-dev, python-dev, libsasl2-dev Standards-Version: 3.8.0 Homepage: http://www.kamailio.org/

1 0

Debian GeoIP Dependency
by Klaus Darilion 12 Nov '10

12 Nov '10

Hi! make deb on stable fails as geoip module needs at least libgeoip 1.4.5 - because of GeoIP_range_by_ip(). Thus libgeoip needs to be installed form backports. MAybe we should adopt the control file to check for libgeoip version regards Klaus

2 1

git:master: sanity: note about different behavior based on autodrop
by Daniel-Constantin Mierla 12 Nov '10

12 Nov '10

Module: sip-router Branch: master Commit: 4a0b559062b70c1c089c1ea9908eaae60679ad04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a0b559… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 12 12:22:20 2010 +0100 sanity: note about different behavior based on autodrop --- modules/sanity/README | 15 +++++++++------ modules/sanity/doc/functions.xml | 12 +++++++----- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/modules/sanity/README b/modules/sanity/README index a3e4ce1..0442064 100644 --- a/modules/sanity/README +++ b/modules/sanity/README @@ -20,7 +20,7 @@ Nils Ohlmeier 1.4. Functions - 1.4.1. sanity_check() + 1.4.1. sanity_check([msg_checks [, uri_checks]]) 1.1. Overview @@ -136,12 +136,15 @@ modparam("sanity", "autodrop", 1) Revision History Revision $Revision$ $Date$ -1.4.1. sanity_check() +1.4.1. sanity_check([msg_checks [, uri_checks]]) - This function makes a row of sanity checks on the given request. The - function returns false (-1) if one of the checks failed. If one of the - checks fails the module sends a precise error reply via sl_send_reply. - Thus there is no need to reply with a generic error message. + This function makes a row of sanity checks over the given SIP request. + The behavior of the function is also controled by 'autodrop' parameter. + If autodrop=0, the function returns false (-1) if one of the checks + failed. When autodrop=1, the function stops the execution of + configuration file. In both cases, ff one of the checks fails the + module sends a precise error reply via SL send_reply(). Thus there is + no need to reply with a generic error message. Example 5. sanity_check usage ... diff --git a/modules/sanity/doc/functions.xml b/modules/sanity/doc/functions.xml index ea9cf1d..f3cfa85 100644 --- a/modules/sanity/doc/functions.xml +++ b/modules/sanity/doc/functions.xml @@ -22,13 +22,15 @@ <section id="sanity_check"> <title> - <function>sanity_check()</function> + <function>sanity_check([msg_checks [, uri_checks]])</function> </title> <para> - This function makes a row of sanity checks on the given request. - The function returns false (-1) if one of the checks failed. If one - of the checks fails the module sends a precise error reply via - sl_send_reply. Thus there is no need to reply with a generic + This function makes a row of sanity checks over the given SIP request. The + behavior of the function is also controled by 'autodrop' parameter. + If autodrop=0, the function returns false (-1) if one of the checks failed. + When autodrop=1, the function stops the execution of configuration file. + In both cases, ff one of the checks fails the module sends a precise error + reply via SL send_reply(). Thus there is no need to reply with a generic error message. </para> <example>

1 0

git:master: dispatcher(k): more verbose logs for MI ds_reload
by Daniel-Constantin Mierla 12 Nov '10

12 Nov '10

Module: sip-router Branch: master Commit: 72c052a94ce3a5fd2baefc74861d797c1a404a1a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=72c052a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 12 12:52:27 2010 +0100 dispatcher(k): more verbose logs for MI ds_reload - if the command is disabled, print error message to syslog with some hints --- modules_k/dispatcher/dispatcher.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 3f8f229..59fe0bb 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -451,7 +451,8 @@ static int mod_init(void) return -1; register_timer(ds_ht_timer, NULL, ds_hash_check_interval); } else { - LM_ERR("call load dispatching AVP set but no size of hash table\n"); + LM_ERR("call load dispatching DSTID_AVP set but no size" + " for hash table\n"); return -1; } } @@ -716,6 +717,8 @@ static struct mi_root* ds_mi_list(struct mi_root* cmd_tree, void* param) static struct mi_root* ds_mi_reload(struct mi_root* cmd_tree, void* param) { if(dstid_avp_name.n!=0) { + LM_ERR("No reload support when call load dispatching is enabled." + " Do not set dstid_avp param if you do not use alg 10.\n"); return init_mi_tree(500, MI_ERR_DSLOAD, MI_ERR_DSLOAD_LEN); }

1 0

git:master: dispatcher(k): note about disabling MI ds_reload
by Daniel-Constantin Mierla 12 Nov '10

12 Nov '10

Module: sip-router Branch: master Commit: e1371192357f889c35003ea28d0eb2351e27f84d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e137119… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 12 12:26:26 2010 +0100 dispatcher(k): note about disabling MI ds_reload - the MI command ds_reload is disabled for call load based dispatching (algorithm 10) --- modules_k/dispatcher/README | 5 ++++- modules_k/dispatcher/doc/dispatcher_admin.xml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/README b/modules_k/dispatcher/README index 781e499..1c747c9 100644 --- a/modules_k/dispatcher/README +++ b/modules_k/dispatcher/README @@ -857,7 +857,10 @@ onreply_route { 5.3. ds_reload - It reloads the groups and included destinations. + It reloads the groups and included destinations. The command is + disabled for call load based dispatching (algorithm 10) since removal + of destinations may leave the list of active calls with broken + references. Name: ds_reload diff --git a/modules_k/dispatcher/doc/dispatcher_admin.xml b/modules_k/dispatcher/doc/dispatcher_admin.xml index b05403a..ae857fd 100644 --- a/modules_k/dispatcher/doc/dispatcher_admin.xml +++ b/modules_k/dispatcher/doc/dispatcher_admin.xml @@ -1069,7 +1069,10 @@ onreply_route { <function moreinfo="none">ds_reload</function> </title> <para> - It reloads the groups and included destinations. + It reloads the groups and included destinations. The command is + disabled for call load based dispatching (algorithm 10) since + removal of destinations may leave the list of active + calls with broken references. </para> <para> Name: <emphasis>ds_reload</emphasis>

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev