sr-dev March 2013

sr-dev@lists.kamailio.org

36 participants
428 discussions

git:4.0: Makefile.defs: version set to 4.0.0-rc1
by Daniel-Constantin Mierla 04 Mar '13

04 Mar '13

Module: sip-router Branch: 4.0 Commit: 9fd2a4cb210e08f576092a6a049570c1a9d0b27f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9fd2a4c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 20:06:53 2013 +0100 Makefile.defs: version set to 4.0.0-rc1 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 4247f31..cdaf7fc 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -163,7 +163,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 0 SUBLEVEL = 0 -EXTRAVERSION = -rc0 +EXTRAVERSION = -rc1 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

git:4.0: dispatcher: release lock instead of destroy when cleaning active calls hash table
by Daniel-Constantin Mierla 04 Mar '13

04 Mar '13

Module: sip-router Branch: 4.0 Commit: 5591cce6007b6d770fbf7e10309caa3593798684 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5591cce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 16:30:34 2013 +0100 dispatcher: release lock instead of destroy when cleaning active calls hash table - this could happen when dispatcher list was reloaded - reported and fix by Dmitry, closes FS#275 (cherry picked from commit d83b9aefd5afa25b2d18a8bf92357fbd33d627bf) --- modules/dispatcher/ds_ht.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/dispatcher/ds_ht.c b/modules/dispatcher/ds_ht.c index 13cff0d..eddc9f0 100644 --- a/modules/dispatcher/ds_ht.c +++ b/modules/dispatcher/ds_ht.c @@ -170,7 +170,7 @@ int ds_ht_clear_slots(ds_ht_t *dsht) } dsht->entries[i].first = NULL; dsht->entries[i].esize = 0; - lock_destroy(&dsht->entries[i].lock); + lock_release(&dsht->entries[i].lock); } return 0; }

1 0

git:4.0: usrloc: added missing state from AoR contact dump
by Daniel-Constantin Mierla 04 Mar '13

04 Mar '13

Module: sip-router Branch: 4.0 Commit: 3fd1ec548504b574522cc2b3a2c623366612ffb7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3fd1ec5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 19:56:54 2013 +0100 usrloc: added missing state from AoR contact dump (cherry picked from commit 068e6e5903801ca7cb7d1ca304d35bca70a34b58) --- modules/usrloc/ul_mi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/usrloc/ul_mi.c b/modules/usrloc/ul_mi.c index 076b051..3f88a71 100644 --- a/modules/usrloc/ul_mi.c +++ b/modules/usrloc/ul_mi.c @@ -660,7 +660,7 @@ struct mi_root* mi_usrloc_show_contact(struct mi_root *cmd, void *param) } node = addf_mi_node_child( rpl, 0, "Contact", 7, - "<%.*s>;q=%s;expires=%d;flags=0x%X;cflags=0x%X;socket=<%.*s>;" + "<%.*s>;q=%s;expires=%d;flags=0x%X;cflags=0x%X;state=%d;socket=<%.*s>;" "methods=0x%X" "%s%.*s%s" /*received*/ "%s%.*s%s" /*user-agent*/ @@ -669,7 +669,7 @@ struct mi_root* mi_usrloc_show_contact(struct mi_root *cmd, void *param) ";reg-id=%u", con->c.len, ZSW(con->c.s), q2str(con->q, 0), (int)(con->expires - act_time), - con->flags, con->cflags, + con->flags, con->cflags, con->state, con->sock?con->sock->sock_str.len:3, con->sock?con->sock->sock_str.s:"NULL", con->methods,

1 0

git:4.0: Makefile.groups: refer to pkg groups instead of K
by Daniel-Constantin Mierla 04 Mar '13

04 Mar '13

Module: sip-router Branch: 4.0 Commit: c390d7ed3bf1072ddfa8c1b3ac240359ea0a466e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c390d7e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 16:19:20 2013 +0100 Makefile.groups: refer to pkg groups instead of K (cherry picked from commit 3cf821d9983418d68ca33edc35ff5eb2e592d16f) --- Makefile.groups | 61 +++++++++++++++++++++++++++---------------------------- 1 files changed, 30 insertions(+), 31 deletions(-) diff --git a/Makefile.groups b/Makefile.groups index 449627c..cf61e87 100644 --- a/Makefile.groups +++ b/Makefile.groups @@ -167,18 +167,18 @@ mod_list_all=$(sort $(mod_list_basic) $(mod_list_extra) \ # groups are sets of modules selected by compile target interest (should be # built by combining lists) -# Modules in this group are the default compiled modules due to +# Modules in this group are the default compiled modules due to # no external compile or link dependencies module_group_default=$(mod_list_basic) $(mod_list_extra) \ $(mod_list_db) $(mod_list_dbuid) \ $(mod_list_devel) -# Modules in this group are the default compiled modules due to +# Modules in this group are the default compiled modules due to # no internal/external compile or link dependencies module_group_standard=$(mod_list_basic) $(mod_list_extra) \ $(mod_list_devel) -# Modules in this group are considered a standard part due to +# Modules in this group are considered a standard part due to # widespread usage, but they have dependencies that must be satisfied for # compilation (e.g., lcr, radius, presence, tls, ...). module_group_common=$(mod_list_db) $(mod_list_dbuid) \ @@ -213,90 +213,89 @@ module_group_ignore= $(sort $(filter-out $(module_group_default), $(mod_list_all -### --- Groups defined for packaging ### +### --- Groups defined for pacKaging ### -# Standard modules in K Debian distro +# Standard modules in main pkg module_group_kstandard=$(mod_list_basic) $(mod_list_extra) \ $(mod_list_db) $(mod_list_dbuid) \ $(mod_list_pcre) -# K mysql module +# pkg mysql module module_group_kmysql=$(mod_list_mysql) -# K postgress module +# pkg postgress module module_group_kpostgres=$(mod_list_postgres) -# K cpl module +# pkg cpl module module_group_kcpl=$(mod_list_cpl) -# K xml modules +# pkg xml modules module_group_kxml=$(mod_list_xmldeps) $(mod_list_mi_xmlrpc) -# K radius modules +# pkg radius modules module_group_kradius=$(mod_list_radius) -# K unixodbc module +# pkg unixodbc module module_group_kunixodbc=$(mod_list_unixodbc) -# K perl module +# pkg perl module module_group_kperl=$(mod_list_app_perl) -# K snmpstats module +# pkg snmpstats module module_group_ksnmpstats=$(mod_list_snmpstats) -# K xmpp module +# pkg xmpp module module_group_kxmpp=$(mod_list_xmpp) -# K carrierroute module +# pkg carrierroute module module_group_kcarrierroute=$(mod_list_carrierroute) -# K berkeley module +# pkg berkeley module module_group_kberkeley=$(mod_list_berkeley) -# K ldap modules +# pkg ldap modules module_group_kldap=$(mod_list_ldap) -# K utils module +# pkg utils module module_group_kutils=$(mod_list_utils) -# K purple module +# pkg purple module module_group_kpurple=$(mod_list_purple) -# K memcached module +# pkg memcached module module_group_kmemcached=$(mod_list_memcached) -# K tls module +# pkg tls module module_group_ktls=$(mod_list_tlsdeps) -# K websocket module +# pkg websocket module module_group_kwebsocket=$(mod_list_websocket) -# K presence modules +# pkg presence modules module_group_kpresence=$(mod_list_presence) -# K lua module +# pkg lua module module_group_klua=$(mod_list_lua) -# K python module +# pkg python module module_group_kpython=$(mod_list_python) -# K geoip module +# pkg geoip module module_group_kgeoip=$(mod_list_geoip) -# K sqlite module +# pkg sqlite module module_group_ksqlite=$(mod_list_sqlite) # K json modules module_group_kjson=$(mod_list_json) -# K redis module +# pkg redis module module_group_kredis=$(mod_list_redis) -# K mono module +# pkg mono module module_group_kmono=$(mod_list_mono) -# For IMS -# kamailio modules +# pkg IMS modules module_group_kims=$(mod_list_ims)

1 0

git:4.0: db_postgres: handle prepare statements in DB APIv2
by Daniel-Constantin Mierla 04 Mar '13

04 Mar '13

Module: sip-router Branch: 4.0 Commit: d8606ec25cc4083a9c425639f14f0bbe26768f7a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8606ec… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 16:14:42 2013 +0100 db_postgres: handle prepare statements in DB APIv2 - patch by Markus Bucher, closes FS#272 (cherry picked from commit 09c7b67beee9529d6a7c06e600c7f294bf453eda) --- modules/db_postgres/pg_cmd.c | 71 +++++++++++++++++++++++++++++++++++++++++- modules/db_postgres/pg_fld.c | 1 + modules/db_postgres/pg_fld.h | 1 + 3 files changed, 72 insertions(+), 1 deletions(-) diff --git a/modules/db_postgres/pg_cmd.c b/modules/db_postgres/pg_cmd.c index eec1c1b..db7ad66 100644 --- a/modules/db_postgres/pg_cmd.c +++ b/modules/db_postgres/pg_cmd.c @@ -198,19 +198,88 @@ static int get_types(db_cmd_t* cmd) { struct pg_cmd* pcmd; struct pg_con* pcon; + int i, n; + pg_type_t *types; pcmd = DB_GET_PAYLOAD(cmd); /* FIXME */ pcon = DB_GET_PAYLOAD(cmd->ctx->con[db_payload_idx]); + types = pcon->oid; pcmd->types = PQdescribePrepared(pcon->con, pcmd->name); if (PQresultStatus(pcmd->types) != PGRES_COMMAND_OK) { ERR("postgres: Error while obtaining description of prepared statement\n"); return -1; } + /* adapted from check_result() in db_mysql */ + n = PQnfields(pcmd->types); + if (cmd->result == NULL) { + /* The result set parameter of db_cmd function was empty, that + * means the command is select * and we have to create the array + * of result fields in the cmd structure manually. + */ + cmd->result = db_fld(n + 1); + cmd->result_count = n; + for(i = 0; i < cmd->result_count; i++) { + struct pg_fld *f; + if (pg_fld(cmd->result + i, cmd->table.s) < 0) goto error; + f = DB_GET_PAYLOAD(cmd->result + i); + f->name = pkg_malloc(strlen(PQfname(pcmd->types, i))+1); + if (f->name == NULL) { + ERR("postgres: Out of private memory\n"); + goto error; + } + strcpy(f->name, PQfname(pcmd->types, i)); + cmd->result[i].name = f->name; + } + } else { + if (cmd->result_count != n) { + BUG("postgres: Number of fields in PQresult does not match number of parameters in DB API\n"); + goto error; + } + } + + /* Now iterate through all the columns in the result set and replace + * any occurrence of DB_UNKNOWN type with the type of the column + * retrieved from the database and if no column name was provided then + * update it from the database as well. + */ + for(i = 0; i < cmd->result_count; i++) { + Oid type = PQftype(pcmd->types, i); + if (cmd->result[i].type != DB_NONE) continue; + + if ((type == types[PG_INT2].oid) || (type == types[PG_INT4].oid) || (type == types[PG_INT8].oid)) + cmd->result[i].type = DB_INT; + else if (type == types[PG_FLOAT4].oid) + cmd->result[i].type = DB_FLOAT; + + else if (type == types[PG_FLOAT8].oid) + cmd->result[i].type = DB_DOUBLE; + + else if ((type == types[PG_TIMESTAMP].oid) || (type == types[PG_TIMESTAMPTZ].oid)) + cmd->result[i].type = DB_DATETIME; + + else if ((type == types[PG_VARCHAR].oid) || (type == types[PG_CHAR].oid) || (type == types[PG_TEXT].oid)) + cmd->result[i].type = DB_STR; + + else if ((type == types[PG_BIT].oid) || (type == types[PG_VARBIT].oid)) + cmd->result[i].type = DB_BITMAP; + + else if (type == types[PG_BYTE].oid) + cmd->result[i].type = DB_BLOB; + + else + { + ERR("postgres: Unsupported PostgreSQL column type: %d, table: %s, column: %s\n", + type, cmd->table.s, PQfname(pcmd->types, i)); + goto error; + } + } return 0; +error: + return -1; } @@ -352,7 +421,7 @@ static int upload_cmd(db_cmd_t* cmd) DBG("postgres: Uploading command '%s': '%s'\n", pcmd->name, pcmd->sql_cmd.s); - res = PQprepare(pcon->con, pcmd->name, pcmd->sql_cmd.s, 0, NULL); + res = PQprepare(pcon->con, pcmd->name, pcmd->sql_cmd.s, (cmd->match_count + cmd->vals_count), NULL); st = PQresultStatus(res); diff --git a/modules/db_postgres/pg_fld.c b/modules/db_postgres/pg_fld.c index 76ad4df..46d54f0 100644 --- a/modules/db_postgres/pg_fld.c +++ b/modules/db_postgres/pg_fld.c @@ -62,6 +62,7 @@ static void pg_fld_free(db_fld_t* fld, struct pg_fld* payload) { db_drv_free(&payload->gen); + if (payload->name) pkg_free(payload->name); pkg_free(payload); } diff --git a/modules/db_postgres/pg_fld.h b/modules/db_postgres/pg_fld.h index 09b9926..6cd9021 100644 --- a/modules/db_postgres/pg_fld.h +++ b/modules/db_postgres/pg_fld.h @@ -47,6 +47,7 @@ struct pg_fld { db_drv_t gen; + char* name; /** * A union of varius data types from db_fld, postgres expects binary * data in network byte order so we use these variables as temporary

1 0

git:4.0: Makefile.defs: -DWITH_AS_SUPPORT is on by default
by Daniel-Constantin Mierla 04 Mar '13

04 Mar '13

Module: sip-router Branch: 4.0 Commit: dc15e648b398ef7d8052181b822c9756bed95013 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dc15e64… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 10:46:01 2013 +0100 Makefile.defs: -DWITH_AS_SUPPORT is on by default - it was for kamailio flavour only - can be disabled with WITHAS=0 and exclude_modules+=seas (cherry picked from commit 01cbe8bf98d6ad1ef8cf7e0b9f646fde81831fc6) --- Makefile.defs | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 85fa155..4247f31 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -148,13 +148,14 @@ CFG_NAME=kamailio KMSTATS ?= 1 # fast malloc statistics on FMSTATS ?= 1 -# application server support on -WITHAS ?= 1 else # unknown: # main binary name MAIN_NAME=kamailio endif +# application server support on +WITHAS ?= 1 + # what to install INSTALL_FLAVOUR=$(FLAVOUR)

1 0

git:4.0: Makefile: updated the groups of modules
by Daniel-Constantin Mierla 04 Mar '13

04 Mar '13

Module: sip-router Branch: 4.0 Commit: 31219de430f48fc15bbf58cde5d6073cd5625ef5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=31219de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 16:09:36 2013 +0100 Makefile: updated the groups of modules - they are kept in Makefile.groups to keep main Makefile cleaner - most of modules are in lists groupped mostly by dependency - compilation and packaging groups are build using the lists - exclude_modules list is automatically built from all modules without those part of lists with external dependencies (cherry picked from commit b5024f320b578c831d3ee13b077bb87954bc61b0) --- Makefile | 44 ++++++- Makefile.groups | 397 ++++++++++++++++++++++++++++++++----------------------- Makefile.shared | 5 + 3 files changed, 275 insertions(+), 171 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=312…

1 0

git:4.0: Makefile: split module groups definitions in Makefile.groups
by Daniel-Constantin Mierla 04 Mar '13

04 Mar '13

Module: sip-router Branch: 4.0 Commit: c40939ad2aae3dfb7d33ed8016223da9038f1ca7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c40939a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Mar 3 23:53:14 2013 +0100 Makefile: split module groups definitions in Makefile.groups - the part was quite big and it is more config related than build rules - it has to be updated with the current list of modules (cherry picked from commit 23a22e2c8d73843798d66ec1bebe22cf7702213b) --- Makefile | 243 +------------------------------------------------------ Makefile.groups | 245 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 247 insertions(+), 241 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c40…

1 0

git:master: usrloc: added missing state from AoR contact dump
by Daniel-Constantin Mierla 04 Mar '13

04 Mar '13

Module: sip-router Branch: master Commit: 068e6e5903801ca7cb7d1ca304d35bca70a34b58 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=068e6e5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 4 19:56:54 2013 +0100 usrloc: added missing state from AoR contact dump --- modules/usrloc/ul_mi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/usrloc/ul_mi.c b/modules/usrloc/ul_mi.c index 076b051..3f88a71 100644 --- a/modules/usrloc/ul_mi.c +++ b/modules/usrloc/ul_mi.c @@ -660,7 +660,7 @@ struct mi_root* mi_usrloc_show_contact(struct mi_root *cmd, void *param) } node = addf_mi_node_child( rpl, 0, "Contact", 7, - "<%.*s>;q=%s;expires=%d;flags=0x%X;cflags=0x%X;socket=<%.*s>;" + "<%.*s>;q=%s;expires=%d;flags=0x%X;cflags=0x%X;state=%d;socket=<%.*s>;" "methods=0x%X" "%s%.*s%s" /*received*/ "%s%.*s%s" /*user-agent*/ @@ -669,7 +669,7 @@ struct mi_root* mi_usrloc_show_contact(struct mi_root *cmd, void *param) ";reg-id=%u", con->c.len, ZSW(con->c.s), q2str(con->q, 0), (int)(con->expires - act_time), - con->flags, con->cflags, + con->flags, con->cflags, con->state, con->sock?con->sock->sock_str.len:3, con->sock?con->sock->sock_str.s:"NULL", con->methods,

1 0

Accessing ruid
by Peter Dunkley 04 Mar '13

04 Mar '13

Hello, I've added a new function into the pd/outbound branch to allow me to remove a specific contact based on ruid. I've noticed that ruid is already cached into an xavp when the registrar.xavp_rcd modparam is set. I think this means in the "ordinary" case when I just call registrar.lookup() I can use the content of this xavp (in onreply_route() or failure_route()). Is this the case? Am I correct in thinking that this will not be enough when t_(load|next)_contacts() is used? If this is the case can someone help me work out what needs to be done here? Thanks, Peter

2 1

← Newer
1
...
35
36
37
38
39
40
41
42
43
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 2013