sr-dev February 2012

sr-dev@lists.kamailio.org

24 participants
117 discussions

git:master: xlog: restructure functions
by Klaus Darilion 26 Feb '12

26 Feb '12

Module: sip-router Branch: master Commit: 8831d195c8edfb021f288eb685d8621512dcb3fe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8831d19… Author: Klaus Darilion <klaus.mailinglists(a)pernau.at> Committer: klaus darilion <darilion(a)gucci.labs.nic.at> Date: Sun Feb 26 19:04:56 2012 +0100 xlog: restructure functions - restructure functions for better readability, no code changes --- modules_k/xlog/xlog.c | 42 +++++++++++++++++++++--------------------- 1 files changed, 21 insertions(+), 21 deletions(-) diff --git a/modules_k/xlog/xlog.c b/modules_k/xlog/xlog.c index 0412b25..28e6926 100644 --- a/modules_k/xlog/xlog.c +++ b/modules_k/xlog/xlog.c @@ -195,6 +195,17 @@ static int xlog_1(struct sip_msg* msg, char* frm, char* str2) } /** + * print log message to L_ERR level along with cfg line + */ +static int xlogl_1(struct sip_msg* msg, char* frm, char* str2) +{ + if(!is_printable(L_ERR)) + return 1; + + return xlog_helper(msg, (xl_msg_t*)frm, L_ERR, 1); +} + +/** * print log message to level given in parameter */ static int xlog_2(struct sip_msg* msg, char* lev, char* frm) @@ -224,27 +235,6 @@ static int xlog_2(struct sip_msg* msg, char* lev, char* frm) } /** - * print log message to L_DBG level - */ -static int xdbg(struct sip_msg* msg, char* frm, char* str2) -{ - if(!is_printable(L_DBG)) - return 1; - return xlog_helper(msg, (xl_msg_t*)frm, L_DBG, 0); -} - -/** - * print log message to L_ERR level along with cfg line - */ -static int xlogl_1(struct sip_msg* msg, char* frm, char* str2) -{ - if(!is_printable(L_ERR)) - return 1; - - return xlog_helper(msg, (xl_msg_t*)frm, L_ERR, 1); -} - -/** * print log message to level given in parameter along with cfg line */ static int xlogl_2(struct sip_msg* msg, char* lev, char* frm) @@ -274,6 +264,16 @@ static int xlogl_2(struct sip_msg* msg, char* lev, char* frm) } /** + * print log message to L_DBG level + */ +static int xdbg(struct sip_msg* msg, char* frm, char* str2) +{ + if(!is_printable(L_DBG)) + return 1; + return xlog_helper(msg, (xl_msg_t*)frm, L_DBG, 0); +} + +/** * print log message to L_DBG level along with cfg line */ static int xdbgl(struct sip_msg* msg, char* frm, char* str2)

1 0

t_newtran + dialog
by Brandon Armstead 25 Feb '12

25 Feb '12

Hello, It seems as if I am still experiencing this issue with Kamailio 3.2.0 as described below in Flyspray. http://sip-router.org/tracker/index.php?do=details&task_id=189 It seems if I call t_newtran() before dlg_manage() then dlg_manage does not work correctly. It also seems as if the reverse is not working correctly either. Any thoughts / ideas on how I can absorb re-transmissions and keep the dlg_manage functionality? I'm having issues where signaling is getting messed up due to race conditions / re-transmitted packets that are being processed. Look forward to hearing back from you. Thanks for your help in advance! Sincerely, Brandon Armstead

2 1

git:master: dialog: should be ok to use dlg_manage() after transaction was created
by Daniel-Constantin Mierla 25 Feb '12

25 Feb '12

Module: sip-router Branch: master Commit: 7a8ad6740c244d48911f0216f6baac4804ea2f3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7a8ad67… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 25 14:16:53 2012 +0100 dialog: should be ok to use dlg_manage() after transaction was created --- modules_k/dialog/dialog.c | 24 ++++-------------------- modules_k/dialog/dlg_handlers.c | 37 ++++++++++++++++++++++++++++++++++++- modules_k/dialog/dlg_handlers.h | 5 +++++ 3 files changed, 45 insertions(+), 21 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index b89eb9b..17d7894 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -933,28 +933,12 @@ static int w_dlg_isflagset(struct sip_msg *msg, char *flag, str *s2) return (dctx->flags&(1<<val))?1:-1; } +/** + * + */ static int w_dlg_manage(struct sip_msg *msg, char *s1, char *s2) { - str tag; - int backup_mode; - - if( (msg->to==NULL && parse_headers(msg, HDR_TO_F,0)<0) || msg->to==NULL ) - { - LM_ERR("bad TO header\n"); - return -1; - } - tag = get_to(msg)->tag_value; - if(tag.s!=0 && tag.len!=0) - { - backup_mode = seq_match_mode; - seq_match_mode = SEQ_MATCH_NO_ID; - dlg_onroute(msg, NULL, NULL); - seq_match_mode = backup_mode; - } else { - if(dlg_new_dialog(msg, 0, initial_cbs_inscript)!=0) - return -1; - } - return 1; + return dlg_manage(msg); } static int w_dlg_bye(struct sip_msg *msg, char *side, char *s2) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 4df4744..e8a7e88 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -762,7 +762,7 @@ static void unref_new_dialog(void *iuid) * \param run_initial_cbs if set zero, initial callbacks are not executed * \return 0 on success, -1 on failure */ -int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cbs) +int dlg_new_dialog(sip_msg_t *req, struct cell *t, const int run_initial_cbs) { dlg_cell_t *dlg; str s; @@ -1470,3 +1470,38 @@ void dlg_run_event_route(dlg_cell_t *dlg, sip_msg_t *msg, int ostate, int nstate dlg_unref(dlg, 1); } } + +int dlg_manage(sip_msg_t *msg) +{ + str tag; + int backup_mode; + dlg_cell_t *dlg = NULL; + tm_cell_t *t = NULL; + + if( (msg->to==NULL && parse_headers(msg, HDR_TO_F,0)<0) || msg->to==NULL ) + { + LM_ERR("bad TO header\n"); + return -1; + } + tag = get_to(msg)->tag_value; + if(tag.s!=0 && tag.len!=0) + { + backup_mode = seq_match_mode; + seq_match_mode = SEQ_MATCH_NO_ID; + dlg_onroute(msg, NULL, NULL); + seq_match_mode = backup_mode; + } else { + t = d_tmb.t_gett(); + if(t==T_UNDEFINED) + t = NULL; + if(dlg_new_dialog(msg, t, initial_cbs_inscript)!=0) + return -1; + dlg = dlg_get_ctx_dialog(); + if(dlg==NULL) + return -1; + if(t!=NULL) + dlg_set_tm_callbacks(t, msg, dlg, spiral_detected); + dlg_release(dlg); + } + return 1; +} diff --git a/modules_k/dialog/dlg_handlers.h b/modules_k/dialog/dlg_handlers.h index 1149241..f296437 100644 --- a/modules_k/dialog/dlg_handlers.h +++ b/modules_k/dialog/dlg_handlers.h @@ -177,4 +177,9 @@ dlg_iuid_t *dlg_get_iuid_shm_clone(dlg_cell_t *dlg); */ void dlg_iuid_sfree(void *iuid); +/*! + * + */ +int dlg_manage(sip_msg_t *msg); + #endif

1 0

git:master: sqlops: exported sql_xquery() via inter-module API
by Daniel-Constantin Mierla 25 Feb '12

25 Feb '12

Module: sip-router Branch: master Commit: 7fceaf17a4d3e7bef9767e8e5cbcfaa3f85e0406 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7fceaf1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 25 11:25:52 2012 +0100 sqlops: exported sql_xquery() via inter-module API - sql_do_xquery() split to add a function that takes str parameters --- modules_k/sqlops/sql_api.c | 69 +++++++++++++++++++++++++++++++++----------- modules_k/sqlops/sql_api.h | 10 ++++-- modules_k/sqlops/sqlops.c | 16 ++++------ 3 files changed, 65 insertions(+), 30 deletions(-) diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index cdf6452..c02ac81 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -408,33 +408,22 @@ error: } #ifdef WITH_XAVP -int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, - pv_elem_t *res) +int sql_exec_xquery(struct sip_msg *msg, sql_con_t *con, str *query, + str *xavp) { db1_res_t* db_res = NULL; sr_xavp_t *row = NULL; sr_xval_t val; int i, j; - str sv, xavp; + str sv; - if(msg==NULL || query==NULL || res==NULL) + if(msg==NULL || query==NULL || xavp==NULL) { LM_ERR("bad parameters\n"); return -1; } - if(pv_printf_s(msg, query, &sv)!=0) - { - LM_ERR("cannot print the sql query\n"); - return -1; - } - - if(pv_printf_s(msg, res, &xavp)!=0) - { - LM_ERR("cannot print the result parameter\n"); - return -1; - } - if(con->dbf.raw_query(con->dbh, &sv, &db_res)!=0) + if(con->dbf.raw_query(con->dbh, query, &db_res)!=0) { LM_ERR("cannot do the query\n"); return -1; @@ -529,7 +518,7 @@ int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, val.type = SR_XTYPE_XAVP; val.v.xavp = row; LM_DBG("Adding row\n"); - xavp_add_value(&xavp, &val, NULL); + xavp_add_value(xavp, &val, NULL); } con->dbf.free_result(con->dbh, db_res); @@ -540,6 +529,30 @@ error: return -1; } + +int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, + pv_elem_t *res) +{ + str sv, xavp; + if(msg==NULL || query==NULL || res==NULL) + { + LM_ERR("bad parameters\n"); + return -1; + } + if(pv_printf_s(msg, query, &sv)!=0) + { + LM_ERR("cannot print the sql query\n"); + return -1; + } + + if(pv_printf_s(msg, res, &xavp)!=0) + { + LM_ERR("cannot print the result parameter\n"); + return -1; + } + return sql_exec_xquery(msg, con, &sv, &xavp); +} + #endif @@ -831,3 +844,25 @@ void sqlops_reset_result(str *sres) return; } + +/** + * + */ +int sqlops_do_xquery(sip_msg_t *msg, str *scon, str *squery, str *xavp) +{ + sql_con_t *con = NULL; + + con = sql_get_connection(scon); + if(con==NULL) + { + LM_ERR("invalid connection [%.*s]\n", scon->len, scon->s); + goto error; + } + if(sql_exec_xquery(msg, con, squery, xavp)<0) + goto error; + + return 0; +error: + return -1; +} + diff --git a/modules_k/sqlops/sql_api.h b/modules_k/sqlops/sql_api.h index 94c30a2..504a1ab 100644 --- a/modules_k/sqlops/sql_api.h +++ b/modules_k/sqlops/sql_api.h @@ -74,12 +74,12 @@ int sql_connect(void); int sql_do_query(sql_con_t *con, str *query, sql_result_t *res); #ifdef WITH_XAVP -int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, +int sql_do_xquery(sip_msg_t *msg, sql_con_t *con, pv_elem_t *query, pv_elem_t *res); #endif -int sql_do_pvquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, +int sql_do_pvquery(sip_msg_t *msg, sql_con_t *con, pv_elem_t *query, pvname_list_t *res); -int pv_get_sqlrows(struct sip_msg *msg, pv_param_t *param, +int pv_get_sqlrows(sip_msg_t *msg, pv_param_t *param, pv_value_t *res); int pv_parse_con_name(pv_spec_p sp, str *in); @@ -109,6 +109,9 @@ int sqlops_num_rows(str *sres); typedef void (*sqlops_reset_result_f)(str *sres); void sqlops_reset_result(str *sres); +typedef int (*sqlops_do_xquery_f)(sip_msg_t *msg, str *scon, str *squery, str *sxavp); +int sqlops_do_xquery(sip_msg_t *msg, str *scon, str *squery, str *sxavp); + typedef struct sqlops_api { sqlops_do_query_f query; sqlops_get_value_f value; @@ -117,6 +120,7 @@ typedef struct sqlops_api { sqlops_reset_result_f reset; sqlops_num_rows_f nrows; sqlops_num_columns_f ncols; + sqlops_do_xquery_f xquery; } sqlops_api_t; typedef int (*bind_sqlops_f)(sqlops_api_t* api); diff --git a/modules_k/sqlops/sqlops.c b/modules_k/sqlops/sqlops.c index 3029747..695c6c5 100644 --- a/modules_k/sqlops/sqlops.c +++ b/modules_k/sqlops/sqlops.c @@ -90,22 +90,17 @@ static pv_export_t mod_pvs[] = { static cmd_export_t cmds[]={ {"sql_query", (cmd_function)sql_query, 3, fixup_sql_query, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + ANY_ROUTE}, {"sql_query", (cmd_function)sql_query2, 2, fixup_sql_query, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + ANY_ROUTE}, #ifdef WITH_XAVP {"sql_xquery", (cmd_function)sql_xquery, 3, fixup_sql_xquery, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + ANY_ROUTE}, #endif {"sql_pvquery", (cmd_function)sql_pvquery, 3, fixup_sql_pvquery, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + ANY_ROUTE}, {"sql_result_free", (cmd_function)sql_rfree, 1, fixup_sql_rfree, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, + ANY_ROUTE}, {"bind_sqlops", (cmd_function)bind_sqlops, 0, 0, 0, 0}, {0,0,0,0,0,0} }; @@ -426,6 +421,7 @@ static int bind_sqlops(sqlops_api_t* api) api->reset = sqlops_reset_result; api->nrows = sqlops_num_rows; api->ncols = sqlops_num_columns; + api->xquery = sqlops_do_xquery; return 0; }

1 0

git:master: app_lua: sql_xquery() from sqlops exported to Lua API
by Daniel-Constantin Mierla 25 Feb '12

25 Feb '12

Module: sip-router Branch: master Commit: 4bf91a743281ce17812a1f38e8ecccfcae038122 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4bf91a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Feb 25 11:31:26 2012 +0100 app_lua: sql_xquery() from sqlops exported to Lua API --- modules/app_lua/app_lua_exp.c | 42 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 42 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index 5c4b412..70dc11d 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -776,6 +776,47 @@ static int lua_sr_sqlops_reset(lua_State *L) /** * */ +static int lua_sr_sqlops_xquery(lua_State *L) +{ + str scon; + str squery; + str sres; + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_SQLOPS)) + { + LM_WARN("weird: sqlops 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); + } + + scon.s = (char*)lua_tostring(L, -3); + squery.s = (char*)lua_tostring(L, -2); + sres.s = (char*)lua_tostring(L, -1); + if(scon.s == NULL || squery.s == NULL || sres.s == NULL) + { + LM_WARN("invalid parameters from Lua\n"); + return app_lua_return_error(L); + } + scon.len = strlen(scon.s); + squery.len = strlen(squery.s); + sres.len = strlen(sres.s); + + ret = _lua_sqlopsb.xquery(env_L->msg, &scon, &squery, &sres); + return app_lua_return_int(L, ret); +} + +/** + * + */ static const luaL_reg _sr_sqlops_Map [] = { {"query", lua_sr_sqlops_query}, {"value", lua_sr_sqlops_value}, @@ -784,6 +825,7 @@ static const luaL_reg _sr_sqlops_Map [] = { {"nrows", lua_sr_sqlops_nrows}, {"ncols", lua_sr_sqlops_ncols}, {"reset", lua_sr_sqlops_reset}, + {"xquery", lua_sr_sqlops_xquery}, {NULL, NULL} };

1 0

[ openser-Bugs-1605410 ] Installation problems while creating mysql dbase
by SourceForge.net 25 Feb '12

25 Feb '12

Bugs item #1605410, was opened at 2006-11-29 09:56 Message generated for change (Comment added) made by You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=1605410&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: tools Group: None Status: Closed Resolution: Fixed Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Bogdan-Andrei Iancu (bogdan_iancu) Summary: Installation problems while creating mysql dbase Initial Comment: Trying to execute scripts/mysqldb.sh: omega1 scripts # sh ./mysqldb.sh create MySql password for root: creating database openser ... ERROR 1071 (42000) at line 106: Specified key was too long; max key length is 1000 bytes The problem is in primary key of 'location' table: omega1 scripts # mysql -u root -h localhost -p Enter password: Welcome to the MySQL monitor. Commands end with ; or \g. Your MySQL connection id is 1212 to server version: 4.1.20-log Type 'help;' or '\h' for help. Type '\c' to clear the buffer. mysql> connect test; Reading table information for completion of table and column names You can turn off this feature to get a quicker startup with -A Connection id: 1213 Current database: test mysql> CREATE TABLE location ( -> username varchar(64) NOT NULL default '', -> domain varchar(128) NOT NULL default '', -> contact varchar(255) NOT NULL default '', -> received varchar(255) default NULL, -> path varchar(255) default NULL, -> expires datetime NOT NULL default '2020-05-28 21:32:15', -> q float(10,2) NOT NULL default '1.0', -> callid varchar(255) NOT NULL default 'Default-Call-ID', -> cseq int(11) NOT NULL default '42', -> last_modified datetime NOT NULL default "1900-01-01 00:00", -> flags int(11) NOT NULL default '0', -> user_agent varchar(255) NOT NULL default '', -> socket varchar(128) default NULL, -> methods int(11) default NULL, -> PRIMARY KEY(username, domain, contact) -> ) TYPE=MyISAM; ERROR 1071 (42000): Specified key was too long; max key length is 1000 bytes OS/mySQL versions: omega1 scripts # uname -a Linux omega1 2.6.15-gentoo-r5 #1 SMP Thu May 4 10:27:42 Local time zone must be set--see zic m x86_64 AMD Opteron(tm) Processor 248 AuthenticAMD GNU/Linux omega1 scripts # mysqladmin version -p Enter password: mysqladmin Ver 8.41 Distrib 4.1.20, for pc-linux-gnu on x86_64 Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB This software comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to modify and redistribute it under the GPL license Server version 4.1.20-log Protocol version 10 Connection Localhost via UNIX socket UNIX socket /var/run/mysqld/mysqld.sock Uptime: 20 days 14 min 38 sec Threads: 7 Questions: 146329 Slow queries: 0 Opens: 59 Flush tables: 1 Open tables: 19 Queries per second avg: 0.085 ---------------------------------------------------------------------- Comment By: Jethro () Date: 2012-02-24 23:33 Message: Nevermind. ---------------------------------------------------------------------- Comment By: Jethro () Date: 2012-02-24 23:30 Message: This is no longer an issue in recent versions of MySQL. Please revert this patch so as to remove this archaic restriction. ---------------------------------------------------------------------- Comment By: Bogdan-Andrei Iancu (bogdan_iancu) Date: 2006-12-05 10:52 Message: Logged In: YES user_id=1275325 Originator: NO Patch from Alex applied on CVS. Thanks Alex! regards, bogdan ---------------------------------------------------------------------- Comment By: Bogdan-Andrei Iancu (bogdan_iancu) Date: 2006-12-05 03:12 Message: Logged In: YES user_id=1275325 Originator: NO Hi Alex, thanks for the patch and your explanation, nice job :) - I will apply the patch and also I will take care in the near feature to change the primary keys to all tables. Thanks and regards, Bogdan PS: could you please provide the patch in unified format? ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2006-12-01 10:02 Message: Logged In: NO 2 bogdan_iancu: Greetings! Of course, as it's suggested in RDBMS theory (or concepts) - every table should have field ID as unique number getting from auto increment sequence. If you do so - it will be right enhancement, but will not solve the problem, because you still need to guarantee unique of whole those fields. It can be reached only with using UNIQUE mysql constraint which is also have the same limitation on max length in bytes. The most proper solution will be next one: 1) Test, what's the character encoding is used in database. 2) If it's a UCS-2 or UTF8 (where 3 bytes per char are used) then warn user that db couldn't be created and prompt him to select another character encoding among available. 3) In a "CREATE DATABASE" use closure "CHARACTER SET" Here is mysqldb.sh.patch file - that's do it. Please apply it on mysqldb.sh and include patched file into future version. Sincerely yours, Khalukhin Alex <khalukhin(a)gmail.com> ---------------------- << CUT_HERE << ------------------------- 236a237,254 > db_charset_test() > { > CURRCHARSET=`echo "show variables like '%character_set_server%'" | $CMD "-p$PW" | awk '{print $2}' | sed -e 1d` > ALLCHARSETS=`echo "show character set" | $CMD "-p$PW" | awk '{print $1}' | sed -e 1d | grep -ivE utf8\|ucs2` > while [ `echo "$ALLCHARSETS" | grep -icw $CURRCHARSET` = "0" ] > do > echo "Your current default mysql characters set cannot be used to create DB. Please choice another one from the following list:" > echo "$ALLCHARSETS" > echo -n "Enter character set name: " > read CURRCHARSET > if [ `echo $CURRCHARSET | grep -cE "\w+"` = "0" ]; then > echo "can't continue: user break" > exit 1 > fi > done > export CHARSET=$CURRCHARSET > } > 244a263,264 > db_charset_test > 248c268 < create database $1; --- > create database $1 character set $CHARSET; ---------------------- << CUT_HERE << ------------------------- ---------------------------------------------------------------------- Comment By: Bogdan-Andrei Iancu (bogdan_iancu) Date: 2006-12-01 03:28 Message: Logged In: YES user_id=1275325 Originator: NO Hi, not sure if "DEFAULT CHARACTER SET LATIN1" is standard enough to be directly forced by the installation script - I'm not a mysql expert to know if the LATIN1 set will be present on all mysql servers. The long term solution wil be to change the primary keys of all tables to int auto-increment - this will secondary solve this issue also. regards, bogdan ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2006-11-29 11:25 Message: Logged In: NO 2bogdan_iancu: Thanks for providing me this info - it will be helpful for me to solve problem. But I still want to ask you - is there any way to find out what's the encoding is used in database? So why don't you include such kind of testing in this script or just explictly set character set for each table? For example: mysql> CREATE TABLE location ( -> username varchar(64) NOT NULL default '', -> domain varchar(128) NOT NULL default '', -> contact varchar(255) NOT NULL default '', -> received varchar(255) default NULL, -> path varchar(255) default NULL, -> expires datetime NOT NULL default '2020-05-28 21:32:15', -> q float(10,2) NOT NULL default '1.0', -> callid varchar(255) NOT NULL default 'Default-Call-ID', -> cseq int(11) NOT NULL default '42', -> last_modified datetime NOT NULL default "1900-01-01 00:00", -> flags int(11) NOT NULL default '0', -> user_agent varchar(255) NOT NULL default '', -> socket varchar(128) default NULL, -> methods int(11) default NULL, -> PRIMARY KEY(username, domain, contact) -> ) TYPE=MyISAM; ERROR 1071 (42000): Specified key was too long; max key length is 1000 bytes mysql> CREATE TABLE location ( -> username varchar(64) NOT NULL default '', -> domain varchar(128) NOT NULL default '', -> contact varchar(255) NOT NULL default '', -> received varchar(255) default NULL, -> path varchar(255) default NULL, -> expires datetime NOT NULL default '2020-05-28 21:32:15', -> q float(10,2) NOT NULL default '1.0', -> callid varchar(255) NOT NULL default 'Default-Call-ID', -> cseq int(11) NOT NULL default '42', -> last_modified datetime NOT NULL default "1900-01-01 00:00", -> flags int(11) NOT NULL default '0', -> user_agent varchar(255) NOT NULL default '', -> socket varchar(128) default NULL, -> methods int(11) default NULL, -> PRIMARY KEY(username, domain, contact) -> ) TYPE=MyISAM DEFAULT CHARACTER SET LATIN1; Query OK, 0 rows affected, 1 warning (0.00 sec) ---------------------------------------------------------------------- Comment By: Bogdan-Andrei Iancu (bogdan_iancu) Date: 2006-11-29 10:19 Message: Logged In: YES user_id=1275325 Originator: NO Hi, actually it is not a bug in openser, but a bug related to mysql. This was already reporded some time ago and thanks to Norman Brandinger <norm(a)goes.com>, here is the answer: "Perhaps the problem is related to the fact that UTF-8 uses 3-bytes to save a character. This issue was discussed at: http://bugs.mysql.com/bug.php?id=4541 If the datbase encoding is UTF-8, then this will be important to you." visit also: http://openser.org/pipermail/users/2006-November/007738.html regards, bogdan ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=1605410&group_…

1 0

[ openser-Bugs-1605410 ] Installation problems while creating mysql dbase
by SourceForge.net 25 Feb '12

25 Feb '12

Bugs item #1605410, was opened at 2006-11-29 09:56 Message generated for change (Comment added) made by You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=1605410&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: tools Group: None Status: Closed Resolution: Fixed Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Bogdan-Andrei Iancu (bogdan_iancu) Summary: Installation problems while creating mysql dbase Initial Comment: Trying to execute scripts/mysqldb.sh: omega1 scripts # sh ./mysqldb.sh create MySql password for root: creating database openser ... ERROR 1071 (42000) at line 106: Specified key was too long; max key length is 1000 bytes The problem is in primary key of 'location' table: omega1 scripts # mysql -u root -h localhost -p Enter password: Welcome to the MySQL monitor. Commands end with ; or \g. Your MySQL connection id is 1212 to server version: 4.1.20-log Type 'help;' or '\h' for help. Type '\c' to clear the buffer. mysql> connect test; Reading table information for completion of table and column names You can turn off this feature to get a quicker startup with -A Connection id: 1213 Current database: test mysql> CREATE TABLE location ( -> username varchar(64) NOT NULL default '', -> domain varchar(128) NOT NULL default '', -> contact varchar(255) NOT NULL default '', -> received varchar(255) default NULL, -> path varchar(255) default NULL, -> expires datetime NOT NULL default '2020-05-28 21:32:15', -> q float(10,2) NOT NULL default '1.0', -> callid varchar(255) NOT NULL default 'Default-Call-ID', -> cseq int(11) NOT NULL default '42', -> last_modified datetime NOT NULL default "1900-01-01 00:00", -> flags int(11) NOT NULL default '0', -> user_agent varchar(255) NOT NULL default '', -> socket varchar(128) default NULL, -> methods int(11) default NULL, -> PRIMARY KEY(username, domain, contact) -> ) TYPE=MyISAM; ERROR 1071 (42000): Specified key was too long; max key length is 1000 bytes OS/mySQL versions: omega1 scripts # uname -a Linux omega1 2.6.15-gentoo-r5 #1 SMP Thu May 4 10:27:42 Local time zone must be set--see zic m x86_64 AMD Opteron(tm) Processor 248 AuthenticAMD GNU/Linux omega1 scripts # mysqladmin version -p Enter password: mysqladmin Ver 8.41 Distrib 4.1.20, for pc-linux-gnu on x86_64 Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB This software comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to modify and redistribute it under the GPL license Server version 4.1.20-log Protocol version 10 Connection Localhost via UNIX socket UNIX socket /var/run/mysqld/mysqld.sock Uptime: 20 days 14 min 38 sec Threads: 7 Questions: 146329 Slow queries: 0 Opens: 59 Flush tables: 1 Open tables: 19 Queries per second avg: 0.085 ---------------------------------------------------------------------- Comment By: Jethro () Date: 2012-02-24 23:30 Message: This is no longer an issue in recent versions of MySQL. Please revert this patch so as to remove this archaic restriction. ---------------------------------------------------------------------- Comment By: Bogdan-Andrei Iancu (bogdan_iancu) Date: 2006-12-05 10:52 Message: Logged In: YES user_id=1275325 Originator: NO Patch from Alex applied on CVS. Thanks Alex! regards, bogdan ---------------------------------------------------------------------- Comment By: Bogdan-Andrei Iancu (bogdan_iancu) Date: 2006-12-05 03:12 Message: Logged In: YES user_id=1275325 Originator: NO Hi Alex, thanks for the patch and your explanation, nice job :) - I will apply the patch and also I will take care in the near feature to change the primary keys to all tables. Thanks and regards, Bogdan PS: could you please provide the patch in unified format? ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2006-12-01 10:02 Message: Logged In: NO 2 bogdan_iancu: Greetings! Of course, as it's suggested in RDBMS theory (or concepts) - every table should have field ID as unique number getting from auto increment sequence. If you do so - it will be right enhancement, but will not solve the problem, because you still need to guarantee unique of whole those fields. It can be reached only with using UNIQUE mysql constraint which is also have the same limitation on max length in bytes. The most proper solution will be next one: 1) Test, what's the character encoding is used in database. 2) If it's a UCS-2 or UTF8 (where 3 bytes per char are used) then warn user that db couldn't be created and prompt him to select another character encoding among available. 3) In a "CREATE DATABASE" use closure "CHARACTER SET" Here is mysqldb.sh.patch file - that's do it. Please apply it on mysqldb.sh and include patched file into future version. Sincerely yours, Khalukhin Alex <khalukhin(a)gmail.com> ---------------------- << CUT_HERE << ------------------------- 236a237,254 > db_charset_test() > { > CURRCHARSET=`echo "show variables like '%character_set_server%'" | $CMD "-p$PW" | awk '{print $2}' | sed -e 1d` > ALLCHARSETS=`echo "show character set" | $CMD "-p$PW" | awk '{print $1}' | sed -e 1d | grep -ivE utf8\|ucs2` > while [ `echo "$ALLCHARSETS" | grep -icw $CURRCHARSET` = "0" ] > do > echo "Your current default mysql characters set cannot be used to create DB. Please choice another one from the following list:" > echo "$ALLCHARSETS" > echo -n "Enter character set name: " > read CURRCHARSET > if [ `echo $CURRCHARSET | grep -cE "\w+"` = "0" ]; then > echo "can't continue: user break" > exit 1 > fi > done > export CHARSET=$CURRCHARSET > } > 244a263,264 > db_charset_test > 248c268 < create database $1; --- > create database $1 character set $CHARSET; ---------------------- << CUT_HERE << ------------------------- ---------------------------------------------------------------------- Comment By: Bogdan-Andrei Iancu (bogdan_iancu) Date: 2006-12-01 03:28 Message: Logged In: YES user_id=1275325 Originator: NO Hi, not sure if "DEFAULT CHARACTER SET LATIN1" is standard enough to be directly forced by the installation script - I'm not a mysql expert to know if the LATIN1 set will be present on all mysql servers. The long term solution wil be to change the primary keys of all tables to int auto-increment - this will secondary solve this issue also. regards, bogdan ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2006-11-29 11:25 Message: Logged In: NO 2bogdan_iancu: Thanks for providing me this info - it will be helpful for me to solve problem. But I still want to ask you - is there any way to find out what's the encoding is used in database? So why don't you include such kind of testing in this script or just explictly set character set for each table? For example: mysql> CREATE TABLE location ( -> username varchar(64) NOT NULL default '', -> domain varchar(128) NOT NULL default '', -> contact varchar(255) NOT NULL default '', -> received varchar(255) default NULL, -> path varchar(255) default NULL, -> expires datetime NOT NULL default '2020-05-28 21:32:15', -> q float(10,2) NOT NULL default '1.0', -> callid varchar(255) NOT NULL default 'Default-Call-ID', -> cseq int(11) NOT NULL default '42', -> last_modified datetime NOT NULL default "1900-01-01 00:00", -> flags int(11) NOT NULL default '0', -> user_agent varchar(255) NOT NULL default '', -> socket varchar(128) default NULL, -> methods int(11) default NULL, -> PRIMARY KEY(username, domain, contact) -> ) TYPE=MyISAM; ERROR 1071 (42000): Specified key was too long; max key length is 1000 bytes mysql> CREATE TABLE location ( -> username varchar(64) NOT NULL default '', -> domain varchar(128) NOT NULL default '', -> contact varchar(255) NOT NULL default '', -> received varchar(255) default NULL, -> path varchar(255) default NULL, -> expires datetime NOT NULL default '2020-05-28 21:32:15', -> q float(10,2) NOT NULL default '1.0', -> callid varchar(255) NOT NULL default 'Default-Call-ID', -> cseq int(11) NOT NULL default '42', -> last_modified datetime NOT NULL default "1900-01-01 00:00", -> flags int(11) NOT NULL default '0', -> user_agent varchar(255) NOT NULL default '', -> socket varchar(128) default NULL, -> methods int(11) default NULL, -> PRIMARY KEY(username, domain, contact) -> ) TYPE=MyISAM DEFAULT CHARACTER SET LATIN1; Query OK, 0 rows affected, 1 warning (0.00 sec) ---------------------------------------------------------------------- Comment By: Bogdan-Andrei Iancu (bogdan_iancu) Date: 2006-11-29 10:19 Message: Logged In: YES user_id=1275325 Originator: NO Hi, actually it is not a bug in openser, but a bug related to mysql. This was already reporded some time ago and thanks to Norman Brandinger <norm(a)goes.com>, here is the answer: "Perhaps the problem is related to the fact that UTF-8 uses 3-bytes to save a character. This issue was discussed at: http://bugs.mysql.com/bug.php?id=4541 If the datbase encoding is UTF-8, then this will be important to you." visit also: http://openser.org/pipermail/users/2006-November/007738.html regards, bogdan ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=1605410&group_…

1 0

git:master: Changed the trace function so that it uses the method in cseq on SIP replies instead of using an empty string .
by Marius Ovidiu Bucur 24 Feb '12

24 Feb '12

Module: sip-router Branch: master Commit: 9fedb8564e2eb50553a3bcae66976620316698c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9fedb85… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Fri Feb 24 17:51:42 2012 +0200 Changed the trace function so that it uses the method in cseq on SIP replies instead of using an empty string. --- modules_k/siptrace/siptrace.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules_k/siptrace/siptrace.c b/modules_k/siptrace/siptrace.c index 2c2dc01..b8df1e6 100644 --- a/modules_k/siptrace/siptrace.c +++ b/modules_k/siptrace/siptrace.c @@ -44,6 +44,7 @@ #include "../../lib/srdb1/db.h" #include "../../parser/parse_content.h" #include "../../parser/parse_from.h" +#include "../../parser/parse_cseq.h" #include "../../pvar.h" #include "../../modules/tm/tm_load.h" #include "../../modules/sl/sl.h" @@ -854,8 +855,12 @@ static int sip_trace(struct sip_msg *msg, char *dir, char *s2) if(msg->first_line.type==SIP_REQUEST) { sto.method = msg->first_line.u.request.method; } else { - sto.method.s = ""; - sto.method.len = 0; + if(parse_headers(msg, HDR_CSEQ_F, 0) != 0 || msg->cseq==NULL + || msg->cseq->parsed==NULL) { + LM_ERR("cannot parse cseq header\n"); + return -1; + } + sto.method = get_cseq(msg)->method; } if(msg->first_line.type==SIP_REPLY) {

1 0

git:3.1: module/avpops: Add short description to clarify the purpose of the avp_delete flag.
by Sven Knoblich 24 Feb '12

24 Feb '12

Module: sip-router Branch: 3.1 Commit: 7965ba755fa38b45a6a682b0afae4248cc7276a5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7965ba7… Author: Sven Knoblich <sven.knoblich(a)1und1.de> Committer: Sven Knoblich <sven.knoblich(a)1und1.de> Date: Fri Feb 24 15:47:49 2012 +0100 module/avpops: Add short description to clarify the purpose of the avp_delete flag. (cherry picked from commit fb0951c332894ac6cd967daa02c4a2b569ada671) --- modules/avpops/doc/avpops_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/avpops/doc/avpops_admin.xml b/modules/avpops/doc/avpops_admin.xml index 9b60cc9..4b4a894 100644 --- a/modules/avpops/doc/avpops_admin.xml +++ b/modules/avpops/doc/avpops_admin.xml @@ -583,7 +583,7 @@ avp_db_query("delete from subscriber"); matching_flags = please refer to avp_db_load() function </emphasis></para></listitem> <listitem><para><emphasis> - flag = 'g'|'G' + flag = 'g'|'G' = deletes not only the last value but the complete AVP. </emphasis></para></listitem> </itemizedlist> </para>

1 0

git:3.2: module/avpops: Add short description to clarify the purpose of the avp_delete flag.
by Sven Knoblich 24 Feb '12

24 Feb '12

Module: sip-router Branch: 3.2 Commit: 098784ec6e73177507fcc24fbc27674a524acaec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=098784e… Author: Sven Knoblich <sven.knoblich(a)1und1.de> Committer: Sven Knoblich <sven.knoblich(a)1und1.de> Date: Fri Feb 24 15:47:49 2012 +0100 module/avpops: Add short description to clarify the purpose of the avp_delete flag. (cherry picked from commit fb0951c332894ac6cd967daa02c4a2b569ada671) --- modules/avpops/doc/avpops_admin.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/avpops/doc/avpops_admin.xml b/modules/avpops/doc/avpops_admin.xml index caa51ca..dc3ab0c 100644 --- a/modules/avpops/doc/avpops_admin.xml +++ b/modules/avpops/doc/avpops_admin.xml @@ -583,7 +583,7 @@ avp_db_query("delete from subscriber"); matching_flags = please refer to avp_db_load() function </emphasis></para></listitem> <listitem><para><emphasis> - flag = 'g'|'G' + flag = 'g'|'G' = deletes not only the last value but the complete AVP. </emphasis></para></listitem> </itemizedlist> </para>

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev February 2012