sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
227 discussions

git:carstenbock/ims: - Need to call "parse_rr()" in order to retrieve the parsed content ; -)
by Carsten Bock 13 Jan '11

13 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 59206b14e1cbd4c3f62c53ae1978dba89af2bade URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=59206b1… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 13 23:01:21 2011 +0100 - Need to call "parse_rr()" in order to retrieve the parsed content ;-) --- modules_k/rr/rr_mod.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/modules_k/rr/rr_mod.c b/modules_k/rr/rr_mod.c index 9f2ccba..7608e04 100644 --- a/modules_k/rr/rr_mod.c +++ b/modules_k/rr/rr_mod.c @@ -318,7 +318,12 @@ pv_get_route_uri_f(struct sip_msg *msg, pv_param_t *param, rr_t* rt; str uri; - /* Parse the header until the First-Route-Header: */ + if (!msg) { + LM_ERR("No message?!?\n"); + return -1; + } + + /* Parse the message until the First-Route-Header: */ if (parse_headers(msg, HDR_ROUTE_F, 0) == -1) { LM_ERR("while parsing message\n"); return -1; @@ -328,9 +333,16 @@ pv_get_route_uri_f(struct sip_msg *msg, pv_param_t *param, LM_INFO("No route header present.\n"); return -1; } + hdr = msg->route; + + /* Parse the contents of the header: */ + if (parse_rr(hdr) == -1) { + LM_ERR("Error while parsing Route header\n"); + return -1; + } + /* Retrieve the Route-Header */ - hdr = msg->route; rt = (rr_t*)hdr->parsed; uri = rt->nameaddr.uri;

1 0

git:carstenbock/ims: - Beginnig of cleanup on Config of P-CSCF
by Carsten Bock 13 Jan '11

13 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: d877959a11b11034704564e2b84a0ad06f144102 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d877959… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 13 18:08:44 2011 +0100 - Beginnig of cleanup on Config of P-CSCF - Added documentation templates for the modules (the content will follow, as soon as it is clear, which commands/parameters stay in the module) --- modules/cdp/doc/Makefile | 4 + modules/cdp/doc/cdp.xml | 42 ++++++ modules/cdp/doc/functions.xml | 40 ++++++ modules/cdp/doc/params.xml | 53 ++++++++ modules/cdp_avp/doc/Makefile | 4 + modules/cdp_avp/doc/cdp_avp.xml | 42 ++++++ modules/cdp_avp/doc/functions.xml | 40 ++++++ modules/cdp_avp/doc/params.xml | 53 ++++++++ modules/ecscf/doc/Makefile | 4 + modules/ecscf/doc/ecscf.xml | 42 ++++++ modules/ecscf/doc/functions.xml | 40 ++++++ modules/ecscf/doc/params.xml | 53 ++++++++ modules/icscf/doc/Makefile | 4 + modules/icscf/doc/functions.xml | 40 ++++++ modules/icscf/doc/icscf.xml | 46 +++++++ modules/icscf/doc/params.xml | 53 ++++++++ modules/lrf/doc/Makefile | 4 + modules/lrf/doc/functions.xml | 40 ++++++ modules/lrf/doc/lrf.xml | 42 ++++++ modules/lrf/doc/params.xml | 53 ++++++++ modules/mgcf/doc/Makefile | 4 + modules/mgcf/doc/functions.xml | 40 ++++++ modules/mgcf/doc/mgcf.xml | 42 ++++++ modules/mgcf/doc/params.xml | 53 ++++++++ modules/pcscf/doc/Makefile | 4 + modules/pcscf/doc/functions.xml | 40 ++++++ modules/pcscf/doc/params.xml | 53 ++++++++ modules/pcscf/doc/pcscf.xml | 50 ++++++++ modules/pcscf/pcscf.cfg | 251 ++++++++++++++++++++++++++----------- modules/scscf/doc/Makefile | 4 + modules/scscf/doc/functions.xml | 40 ++++++ modules/scscf/doc/params.xml | 53 ++++++++ modules/scscf/doc/scscf.xml | 46 +++++++ 33 files changed, 1308 insertions(+), 71 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d87…

1 0

git:carstenbock/ims: - first start of the cleanup of the configuration
by Carsten Bock 13 Jan '11

13 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: 3af8316727d877e5a36ed7ee24da97fc677efa97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3af8316… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Thu Jan 13 21:25:38 2011 +0100 - first start of the cleanup of the configuration - as a result: removed obsolete functions - added a PV to the RR-Module: $route_uri, the URI of the first Route-Header --- modules/pcscf/mod.c | 3 - modules/pcscf/pcscf.cfg | 51 +++++++++++-------- modules/pcscf/security.c | 112 ----------------------------------------- modules/pcscf/security.h | 4 -- modules_k/rr/doc/rr.xml | 12 ++++ modules_k/rr/doc/rr_admin.xml | 19 ++++++- modules_k/rr/rr_mod.c | 49 +++++++++++++++++- 7 files changed, 105 insertions(+), 145 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3af…

1 0

git:3.1: snmpstats: fixed faulty allocation of snmp stats array
by Daniel-Constantin Mierla 13 Jan '11

13 Jan '11

Module: sip-router Branch: 3.1 Commit: a0d376d85aae2f6e46e381a01fb85c5830250d4d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0d376d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 13 11:20:07 2011 +0100 snmpstats: fixed faulty allocation of snmp stats array - the size of struct was used while the pointer to that struct was in the array - reported by Paul Pankhurst (cherry picked from commit 52ce2349234da4b82bff28eed1bb89baad645a96) --- modules_k/snmpstats/snmpstats.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 89ac61b..9e52c03 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -195,10 +195,10 @@ static int register_message_code_statistics(void) sizeof(in_message_code_names) / sizeof(char *); in_message_code_stats = - shm_malloc(sizeof(stat_var) * number_of_message_codes); + shm_malloc(sizeof(stat_var*) * number_of_message_codes); out_message_code_stats = - shm_malloc(sizeof(stat_var) * number_of_message_codes); + shm_malloc(sizeof(stat_var*) * number_of_message_codes); /* We can only proceed if we had enough memory to allocate the * statistics. Note that we don't free the memory, but we don't care @@ -210,8 +210,8 @@ static int register_message_code_statistics(void) } /* Make sure everything is zeroed out */ - memset(in_message_code_stats, 0, number_of_message_codes); - memset(out_message_code_stats, 0, number_of_message_codes); + memset(in_message_code_stats, 0, sizeof(stat_var*) * number_of_message_codes); + memset(out_message_code_stats, 0, sizeof(stat_var*) * number_of_message_codes); for (i = 0; i < number_of_message_codes; i++) {

1 0

git:master: snmpstats: fixed faulty allocation of snmp stats array
by Daniel-Constantin Mierla 13 Jan '11

13 Jan '11

Module: sip-router Branch: master Commit: 52ce2349234da4b82bff28eed1bb89baad645a96 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=52ce234… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Jan 13 11:20:07 2011 +0100 snmpstats: fixed faulty allocation of snmp stats array - the size of struct was used while the pointer to that struct was in the array - reported by Paul Pankhurst --- modules_k/snmpstats/snmpstats.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules_k/snmpstats/snmpstats.c b/modules_k/snmpstats/snmpstats.c index 89ac61b..9e52c03 100644 --- a/modules_k/snmpstats/snmpstats.c +++ b/modules_k/snmpstats/snmpstats.c @@ -195,10 +195,10 @@ static int register_message_code_statistics(void) sizeof(in_message_code_names) / sizeof(char *); in_message_code_stats = - shm_malloc(sizeof(stat_var) * number_of_message_codes); + shm_malloc(sizeof(stat_var*) * number_of_message_codes); out_message_code_stats = - shm_malloc(sizeof(stat_var) * number_of_message_codes); + shm_malloc(sizeof(stat_var*) * number_of_message_codes); /* We can only proceed if we had enough memory to allocate the * statistics. Note that we don't free the memory, but we don't care @@ -210,8 +210,8 @@ static int register_message_code_statistics(void) } /* Make sure everything is zeroed out */ - memset(in_message_code_stats, 0, number_of_message_codes); - memset(out_message_code_stats, 0, number_of_message_codes); + memset(in_message_code_stats, 0, sizeof(stat_var*) * number_of_message_codes); + memset(out_message_code_stats, 0, sizeof(stat_var*) * number_of_message_codes); for (i = 0; i < number_of_message_codes; i++) {

1 0

git:master: modules_k/presence: added new functionality to the presence engine
by Marius Ovidiu Bucur 12 Jan '11

12 Jan '11

Module: sip-router Branch: master Commit: 35568faf7082ccd1316bb09c9216b9ff8efd9227 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35568fa… Author: Marius Bucur <marius.bucur(a)1and1.ro> Committer: Marius Bucur <marius.bucur(a)1and1.ro> Date: Wed Jan 12 18:13:32 2011 +0200 modules_k/presence: added new functionality to the presence engine The new "dbmode" parameter controls the way subscriptions are handled: in memory, fallback to database, or database only. The "fallback2db" parameter will still ve available for config compatibility. --- modules_k/presence/README | 94 ++++++--- modules_k/presence/doc/presence_admin.xml | 22 ++- modules_k/presence/hash.c | 4 +- modules_k/presence/notify.c | 144 +++++++------ modules_k/presence/presence.c | 11 +- modules_k/presence/presence.h | 11 +- modules_k/presence/presentity.c | 4 +- modules_k/presence/subscribe.c | 218 ++++++++++++++++++-- .../presence_tests/clean_subscribers.sh | 13 ++ .../test_framework/presence_tests/config.sh | 12 + .../presence_tests/presence_subscribe_suite.sh | 58 +++++ .../test_framework/presence_tests/send_publish.sh | 29 +++ .../presence_tests/send_subscribe.sh | 47 +++++ 13 files changed, 536 insertions(+), 131 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=355…

1 0

git:carstenbock/ims: - Added config files for E-CSCF, LRF and MGCF
by Carsten Bock 11 Jan '11

11 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: e277313ddda60a3bf3b67eef5edbd18a0895003e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e277313… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 23:36:46 2011 +0100 - Added config files for E-CSCF, LRF and MGCF --- modules/ecscf/Makefile | 2 +- modules/ecscf/ecscf.cfg | 272 +++++++++++++++++++++++++++++++++ modules/lrf/Makefile | 2 +- modules/lrf/lrf.cfg | 147 ++++++++++++++++++ modules/mgcf/Makefile | 2 + modules/mgcf/mgcf.cfg | 380 +++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 803 insertions(+), 2 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=e27…

1 0

git:master: db_postgres: reconnect support for DB API v1
by Daniel-Constantin Mierla 11 Jan '11

11 Jan '11

Module: sip-router Branch: master Commit: b200828b1fc13e44a098be6f26294c842444c1f6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b200828… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jan 11 23:08:25 2011 +0100 db_postgres: reconnect support for DB API v1 - attept to reconnect to postgres server upon bad connection (e.g., connection lost) - number of retries can be set via command line parameter, reusing exisiting one from DB API v2 --- modules/db_postgres/km_dbase.c | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 953a33e..649c945 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -78,6 +78,7 @@ #include "km_pg_con.h" #include "km_val.h" #include "km_res.h" +#include "pg_mod.h" static void db_postgres_free_query(const db1_con_t* _con); @@ -113,6 +114,8 @@ void db_postgres_close(db1_con_t* _h) */ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) { + int i; + if(! _con || !_s || !_s->s) { LM_ERR("invalid parameter value\n"); @@ -141,19 +144,27 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) return -1; } - /* free any previous query that is laying about */ - db_postgres_free_query(_con); - - /* exec the query */ - if (PQsendQuery(CON_CONNECTION(_con), _s->s)) { - LM_DBG("%p PQsendQuery(%.*s)\n", _con, _s->len, _s->s); - } else { - LM_ERR("%p PQsendQuery Error: %s Query: %.*s\n", _con, - PQerrorMessage(CON_CONNECTION(_con)), _s->len, _s->s); - return -1; + for(i = 0; i <= pg_retries; i++) { + /* free any previous query that is laying about */ + db_postgres_free_query(_con); + /* exec the query */ + if (PQsendQuery(CON_CONNECTION(_con), _s->s)) { + LM_DBG("sending query ok: %p - [%.*s]\n", + _con, _s->len, _s->s); + return 0; + } + LM_WARN("sending postgres command failed, connection status %d," + " error [%s]\n", PQstatus(CON_CONNECTION(_con)), + PQerrorMessage(CON_CONNECTION(_con))); + if(PQstatus(CON_CONNECTION(_con))!=CONNECTION_OK) + { + LM_DBG("reseting the connection to postgress server\n"); + PQreset(CON_CONNECTION(_con)); + } } - - return 0; + LM_ERR("%p PQsendQuery Error: %s Query: %.*s\n", _con, + PQerrorMessage(CON_CONNECTION(_con)), _s->len, _s->s); + return -1; }

1 0

git:carstenbock/ims: - removed reference to debug
by Carsten Bock 11 Jan '11

11 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: c54071efb9dc7eaa10c8c93d534a103be5eea4f2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c54071e… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 23:02:51 2011 +0100 - removed reference to debug --- modules/ecscf/dlg_state.c | 3 +-- modules/lrf/dlg_state.c | 2 +- modules/lrf/locsip_subscribe.c | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/ecscf/dlg_state.c b/modules/ecscf/dlg_state.c index b504a61..269ca04 100644 --- a/modules/ecscf/dlg_state.c +++ b/modules/ecscf/dlg_state.c @@ -60,7 +60,6 @@ #include "sip.h" -extern int debug; extern struct tm_binds tmb; int e_dialogs_hash_size; /**< size of the dialog hash table */ @@ -638,7 +637,7 @@ void print_e_dialogs(int log_level) { e_dialog *d; int i; - if (debug<log_level) return; /* to avoid useless calls when nothing will be printed */ + if (L_DBG<log_level) return; /* to avoid useless calls when nothing will be printed */ d_act_time(); LOG(log_level,"INF:"M_NAME":---------- E-CSCF Dialog List begin --------------\n"); for(i=0;i<e_dialogs_hash_size;i++){ diff --git a/modules/lrf/dlg_state.c b/modules/lrf/dlg_state.c index 0c27eab..fd6a81b 100644 --- a/modules/lrf/dlg_state.c +++ b/modules/lrf/dlg_state.c @@ -532,7 +532,7 @@ void print_lrf_dialogs(int log_level) { lrf_dialog *d; int i,j; - //if (debug<log_level) return; /* to avoid useless calls when nothing will be printed */ + if (L_DBG<log_level) return; /* to avoid useless calls when nothing will be printed */ d_act_time(); LOG(log_level,"INF:"M_NAME":---------- LRF Dialog List begin --------------\n"); for(i=0;i<lrf_dialogs_hash_size;i++){ diff --git a/modules/lrf/locsip_subscribe.c b/modules/lrf/locsip_subscribe.c index 1076520..4c51564 100644 --- a/modules/lrf/locsip_subscribe.c +++ b/modules/lrf/locsip_subscribe.c @@ -73,7 +73,6 @@ #include "sip.h" #include "user_data.h" -extern int debug; extern struct tm_binds tmb; /**< Structure with pointers to tm funcs */ extern dlg_func_t dialogb; /**< Structure with pointers to dialog funcs */ @@ -650,7 +649,7 @@ void print_subs(int log_level) { loc_subscription *s; int i; - if (debug<log_level) return; /* to avoid useless calls when nothing will be printed */ + if (L_DBG<log_level) return; /* to avoid useless calls when nothing will be printed */ LOG(log_level,ANSI_GREEN"INF:"M_NAME":---------- Subscription list begin ---------\n"); for(i=0;i<subscriptions_hash_size;i++){ subs_lock(i);

1 0

git:carstenbock/ims: - Changed the debian packaging rules for double Libraries ( otherwise liblost_client gets removed from the kamailio-ims-modules)
by Carsten Bock 11 Jan '11

11 Jan '11

Module: sip-router Branch: carstenbock/ims Commit: cf39ab16641070423333c7a07ec4d208e816bfb5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf39ab1… Author: Carsten Bock <carsten(a)bock.info> Committer: Carsten Bock <carsten(a)bock.info> Date: Tue Jan 11 22:01:48 2011 +0100 - Changed the debian packaging rules for double Libraries (otherwise liblost_client gets removed from the kamailio-ims-modules) --- pkg/kamailio/deb/debian/rules | 4 ++-- pkg/kamailio/deb/lenny/rules | 4 ++-- pkg/kamailio/deb/lucid/rules | 4 ++-- pkg/kamailio/deb/squeeze/rules | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/kamailio/deb/debian/rules b/pkg/kamailio/deb/debian/rules index cedfd2a..e4ebe36 100755 --- a/pkg/kamailio/deb/debian/rules +++ b/pkg/kamailio/deb/debian/rules @@ -46,8 +46,8 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio #\ + #$(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) diff --git a/pkg/kamailio/deb/lenny/rules b/pkg/kamailio/deb/lenny/rules index d5582af..0e2abf6 100755 --- a/pkg/kamailio/deb/lenny/rules +++ b/pkg/kamailio/deb/lenny/rules @@ -46,8 +46,8 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio #\ + #$(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) diff --git a/pkg/kamailio/deb/lucid/rules b/pkg/kamailio/deb/lucid/rules index cedfd2a..e4ebe36 100755 --- a/pkg/kamailio/deb/lucid/rules +++ b/pkg/kamailio/deb/lucid/rules @@ -46,8 +46,8 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio #\ + #$(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP))) diff --git a/pkg/kamailio/deb/squeeze/rules b/pkg/kamailio/deb/squeeze/rules index 7af28a9..e606451 100755 --- a/pkg/kamailio/deb/squeeze/rules +++ b/pkg/kamailio/deb/squeeze/rules @@ -46,8 +46,8 @@ PACKAGE_GROUPS=mysql postgres berkeley unixodbc radius presence \ # directories with possible duplicate libraries (that should be deleted # from current module* packages) -DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio \ - $(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio +DUP_LIBS_DIRS=$(CURDIR)/debian/kamailio/usr/lib/kamailio #\ + #$(CURDIR)/debian/kamailio-db-modules/usr/lib/kamailio # modules names out of modules sp MODULES_SP_NAMES=$(filter-out $(MDIRS),$(subst /, ,$(MODULES_SP)))

1 0

← Newer
1
...
10
11
12
13
14
15
16
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011