sr-dev April 2013

sr-dev@lists.kamailio.org

38 participants
401 discussions

git:master: db_mysql: add cast to remove compile warning

by Richard Fuchs

Module: sip-router Branch: master Commit: 14d4ea782a9a24da9755963ea12807f255cebce5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=14d4ea7… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Mon Apr 29 11:26:18 2013 -0400 db_mysql: add cast to remove compile warning --- modules/db_mysql/km_db_mysql.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/db_mysql/km_db_mysql.c b/modules/db_mysql/km_db_mysql.c index 88cc481..5758f6e 100644 --- a/modules/db_mysql/km_db_mysql.c +++ b/modules/db_mysql/km_db_mysql.c @@ -107,7 +107,7 @@ int db_mysql_bind_api(db_func_t *dbb) dbb->query = db_mysql_query; dbb->fetch_result = db_mysql_fetch_result; dbb->raw_query = db_mysql_raw_query; - dbb->free_result = db_mysql_free_result; + dbb->free_result = (db_free_result_f) db_mysql_free_result; dbb->insert = db_mysql_insert; dbb->delete = db_mysql_delete; dbb->update = db_mysql_update;

11 years, 8 months

git:master: db_mysql: fix segfault when recursive queries are made

by Richard Fuchs

Module: sip-router Branch: master Commit: 94ce2b1de63432baaaecd9285608380a40a70550 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94ce2b1… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Wed Apr 10 09:34:49 2013 -0400 db_mysql: fix segfault when recursive queries are made The MySQL result object (MYSQL_RES) should not be stored within the srdb1 connection object, but rather within the srdb1 result object. Otherwise recursive queries overwrite each other's result sets, which results in segfault. --- modules/db_mysql/km_dbase.c | 36 +++++++++++++++++++----------------- modules/db_mysql/km_dbase.h | 2 +- modules/db_mysql/km_my_con.c | 1 - modules/db_mysql/km_my_con.h | 4 ---- modules/db_mysql/km_res.c | 27 +++++++++++++++++++++++---- modules/db_mysql/km_res.h | 19 +++++++++++++++++++ modules/db_mysql/km_row.c | 5 +++-- 7 files changed, 65 insertions(+), 29 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 7288b66..4cdcef0 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -163,14 +163,14 @@ static int db_mysql_store_result(const db1_con_t* _h, db1_res_t** _r) return -1; } - *_r = db_new_result(); + *_r = db_mysql_new_result(); if (*_r == 0) { LM_ERR("no memory left\n"); return -2; } - CON_RESULT(_h) = mysql_store_result(CON_CONNECTION(_h)); - if (!CON_RESULT(_h)) { + RES_RESULT(*_r) = mysql_store_result(CON_CONNECTION(_h)); + if (!RES_RESULT(*_r)) { if (mysql_field_count(CON_CONNECTION(_h)) == 0) { (*_r)->col.n = 0; (*_r)->n = 0; @@ -181,7 +181,7 @@ static int db_mysql_store_result(const db1_con_t* _h, db1_res_t** _r) if (code == CR_SERVER_GONE_ERROR || code == CR_SERVER_LOST) { counter_inc(mysql_cnts_h.driver_err); } - db_free_result(*_r); + db_mysql_free_result(_h, *_r); *_r = 0; return -3; } @@ -195,14 +195,14 @@ static int db_mysql_store_result(const db1_con_t* _h, db1_res_t** _r) /* all mem on Kamailio API side is already freed by * db_mysql_convert_result in case of error, but we also need * to free the mem from the mysql lib side */ - mysql_free_result(CON_RESULT(_h)); + mysql_free_result(RES_RESULT(*_r)); #if (MYSQL_VERSION_ID >= 40100) while( mysql_more_results(CON_CONNECTION(_h)) && mysql_next_result(CON_CONNECTION(_h)) > 0 ) { MYSQL_RES *res = mysql_store_result( CON_CONNECTION(_h) ); mysql_free_result(res); } #endif - CON_RESULT(_h) = 0; + RES_RESULT(*_r) = 0; return -4; } @@ -224,19 +224,21 @@ done: * \param _r result set that should be freed * \return zero on success, negative value on failure */ -int db_mysql_free_result(db1_con_t* _h, db1_res_t* _r) +int db_mysql_free_result(const db1_con_t* _h, db1_res_t* _r) { if ((!_h) || (!_r)) { LM_ERR("invalid parameter value\n"); return -1; } + mysql_free_result(RES_RESULT(_r)); + RES_RESULT(_r) = 0; + pkg_free(RES_PTR(_r)); + if (db_free_result(_r) < 0) { LM_ERR("unable to free result structure\n"); return -1; } - mysql_free_result(CON_RESULT(_h)); - CON_RESULT(_h) = 0; return 0; } @@ -288,21 +290,21 @@ int db_mysql_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows) /* exit if the fetch count is zero */ if (nrows == 0) { - db_free_result(*_r); + db_mysql_free_result(_h, *_r); *_r = 0; return 0; } if(*_r==0) { /* Allocate a new result structure */ - *_r = db_new_result(); + *_r = db_mysql_new_result(); if (*_r == 0) { LM_ERR("no memory left\n"); return -2; } - CON_RESULT(_h) = mysql_store_result(CON_CONNECTION(_h)); - if (!CON_RESULT(_h)) { + RES_RESULT(*_r) = mysql_store_result(CON_CONNECTION(_h)); + if (!RES_RESULT(*_r)) { if (mysql_field_count(CON_CONNECTION(_h)) == 0) { (*_r)->col.n = 0; (*_r)->n = 0; @@ -313,7 +315,7 @@ int db_mysql_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows) if (code == CR_SERVER_GONE_ERROR || code == CR_SERVER_LOST) { counter_inc(mysql_cnts_h.driver_err); } - db_free_result(*_r); + db_mysql_free_result(_h, *_r); *_r = 0; return -3; } @@ -323,7 +325,7 @@ int db_mysql_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows) return -4; } - RES_NUM_ROWS(*_r) = mysql_num_rows(CON_RESULT(_h)); + RES_NUM_ROWS(*_r) = mysql_num_rows(RES_RESULT(*_r)); if (!RES_NUM_ROWS(*_r)) { LM_DBG("no rows returned from the query\n"); RES_ROWS(*_r) = 0; @@ -362,8 +364,8 @@ int db_mysql_fetch_result(const db1_con_t* _h, db1_res_t** _r, const int nrows) } for(i = 0; i < rows; i++) { - CON_ROW(_h) = mysql_fetch_row(CON_RESULT(_h)); - if (!CON_ROW(_h)) { + RES_ROW(*_r) = mysql_fetch_row(RES_RESULT(*_r)); + if (!RES_ROW(*_r)) { LM_ERR("driver error: %s\n", mysql_error(CON_CONNECTION(_h))); RES_ROW_N(*_r) = i; db_free_rows(*_r); diff --git a/modules/db_mysql/km_dbase.h b/modules/db_mysql/km_dbase.h index 52b2778..23fc002 100644 --- a/modules/db_mysql/km_dbase.h +++ b/modules/db_mysql/km_dbase.h @@ -58,7 +58,7 @@ void db_mysql_close(db1_con_t* _h); /*! \brief * Free all memory allocated by get_result */ -int db_mysql_free_result(db1_con_t* _h, db1_res_t* _r); +int db_mysql_free_result(const db1_con_t* _h, db1_res_t* _r); /*! \brief diff --git a/modules/db_mysql/km_my_con.c b/modules/db_mysql/km_my_con.c index ce20be2..646d74b 100644 --- a/modules/db_mysql/km_my_con.c +++ b/modules/db_mysql/km_my_con.c @@ -144,7 +144,6 @@ void db_mysql_free_connection(struct pool_con* con) _c = (struct my_con*) con; - if (_c->res) mysql_free_result(_c->res); if (_c->id) free_db_id(_c->id); if (_c->con) { mysql_close(_c->con); diff --git a/modules/db_mysql/km_my_con.h b/modules/db_mysql/km_my_con.h index 33f2128..8e96e20 100644 --- a/modules/db_mysql/km_my_con.h +++ b/modules/db_mysql/km_my_con.h @@ -44,9 +44,7 @@ struct my_con { unsigned int ref; /*!< Reference count */ struct pool_con* next; /*!< Next connection in the pool */ - MYSQL_RES* res; /*!< Actual result */ MYSQL* con; /*!< Connection representation */ - MYSQL_ROW row; /*!< Actual row in the result */ time_t timestamp; /*!< Timestamp of last query */ int transaction; /*!< indicates whether a multi-query transaction is currently open */ }; @@ -55,9 +53,7 @@ struct my_con { /* * Some convenience wrappers */ -#define CON_RESULT(db_con) (((struct my_con*)((db_con)->tail))->res) #define CON_CONNECTION(db_con) (((struct my_con*)((db_con)->tail))->con) -#define CON_ROW(db_con) (((struct my_con*)((db_con)->tail))->row) #define CON_TIMESTAMP(db_con) (((struct my_con*)((db_con)->tail))->timestamp) #define CON_TRANSACTION(db_con) (((struct my_con*)((db_con)->tail))->transaction) diff --git a/modules/db_mysql/km_res.c b/modules/db_mysql/km_res.c index 10d3ce2..965e6dc 100644 --- a/modules/db_mysql/km_res.c +++ b/modules/db_mysql/km_res.c @@ -73,7 +73,7 @@ int db_mysql_get_columns(const db1_con_t* _h, db1_res_t* _r) return -3; } - fields = mysql_fetch_fields(CON_RESULT(_h)); + fields = mysql_fetch_fields(RES_RESULT(_r)); for(col = 0; col < RES_COL_N(_r); col++) { RES_NAMES(_r)[col] = (str*)pkg_malloc(sizeof(str)); if (! RES_NAMES(_r)[col]) { @@ -164,7 +164,7 @@ static inline int db_mysql_convert_rows(const db1_con_t* _h, db1_res_t* _r) return -1; } - RES_ROW_N(_r) = mysql_num_rows(CON_RESULT(_h)); + RES_ROW_N(_r) = mysql_num_rows(RES_RESULT(_r)); if (!RES_ROW_N(_r)) { LM_DBG("no rows returned from the query\n"); RES_ROWS(_r) = 0; @@ -177,8 +177,8 @@ static inline int db_mysql_convert_rows(const db1_con_t* _h, db1_res_t* _r) } for(row = 0; row < RES_ROW_N(_r); row++) { - CON_ROW(_h) = mysql_fetch_row(CON_RESULT(_h)); - if (!CON_ROW(_h)) { + RES_ROW(_r) = mysql_fetch_row(RES_RESULT(_r)); + if (!RES_ROW(_r)) { LM_ERR("driver error: %s\n", mysql_error(CON_CONNECTION(_h))); RES_ROW_N(_r) = row; db_free_rows(_r); @@ -221,3 +221,22 @@ int db_mysql_convert_result(const db1_con_t* _h, db1_res_t* _r) return 0; } + +/*! + * \brief Allocate new result set with private structure + * \return db1_res_t object on success, NULL on failure + */ +db1_res_t* db_mysql_new_result(void) +{ + db1_res_t* obj; + + obj = db_new_result(); + if (!obj) + return NULL; + RES_PTR(obj) = pkg_malloc(sizeof(struct my_res)); + if (!RES_PTR(obj)) { + db_free_result(obj); + return NULL; + } + return obj; +} diff --git a/modules/db_mysql/km_res.h b/modules/db_mysql/km_res.h index 957a961..0b063d8 100644 --- a/modules/db_mysql/km_res.h +++ b/modules/db_mysql/km_res.h @@ -37,6 +37,18 @@ #include "../../lib/srdb1/db_con.h" +struct my_res { + MYSQL_RES* res; /*!< Actual result */ + MYSQL_ROW row; /*!< Actual row in the result */ +}; + +/* + * Some convenience wrappers + */ +#define RES_RESULT(db_res) (((struct my_res*)((db_res)->ptr))->res) +#define RES_ROW(db_res) (((struct my_res*)((db_res)->ptr))->row) + + /*! * \brief Fill the result structure with data from database * \param _h database connection @@ -54,4 +66,11 @@ int db_mysql_convert_result(const db1_con_t* _h, db1_res_t* _r); */ int db_mysql_get_columns(const db1_con_t* _h, db1_res_t* _r); + +/*! + * \brief Allocate new result set with private structure + * \return db1_res_t object on success, NULL on failure + */ +db1_res_t* db_mysql_new_result(void); + #endif diff --git a/modules/db_mysql/km_row.c b/modules/db_mysql/km_row.c index 42f2841..9f2c730 100644 --- a/modules/db_mysql/km_row.c +++ b/modules/db_mysql/km_row.c @@ -36,6 +36,7 @@ #include "km_my_con.h" #include "km_val.h" #include "km_row.h" +#include "km_res.h" /*! * \brief Convert a row from result into DB API representation @@ -59,11 +60,11 @@ int db_mysql_convert_row(const db1_con_t* _h, db1_res_t* _res, db_row_t* _r) return -2; } - lengths = mysql_fetch_lengths(CON_RESULT(_h)); + lengths = mysql_fetch_lengths(RES_RESULT(_res)); for(i = 0; i < RES_COL_N(_res); i++) { if (db_str2val(RES_TYPES(_res)[i], &(ROW_VALUES(_r)[i]), - ((MYSQL_ROW)CON_ROW(_h))[i], lengths[i], 0) < 0) { + ((MYSQL_ROW)RES_ROW(_res))[i], lengths[i], 0) < 0) { LM_ERR("failed to convert value\n"); LM_DBG("free row at %p\n", _r); db_free_row(_r);

11 years, 8 months

Regarding Support of MSRP B2BUA in kamailio

by Ram Anji

Hi, I want to configure kamailio server as MSRP B2BUA. Can anyone guide me for the same ? Thanks in advance. Regards, Raman

11 years, 8 months

double record-routing also at outbound edge

by Juha Heinanen

i have one more comment on flow token vs. contact aliasing. flow token is part of a route uri that represent a proxy in the route set. route set cannot be changed during the dialog, but remote target uri can. from rfc3261: Requests within a dialog MAY contain Record-Route and Contact header fields. However, these requests do not cause the dialog's route set to be modified, although they may modify the remote target URI. Specifically, requests that are not target refresh requests do not modify the dialog's remote target URI, and requests that are target refresh requests do. For dialogs that have been established with an INVITE, the only target refresh request defined is re-INVITE (see Section 14). Other extensions may define different target refresh requests for dialogs established in other ways. Note that an ACK is NOT a target refresh request. Target refresh requests only update the dialog's remote target URI, and not the route set formed from the Record-Route. if flow token is used instead of contact aliasing to store the remote target uri, then it is not possible to modify the remote target uri via target refresh requests (e.g. when moving from wifi to mobile network) and such setup is violating the above text of rfc3261. this problem does not exist with contact aliasing, because add_contact_alias() is called on each in-dialog target refresh request, which allows changing of remote target uri during the dialog. -- juha

11 years, 8 months

Re: [sr-dev] Fwd:

by Charles Chance

Hi, Sincere apologies, not sure how this happened - please ignore, it was not me who sent it :/ Regards, Charles On 2 April 2013 08:21, Charles Chance <charles.chance(a)sipcentric.com> wrote: > http://www.toyosoken.co.jp/ivtduw.php > > > _______________________________________________ > sr-dev mailing list > sr-dev(a)lists.sip-router.org > http://lists.sip-router.org/cgi-bin/mailman/listinfo/sr-dev > -- *Charles Chance* Managing Director t. 0121 285 4400 m. 07932 063 891 -- www.sipcentric.com Follow us on twitter @sipcentric <http://twitter.com/sipcentric> Sipcentric Ltd. Company registered in England & Wales no. 7365592. Registered office: Unit 10 iBIC, Birmingham Science Park, Holt Court South, Birmingham B7 4EJ.

11 years, 8 months

Fwd:

by Charles Chance

http://www.toyosoken.co.jp/ivtduw.php

11 years, 8 months

git:master: modules/usrloc: fixed typo in db_ops_ruid param name

by Juha Heinanen

Module: sip-router Branch: master Commit: edebc03f65445f968accb58b5a761817aaee55e8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=edebc03… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 27 18:07:21 2013 +0300 modules/usrloc: fixed typo in db_ops_ruid param name --- modules/usrloc/README | 64 +++++++++++++++++----------------- modules/usrloc/doc/usrloc_admin.xml | 8 ++-- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/modules/usrloc/README b/modules/usrloc/README index d688f8e..005ea30 100644 --- a/modules/usrloc/README +++ b/modules/usrloc/README @@ -16,9 +16,9 @@ Edited by Bogdan-Andrei Iancu - Copyright � 2003 FhG FOKUS + Copyright (c) 2003 FhG FOKUS - Copyright � 2005 Voice Sistem SRL + Copyright (c) 2005 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -67,7 +67,7 @@ Bogdan-Andrei Iancu 3.29. db_check_update (string) 3.30. timer_procs (string) 3.31. xavp_contact (string) - 3.32. db_obs_ruid (string) + 3.32. db_ops_ruid (string) 4. Functions 5. MI Commands @@ -148,7 +148,7 @@ Bogdan-Andrei Iancu 1.29. Set db_check_update parameter 1.30. Set timer_procs parameter 1.31. Set xavp_contact parameter - 1.32. Set db_obs_ruid parameter + 1.32. Set db_ops_ruid parameter Chapter 1. Admin Guide @@ -196,7 +196,7 @@ Chapter 1. Admin Guide 3.29. db_check_update (string) 3.30. timer_procs (string) 3.31. xavp_contact (string) - 3.32. db_obs_ruid (string) + 3.32. db_ops_ruid (string) 4. Functions 5. MI Commands @@ -309,7 +309,7 @@ Chapter 1. Admin Guide 3.29. db_check_update (string) 3.30. timer_procs (string) 3.31. xavp_contact (string) - 3.32. db_obs_ruid (string) + 3.32. db_ops_ruid (string) 3.1. nat_bflag (integer) @@ -736,7 +736,7 @@ modparam("usrloc", "timer_procs", 4) modparam("usrloc", "xavp_contact", "ulattrs") ... -3.32. db_obs_ruid (string) +3.32. db_ops_ruid (string) If set to 1, database queries for update or delete are done using ruid value. If it is set to 0, the old style using aor, contact and call-id @@ -744,9 +744,9 @@ modparam("usrloc", "xavp_contact", "ulattrs") Default value is "0". - Example 1.32. Set db_obs_ruid parameter + Example 1.32. Set db_ops_ruid parameter ... -modparam("usrloc", "db_obs_ruid", 1) +modparam("usrloc", "db_ops_ruid", 1) ... 4. Functions @@ -762,7 +762,7 @@ modparam("usrloc", "db_obs_ruid", 1) 5.5. ul_add 5.6. ul_show_contact -5.1. ul_rm +5.1. ul_rm Deletes an entire AOR record (including its contacts). @@ -771,7 +771,7 @@ modparam("usrloc", "db_obs_ruid", 1) * AOR - user AOR in username[@domain] format (domain must be supplied only if use_domain option is on). -5.2. ul_rm_contact +5.2. ul_rm_contact Deletes a contact from an AOR record. @@ -781,7 +781,7 @@ modparam("usrloc", "db_obs_ruid", 1) only if use_domain option is on). * contact - exact contact to be removed -5.3. ul_dump +5.3. ul_dump Dumps the entire content of the USRLOC in memory cache @@ -790,11 +790,11 @@ modparam("usrloc", "db_obs_ruid", 1) "brief", a brief dump will be done (only AOR and contacts, with no other details) -5.4. ul_flush +5.4. ul_flush Triggers the flush of USRLOC memory cache into DB. -5.5. ul_add +5.5. ul_add Adds a new contact for an user AOR. @@ -810,7 +810,7 @@ modparam("usrloc", "db_obs_ruid", 1) * cflags - per branch flags of the contact * methods - mask with supported requests of the contact -5.6. ul_show_contact +5.6. ul_show_contact Dumps the contacts of an user AOR. @@ -824,14 +824,14 @@ modparam("usrloc", "db_obs_ruid", 1) 6.1. ul.dump 6.2. ul.lookup table AOR -6.1. ul.dump +6.1. ul.dump Dumps the content of the location table Parameters: * None. -6.2. ul.lookup table AOR +6.2. ul.lookup table AOR Looks up the contents of an AOR entry in the location table @@ -919,7 +919,7 @@ Chapter 2. Developer Guide 1.14. ul_register_ulcb(type ,callback, param) 1.15. ul_get_num_users() -1.1. ul_register_domain(name) +1.1. ul_register_domain(name) The function registers a new domain. Domain is just another name for table used in registrar. The function is called from fixups in @@ -934,7 +934,7 @@ Chapter 2. Developer Guide * const char* name - Name of the domain (also called table) to be registered. -1.2. ul_insert_urecord(domain, aor, rec) +1.2. ul_insert_urecord(domain, aor, rec) The function creates a new record structure and inserts it in the specified domain. The record is structure that contains all the @@ -949,7 +949,7 @@ Chapter 2. Developer Guide * urecord_t** rec - The newly created record structure. -1.3. ul_delete_urecord(domain, aor) +1.3. ul_delete_urecord(domain, aor) The function deletes all the contacts bound with the given Address Of Record. @@ -961,7 +961,7 @@ Chapter 2. Developer Guide * str* aor - Address of record (aka username) of the record, that should be deleted. -1.4. ul_get_urecord(domain, aor) +1.4. ul_get_urecord(domain, aor) The function returns pointer to record with given Address of Record. @@ -971,7 +971,7 @@ Chapter 2. Developer Guide * str* aor - Address of Record of request record. -1.5. ul_lock_udomain(domain) +1.5. ul_lock_udomain(domain) The function lock the specified domain, it means, that no other processes will be able to access during the time. This prevents race @@ -982,14 +982,14 @@ Chapter 2. Developer Guide Meaning of the parameters is as follows: * udomain_t* domain - Domain to be locked. -1.6. ul_unlock_udomain(domain) +1.6. ul_unlock_udomain(domain) Unlock the specified domain previously locked by ul_lock_udomain. Meaning of the parameters is as follows: * udomain_t* domain - Domain to be unlocked. -1.7. ul_release_urecord(record) +1.7. ul_release_urecord(record) Do some sanity checks - if all contacts have been removed, delete the entire record structure. @@ -997,7 +997,7 @@ Chapter 2. Developer Guide Meaning of the parameters is as follows: * urecord_t* record - Record to be released. -1.8. ul_insert_ucontact(record, contact, expires, q, callid, cseq, flags, +1.8. ul_insert_ucontact(record, contact, expires, q, callid, cseq, flags, cont, ua, sock) The function inserts a new contact in the given record with specified @@ -1018,7 +1018,7 @@ cont, ua, sock) * struct socket_info *sock - socket on which the REGISTER message was received on. -1.9. ul_delete_ucontact (record, contact) +1.9. ul_delete_ucontact (record, contact) The function deletes given contact from record. @@ -1028,7 +1028,7 @@ cont, ua, sock) * ucontact_t* contact - Contact to be deleted. -1.10. ul_get_ucontact(record, contact) +1.10. ul_get_ucontact(record, contact) The function tries to find contact with given Contact URI and returns pointer to structure representing the contact. @@ -1038,7 +1038,7 @@ cont, ua, sock) * str_t* contact - URI of the request contact. -1.11. ul_get_all_ucontacts (buf, len, flags) +1.11. ul_get_all_ucontacts (buf, len, flags) The function retrieves all contacts of all registered users and returns them in the caller-supplied buffer. If the buffer is too small, the @@ -1059,7 +1059,7 @@ cont, ua, sock) * unsigned int flags - Flags that must be set. -1.12. ul_update_ucontact(contact, expires, q, callid, cseq, set, res, ua, +1.12. ul_update_ucontact(contact, expires, q, callid, cseq, set, res, ua, sock) The function updates contact with new values. @@ -1078,7 +1078,7 @@ sock) * struct socket_info *sock - socket on which the REGISTER message was received on. -1.13. ul_bind_ursloc( api ) +1.13. ul_bind_ursloc( api ) The function imports all functions that are exported by the USRLOC module. Overs for other modules which want to user the internal USRLOC @@ -1087,7 +1087,7 @@ sock) Meaning of the parameters is as follows: * usrloc_api_t* api - USRLOC API -1.14. ul_register_ulcb(type ,callback, param) +1.14. ul_register_ulcb(type ,callback, param) The function register with USRLOC a callback function to be called when some event occures inside USRLOC. @@ -1100,6 +1100,6 @@ sock) * void *param - some parameter to be passed to the callback each time when it is called. -1.15. ul_get_num_users() +1.15. ul_get_num_users() The function loops through all domains summing up the number of users. diff --git a/modules/usrloc/doc/usrloc_admin.xml b/modules/usrloc/doc/usrloc_admin.xml index 451063f..99c2e24 100644 --- a/modules/usrloc/doc/usrloc_admin.xml +++ b/modules/usrloc/doc/usrloc_admin.xml @@ -853,8 +853,8 @@ modparam("usrloc", "xavp_contact", "ulattrs") </example> </section> - <section id="usrloc.p.db_obs_ruid"> - <title><varname>db_obs_ruid</varname> (string)</title> + <section id="usrloc.p.db_ops_ruid"> + <title><varname>db_ops_ruid</varname> (string)</title> <para> If set to 1, database queries for update or delete are done using ruid value. If it is set to 0, the old style using aor, contact and @@ -866,10 +866,10 @@ modparam("usrloc", "xavp_contact", "ulattrs") </emphasis> </para> <example> - <title>Set <varname>db_obs_ruid</varname> parameter</title> + <title>Set <varname>db_ops_ruid</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("usrloc", "db_obs_ruid", 1) +modparam("usrloc", "db_ops_ruid", 1) ... </programlisting> </example>

11 years, 8 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Juha Heinanen

Module: sip-router Branch: master Commit: 218a83c50a217c420502d484738b6b3401c89b8c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=218a83c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Apr 27 18:10:28 2013 +0300 Merge branch 'master' of ssh://git.sip-router.org/sip-router - Forgot to pull before push. ---

11 years, 8 months

Dispatcher broken by recent change?

by Peter Dunkley

Hello, I've been running a test system keeping it fairly close to git master. I did a new build today and installed it and discovered dispatcher was giving me this error: Apr 26 15:50:10 ip-10-244-155-159 /usr/sbin/kamailio[1280]: ERROR: dispatcher [dispatch.c:2373]: Setting the state failed (<sip:...hostname...=tc, group 1) This was working with master as built on 24/04/2013. Could it be related to this commit (note the missing "p>" from the end of the URI in the log message)? Module: sip-router Branch: master Commit: 4e4b1339bfd3a832f5feeb1d2a2380c7455ec82b URL:http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e4… Author: Daniel-Constantin Mierla<miconda(a)gmail.com> Committer: Daniel-Constantin Mierla<miconda(a)gmail.com> Date: Thu Apr 25 14:50:40 2013 +0200 tm: add angle brackets around From/To URI for local generated requests Regards, Peter

11 years, 8 months

git:master: tm: wrap around expression adjusting length for To/From headers

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: aefea5477dc7878d5e818628e04ddcb088fd2858 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aefea54… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Apr 26 19:55:43 2013 +0200 tm: wrap around expression adjusting length for To/From headers - applies for local requests --- modules/tm/t_msgbuilder.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/t_msgbuilder.c b/modules/tm/t_msgbuilder.c index 2beb918..c947d38 100644 --- a/modules/tm/t_msgbuilder.c +++ b/modules/tm/t_msgbuilder.c @@ -1399,7 +1399,7 @@ static inline char* print_to(char* w, dlg_t* dialog, struct cell* t) { t->to.s = w; t->to.len = TO_LEN + dialog->rem_uri.len + CRLF_LEN - + (dialog->rem_uri.s[0]!='<')?2:0; + + ((dialog->rem_uri.s[0]!='<')?2:0); memapp(w, TO, TO_LEN); if(dialog->rem_uri.s[0]!='<') memapp(w, "<", 1); @@ -1424,7 +1424,7 @@ static inline char* print_from(char* w, dlg_t* dialog, struct cell* t) { t->from.s = w; t->from.len = FROM_LEN + dialog->loc_uri.len + CRLF_LEN - + (dialog->loc_uri.s[0]!='<')?2:0; + + ((dialog->loc_uri.s[0]!='<')?2:0); memapp(w, FROM, FROM_LEN); if(dialog->loc_uri.s[0]!='<') memapp(w, "<", 1);

11 years, 8 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2013