sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

git:alexh/master: modules_k/sqlops: sql_query(): make result parameter optional
by Alex Hermann 29 Mar '11

29 Mar '11

Module: sip-router Branch: alexh/master Commit: 69c718cfc1c07a5a68b09b3a34114b63dd9b9490 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=69c718c… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Mar 10 15:21:06 2011 +0100 modules_k/sqlops: sql_query(): make result parameter optional No need to specify a result parameter for SQL statements that do not return a resultset, so make it optional. --- modules_k/sqlops/doc/sqlops_admin.xml | 4 +++- modules_k/sqlops/sql_api.c | 9 ++++++++- modules_k/sqlops/sqlops.c | 9 +++++++++ 3 files changed, 20 insertions(+), 2 deletions(-) diff --git a/modules_k/sqlops/doc/sqlops_admin.xml b/modules_k/sqlops/doc/sqlops_admin.xml index d042c61..a0a8512 100644 --- a/modules_k/sqlops/doc/sqlops_admin.xml +++ b/modules_k/sqlops/doc/sqlops_admin.xml @@ -179,7 +179,7 @@ modparam("sqlops", "sqlres", "ra") <title>Exported Functions</title> <section> <title> - <function moreinfo="none">sql_query(connection, query, result)</function> + <function moreinfo="none">sql_query(connection, query[, result])</function> </title> <para> Make a SQL query using 'connection' and store data in 'result'. @@ -201,6 +201,8 @@ modparam("sqlops", "sqlres", "ra") <emphasis>result</emphasis> - string name to identify the result. Will be used by $dbr(...) pseudo-variable to access result attributes. + If omitted, any resultset will be discarded. The result parameter should + normally only be omitted when no result is expected (INSERT, UPDATE, DELETE). </para> </listitem> </itemizedlist> diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index 0dc97e0..5fe3371 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -208,7 +208,6 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) LM_ERR("bad parameters\n"); return -1; } - sql_reset_result(res); if(con->dbf.raw_query(con->dbh, query, &db_res)!=0) { LM_ERR("cannot do the query\n"); @@ -221,6 +220,14 @@ int sql_do_query(sql_con_t *con, str *query, sql_result_t *res) con->dbf.free_result(con->dbh, db_res); return 2; } + if(!res) + { + LM_DBG("no sqlresult parameter, ignoring result from query\n"); + con->dbf.free_result(con->dbh, db_res); + return 3; + } + + sql_reset_result(res); res->ncols = RES_COL_N(db_res); res->nrows = RES_ROW_N(db_res); LM_DBG("rows [%d] cols [%d]\n", res->nrows, res->ncols); diff --git a/modules_k/sqlops/sqlops.c b/modules_k/sqlops/sqlops.c index 6d04e4b..a34a7d9 100644 --- a/modules_k/sqlops/sqlops.c +++ b/modules_k/sqlops/sqlops.c @@ -60,6 +60,7 @@ static int bind_sqlops(sqlops_api_t* api); /** module functions */ static int sql_query(struct sip_msg*, char*, char*, char*); +static int sql_query2(struct sip_msg*, char*, char*); #ifdef WITH_XAVP static int sql_xquery(struct sip_msg *msg, char *dbl, char *query, char *res); #endif @@ -86,6 +87,9 @@ 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}, + {"sql_query", (cmd_function)sql_query2, 2, fixup_sql_query, 0, + REQUEST_ROUTE | FAILURE_ROUTE | + ONREPLY_ROUTE | BRANCH_ROUTE | LOCAL_ROUTE}, #ifdef WITH_XAVP {"sql_xquery", (cmd_function)sql_xquery, 3, fixup_sql_xquery, 0, REQUEST_ROUTE | FAILURE_ROUTE | @@ -192,6 +196,11 @@ static int sql_query(struct sip_msg *msg, char *dbl, char *query, char *res) return sql_do_query((sql_con_t*)dbl, &sq, (sql_result_t*)res); } +static int sql_query2(struct sip_msg *msg, char *dbl, char *query) +{ + return sql_query(msg, dbl, query, NULL); +} + #ifdef WITH_XAVP /** *

1 0

git:alexh/master: modules_k/sqlops: Add BIGINT support for sql_xquery()
by Alex Hermann 29 Mar '11

29 Mar '11

Module: sip-router Branch: alexh/master Commit: 2e88be743bb0107b8e1025b85f044803a49bcefe URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e88be7… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Mon Mar 14 14:47:25 2011 +0100 modules_k/sqlops: Add BIGINT support for sql_xquery() xavp's have native support for longlongs so there's no reason not to use it. --- modules_k/sqlops/sql_api.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index 5fe3371..aca782d 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -438,6 +438,11 @@ int sql_do_xquery(struct sip_msg *msg, sql_con_t *con, pv_elem_t *query, val.v.i = (int)RES_ROWS(db_res)[i].values[j].val.bitmap_val; break; + case DB1_BIGINT: + val.type = SR_XTYPE_LLONG; + val.v.ll + = RES_ROWS(db_res)[i].values[j].val.ll_val; + break; default: val.type = SR_XTYPE_NULL; }

1 0

git:3.1: core: added function to search a str inside a str
by Daniel-Constantin Mierla 29 Mar '11

29 Mar '11

Module: sip-router Branch: 3.1 Commit: c61a9bfab9bab92f9c7f59cba880a8431b5be146 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c61a9bf… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Mar 26 23:44:01 2011 +0100 core: added function to search a str inside a str - str_search(text, needle) added to return the position of str needle when it is found inside str text (cherry picked from commit 8c2a2826f5f6954b4a38405fd04f128078e98e0f) --- ut.c | 23 +++++++++++++++++++++++ ut.h | 4 ++++ 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/ut.c b/ut.c index 275381c..9bb4b9f 100644 --- a/ut.c +++ b/ut.c @@ -273,3 +273,26 @@ char* get_abs_pathname(str* base, str* file) } return res; } + + +/** + * @brief search for occurence of needle in text + * @return pointer to start of needle in text or NULL if the needle + * is not found + */ +char *str_search(str *text, str *needle) +{ + char *p; + + if(text==NULL || text->s==NULL || needle==NULL || needle->s==NULL + || text->len<needle->len) + return NULL; + + for (p = text->s; p <= text->s + text->len - needle->len; p++) { + if (*p == *needle->s && memcmp(p, needle->s, needle->len)==0) { + return p; + } + } + + return NULL; +} diff --git a/ut.h b/ut.h index 1e4b2b4..da40ebc 100644 --- a/ut.h +++ b/ut.h @@ -824,4 +824,8 @@ unsigned int get_sys_version(int* major, int* minor, int* minor2); */ char* get_abs_pathname(str* base, str* file); +/** + * search for needle in text + */ +char *str_search(str *text, str *needle); #endif

2 2

git:mariusbucur/dmq: added new dmq module ( Kamailio distributed message queue)
by Marius Ovidiu Bucur 29 Mar '11

29 Mar '11

Module: sip-router Branch: mariusbucur/dmq Commit: 565779d459f489f552799fa09a2f7f7546f7f674 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=565779d… Author: mariusb <mariusb(a)ubuntu.(none)> Committer: mariusb <mariusb(a)ubuntu.(none)> Date: Tue Mar 29 17:25:27 2011 +0300 added new dmq module (Kamailio distributed message queue) --- modules_k/dmq/Makefile | 23 ++++ modules_k/dmq/dmq.c | 250 ++++++++++++++++++++++++++++++++++++++++++++++ modules_k/dmq/dmq.h | 1 + 3 files changed, 274 insertions(+), 0 deletions(-) diff --git a/modules_k/dmq/Makefile b/modules_k/dmq/Makefile new file mode 100644 index 0000000..9c35e52 --- /dev/null +++ b/modules_k/dmq/Makefile @@ -0,0 +1,23 @@ +# $Id$ +# +# Presence Agent +# +# +# WARNING: do not run this directly, it should be run by the master Makefile + +include ../../Makefile.defs +auto_gen= +NAME=dmq.so +LIBS= + +DEFS+=-I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include +LIBS+=-L/usr/include/lib -L$(LOCALBASE)/lib -lxml2 + +DEFS+=-DOPENSER_MOD_INTERFACE + +SERLIBPATH=../../lib +SER_LIBS+=$(SERLIBPATH)/kmi/kmi +SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 +SER_LIBS+=$(SERLIBPATH)/kcore/kcore +include ../../Makefile.modules diff --git a/modules_k/dmq/bind_dmq.h b/modules_k/dmq/bind_dmq.h new file mode 100644 index 0000000..e69de29 diff --git a/modules_k/dmq/dmq.c b/modules_k/dmq/dmq.c new file mode 100644 index 0000000..d8a1040 --- /dev/null +++ b/modules_k/dmq/dmq.c @@ -0,0 +1,250 @@ +/* + * $Id$ + * + * dmq module - distributed message queue + * + * Copyright (C) 2011 Bucur Marius - Ovidiu + * + * 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 + * + * History: + * -------- + * 2010-03-29 initial version (mariusbucur) + */ +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include <sys/types.h> +#include <sys/ipc.h> +#include <unistd.h> +#include <fcntl.h> +#include <time.h> + +#include "../../lib/srdb1/db.h" +#include "../../sr_module.h" +#include "../../dprint.h" +#include "../../error.h" +#include "../../ut.h" +#include "../../parser/parse_to.h" +#include "../../parser/parse_uri.h" +#include "../../parser/parse_content.h" +#include "../../parser/parse_from.h" +#include "../../mem/mem.h" +#include "../../mem/shm_mem.h" +#include "../../usr_avp.h" +#include "../../modules/tm/tm_load.h" +#include "../../modules/sl/sl.h" +#include "../../pt.h" +#include "../../lib/kmi/mi.h" +#include "../../lib/kcore/hash_func.h" +#include "../pua/hash.h" +#include "dmq.h" +#include "bind_dmq.h" +#include "../../mod_fix.h" + +static int mi_child_init(void); +static int mod_init(void); +static int child_init(int); +static void destroy(void); + +MODULE_VERSION + +/* database connection */ +db1_con_t *dmq_db = NULL; +db_func_t dmq_dbf; +int library_mode= 0; +str server_address= {0, 0}; +int startup_time = 0; +int pid = 0; + +/* module parameters */ +str db_url; + +/* to tag prefix */ +char* to_tag_pref = "10"; + +/* TM bind */ +struct tm_binds tmb; +/* SL API structure */ +sl_api_t slb; + +/** module functions */ + +static int mod_init(void); +static int child_init(int); +static void destroy(void); +static int fixup_dmq(void** param, int param_no); + +static cmd_export_t cmds[]= +{ + {"handle_dmq_message", (cmd_function)handle_dmq_message, 0, fixup_dmq, 0, REQUEST_ROUTE}, + {0, 0, 0, 0, 0, 0} +}; + +static param_export_t params[]={ + { "db_url", STR_PARAM, &db_url.s}, + {0,0,0} +}; + +static mi_export_t mi_cmds[] = { + { "cleanup", 0, 0, 0, mi_child_init}, + { 0, 0, 0, 0, 0} +}; + +/** module exports */ +struct module_exports exports= { + "dmq", /* module name */ + DEFAULT_DLFLAGS, /* dlopen flags */ + cmds, /* exported functions */ + params, /* exported parameters */ + 0, /* exported statistics */ + mi_cmds, /* exported MI functions */ + 0, /* exported pseudo-variables */ + 0, /* extra processes */ + mod_init, /* module initialization function */ + 0, /* response handling function */ + (destroy_function) destroy, /* destroy function */ + child_init /* per-child init function */ +}; + +/** + * init module function + */ +static int mod_init(void) +{ + if(register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } + + db_url.len = db_url.s ? strlen(db_url.s) : 0; + LM_DBG("db_url=%s/%d/%p\n", ZSW(db_url.s), db_url.len,db_url.s); + if(db_url.s== NULL) + library_mode= 1; + + if(library_mode== 1) + { + LM_DBG("dmq module used for API library purpose only\n"); + } + + /* bind the SL API */ + if (sl_load_api(&slb)!=0) { + LM_ERR("cannot bind to SL API\n"); + return -1; + } + + /* load all TM stuff */ + if(load_tm_api(&tmb)==-1) + { + LM_ERR("Can't load tm functions. Module TM not loaded?\n"); + return -1; + } + + if(db_url.s== NULL) + { + LM_ERR("database url not set!\n"); + return -1; + } + + /* binding to database module */ + if (db_bind_mod(&db_url, &dmq_dbf)) + { + LM_ERR("database module not found\n"); + return -1; + } + + + if (!DB_CAPABILITY(dmq_dbf, DB_CAP_ALL)) + { + LM_ERR("database module does not implement all functions needed by dmq module\n"); + return -1; + } + + dmq_db = dmq_dbf.init(&db_url); + if (!dmq_db) + { + LM_ERR("connection to database failed\n"); + return -1; + } + + /*verify table versions */ + startup_time = (int) time(NULL); + return 0; +} + +/** + * Initialize children + */ +static int child_init(int rank) +{ + if (rank==PROC_INIT || rank==PROC_MAIN || rank==PROC_TCP_MAIN) + return 0; /* do nothing for the main process */ + + pid = my_pid(); + + if(library_mode) + return 0; + + if (dmq_dbf.init==0) + { + LM_CRIT("child_init: database not bound\n"); + return -1; + } + if (dmq_db) + return 0; + dmq_db = dmq_dbf.init(&db_url); + if (!dmq_db) + { + LM_ERR("child %d: unsuccessful connecting to database\n", rank); + return -1; + } + + LM_DBG("child %d: database connection opened successfully\n", rank); + return 0; +} + +static int mi_child_init(void) +{ + if(library_mode) + return 0; + + if (dmq_dbf.init==0) + { + LM_CRIT("database not bound\n"); + return -1; + } + if (dmq_db) + return 0; + dmq_db = dmq_dbf.init(&db_url); + if (!dmq_db) + { + LM_ERR("connecting database\n"); + return -1; + } + + LM_DBG("database connection opened successfully\n"); + return 0; +} + + +/* + * destroy function + */ +static void destroy(void) +{ +} \ No newline at end of file diff --git a/modules_k/dmq/dmq.h b/modules_k/dmq/dmq.h new file mode 100644 index 0000000..bea79d3 --- /dev/null +++ b/modules_k/dmq/dmq.h @@ -0,0 +1 @@ +int handle_dmq_message(struct sip_msg* msg, char* str1 ,char* str2);

1 0

git:carstenbock/ims: - minor Typo
by Carsten Bock 29 Mar '11

29 Mar '11

Module: sip-router Branch: carstenbock/ims Commit: 25c6cc34e526718bbcfee9b6638bd7ba92c44469 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25c6cc3… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Mar 29 11:43:44 2011 +0200 - minor Typo --- utils/kamctl/mysql/usrloc-create.sql | 2 +- utils/kamctl/oracle/usrloc-create.sql | 2 +- utils/kamctl/postgres/usrloc-create.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index 66919d6..8957b36 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -16,7 +16,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INT(11) DEFAULT NULL, - reg_avps VARCHAR(255) DEFAULT NULL, + reg_avps VARCHAR(255) DEFAULT NULL ) ENGINE=MyISAM; CREATE INDEX account_contact_idx ON location (username, domain, contact); diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 94f466b..1c4b5f9 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -16,7 +16,7 @@ CREATE TABLE location ( user_agent VARCHAR2(255) DEFAULT '', socket VARCHAR2(64) DEFAULT NULL, methods NUMBER(10) DEFAULT NULL, - reg_avps VARCHAR(255) DEFAULT NULL, + reg_avps VARCHAR(255) DEFAULT NULL ); CREATE OR REPLACE TRIGGER location_tr diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index 2764291..3a0223a 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -16,7 +16,7 @@ CREATE TABLE location ( user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, methods INTEGER DEFAULT NULL, - reg_avps VARCHAR(255) DEFAULT NULL, + reg_avps VARCHAR(255) DEFAULT NULL ); CREATE INDEX location_account_contact_idx ON location (username, domain, contact);

2 1

git:master: db1: update database scheme files after lcr extension ( commit 8c0501bfaa27acab9721953)
by Henning Westerholt 29 Mar '11

29 Mar '11

Module: sip-router Branch: master Commit: 9a7639cad604640028b930f3e4fb1242ee804499 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9a7639c… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Mar 29 15:57:43 2011 +0200 db1: update database scheme files after lcr extension (commit 8c0501bfaa27acab9721953) --- utils/kamctl/db_berkeley/kamailio/lcr_gw | 6 ++---- utils/kamctl/db_berkeley/kamailio/lcr_rule | 2 -- utils/kamctl/db_berkeley/kamailio/lcr_rule_target | 2 -- utils/kamctl/db_berkeley/kamailio/version | 6 +----- utils/kamctl/dbtext/kamailio/lcr_gw | 3 +-- utils/kamctl/dbtext/kamailio/lcr_rule | 1 - utils/kamctl/dbtext/kamailio/lcr_rule_target | 1 - utils/kamctl/dbtext/kamailio/version | 4 +--- utils/kamctl/mysql/lcr-create.sql | 5 +++-- utils/kamctl/oracle/lcr-create.sql | 5 +++-- utils/kamctl/postgres/lcr-create.sql | 5 +++-- 11 files changed, 14 insertions(+), 26 deletions(-) diff --git a/utils/kamctl/db_berkeley/kamailio/lcr_gw b/utils/kamctl/db_berkeley/kamailio/lcr_gw index 00df7e4..dd971d1 100644 --- a/utils/kamctl/db_berkeley/kamailio/lcr_gw +++ b/utils/kamctl/db_berkeley/kamailio/lcr_gw @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) lcr_id(int) gw_name(str) ip_addr(str) hostname(str) port(int) params(str) uri_scheme(int) transport(int) strip(int) tag(str) flags(int) defunct(int) +id(int) lcr_id(int) gw_name(str) ip_addr(str) hostname(str) port(int) params(str) uri_scheme(int) transport(int) strip(int) prefix(str) tag(str) flags(int) defunct(int) METADATA_KEY 2 METADATA_READONLY @@ -7,6 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|0|NULL -lcr_gw| -lcr_gw|1 +NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|NULL|0|NULL diff --git a/utils/kamctl/db_berkeley/kamailio/lcr_rule b/utils/kamctl/db_berkeley/kamailio/lcr_rule index dd53806..99a12cf 100644 --- a/utils/kamctl/db_berkeley/kamailio/lcr_rule +++ b/utils/kamctl/db_berkeley/kamailio/lcr_rule @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|NULL|NULL|0|1 -lcr_rule| -lcr_rule|1 diff --git a/utils/kamctl/db_berkeley/kamailio/lcr_rule_target b/utils/kamctl/db_berkeley/kamailio/lcr_rule_target index 927e537..cffb6eb 100644 --- a/utils/kamctl/db_berkeley/kamailio/lcr_rule_target +++ b/utils/kamctl/db_berkeley/kamailio/lcr_rule_target @@ -8,5 +8,3 @@ METADATA_LOGFLAGS 0 METADATA_DEFAULTS NIL|NIL|NIL|NIL|NIL|1 -lcr_rule_target| -lcr_rule_target|1 diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 93e3eb1..28d3bba 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -50,18 +50,14 @@ globalblacklist| globalblacklist|1 grp| grp|2 -METADATA_DEFAULTS -NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NIL|NULL|NIL|0|NULL htable| htable|1 imc_members| imc_members|1 imc_rooms| imc_rooms|1 -METADATA_DEFAULTS -NIL|NIL|NULL|NULL|NIL|NIL lcr_gw| -lcr_gw|1 +lcr_gw|2 lcr_rule| lcr_rule|1 lcr_rule_target| diff --git a/utils/kamctl/dbtext/kamailio/lcr_gw b/utils/kamctl/dbtext/kamailio/lcr_gw index 71f1fb9..f4b491f 100644 --- a/utils/kamctl/dbtext/kamailio/lcr_gw +++ b/utils/kamctl/dbtext/kamailio/lcr_gw @@ -1,2 +1 @@ -id(int,auto) lcr_id(int) gw_name(string,null) ip_addr(string,null) hostname(string,null) port(int,null) params(string,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) flags(int) defunct(int,null) -lcr_gw:1 +id(int,auto) lcr_id(int) gw_name(string,null) ip_addr(string,null) hostname(string,null) port(int,null) params(string,null) uri_scheme(int,null) transport(int,null) strip(int,null) prefix(string,null) tag(string,null) flags(int) defunct(int,null) diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule b/utils/kamctl/dbtext/kamailio/lcr_rule index 483ce58..f1dcabd 100644 --- a/utils/kamctl/dbtext/kamailio/lcr_rule +++ b/utils/kamctl/dbtext/kamailio/lcr_rule @@ -1,2 +1 @@ id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) stopper(int) enabled(int) -lcr_rule:1 diff --git a/utils/kamctl/dbtext/kamailio/lcr_rule_target b/utils/kamctl/dbtext/kamailio/lcr_rule_target index d72e6f0..54dedd8 100644 --- a/utils/kamctl/dbtext/kamailio/lcr_rule_target +++ b/utils/kamctl/dbtext/kamailio/lcr_rule_target @@ -1,2 +1 @@ id(int,auto) lcr_id(int) rule_id(int) gw_id(int) priority(int) weight(int) -lcr_rule_target:1 diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index 60a7a5f..0b9aad0 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -20,12 +20,10 @@ dr_gw_lists:1 dr_rules:3 globalblacklist:1 grp:2 -id(int,auto) lcr_id(int) gw_name(string) grp_id(int) ip_addr(string) hostname(string,null) port(int,null) uri_scheme(int,null) transport(int,null) strip(int,null) tag(string,null) weight(int,null) flags(int) defunct(int,null) htable:1 imc_members:1 imc_rooms:1 -id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) grp_id(int) priority(int) -lcr_gw:1 +lcr_gw:2 lcr_rule:1 lcr_rule_target:1 location:1004 diff --git a/utils/kamctl/mysql/lcr-create.sql b/utils/kamctl/mysql/lcr-create.sql index fbad865..0c23051 100644 --- a/utils/kamctl/mysql/lcr-create.sql +++ b/utils/kamctl/mysql/lcr-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','1'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); CREATE TABLE lcr_gw ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, lcr_id SMALLINT UNSIGNED NOT NULL, @@ -10,7 +10,8 @@ CREATE TABLE lcr_gw ( uri_scheme TINYINT UNSIGNED, transport TINYINT UNSIGNED, strip TINYINT UNSIGNED, - tag VARCHAR(16) DEFAULT NULL, + prefix VARCHAR(16) DEFAULT NULL, + tag VARCHAR(64) DEFAULT NULL, flags INT UNSIGNED DEFAULT 0 NOT NULL, defunct INT UNSIGNED DEFAULT NULL, CONSTRAINT lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname) diff --git a/utils/kamctl/oracle/lcr-create.sql b/utils/kamctl/oracle/lcr-create.sql index b072818..89e9bbc 100644 --- a/utils/kamctl/oracle/lcr-create.sql +++ b/utils/kamctl/oracle/lcr-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','1'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); CREATE TABLE lcr_gw ( id NUMBER(10) PRIMARY KEY, lcr_id NUMBER(5), @@ -10,7 +10,8 @@ CREATE TABLE lcr_gw ( uri_scheme NUMBER(5), transport NUMBER(5), strip NUMBER(5), - tag VARCHAR2(16) DEFAULT NULL, + prefix VARCHAR2(16) DEFAULT NULL, + tag VARCHAR2(64) DEFAULT NULL, flags NUMBER(10) DEFAULT 0 NOT NULL, defunct NUMBER(10) DEFAULT NULL, CONSTRAINT ORA_lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname) diff --git a/utils/kamctl/postgres/lcr-create.sql b/utils/kamctl/postgres/lcr-create.sql index 0382e69..714615f 100644 --- a/utils/kamctl/postgres/lcr-create.sql +++ b/utils/kamctl/postgres/lcr-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('lcr_gw','1'); +INSERT INTO version (table_name, table_version) values ('lcr_gw','2'); CREATE TABLE lcr_gw ( id SERIAL PRIMARY KEY NOT NULL, lcr_id SMALLINT NOT NULL, @@ -10,7 +10,8 @@ CREATE TABLE lcr_gw ( uri_scheme SMALLINT, transport SMALLINT, strip SMALLINT, - tag VARCHAR(16) DEFAULT NULL, + prefix VARCHAR(16) DEFAULT NULL, + tag VARCHAR(64) DEFAULT NULL, flags INTEGER DEFAULT 0 NOT NULL, defunct INTEGER DEFAULT NULL, CONSTRAINT lcr_gw_lcr_id_ip_addr_port_hostname_idx UNIQUE (lcr_id, ip_addr, port, hostname)

1 0

git:carstenbock/ims: - fix for Update-Keys
by Carsten Bock 29 Mar '11

29 Mar '11

Module: sip-router Branch: carstenbock/ims Commit: eb8ea6e95bc057a46c0548b20537c301d585babc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb8ea6e… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Mar 29 13:35:02 2011 +0200 - fix for Update-Keys --- modules_k/usrloc/ucontact.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/usrloc/ucontact.c b/modules_k/usrloc/ucontact.c index c8f9a1b..a80e4ce 100644 --- a/modules_k/usrloc/ucontact.c +++ b/modules_k/usrloc/ucontact.c @@ -576,6 +576,7 @@ int db_update_ucontact(ucontact_t* _c) keys2[8] = &sock_col; keys2[9] = &methods_col; keys2[10] = &last_mod_col; + keys2[11] = &reg_avps_col; vals1[0].type = DB1_STR; vals1[0].nul = 0;

1 0

git:carstenbock/ims: - increased table version for usrloc to 1005
by Carsten Bock 29 Mar '11

29 Mar '11

Module: sip-router Branch: carstenbock/ims Commit: 35e5a129aec0bd61f4fdd9a5c04387891cb6555f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35e5a12… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Mar 29 11:37:15 2011 +0200 - increased table version for usrloc to 1005 - updated the table definitions --- modules_k/usrloc/ul_mod.h | 2 +- utils/kamctl/db_berkeley/kamailio/location | 4 ++-- utils/kamctl/db_berkeley/kamailio/version | 2 +- utils/kamctl/dbtext/kamailio/location | 3 ++- utils/kamctl/dbtext/kamailio/version | 2 +- utils/kamctl/mysql/usrloc-create.sql | 5 +++-- utils/kamctl/oracle/usrloc-create.sql | 5 +++-- utils/kamctl/postgres/usrloc-create.sql | 5 +++-- 8 files changed, 16 insertions(+), 12 deletions(-) diff --git a/modules_k/usrloc/ul_mod.h b/modules_k/usrloc/ul_mod.h index d67c513..06573c1 100644 --- a/modules_k/usrloc/ul_mod.h +++ b/modules_k/usrloc/ul_mod.h @@ -43,7 +43,7 @@ */ -#define UL_TABLE_VERSION 1004 +#define UL_TABLE_VERSION 1005 extern str user_col; extern str domain_col; diff --git a/utils/kamctl/db_berkeley/kamailio/location b/utils/kamctl/db_berkeley/kamailio/location index 061f3ef..c1fad1e 100644 --- a/utils/kamctl/db_berkeley/kamailio/location +++ b/utils/kamctl/db_berkeley/kamailio/location @@ -1,5 +1,5 @@ METADATA_COLUMNS -id(int) username(str) domain(str) contact(str) received(str) path(str) expires(datetime) q(double) callid(str) cseq(int) last_modified(datetime) flags(int) cflags(int) user_agent(str) socket(str) methods(int) +id(int) username(str) domain(str) contact(str) received(str) path(str) expires(datetime) q(double) callid(str) cseq(int) last_modified(datetime) flags(int) cflags(int) user_agent(str) socket(str) methods(int) reg_avps(str) METADATA_KEY 1 2 METADATA_READONLY @@ -7,4 +7,4 @@ METADATA_READONLY METADATA_LOGFLAGS 0 METADATA_DEFAULTS -NIL|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|13|'1900-01-01 00:00:01'|0|0|''|NULL|NULL +NIL|''|NULL|''|NULL|NULL|'2020-05-28 21:32:15'|1.0|'Default-Call-ID'|13|'1900-01-01 00:00:01'|0|0|''|NULL|NULL|NULL diff --git a/utils/kamctl/db_berkeley/kamailio/version b/utils/kamctl/db_berkeley/kamailio/version index 7adb9d6..96dffb5 100644 --- a/utils/kamctl/db_berkeley/kamailio/version +++ b/utils/kamctl/db_berkeley/kamailio/version @@ -68,7 +68,7 @@ lcr_rule|1 lcr_rule_target| lcr_rule_target|1 location| -location|1004 +location|1005 matrix| matrix|1 missed_calls| diff --git a/utils/kamctl/dbtext/kamailio/location b/utils/kamctl/dbtext/kamailio/location index 3f80cc4..4a6df19 100644 --- a/utils/kamctl/dbtext/kamailio/location +++ b/utils/kamctl/dbtext/kamailio/location @@ -1 +1,2 @@ -id(int,auto) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) + +id(int,auto) username(string) domain(string,null) contact(string) received(string,null) path(string,null) expires(int) q(double) callid(string) cseq(int) last_modified(int) flags(int) cflags(int) user_agent(string) socket(string,null) methods(int,null) reg_avps(string,null) diff --git a/utils/kamctl/dbtext/kamailio/version b/utils/kamctl/dbtext/kamailio/version index bbb8503..2505374 100644 --- a/utils/kamctl/dbtext/kamailio/version +++ b/utils/kamctl/dbtext/kamailio/version @@ -29,7 +29,7 @@ id(int,auto) lcr_id(int) prefix(string,null) from_uri(string,null) grp_id(int) p lcr_gw:1 lcr_rule:1 lcr_rule_target:1 -location:1004 +location:1005 matrix:1 missed_calls:3 mtree:1 diff --git a/utils/kamctl/mysql/usrloc-create.sql b/utils/kamctl/mysql/usrloc-create.sql index 5dd6f6c..66919d6 100644 --- a/utils/kamctl/mysql/usrloc-create.sql +++ b/utils/kamctl/mysql/usrloc-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('location','1004'); +INSERT INTO version (table_name, table_version) values ('location','1005'); CREATE TABLE location ( id INT(10) UNSIGNED AUTO_INCREMENT PRIMARY KEY NOT NULL, username VARCHAR(64) DEFAULT '' NOT NULL, @@ -15,7 +15,8 @@ CREATE TABLE location ( cflags INT(11) DEFAULT 0 NOT NULL, user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, - methods INT(11) DEFAULT NULL + methods INT(11) DEFAULT NULL, + reg_avps VARCHAR(255) DEFAULT NULL, ) ENGINE=MyISAM; CREATE INDEX account_contact_idx ON location (username, domain, contact); diff --git a/utils/kamctl/oracle/usrloc-create.sql b/utils/kamctl/oracle/usrloc-create.sql index 055de44..94f466b 100644 --- a/utils/kamctl/oracle/usrloc-create.sql +++ b/utils/kamctl/oracle/usrloc-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('location','1004'); +INSERT INTO version (table_name, table_version) values ('location','1005'); CREATE TABLE location ( id NUMBER(10) PRIMARY KEY, username VARCHAR2(64) DEFAULT '', @@ -15,7 +15,8 @@ CREATE TABLE location ( cflags NUMBER(10) DEFAULT 0 NOT NULL, user_agent VARCHAR2(255) DEFAULT '', socket VARCHAR2(64) DEFAULT NULL, - methods NUMBER(10) DEFAULT NULL + methods NUMBER(10) DEFAULT NULL, + reg_avps VARCHAR(255) DEFAULT NULL, ); CREATE OR REPLACE TRIGGER location_tr diff --git a/utils/kamctl/postgres/usrloc-create.sql b/utils/kamctl/postgres/usrloc-create.sql index a93c034..2764291 100644 --- a/utils/kamctl/postgres/usrloc-create.sql +++ b/utils/kamctl/postgres/usrloc-create.sql @@ -1,4 +1,4 @@ -INSERT INTO version (table_name, table_version) values ('location','1004'); +INSERT INTO version (table_name, table_version) values ('location','1005'); CREATE TABLE location ( id SERIAL PRIMARY KEY NOT NULL, username VARCHAR(64) DEFAULT '' NOT NULL, @@ -15,7 +15,8 @@ CREATE TABLE location ( cflags INTEGER DEFAULT 0 NOT NULL, user_agent VARCHAR(255) DEFAULT '' NOT NULL, socket VARCHAR(64) DEFAULT NULL, - methods INTEGER DEFAULT NULL + methods INTEGER DEFAULT NULL, + reg_avps VARCHAR(255) DEFAULT NULL, ); CREATE INDEX location_account_contact_idx ON location (username, domain, contact);

1 0

git:3.1: app_lua: try to locate liblua for centos
by Daniel-Constantin Mierla 29 Mar '11

29 Mar '11

Module: sip-router Branch: 3.1 Commit: 0773c617da635bac1ba8c6d53550d3e57388359d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0773c61… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 29 12:16:13 2011 +0200 app_lua: try to locate liblua for centos - centos has liblua instead of liblua5.1 and does not provide lua-config or pkg-config to discover the name of lua library - in this case use shell to figure out whether is liblua5.1 or liblua (cherry picked from commit 20d396d9bd190929366e9e493124606aedb087c1) --- modules/app_lua/Makefile | 20 ++++++++++++++++---- 1 files changed, 16 insertions(+), 4 deletions(-) diff --git a/modules/app_lua/Makefile b/modules/app_lua/Makefile index 89fc8d6..1ba3237 100644 --- a/modules/app_lua/Makefile +++ b/modules/app_lua/Makefile @@ -13,13 +13,25 @@ BUILDER = $(shell which lua-config) ifeq ($(BUILDER),) BUILDER = $(shell which pkg-config) ifeq ($(BUILDER),) - DEFS+=-I/usr/include/lua5.1 - LIBS= -llua5.1 + LUA51 = $(shell ls /usr/lib/liblua* | grep 5.1) + ifeq ($(LUA51),) + DEFS+=-I/usr/include/lua + LIBS= -llua + else + DEFS+=-I/usr/include/lua5.1 + LIBS= -llua5.1 + endif else LUALIBS = $(shell pkg-config --silence-errors --libs lua) ifeq ($(LUALIBS),) - DEFS+=-I/usr/include/lua5.1 - LIBS= -llua5.1 + LUA51 = $(shell ls /usr/lib/liblua* | grep 5.1) + ifeq ($(LUA51),) + DEFS+=-I/usr/include/lua + LIBS= -llua + else + DEFS+=-I/usr/include/lua5.1 + LIBS= -llua5.1 + endif else DEFS+ = $(shell pkg-config --cflags lua) LIBS = $(shell pkg-config --libs lua)

1 0

git:3.1: db_mysql: use mysql_config to detect include and libs
by Daniel-Constantin Mierla 29 Mar '11

29 Mar '11

Module: sip-router Branch: 3.1 Commit: a37285b1825b7182ea920f240845ae48bb6d0b90 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a37285b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 29 11:18:08 2011 +0200 db_mysql: use mysql_config to detect include and libs (cherry picked from commit 54306955b4eac0dfcfc66d82e0eceb8551b52bb2) --- modules/db_mysql/Makefile | 30 +++++++++++++++++++++++++----- 1 files changed, 25 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/Makefile b/modules/db_mysql/Makefile index c6458e0..d71ca94 100644 --- a/modules/db_mysql/Makefile +++ b/modules/db_mysql/Makefile @@ -6,18 +6,38 @@ include ../../Makefile.defs auto_gen= NAME=db_mysql.so -# mysql.h locations (freebsd,openbsd solaris) -DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include -I$(LOCALBASE)/include/mysql \ +DEFS +=-DSER_MOD_INTERFACE + +# set CROSS_COMPILE to true if you want to skip +# the autodetection +# CROSS_COMPILE=true + +ifeq ($(CROSS_COMPILE),) +MYSQLCFG=$(shell which mysql_config) +endif + +ifneq ($(MYSQLCFG),) + + # use autodetection + DEFS += $(shell $(MYSQLCFG) --include | sed 's/$-I.*$\/mysql/\1/g' ) + LIBS = $(shell $(MYSQLCFG) --libs) + +else + + # mysql.h locations (freebsd,openbsd solaris) + DEFS +=-DSER_MOD_INTERFACE -I$(LOCALBASE)/include \ + -I$(LOCALBASE)/include/mysql \ -I$(LOCALBASE)/mysql/include \ -I/usr/include/mysql -# libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD -# (Debian does the right thing and puts it in /usr/lib) -LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ + # libmysqlclient locations on RH/Suse, Solaris /OpenBSD, FreeBSD + # (Debian does the right thing and puts it in /usr/lib) + LIBS=-L/usr/lib/mysql -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/mysql \ -L$(LOCALBASE)/mysql/lib/mysql/ \ -L$(LOCALBASE)/mysql/lib \ -L/usr/lib64/mysql \ -lmysqlclient -lz +endif SERLIBPATH=../../lib SER_LIBS=$(SERLIBPATH)/srdb2/srdb2 $(SERLIBPATH)/srdb1/srdb1

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011