sr-dev August 2011

sr-dev@lists.kamailio.org

33 participants
292 discussions

git:master: db_mysql: renamed some internal functions
by Daniel-Constantin Mierla 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: a001f2f26d0b9746aa5e9f83e493ab30da965b9e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a001f2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 18 00:35:48 2011 +0200 db_mysql: renamed some internal functions - 'mysql' added in the name of some functions from DB APIv1 to be consistent with the rest of them --- modules/db_mysql/km_db_mysql.c | 4 ++-- modules/db_mysql/km_dbase.c | 4 ++-- modules/db_mysql/km_dbase.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 2c1c777..a94cf77 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -111,8 +111,8 @@ int db_mysql_bind_api(db_func_t *dbb) dbb->delete = db_mysql_delete; dbb->update = db_mysql_update; dbb->replace = db_mysql_replace; - dbb->last_inserted_id = db_last_inserted_id; - dbb->insert_update = db_insert_update; + dbb->last_inserted_id = db_mysql_last_inserted_id; + dbb->insert_update = db_mysql_insert_update; dbb->insert_delayed = db_mysql_insert_delayed; return 0; diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 8118d9a..6f344f2 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -470,7 +470,7 @@ int db_mysql_replace(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v * \return returns the ID as integer or returns 0 if the previous statement * does not use an AUTO_INCREMENT value. */ -int db_last_inserted_id(const db1_con_t* _h) +int db_mysql_last_inserted_id(const db1_con_t* _h) { if (!_h) { LM_ERR("invalid parameter value\n"); @@ -487,7 +487,7 @@ int db_last_inserted_id(const db1_con_t* _h) * \param _v values of the keys * \param _n number of key=value pairs */ - int db_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, + int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n) { int off, ret; diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 8d687ea..f7c2d0c 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -109,12 +109,12 @@ int db_mysql_replace(const db1_con_t* handle, const db_key_t* keys, const db_val /*! \brief * Returns the last inserted ID */ -int db_last_inserted_id(const db1_con_t* _h); +int db_mysql_last_inserted_id(const db1_con_t* _h); /*! \brief * Insert a row into table, update on duplicate key */ -int db_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, +int db_mysql_insert_update(const db1_con_t* _h, const db_key_t* _k, const db_val_t* _v, const int _n);

1 0

decode_mime_type error
by Jijo 17 Aug '11

17 Aug '11

Hi All, The function parse_content_type_hdr() is failing in decode_mime_type() when Content-Type parameter "boundary" has value comma as below. The error message is "ERROR:parse_content_type_hdr: CONTENT_TYPE hdr contains " "more then one mime type :-(! Content Type Header is as below, It works fine if the boundary value is without comma. Content-Type: multipart/mixed;boundary="*,*AW" The parse_content_type_hdr() is failing in the following code, ret = decode_mime_type(msg->content_type->body.s, end , &mime); if (ret==0) goto error; if (ret!=end) { LOG(L_INFO,"ERROR:parse_content_type_hdr: CONTENT_TYPE hdr contains " "more then one mime type :-(!\n"); goto error ; } I thought of fixing this issue by commenting the code for condition ret !=end. I'm not sure why we we need that check, as mime variable has the information to process the content. Please let me know if you see any impact. Thanks Jijo

1 0

compilation warnings
by Juha Heinanen 17 Aug '11

17 Aug '11

i just compiled master, and got these warnings: CC (cc) [M db_mysql.so] km_db_mysql.o km_db_mysql.c: In function ‘kam_mysql_mod_init’: km_db_mysql.c:93: warning: implicit declaration of function ‘db_mysql_alloc_buffer’ CC (cc) [M rls.so] resource_notify.o resource_notify.c:51:1: warning: "CONT_COPY" redefined In file included from rls.h:37, from resource_notify.c:38: ../presence/hash.h:52:1: warning: this is the location of the previous definition CC (cc) [M xcap_server.so] xcap_server.o xcap_server.c:422: warning: ‘xcaps_str_appsexml’ defined but not used especially the first one sounds dangerous. -- juha

2 1

git:master: modules_k/dispatcher: removed recently added modparams and added event_routes
by Peter Dunkley 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: 390ec4355fb0b4990cdff3e037e5256babc5f3fd URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=390ec43… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 17 17:00:51 2011 +0100 modules_k/dispatcher: removed recently added modparams and added event_routes - As per Daniel's suggestion, the module now uses libkcore/faked_msg and instead of parameters to specify routes when a destination goes up/down the module now calls the event_route[dispatcher:dst-up] and event_route[dispatcher:dst-down]. --- modules_k/dispatcher/Makefile | 1 + modules_k/dispatcher/README | 103 +++++++++++-------------- modules_k/dispatcher/dispatch.c | 68 ++++++++++------- modules_k/dispatcher/dispatch.h | 3 - modules_k/dispatcher/dispatcher.c | 94 ---------------------- modules_k/dispatcher/doc/dispatcher_admin.xml | 104 ++++++++++--------------- 6 files changed, 128 insertions(+), 245 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=390…

1 0

git:master: modules_k/dialog: Provider helper get_valid_msg() to retrieve
by Timo Reimann 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: a5498b52e9a3bbef63e4ce4212cc05124f428cd2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5498b5… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 17 13:12:24 2011 +0200 modules_k/dialog: Provider helper get_valid_msg() to retrieve valid SIP message from given dialog callback parameter structure. (Useful due to interface change committed in c02155941.) --- modules_k/dialog/dlg_cb.c | 21 +++++++++++++++++++++ modules_k/dialog/dlg_cb.h | 7 +++++++ 2 files changed, 28 insertions(+), 0 deletions(-) diff --git a/modules_k/dialog/dlg_cb.c b/modules_k/dialog/dlg_cb.c index 3f2f2cd..df8c3cb 100644 --- a/modules_k/dialog/dlg_cb.c +++ b/modules_k/dialog/dlg_cb.c @@ -260,3 +260,24 @@ void run_dlg_callbacks( int type , } return; } + + +struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params) +{ + struct sip_msg *msg; + + if (cb_params == NULL) { + LM_ERR("no dialog parameters given\n"); + return NULL; + } + + msg = cb_params->req; + if (msg == NULL) { + msg = cb_params->rpl; + if (msg == NULL || msg == FAKED_REPLY) { + return NULL; + } + } + + return msg; +} diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h index 80eae7b..f8bcadc 100644 --- a/modules_k/dialog/dlg_cb.h +++ b/modules_k/dialog/dlg_cb.h @@ -111,4 +111,11 @@ void run_dlg_callbacks( int type , void run_load_callbacks( void ); +/*! + * \brief Function that returns valid SIP message from given dialog callback parameter struct + * \param cb_params dialog callback parameter struct + * \return pointer to valid SIP message if existent, NULL otherwise + */ +struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params); + #endif

2 2

git:master: modules_k/dialog: Prefix get_valid_msg() function name with " dlg_"
by Timo Reimann 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: 3b7a97f8f463dae560de2a371ada379c99c4db47 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3b7a97f… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Aug 17 17:25:14 2011 +0200 modules_k/dialog: Prefix get_valid_msg() function name with "dlg_" and turn static inline to enable usage when the dialog module is not linked in. - modules_k/pua_dialoginfo: Use changed function name. --- modules_k/dialog/dlg_cb.c | 21 --------------------- modules_k/dialog/dlg_cb.h | 20 +++++++++++++++++++- modules_k/pua_dialoginfo/pua_dialoginfo.c | 2 +- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/modules_k/dialog/dlg_cb.c b/modules_k/dialog/dlg_cb.c index df8c3cb..3f2f2cd 100644 --- a/modules_k/dialog/dlg_cb.c +++ b/modules_k/dialog/dlg_cb.c @@ -260,24 +260,3 @@ void run_dlg_callbacks( int type , } return; } - - -struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params) -{ - struct sip_msg *msg; - - if (cb_params == NULL) { - LM_ERR("no dialog parameters given\n"); - return NULL; - } - - msg = cb_params->req; - if (msg == NULL) { - msg = cb_params->rpl; - if (msg == NULL || msg == FAKED_REPLY) { - return NULL; - } - } - - return msg; -} diff --git a/modules_k/dialog/dlg_cb.h b/modules_k/dialog/dlg_cb.h index f8bcadc..8d364ba 100644 --- a/modules_k/dialog/dlg_cb.h +++ b/modules_k/dialog/dlg_cb.h @@ -116,6 +116,24 @@ void run_load_callbacks( void ); * \param cb_params dialog callback parameter struct * \return pointer to valid SIP message if existent, NULL otherwise */ -struct sip_msg *get_valid_msg(struct dlg_cb_params *cb_params); +static inline struct sip_msg *dlg_get_valid_msg(struct dlg_cb_params *cb_params) +{ + struct sip_msg *msg; + + if (cb_params == NULL) { + LM_ERR("no dialog parameters given\n"); + return NULL; + } + + msg = cb_params->req; + if (msg == NULL) { + msg = cb_params->rpl; + if (msg == NULL || msg == FAKED_REPLY) { + return NULL; + } + } + + return msg; +}; #endif diff --git a/modules_k/pua_dialoginfo/pua_dialoginfo.c b/modules_k/pua_dialoginfo/pua_dialoginfo.c index 792e3b0..947f90d 100644 --- a/modules_k/pua_dialoginfo/pua_dialoginfo.c +++ b/modules_k/pua_dialoginfo/pua_dialoginfo.c @@ -130,7 +130,7 @@ __dialog_cbtest(struct dlg_cell *dlg, int type, struct dlg_cb_params *_params) } if (type != DLGCB_DESTROY) { - msg = get_valid_msg(_params); + msg = dlg_get_valid_msg(_params); if (!msg) { LM_ERR("no SIP message available in callback parameters\n"); return;

1 0

git:master: modules_k/presence, modules_k/presence_xml: Added new exported functions to enable the online status of a user to be checked
by Peter Dunkley 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: bd598ce945d8e5db910ea1a12795c5cdd7d580cf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd598ce… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Wed Aug 17 15:01:26 2011 +0100 modules_k/presence, modules_k/presence_xml: Added new exported functions to enable the online status of a user to be checked - Exported two new API functions from presence (get_presentity() and free_presentity()). These functions are used by the new exported functions. - Added two new exported functions to presence_xml. pres_check_basic() enables you to find out whether a users basic status matches the string you provide. pres_check_activities() enables you to find out whether any of a users listed activities matches the string you provide. pres_check_basic() effectively lets you tell whether a user is online or offline (based on presence). pres_check_activities() lets you see what a user is currently doing (for example, is the user too busy to take a call?). The results from these exported functions can be used to make routing decisions. For example, you can choose not to route calls to users who are away or busy. --- modules_k/presence/README | 31 +++ modules_k/presence/bind_presence.c | 3 + modules_k/presence/bind_presence.h | 4 + modules_k/presence/doc/presence_devel.xml | 45 +++++ modules_k/presence/notify.c | 64 ++---- modules_k/presence/notify.h | 2 + modules_k/presence_xml/README | 60 ++++++- modules_k/presence_xml/doc/presence_xml_admin.xml | 88 ++++++++- modules_k/presence_xml/pres_check.c | 220 +++++++++++++++++++++ modules_k/presence_xml/pres_check.h | 32 +++ modules_k/presence_xml/presence_xml.c | 14 ++- 11 files changed, 515 insertions(+), 48 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bd5…

1 0

git:master: modules_k/dialog When hash_size was smaller then 1, consider this as a value(1 == 2^0)
by Marius Zbihlei 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: 11033b05be673593a87afdc2a1d8a2c887fb9ab7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=11033b0… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Aug 17 15:00:00 2011 +0300 modules_k/dialog When hash_size was smaller then 1, consider this as a value(1 == 2^0) The 1<<(n-1) check for the power of two smaller than the given number doesn't work for n == 0 (undefined behavior), so values of dlg_hash_size smaller than 1 where not checked correctly. --- modules_k/dialog/dialog.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index d31135a..6711732 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -603,11 +603,18 @@ static int mod_init(void) return -1; } + /* sanitize dlg_hash_zie */ + if (dlg_hash_size < 1){ + LM_WARN("hash_size is smaller " + "then 1 -> rounding from %d to 1\n", + dlg_hash_size); + dlg_hash_size = 1; + } /* initialized the hash table */ for( n=0 ; n<(8*sizeof(n)) ; n++) { if (dlg_hash_size==(1<<n)) break; - if (dlg_hash_size<(1<<n)) { + if (n && dlg_hash_size<(1<<n)) { LM_WARN("hash_size is not a power " "of 2 as it should be -> rounding from %d to %d\n", dlg_hash_size, 1<<(n-1));

1 0

git:master: modules_k/ uac In case uuid was not found in the case of remore registration, do not crash when jumping to label
by Marius Zbihlei 17 Aug '11

17 Aug '11

Module: sip-router Branch: master Commit: a925dbd9e1aa6d45d2ce1dbbb1b6e40f318e3c61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a925dbd… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Aug 17 14:44:52 2011 +0300 modules_k/uac In case uuid was not found in the case of remore registration, do not crash when jumping to label --- modules_k/uac/uac_reg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/uac/uac_reg.c b/modules_k/uac/uac_reg.c index 253cc14..c25712f 100644 --- a/modules_k/uac/uac_reg.c +++ b/modules_k/uac/uac_reg.c @@ -628,7 +628,7 @@ void uac_reg_tm_callback( struct cell *t, int type, struct tmcb_params *ps) } done: - ri->flags &= ~UAC_REG_ONGOING; + if(ri) ri->flags &= ~UAC_REG_ONGOING; shm_free(uuid); }

1 0

Master branch compilation error
by Jon Bonilla 17 Aug '11

17 Aug '11

Hi all Nightly builds for debian and ubuntu have failed for "master" branch. Here's the compilation log: LD (gcc) [M pua_bla.so] pua_bla.so CC (gcc) [M pua_dialoginfo.so] dialog_publish.o CC (gcc) [M pua_dialoginfo.so] pua_dialoginfo.o pua_dialoginfo.c: In function ‘__dialog_sendpublish’: pua_dialoginfo.c:231: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:231: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:231: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:234: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:235: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:236: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:239: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:243: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:243: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:243: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c:248: error: ‘struct dlg_cb_params’ has no member named ‘msg’ pua_dialoginfo.c: In function ‘__dialog_created’: pua_dialoginfo.c:284: error: ‘struct dlg_cb_params’ has no member named ‘msg’ make[2]: *** [pua_dialoginfo.o] Error 1 make[1]: *** [modules_k] Error 1 make[1]: se sale del directorio `/usr/src/kamailio/kamailiogitsrc-master' make: *** [build-stamp] Error 2 dpkg-buildpackage: fallo: debian/rules build devolvió un estado de salida de error 2 cheers, Jon

2 2

← Newer
1
...
11
12
13
14
15
16
17
...
30
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2011