sr-dev May 2012

sr-dev@lists.kamailio.org

29 participants
173 discussions

git:master: pkg/kamailio/fedora: Created . spec for building Kamailio on Fedora
by Peter Dunkley 07 May '12

07 May '12

Module: sip-router Branch: master Commit: 37f7dfe0cc8a239ab7f9461c5c26f16cc24aa924 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=37f7dfe… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon May 7 02:51:36 2012 +0100 pkg/kamailio/fedora: Created .spec for building Kamailio on Fedora - Also updated pkg/kamailio/fedora/kamailio.init and added pkg/kamailio/fedora/kamailio.default. - Tested/developed on Fedora 16 x86_64 - but should work on other architectures. - The spec file builds all Kamailio 3.3.0 modules (modules/modules_k) except: - modules/auth_identity: Conflicts with TLS unless statically linked (which requires changes to Makefile and is impractical for generic RPM building). - modules/db_cassandra: Requires Thrift which is not in the F16 repo. - modules/iptrtpproxy: Needs local copy of iptables source to build (impractical for generic RPM building). - modules_k/db_oracle: Requires Oracle which is not in the F16 repo (and is closed-source). - modules_k/memcached: Module compilation appears to require an older version of libmemcached-devel than the one in the F16 repo. - modules_k/mi_xmlrpc: The F16 repo contains an unsupported version of libxmlrpc-c3, and there is an compilation error due to the module code using an unknown type ('TString'). - modules_k/osp: Requires OSP Toolkit which is not in the F16 repo. - I plan to update this .spec in a couple of weeks when Fedora 17 is released. I will add modules/db_cassandra and modules_k/osp if Fedora 17 contains the right versions of Thrift and OSP Toolkit. --- pkg/kamailio/fedora/kamailio.default | 25 + pkg/kamailio/fedora/kamailio.init | 106 +++- pkg/kamailio/fedora/kamailio.spec | 879 ++++++++++++++++++++++++++++++++++ 3 files changed, 983 insertions(+), 27 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=37f…

1 0

git:master: modules_k/auth_identity: Updated to compile on Fedora 16
by Peter Dunkley 06 May '12

06 May '12

Module: sip-router Branch: master Commit: a79afc381447eb0fa84f4ff73b4470a1179945bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a79afc3… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Sun May 6 18:37:01 2012 +0100 modules_k/auth_identity: Updated to compile on Fedora 16 - auth_http.c and auth_identity.c include a header file that does not exist in the libcurl 7.21.7 RPMS. A quick search around online has indicated that this include shouldn't have been needed anyway. --- modules/auth_identity/auth_http.c | 1 - modules/auth_identity/auth_identity.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/auth_identity/auth_http.c b/modules/auth_identity/auth_http.c index ab42199..990405b 100644 --- a/modules/auth_identity/auth_http.c +++ b/modules/auth_identity/auth_http.c @@ -31,7 +31,6 @@ #include <stdlib.h> #include <string.h> #include <curl/curl.h> -#include <curl/types.h> #include <curl/easy.h> #include <openssl/pem.h> #include <openssl/err.h> diff --git a/modules/auth_identity/auth_identity.c b/modules/auth_identity/auth_identity.c index d4fb697..71e0ae0 100644 --- a/modules/auth_identity/auth_identity.c +++ b/modules/auth_identity/auth_identity.c @@ -47,7 +47,6 @@ #include <openssl/sha.h> #include <curl/curl.h> -#include <curl/types.h> #include <curl/easy.h> #include "../../dprint.h"

1 0

Building kamailio on Ubuntu 12.04
by Sasa Vilic 05 May '12

05 May '12

Hi, I am trying to build .deb packages for Ubuntu/Debian. I have Ubuntu server 12.04 installed, and I get following error: abyss_data.c:219:24: error: unknown type name ‘TBuffer’ and similar message about 'TString'. Any ideas how to solve this? Kind regards, Sasa

2 1

[tracker] Comment added: Kamailio looses track of location entries
by sip-router 05 May '12

05 May '12

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#226 - Kamailio looses track of location entries User who did this - Andrew Pogrebennyk (marduk) ---------- Glad that you write this, we discussed it here: http://comments.gmane.org/gmane.comp.voip.openser.user/34907, but AFAIK no development has been made into that direction. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=226#comment636 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: lib/srdb1: Changed OP_NEQ to use ANSI standard <>
by Peter Dunkley 04 May '12

04 May '12

Module: sip-router Branch: master Commit: 79e59ec116c14d3416803736a920d9ac478c6055 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=79e59ec… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri May 4 18:14:06 2012 +0100 lib/srdb1: Changed OP_NEQ to use ANSI standard <> - OP_NEQ was "!=" which works with many, but not all, SQL databases. - One database this doesn't work with is PostgreSQL. - <> is the standard and all databases should support it. --- lib/srdb1/db_op.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/db_op.h b/lib/srdb1/db_op.h index 4b4c3a4..2da6e1f 100644 --- a/lib/srdb1/db_op.h +++ b/lib/srdb1/db_op.h @@ -41,7 +41,7 @@ /** operator greater than equal */ #define OP_GEQ ">=" /** operator negation */ -#define OP_NEQ "!=" +#define OP_NEQ "<>" /** bitwise AND */ #define OP_BITWISE_AND "&"

1 1

git:master: modules_k/rls: Added checks for NULL results from DB queries
by Peter Dunkley 04 May '12

04 May '12

Module: sip-router Branch: master Commit: 275c8a77b6f09aabf428d91c9c22ab5bcfce8d4e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=275c8a7… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri May 4 18:21:47 2012 +0100 modules_k/rls: Added checks for NULL results from DB queries --- modules_k/rls/notify.c | 6 ++++++ modules_k/rls/subscribe.c | 6 ++++++ 2 files changed, 12 insertions(+), 0 deletions(-) diff --git a/modules_k/rls/notify.c b/modules_k/rls/notify.c index a460fa0..fd99b5a 100644 --- a/modules_k/rls/notify.c +++ b/modules_k/rls/notify.c @@ -1323,6 +1323,12 @@ int rls_get_resource_list(str *rl_uri, str *username, str *domain, return -1; } + if(result == NULL) + { + LM_ERR("bad result\n"); + return -1; + } + if(result->n<=0) { LM_DBG("No rl document found\n"); diff --git a/modules_k/rls/subscribe.c b/modules_k/rls/subscribe.c index 3918849..7df5d40 100644 --- a/modules_k/rls/subscribe.c +++ b/modules_k/rls/subscribe.c @@ -177,6 +177,12 @@ int rls_get_service_list(str *service_uri, str *user, str *domain, return -1; } + if (result == NULL) + { + LM_ERR("bad result\n"); + return -1; + } + if(result->n<=0) { LM_DBG("No rl document found\n");

1 0

git:master: modules_k/pua: Fixed memory leak and added checks for NULL results being returned from database queries
by Peter Dunkley 04 May '12

04 May '12

Module: sip-router Branch: master Commit: 0019761893c5264fce3dec02e90e672aedaa5ee9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0019761… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri May 4 18:18:58 2012 +0100 modules_k/pua: Fixed memory leak and added checks for NULL results being returned from database queries --- modules_k/pua/pua_db.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/modules_k/pua/pua_db.c b/modules_k/pua/pua_db.c index 200e951..a92b028 100644 --- a/modules_k/pua/pua_db.c +++ b/modules_k/pua/pua_db.c @@ -179,6 +179,12 @@ int clean_puadb( int update_period, int min_expires ) return(-1); } + if (res == NULL) + { + LM_ERR("bad result\n"); + return(-1); + } + if (RES_ROW_N(res) == 0) { /* no match */ @@ -285,6 +291,12 @@ int is_dialog_puadb(ua_pres_t *pres) return(-1); } + if (res == NULL) + { + LM_ERR("bad result\n"); + return(-1); + } + nr_rows = RES_ROW_N(res); pua_dbf.free_result(pua_db, res); @@ -366,6 +378,12 @@ int get_record_id_puadb(ua_pres_t *pres, str **rec_id ) return(-1); } + if (res == NULL) + { + LM_ERR("bad result\n"); + return(-1); + } + nr_rows = RES_ROW_N(res); switch (nr_rows) @@ -392,6 +410,12 @@ int get_record_id_puadb(ua_pres_t *pres, str **rec_id ) return(-1); } + if (res == NULL) + { + LM_ERR("bad result\n"); + return(-1); + } + nr_rows = RES_ROW_N(res); if (nr_rows == 1) @@ -827,6 +851,12 @@ ua_pres_t *get_record_puadb(str pres_id, str *etag, ua_pres_t *result, db1_res_t return(NULL); } + if (res == NULL) + { + LM_ERR("bad result\n"); + return(NULL); + } + nr_rows = RES_ROW_N(res); if (nr_rows == 0) @@ -1194,6 +1224,12 @@ ua_pres_t *get_dialog_puadb(str pres_id, str *pres_uri, ua_pres_t *result, db1_r return(NULL); } + if (res == NULL) + { + LM_ERR("bad result\n"); + return(NULL); + } + nr_rows = RES_ROW_N(res); if (nr_rows == 0) @@ -1524,6 +1560,12 @@ list_entry_t *get_subs_list_puadb(str *did) return list; } + if (res == NULL) + { + LM_ERR("bad result\n"); + return list; + } + if (RES_ROW_N(res) == 0) { LM_INFO( "No records found\n"); @@ -1565,5 +1607,7 @@ list_entry_t *get_subs_list_puadb(str *did) } while ((db_fetch_next(&pua_dbf, pua_fetch_rows, pua_db, &res)==1) && (RES_ROWS(res)>0)); + pua_dbf.free_result(pua_db, res); + return list; }

1 0

git:master: lib/srdb1/schema: Fixed typo in description field for extra_headers in silo.xml
by Peter Dunkley 04 May '12

04 May '12

Module: sip-router Branch: master Commit: b26e588e0af55a2304027327559b1d516eca7d74 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b26e588… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Fri May 4 18:12:33 2012 +0100 lib/srdb1/schema: Fixed typo in description field for extra_headers in silo.xml - Fix by Hugh Waite @ Crocodile RCS --- lib/srdb1/schema/silo.xml | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/silo.xml b/lib/srdb1/schema/silo.xml index 435cd75..67eeb67 100644 --- a/lib/srdb1/schema/silo.xml +++ b/lib/srdb1/schema/silo.xml @@ -100,7 +100,7 @@ <name>extra_hdrs</name> <type>text</type> <default/> - <description>iExtra headers that must be restored</description> + <description>Extra headers that must be restored</description> </column> <column id="callid">

1 0

git:master: kamailio.cfg: set version to 3.3 in the top comments
by Daniel-Constantin Mierla 04 May '12

04 May '12

Module: sip-router Branch: master Commit: f55f4dcd848547fb89f9d8c51bdb20f5544087bd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f55f4dc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 4 16:35:40 2012 +0200 kamailio.cfg: set version to 3.3 in the top comments - GRUU is disabled via registrar modparam to be coherent with the logi in config, as GRUU would require lookup for requests within dialog --- etc/kamailio.cfg | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/etc/kamailio.cfg b/etc/kamailio.cfg index 284cea3..6d60ee3 100644 --- a/etc/kamailio.cfg +++ b/etc/kamailio.cfg @@ -1,6 +1,6 @@ #!KAMAILIO # -# Kamailio (OpenSER) SIP Server v3.2 - default configuration script +# Kamailio (OpenSER) SIP Server v3.3 - default configuration script # - web: http://www.kamailio.org # - git: http://sip-router.org # @@ -306,6 +306,8 @@ modparam("registrar", "method_filtering", 1) #modparam("registrar", "max_contacts", 10) # max value for expires of registrations modparam("registrar", "max_expires", 3600) +# set it to 1 to enable GRUU +modparam("registrar", "gruu_enabled", 0) # ----- acc params -----

1 0

git:master: usrloc(k): set ruid for contacts added via MI command
by Daniel-Constantin Mierla 04 May '12

04 May '12

Module: sip-router Branch: master Commit: 1984f288bcc74a0287513ce69490a38cfe16971f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1984f28… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 4 16:35:04 2012 +0200 usrloc(k): set ruid for contacts added via MI command --- modules_k/usrloc/Makefile | 1 + modules_k/usrloc/ul_mi.c | 10 +++++++++- modules_k/usrloc/ul_mod.c | 7 +++++++ 3 files changed, 17 insertions(+), 1 deletions(-) diff --git a/modules_k/usrloc/Makefile b/modules_k/usrloc/Makefile index 1c6c64e..50f9ce0 100644 --- a/modules_k/usrloc/Makefile +++ b/modules_k/usrloc/Makefile @@ -16,4 +16,5 @@ SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/kmi/kmi SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 SER_LIBS+=$(SERLIBPATH)/kcore/kcore +SER_LIBS+=$(SERLIBPATH)/srutils/srutils include ../../Makefile.modules diff --git a/modules_k/usrloc/ul_mi.c b/modules_k/usrloc/ul_mi.c index 1855706..ca7c71a 100644 --- a/modules_k/usrloc/ul_mi.c +++ b/modules_k/usrloc/ul_mi.c @@ -35,6 +35,7 @@ #include <string.h> #include <stdio.h> #include "../../lib/kmi/mi.h" +#include "../../lib/srutils/sruid.h" #include "../../dprint.h" #include "../../ut.h" #include "../../qvalue.h" @@ -49,12 +50,14 @@ /*! CSEQ nr used */ #define MI_UL_CSEQ 1 /*! call-id used for ul_add and ul_rm_contact */ -static str mi_ul_cid = str_init("dfjrewr12386fd6-343(a)openser.mi"); +static str mi_ul_cid = str_init("dfjrewr12386fd6-343(a)kamailio.mi"); /*! user agent used for ul_add */ static str mi_ul_ua = str_init("SIP Router MI Server"); /*! path used for ul_add and ul_rm_contact */ static str mi_ul_path = str_init("dummypath"); +extern sruid_t _ul_sruid; + /************************ helper functions ****************************/ /*! @@ -540,6 +543,10 @@ struct mi_root* mi_usrloc_add(struct mi_root *cmd, void *param) if (str2int( &node->value, (unsigned int*)&ci.methods) < 0) goto bad_syntax; + if(sruid_next(&_ul_sruid)<0) + goto error; + ci.ruid = _ul_sruid.uid; + lock_udomain( dom, aor); n = get_urecord( dom, aor, &r); @@ -580,6 +587,7 @@ release_error: release_urecord(r); lock_error: unlock_udomain( dom, aor); +error: return init_mi_tree( 500, MI_INTERNAL_ERR_S, MI_INTERNAL_ERR_LEN); } diff --git a/modules_k/usrloc/ul_mod.c b/modules_k/usrloc/ul_mod.c index 5a05a3d..ccd94e8 100644 --- a/modules_k/usrloc/ul_mod.c +++ b/modules_k/usrloc/ul_mod.c @@ -60,6 +60,7 @@ #include "../../timer_proc.h" /* register_sync_timer */ #include "../../globals.h" /* is_main */ #include "../../ut.h" /* str_init */ +#include "../../lib/srutils/sruid.h" #include "dlist.h" /* register_udomain */ #include "udomain.h" /* {insert,delete,get,release}_urecord */ #include "urecord.h" /* {insert,delete,get}_ucontact */ @@ -107,6 +108,9 @@ extern int ul_locks_no; int ul_db_update_as_insert = 0; int ul_timer_procs = 0; +/* sruid to get internal uid for mi/rpc commands */ +sruid_t _ul_sruid; + /* * Module parameters and their default values */ @@ -241,6 +245,9 @@ static int mod_init(void) int i; udomain_t* d; + if(sruid_init(&_ul_sruid, '-', "ulcx", SRUID_INC)<0) + return -1; + #ifdef STATISTICS /* register statistics */ if (register_module_stats( exports.name, mod_stats)!=0 ) {

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2012