sr-dev September 2013

sr-dev@lists.kamailio.org

33 participants
296 discussions

git:master: xhttp: cache the URL string when performing transformations so sequential transformations on the same string do not require a reparse .
by Peter Dunkley 26 Sep '13

26 Sep '13

Module: sip-router Branch: master Commit: ac5d846e2e472b1c097992bc2bdcfb58100c6eaa URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac5d846… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Thu Sep 26 23:27:31 2013 +0100 xhttp: cache the URL string when performing transformations so sequential transformations on the same string do not require a reparse. --- modules/xhttp/xhttp_trans.c | 40 ++++++++++++++++++++++++++++++---------- 1 files changed, 30 insertions(+), 10 deletions(-) diff --git a/modules/xhttp/xhttp_trans.c b/modules/xhttp/xhttp_trans.c index 35c1609..36c5888 100644 --- a/modules/xhttp/xhttp_trans.c +++ b/modules/xhttp/xhttp_trans.c @@ -30,6 +30,9 @@ enum _tr_xhttpurl_subtype { TR_XHTTPURL_NONE = 0, TR_XHTTPURL_PATH, enum _tr_xhttpquerystring_subtype { TR_XHTTPUTLQUERYSTRING_NONE = 0, TR_XHTTPURLQUERYSTRING_VALUE}; +static str _httpurl_str = {0, 0}; +static int _httpurl_querystring_pos = 0; + int xhttp_tr_eval_xhttpurl(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t *val) { @@ -44,28 +47,45 @@ int xhttp_tr_eval_xhttpurl(struct sip_msg *msg, tr_param_t *tp, int subtype, val->flags = PV_VAL_STR; } + if (_httpurl_str.len == 0 || _httpurl_str.len != val->rs.len + || strncmp(_httpurl_str.s, val->rs.s, val->rs.len) != 0) + { + if (val->rs.len > _httpurl_str.len) + { + if (_httpurl_str.s) pkg_free(_httpurl_str.s); + _httpurl_str.s = (char *) pkg_malloc( + (val->rs.len + 1) * sizeof(char)); + if (_httpurl_str.s == NULL) + { + LM_ERR("allocating package memory\n"); + memset(&_httpurl_str.s, 0, sizeof(str)); + return -1; + } + } + _httpurl_str.len = val->rs.len; + memcpy(_httpurl_str.s, val->rs.s, val->rs.len); + + while (val->rs.s[pos] != '?' && pos < val->rs.len) pos++; + _httpurl_querystring_pos = (pos >= val->rs.len) ? 0 : pos + 1; + } + switch (subtype) { case TR_XHTTPURL_PATH: - while (val->rs.s[pos] != '?' && pos < val->rs.len) - pos++; - - val->rs.len = pos; + val->rs.len = (_httpurl_querystring_pos == 0) + ? val->rs.len : _httpurl_querystring_pos - 1; break; case TR_XHTTPURL_QUERYSTRING: - while (val->rs.s[pos] != '?' && pos < val->rs.len) - pos++; - - if (pos >= val->rs.len) + if (_httpurl_querystring_pos == 0) { val->rs.s[0] = '\0'; val->rs.len = 0; break; } - val->rs.s = &val->rs.s[pos + 1]; - val->rs.len = val->rs.len - pos - 1; + val->rs.s = &val->rs.s[_httpurl_querystring_pos]; + val->rs.len = val->rs.len - _httpurl_querystring_pos; break; default:

1 0

git:master: pv: tweaked {param.} transformation so that if the (optional) delimiter parameter is changed between runs the param string is reparsed
by Peter Dunkley 26 Sep '13

26 Sep '13

Module: sip-router Branch: master Commit: 96c9a85b607e5c42ec0f0709a2807a60e7d5b1c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96c9a85… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Thu Sep 26 23:26:38 2013 +0100 pv: tweaked {param.} transformation so that if the (optional) delimiter parameter is changed between runs the param string is reparsed --- modules/pv/pv_trans.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index 5730da8..738efca 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -1113,6 +1113,7 @@ done: static str _tr_params_str = {0, 0}; static param_t* _tr_params_list = NULL; +static char _tr_params_separator = ';'; /*! @@ -1136,31 +1137,30 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, if(val==NULL || (!(val->flags&PV_VAL_STR)) || val->rs.len<=0) return -1; - if(_tr_params_str.len==0 || _tr_params_str.len!=val->rs.len || - strncmp(_tr_params_str.s, val->rs.s, val->rs.len)!=0) + if (tp != NULL) { if (subtype == TR_PL_COUNT) { - if (tp != NULL) - { - if(tp->type != TR_PARAM_STRING - || tp->v.s.len != 1) - return -1; + if(tp->type != TR_PARAM_STRING || tp->v.s.len != 1) + return -1; - separator = tp->v.s.s[0]; - } + separator = tp->v.s.s[0]; } - else + else if (tp->next != NULL) { - if(tp->next != NULL) - { - if(tp->next->type != TR_PARAM_STRING - || tp->next->v.s.len != 1) - return -1; + if(tp->next->type != TR_PARAM_STRING + || tp->next->v.s.len != 1) + return -1; - separator = tp->next->v.s.s[0]; - } + separator = tp->next->v.s.s[0]; } + } + + if(_tr_params_str.len==0 || _tr_params_str.len!=val->rs.len || + strncmp(_tr_params_str.s, val->rs.s, val->rs.len)!=0 || + _tr_params_separator != separator) + { + _tr_params_separator = separator; if(val->rs.len>_tr_params_str.len) { @@ -1192,7 +1192,7 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, /* parse params */ sv = _tr_params_str; if (parse_params2(&sv, CLASS_ANY, &phooks, &_tr_params_list, - separator)<0) + _tr_params_separator)<0) return -1; }

1 0

git:master: Move assert_identity to ims_usrloc_pcscf as we may have more than one IMPI per Port /IP/Proto
by Carsten Bock 26 Sep '13

26 Sep '13

Module: sip-router Branch: master Commit: ed23dbde621a4b60d35639d3c61284b658fb6ad1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed23dbd… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Thu Sep 26 20:21:11 2013 +0200 Move assert_identity to ims_usrloc_pcscf as we may have more than one IMPI per Port/IP/Proto --- modules/ims_registrar_pcscf/service_routes.c | 42 ++++----------------- modules/ims_usrloc_pcscf/udomain.c | 50 +++++++++++++++++++++++--- modules/ims_usrloc_pcscf/udomain.h | 1 + modules/ims_usrloc_pcscf/usrloc.c | 1 + modules/ims_usrloc_pcscf/usrloc.h | 3 ++ 5 files changed, 58 insertions(+), 39 deletions(-) diff --git a/modules/ims_registrar_pcscf/service_routes.c b/modules/ims_registrar_pcscf/service_routes.c index e53cdd0..42590b5 100644 --- a/modules/ims_registrar_pcscf/service_routes.c +++ b/modules/ims_registrar_pcscf/service_routes.c @@ -390,40 +390,14 @@ str * get_asserted_identity(struct sip_msg* _m) { * Add proper asserted identies based on registration */ int assert_identity(struct sip_msg* _m, udomain_t* _d, str identity) { - // Get the contact: - pcontact_t * c = getContactP(_m, _d); - // Public identities of this contact - ppublic_t * p; - - // Contact not found => Identity not asserted. - if (c == NULL) return -2; - - /* Lock this record while working with the data: */ - ul.lock_udomain(_d, &c->aor); - - LM_DBG("Checking identity: %.*s\n", identity.len, identity.s); - - LM_DBG("AOR of contact: %.*s\n", c->aor.len, c->aor.s); - - for (p = c->head; p; p = p->next) { - LM_DBG("Public identity: %.*s\n", p->public_identity.len, p->public_identity.s); - /* Check length: */ - if (identity.len == p->public_identity.len) { - /* Check contents: */ - if (strncasecmp(identity.s, p->public_identity.s, identity.len) == 0) { - LM_DBG("Match!\n"); - goto success; - } - } else LM_DBG("Length does not match.\n"); - } + str received_host = {0, 0}; + char srcip[50]; - // We should only get here, if we failed: - /* Unlock domain */ - ul.unlock_udomain(_d, &c->aor); - return -1; -success: - /* Unlock domain */ - ul.unlock_udomain(_d, &c->aor); - return 1; + received_host.len = ip_addr2sbuf(&_m->rcv.src_ip, srcip, sizeof(srcip)); + received_host.s = srcip; + if (ul.assert_identity(_d, &received_host, _m->rcv.src_port, _m->rcv.proto, &identity) == 0) + return -1; + else + return 1; } diff --git a/modules/ims_usrloc_pcscf/udomain.c b/modules/ims_usrloc_pcscf/udomain.c index 8c0d370..3d2d46c 100644 --- a/modules/ims_usrloc_pcscf/udomain.c +++ b/modules/ims_usrloc_pcscf/udomain.c @@ -433,12 +433,43 @@ int get_pcontact_by_src(udomain_t* _d, str * _host, unsigned short _port, unsign int i; struct pcontact* c; - if (_d->table) { - for(i = 0; i < _d->size; i++) { + for(i=0; i<_d->size; i++) + { + c = _d->table[i].first; + while(c) { + LM_DBG("Port %d (search %d), Proto %d (search %d), reg_state %s (search %s)\n", + c->received_port, _port, c->received_proto, _proto, + reg_state_to_string(c->reg_state), reg_state_to_string(PCONTACT_REGISTERED) + ); + // First check, if Proto and Port matches: + if ((c->reg_state == PCONTACT_REGISTERED) && (c->received_port == _port) && (c->received_proto == _proto)) { + LM_DBG("Received host len %d (search %d)\n", c->received_host.len, _host->len); + // Then check the length: + if (c->received_host.len == _host->len) { + LM_DBG("Received host %.*s (search %.*s)\n", + c->received_host.len, c->received_host.s, + _host->len, _host->s); + + // Finally really compare the "received_host" + if (!memcmp(c->received_host.s, _host->s, _host->len)) { + *_c = c; + return 0; + } + } + } + c = c->next; } } + return 1; /* Nothing found */ +} +int assert_identity(udomain_t* _d, str * _host, unsigned short _port, unsigned short _proto, str * _identity) { + int i; + struct pcontact* c; + // Public identities of this contact + struct ppublic * p; + for(i=0; i<_d->size; i++) { c = _d->table[i].first; @@ -458,15 +489,24 @@ int get_pcontact_by_src(udomain_t* _d, str * _host, unsigned short _port, unsign // Finally really compare the "received_host" if (!memcmp(c->received_host.s, _host->s, _host->len)) { - *_c = c; - return 0; + for (p = c->head; p; p = p->next) { + LM_DBG("Public identity: %.*s\n", p->public_identity.len, p->public_identity.s); + /* Check length: */ + if (_identity->len == p->public_identity.len) { + /* Check contents: */ + if (strncasecmp(_identity->s, p->public_identity.s, _identity->len) == 0) { + LM_DBG("Match!\n"); + return 1; + } + } else LM_DBG("Length does not match.\n"); + } } } } c = c->next; } } - return 1; /* Nothing found */ + return 0; /* Nothing found */ } int delete_pcontact(udomain_t* _d, str* _aor, struct pcontact* _c) diff --git a/modules/ims_usrloc_pcscf/udomain.h b/modules/ims_usrloc_pcscf/udomain.h index f2c74c6..23e4d58 100644 --- a/modules/ims_usrloc_pcscf/udomain.h +++ b/modules/ims_usrloc_pcscf/udomain.h @@ -78,6 +78,7 @@ int update_pcontact(struct udomain* _d, struct pcontact_info* _ci, struct pconta int insert_pcontact(struct udomain* _d, str* _contact, struct pcontact_info* _ci, struct pcontact** _r); int get_pcontact(udomain_t* _d, str* _aor, struct pcontact** _r); int get_pcontact_by_src(udomain_t* _d, str * _host, unsigned short _port, unsigned short _proto, struct pcontact** _c); +int assert_identity(udomain_t* _d, str * _host, unsigned short _port, unsigned short _proto, str * _identity); int delete_pcontact(udomain_t* _d, str* _aor, struct pcontact* _r); #endif diff --git a/modules/ims_usrloc_pcscf/usrloc.c b/modules/ims_usrloc_pcscf/usrloc.c index 3a444b4..5d483b5 100644 --- a/modules/ims_usrloc_pcscf/usrloc.c +++ b/modules/ims_usrloc_pcscf/usrloc.c @@ -72,6 +72,7 @@ int bind_usrloc(usrloc_api_t* api) { api->delete_pcontact = delete_pcontact; api->get_pcontact = get_pcontact; api->get_pcontact_by_src = get_pcontact_by_src; + api->assert_identity = assert_identity; api->update_pcontact = update_pcontact; api->update_rx_regsession = update_rx_regsession; diff --git a/modules/ims_usrloc_pcscf/usrloc.h b/modules/ims_usrloc_pcscf/usrloc.h index 38d4a2e..28724af 100644 --- a/modules/ims_usrloc_pcscf/usrloc.h +++ b/modules/ims_usrloc_pcscf/usrloc.h @@ -195,6 +195,8 @@ typedef int (*get_pcontact_t)(struct udomain* _d, str* _contact, struct pcontact typedef int (*get_pcontact_by_src_t)(struct udomain* _d, str * _host, unsigned short _port, unsigned short _proto, struct pcontact** _c); +typedef int (*assert_identity_t)(struct udomain* _d, str * _host, unsigned short _port, unsigned short _proto, str * _identity); + typedef int (*insert_pcontact_t)(struct udomain* _d, str* _aor, struct pcontact_info* ci, struct pcontact** _c); typedef int (*delete_pcontact_t)(struct udomain* _d, str* _aor, struct pcontact* _c); typedef int (*update_pcontact_t)(struct udomain* _d, struct pcontact_info* ci, struct pcontact* _c); @@ -220,6 +222,7 @@ typedef struct usrloc_api { delete_pcontact_t delete_pcontact; get_pcontact_t get_pcontact; get_pcontact_by_src_t get_pcontact_by_src; + assert_identity_t assert_identity; update_pcontact_t update_pcontact; update_rx_regsession_t update_rx_regsession;

1 0

git:master: db_mysql: unlock tables at the end of transaction if they were locked
by Daniel-Constantin Mierla 26 Sep '13

26 Sep '13

Module: sip-router Branch: master Commit: 78d25dd11a64f36c5372cff3fe5d8a65a0e13396 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78d25dd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 26 15:10:22 2013 +0200 db_mysql: unlock tables at the end of transaction if they were locked --- modules/db_mysql/km_dbase.c | 49 ++++++++++++++++++++++++++++++++++++++--- modules/db_mysql/km_my_con.h | 4 ++- 2 files changed, 48 insertions(+), 5 deletions(-) diff --git a/modules/db_mysql/km_dbase.c b/modules/db_mysql/km_dbase.c index 4cdcef0..4587681 100644 --- a/modules/db_mysql/km_dbase.c +++ b/modules/db_mysql/km_dbase.c @@ -510,7 +510,7 @@ int db_mysql_affected_rows(const db1_con_t* _h) int db_mysql_start_transaction(db1_con_t* _h, db_locking_t _l) { str begin_str = str_init("BEGIN"); - str lock_start_str = str_init("LOCK TABLE "); + str lock_start_str = str_init("LOCK TABLES "); str lock_end_str = str_init(" WRITE"); str lock_str = {0, 0}; @@ -559,6 +559,7 @@ int db_mysql_start_transaction(db1_con_t* _h, db_locking_t _l) } if (lock_str.s) pkg_free(lock_str.s); + CON_LOCKEDTABLES(_h) = 1; break; default: @@ -575,6 +576,35 @@ error: } /** + * Unlock tables in the session + * \param _h database handle + * \return 0 on success, negative on failure + */ +int db_mysql_unlock_tables(db1_con_t* _h) +{ + str query_str = str_init("UNLOCK TABLES"); + + if (!_h) { + LM_ERR("invalid parameter value\n"); + return -1; + } + + if (CON_LOCKEDTABLES(_h) == 0) { + LM_DBG("no active locked tables\n"); + return 0; + } + + if (db_mysql_raw_query(_h, &query_str, NULL) < 0) + { + LM_ERR("executing raw_query\n"); + return -1; + } + + CON_LOCKEDTABLES(_h) = 0; + return 0; +} + +/** * Ends a transaction and commits the changes (SQL COMMIT) * \param _h database handle * \return 0 on success, negative on failure @@ -603,6 +633,10 @@ int db_mysql_end_transaction(db1_con_t* _h) raw_query fails, and the calling module does an abort_transaction() to clean-up, a ROLLBACK will be sent to the DB. */ CON_TRANSACTION(_h) = 0; + + if(db_mysql_unlock_tables(_h)<0) + return -1; + return 0; } @@ -614,6 +648,7 @@ int db_mysql_end_transaction(db1_con_t* _h) int db_mysql_abort_transaction(db1_con_t* _h) { str query_str = str_init("ROLLBACK"); + int ret; if (!_h) { LM_ERR("invalid parameter value\n"); @@ -622,7 +657,8 @@ int db_mysql_abort_transaction(db1_con_t* _h) if (CON_TRANSACTION(_h) == 0) { LM_DBG("nothing to rollback\n"); - return 0; + ret = 0; + goto done; } /* Whether the rollback succeeds or not we need to _end_ the @@ -632,10 +668,15 @@ int db_mysql_abort_transaction(db1_con_t* _h) if (db_mysql_raw_query(_h, &query_str, NULL) < 0) { LM_ERR("executing raw_query\n"); - return -1; + ret = -1; + goto done; } - return 1; + ret = 1; + +done: + db_mysql_unlock_tables(_h); + return ret; } diff --git a/modules/db_mysql/km_my_con.h b/modules/db_mysql/km_my_con.h index 8e96e20..7a58530 100644 --- a/modules/db_mysql/km_my_con.h +++ b/modules/db_mysql/km_my_con.h @@ -46,7 +46,8 @@ struct my_con { MYSQL* con; /*!< Connection representation */ time_t timestamp; /*!< Timestamp of last query */ - int transaction; /*!< indicates whether a multi-query transaction is currently open */ + int transaction; /*!< Multi-query transaction is currently open */ + int lockedtables; /*!< Table locks were aquired */ }; @@ -56,6 +57,7 @@ struct my_con { #define CON_CONNECTION(db_con) (((struct my_con*)((db_con)->tail))->con) #define CON_TIMESTAMP(db_con) (((struct my_con*)((db_con)->tail))->timestamp) #define CON_TRANSACTION(db_con) (((struct my_con*)((db_con)->tail))->transaction) +#define CON_LOCKEDTABLES(db_con) (((struct my_con*)((db_con)->tail))->lockedtables) /*! \brief

1 0

git:master: presence_xml: updated docs about integrated_xcap_server
by Daniel-Constantin Mierla 26 Sep '13

26 Sep '13

Module: sip-router Branch: master Commit: 8e35cef8716bbd0caa406a5080e93acb3c881c41 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8e35cef… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 26 13:23:46 2013 +0200 presence_xml: updated docs about integrated_xcap_server --- modules/presence_xml/README | 30 +++++++++++----------- modules/presence_xml/doc/presence_xml_admin.xml | 3 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/modules/presence_xml/README b/modules/presence_xml/README index e42dbed..55e4b80 100644 --- a/modules/presence_xml/README +++ b/modules/presence_xml/README @@ -8,7 +8,7 @@ Edited by Anca-Maria Vamanu - Copyright © 2007 Voice Sistem SRL + Copyright � 2007 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -144,7 +144,7 @@ Chapter 1. Admin Guide The database URL. - Default value is “mysql://openser:openserrw@localhost/openser”. + Default value is "mysql://kamailio:kamailiorw@localhost/kamailio". Example 1.1. Set db_url parameter ... @@ -155,7 +155,7 @@ modparam("presence_xml", "db_url", "dbdriver://username:password@dbhost/dbname") The name of the database table where XCAP documents are stored. - Default value is “xcap”. + Default value is "xcap". Example 1.2. Set xcap_table parameter ... @@ -166,7 +166,7 @@ modparam("presence_xml", "xcap_table", "xcaps") Set this parameter to disable the handling of the "presence" event. - Default value: “0”. + Default value: "0". Example 1.3. Set disable_presence parameter ... @@ -178,7 +178,7 @@ modparam("presence_xml", "disable_presence", 1) Set this parameter to disable the handling of the "presence.winfo" event. - Default value: “0”. + Default value: "0". Example 1.4. Set disable_winfo parameter ... @@ -189,7 +189,7 @@ modparam("presence_xml", "disable_winfo", 1) Set this parameter to disable the handling of the "dialog;sla" event. - Default value: “1” (0 - enabled, 1 - disabled). + Default value: "1" (0 - enabled, 1 - disabled). Example 1.5. Set disable_bla parameter ... @@ -209,7 +209,7 @@ modparam("presence_xml", "disable_bla", 1) Note: When switching from one value to another, the watchers table must be emptied. - Default value is “0”. + Default value is "0". Example 1.6. Set force_active parameter ... @@ -229,9 +229,9 @@ modparam("presence_xml", "force_active", 1) database and, if needed, send NOTIFY updates. Otherwise, it uses xcap_client module to fetch documents from the XCAP - servers with HTTP requests. This mode is currently not supported. + servers with HTTP requests. - Default value is “0”. + Default value is "0". Example 1.7. Set integrated_xcap_server parameter ... @@ -257,7 +257,7 @@ modparam("presence_xml", "xcap_server", "xcap_server.ag.org") no connection to database. Useful when needing only to use $xml(...) pseudoc-variable. - Default value: “0” (0 - active mode, 1 - passive mode). + Default value: "0" (0 - active mode, 1 - passive mode). Example 1.9. Set passive_mode parameter ... @@ -274,7 +274,7 @@ modparam("presence_xml", "passive_mode", 1) ones defined by the RFC 3265, this parameter offers the possibility for the admin to decide which one he wishes to use. - Default value: “probation” . Since probation also accepts a retry-after + Default value: "probation" . Since probation also accepts a retry-after parameter to specify after at least how may seconds the client should reattempt to resubscribe, you can include this in the parameter also. @@ -289,7 +289,7 @@ modparam("presence_xml", "xcapauth_userdel_reason", "rejected") 4.1. pres_check_basic(presentity_uri, status) 4.2. pres_check_activities(presentity_uri, activity) -4.1. pres_check_basic(presentity_uri, status) +4.1. pres_check_basic(presentity_uri, status) Checks the /presence/tuple/status/basic nodes in the presentity for presentity_uri against the value in status. @@ -312,7 +312,7 @@ modparam("presence_xml", "xcapauth_userdel_reason", "rejected") } ... -4.2. pres_check_activities(presentity_uri, activity) +4.2. pres_check_activities(presentity_uri, activity) Checks whether a /presence/person/activities/activity node exists in the presentity for presentity_uri. @@ -339,7 +339,7 @@ modparam("presence_xml", "xcapauth_userdel_reason", "rejected") 5. Installation - The module requires one table in Kamailio database: “xcap”. The SQL + The module requires one table in Kamailio database: "xcap". The SQL syntax to create it can be found in presence-create.sql script in the database directories in the kamailio/scripts folder. You can also find the complete database documentation on the project webpage, @@ -350,7 +350,7 @@ modparam("presence_xml", "xcapauth_userdel_reason", "rejected") * $xml(name=>spec) Exported pseudo-variables are documented at - http://www.kamailio.org/dokuwiki/. + http://www.kamailio.org/wiki/. Chapter 2. Developer Guide diff --git a/modules/presence_xml/doc/presence_xml_admin.xml b/modules/presence_xml/doc/presence_xml_admin.xml index 57b4f26..840628e 100644 --- a/modules/presence_xml/doc/presence_xml_admin.xml +++ b/modules/presence_xml/doc/presence_xml_admin.xml @@ -235,8 +235,7 @@ modparam("presence_xml", "force_active", 1) </para> <para> Otherwise, it uses xcap_client module to fetch documents - from the XCAP servers with HTTP requests. This mode is - currently not supported.</para> + from the XCAP servers with HTTP requests.</para> <para> <emphasis>Default value is <quote>0</quote>. </emphasis>

1 0

git:master: mi_rpc: compatibility with libxmlrpc-c3 library on wheezy
by Daniel-Constantin Mierla 26 Sep '13

26 Sep '13

Module: sip-router Branch: master Commit: baa4fccc2870df102a66089d6e9b6ca1ff47fc25 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=baa4fcc… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Sep 26 12:59:59 2013 +0200 mi_rpc: compatibility with libxmlrpc-c3 library on wheezy - patch by Muhammad Shahzad --- modules/mi_xmlrpc/abyss_data.h | 17 +++++++++++++++++ modules/mi_xmlrpc/abyss_http.c | 4 ++-- modules/mi_xmlrpc/abyss_xmlrpc_server.c | 3 ++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/modules/mi_xmlrpc/abyss_data.h b/modules/mi_xmlrpc/abyss_data.h index c8a874c..511c480 100644 --- a/modules/mi_xmlrpc/abyss_data.h +++ b/modules/mi_xmlrpc/abyss_data.h @@ -3,6 +3,23 @@ #include "abyss_thread.h" +#ifndef XMLRPC_OLD_VERSION +#define MAX_CONN 16 +typedef struct +{ + void *data; + int size; + int staticid; +} TBuffer; + +typedef struct +{ + TBuffer buffer; + int size; +} TString; + +#endif + /********************************************************************* ** List *********************************************************************/ diff --git a/modules/mi_xmlrpc/abyss_http.c b/modules/mi_xmlrpc/abyss_http.c index c8b7593..ca9b736 100644 --- a/modules/mi_xmlrpc/abyss_http.c +++ b/modules/mi_xmlrpc/abyss_http.c @@ -544,12 +544,12 @@ RequestRead(TSession * const sessionP) { } - +#ifdef XMLRPC_OLD_VERSION char *RequestHeaderValue(TSession *r,char *name) { return (TableFind(&r->request_headers,name)); } - +#endif abyss_bool diff --git a/modules/mi_xmlrpc/abyss_xmlrpc_server.c b/modules/mi_xmlrpc/abyss_xmlrpc_server.c index f2ecab1..55aabf6 100644 --- a/modules/mi_xmlrpc/abyss_xmlrpc_server.c +++ b/modules/mi_xmlrpc/abyss_xmlrpc_server.c @@ -941,8 +941,9 @@ uriPathParm(const xmlrpc_server_abyss_parms * const parmsP, } - +#ifdef XMLRPC_OLD_VERSION static xmlrpc_server_shutdown_fn shutdownAbyss; +#endif static void shutdownAbyss(xmlrpc_env * const envP,

1 0

TM changes to support extended async usage
by Jason Penton 26 Sep '13

26 Sep '13

Hi guys..... more specifically, TM experts ;) I have just committed a tmp branch called tm_async_extensions. We noticed with the current async impl, it is not possible to do things like forward() and t_relay() in a continued async route block. This is mainly because the faked env. created is specifically triggered to be a failure route in the continuation code. We have changed this to execute the route block using the original block type when the transaction was suspended (eg REQUEST_ROUTE, ON_REPLY, etc). We have also tested using reply blocks (ie suspending replies) but that code will come later once everyone is happy that we include the current subset of changes to improve normal async REQUEST processing. The current changes require some changes to the main TM structure (mainly for 'backing up' state before suspending). There is also a new mutex used to prevent multiple concurrent invocations of t_continue (previously we were using the reply lock). It would be great if some TM experts could review the code to ensure there are no use cases that we have missed that could break things. Daniel I suspect you know TM and its impacts the best, or is there someone else we should include? So far for our use cases, these changes work great. We can do things like: route[INVITE] { t_newtran(); async_route("INVITERESUME", "10"); #resume transaction in 10 seconds running route block INVITERESUME exit; } route[INVITERESUME] { t_relay(); } All upstream reply processing is correctly handled, local ACK generation and processing works as expected, etc. The above example may seem absurd (why would we want to delay our proxy of an INVITE for 10 seconds????) - Well this is just an easy example we use in our test cases. Actually we are using the async processing in the IMS code to increase performance when an INVITE for example triggers a long running process (like a DIAMETER request to get a users profile for example). Using conventional methods (no async transactions), the SIP worker process will sit locked up for this time (maybe 100's of milliseconds) unnecessarily. We found that using t_suspend and t_continue internally in our code improves performance significantly. I can see many use cases for the async code to improve performance, especially cases where we use backend DB's, memcached, radius, diameter, etc before actually "doing SIP routing"..... Any feedback would be greatly appreciated. Cheers Jason

2 4

[tracker] Task opened: uac_redirect not honoring q-value for max_total = 1 (Attachment added)
by sip-router 26 Sep '13

26 Sep '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Stefan Prelle (spr) Attached to Project - sip-router Summary - uac_redirect not honoring q-value for max_total = 1 Task Type - Bug Report Category - Modules kamailio Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - I am using kamailio 4.0.3 and the uac_redirect module to evaluate the 302 response from a SIP redirect server and establish a call only to the target with the highest priority. My problem is, that kamailio does not pick the target with the highest priority, but the one with the lowest. In the 302 the kamailio is receiving, there is a Contact header like this: <code>Contact:<sip:+49xxx@a.a.a.a:5060;user=phone>;q=0.5,<sip:+49xxx@b.b.b.b:5060;user=phone>;q=0.25</code> In my failure_route block I basically use the following commands <code>get_redirects("1"); t_relay();</code> The call then gets redirected to b.b.b.b whereas I would expect it to goto a.a.a.a When I change my script to <code>get_redirects("*");</code> the call is forked to both IPs in parallel (starting with a.a.a.a) I tried to strip that down to a minimal config that you will find attached. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=349 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: xhttp: added transformation to break a URL into "path" and " querystring"
by Peter Dunkley 25 Sep '13

25 Sep '13

Module: sip-router Branch: master Commit: 378bd71de3b035b497469f89a640931d0792ce4f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=378bd71… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Wed Sep 25 16:12:50 2013 +0100 xhttp: added transformation to break a URL into "path" and "querystring" --- modules/xhttp/xhttp_mod.c | 13 +++++ modules/xhttp/xhttp_trans.c | 125 +++++++++++++++++++++++++++++++++++++++++++ modules/xhttp/xhttp_trans.h | 30 ++++++++++ 3 files changed, 168 insertions(+), 0 deletions(-) diff --git a/modules/xhttp/xhttp_mod.c b/modules/xhttp/xhttp_mod.c index 23ac3c4..9848892 100644 --- a/modules/xhttp/xhttp_mod.c +++ b/modules/xhttp/xhttp_mod.c @@ -45,6 +45,7 @@ #include "../../pvar.h" #include "api.h" +#include "xhttp_trans.h" MODULE_VERSION @@ -106,6 +107,13 @@ struct module_exports exports= { 0 /* per-child init function */ }; +static tr_export_t mod_trans[] = { + { {"url", sizeof("url")-1}, + xhttp_tr_parse_url }, + + { { 0, 0 }, 0 } +}; + /** * */ @@ -162,6 +170,11 @@ static int mod_init(void) return 0; } +int mod_register(char *path, int *dlflags, void *p1, void *p2) +{ + return register_trans_mod(path, mod_trans); +} + /** * */ diff --git a/modules/xhttp/xhttp_trans.c b/modules/xhttp/xhttp_trans.c new file mode 100644 index 0000000..35c1609 --- /dev/null +++ b/modules/xhttp/xhttp_trans.c @@ -0,0 +1,125 @@ +/* + * $Id$ + * + * Copyright (C) 2013 Crocodile RCS Ltd + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#include "../../pvar.h" +#include "../../str.h" +#include "../../trim.h" +#include "xhttp_trans.h" + +enum _tr_xhttp_type { TR_XHTTP_NONE = 0, TR_XHTTPURL, TR_XHTTPURLQUERYSTRING }; +enum _tr_xhttpurl_subtype { TR_XHTTPURL_NONE = 0, TR_XHTTPURL_PATH, + TR_XHTTPURL_QUERYSTRING}; +enum _tr_xhttpquerystring_subtype { TR_XHTTPUTLQUERYSTRING_NONE = 0, + TR_XHTTPURLQUERYSTRING_VALUE}; + +int xhttp_tr_eval_xhttpurl(struct sip_msg *msg, tr_param_t *tp, int subtype, + pv_value_t *val) +{ + int pos = 0; + + if (val == NULL || val->flags & PV_VAL_NULL) + return -1; + + if (!(val->flags & PV_VAL_STR)) + { + val->rs.s = int2str(val->ri, &val->rs.len); + val->flags = PV_VAL_STR; + } + + switch (subtype) + { + case TR_XHTTPURL_PATH: + while (val->rs.s[pos] != '?' && pos < val->rs.len) + pos++; + + val->rs.len = pos; + break; + + case TR_XHTTPURL_QUERYSTRING: + while (val->rs.s[pos] != '?' && pos < val->rs.len) + pos++; + + if (pos >= val->rs.len) + { + val->rs.s[0] = '\0'; + val->rs.len = 0; + break; + } + + val->rs.s = &val->rs.s[pos + 1]; + val->rs.len = val->rs.len - pos - 1; + break; + + default: + LM_ERR("unknown subtype %d\n", subtype); + return -1; + } + + return 0; +} + +char *xhttp_tr_parse_url(str *in, trans_t *t) +{ + char *p; + str name; + + if (in == NULL || in->s == NULL || t == NULL) + return NULL; + + p = in->s; + name.s = in->s; + t->type = TR_XHTTPURL; + t->trf = xhttp_tr_eval_xhttpurl; + + /* find next token */ + while (is_in_str(p, in) && *p != TR_PARAM_MARKER && *p != TR_RBRACKET) + { + p++; + } + + if (*p == '\0') + { + LM_ERR("invalid transformation: %.*s\n", in->len, in->s); + goto error; + } + name.len = p - name.s; + trim(&name); + + if (name.len == 4 && strncasecmp(name.s, "path", 4) == 0) + { + t->subtype = TR_XHTTPURL_PATH; + goto done; + } + else if (name.len == 11 && strncasecmp(name.s, "querystring", 11) == 0) + { + t->subtype = TR_XHTTPURL_QUERYSTRING; + goto done; + } + + LM_ERR("unknown transformation: %.*s/%.*s/%d!\n", in->len, in->s, + name.len, name.s, name.len); +error: + return NULL; + +done: + t->name = name; + return p; +} diff --git a/modules/xhttp/xhttp_trans.h b/modules/xhttp/xhttp_trans.h new file mode 100644 index 0000000..0f27ca8 --- /dev/null +++ b/modules/xhttp/xhttp_trans.h @@ -0,0 +1,30 @@ +/* + * $Id$ + * + * Copyright (C) 2013 Crocodile RCS Ltd + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ +#ifndef XHTTP_TRANS_H_ +#define XHTTP_TRANS_H_ + +#include "../../pvar.h" +#include "../../str.h" + +char *xhttp_tr_parse_url(str *in, trans_t *t); + +#endif /* XHTTP_TRANS_H_ */

1 0

git:master: pv: updated param transformations so that you can (optionally) specify what the parameter delimiter is
by Peter Dunkley 25 Sep '13

25 Sep '13

Module: sip-router Branch: master Commit: 454a28dad2fef3f1adaf0acec9a7f1c320fe6571 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=454a28d… Author: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Committer: Peter Dunkley <peter.dunkley(a)crocodilertc.net> Date: Wed Sep 25 16:11:57 2013 +0100 pv: updated param transformations so that you can (optionally) specify what the parameter delimiter is - default behaviour unchanged - this allows HTTP URL parameters to be decoded --- modules/pv/pv_trans.c | 98 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 97 insertions(+), 1 deletions(-) diff --git a/modules/pv/pv_trans.c b/modules/pv/pv_trans.c index abfff74..5730da8 100644 --- a/modules/pv/pv_trans.c +++ b/modules/pv/pv_trans.c @@ -1129,6 +1129,7 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, pv_value_t v; str sv; int n, i; + char separator = ';'; param_hooks_t phooks; param_t *pit=NULL; @@ -1138,6 +1139,29 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, if(_tr_params_str.len==0 || _tr_params_str.len!=val->rs.len || strncmp(_tr_params_str.s, val->rs.s, val->rs.len)!=0) { + if (subtype == TR_PL_COUNT) + { + if (tp != NULL) + { + if(tp->type != TR_PARAM_STRING + || tp->v.s.len != 1) + return -1; + + separator = tp->v.s.s[0]; + } + } + else + { + if(tp->next != NULL) + { + if(tp->next->type != TR_PARAM_STRING + || tp->next->v.s.len != 1) + return -1; + + separator = tp->next->v.s.s[0]; + } + } + if(val->rs.len>_tr_params_str.len) { if(_tr_params_str.s) pkg_free(_tr_params_str.s); @@ -1167,7 +1191,8 @@ int tr_eval_paramlist(struct sip_msg *msg, tr_param_t *tp, int subtype, /* parse params */ sv = _tr_params_str; - if (parse_params(&sv, CLASS_ANY, &phooks, &_tr_params_list)<0) + if (parse_params2(&sv, CLASS_ANY, &phooks, &_tr_params_list, + separator)<0) return -1; } @@ -2307,6 +2332,7 @@ char* tr_parse_paramlist(str* in, trans_t *t) char *p; char *p0; char *ps; + char *start_pos; str s; str name; int n; @@ -2347,6 +2373,22 @@ char* tr_parse_paramlist(str* in, trans_t *t) t->params = tp; tp = 0; while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + + if(*p==TR_PARAM_MARKER) + { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + if (p - start_pos != 1) + { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + } + if(*p!=TR_RBRACKET) { LM_ERR("invalid value transformation: %.*s!\n", @@ -2367,6 +2409,22 @@ char* tr_parse_paramlist(str* in, trans_t *t) t->params = tp; tp = 0; while(is_in_str(p, in) && (*p==' ' || *p=='\t' || *p=='\n')) p++; + + if(*p==TR_PARAM_MARKER) + { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + if (p - start_pos != 1) + { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + } + if(*p!=TR_RBRACKET) { LM_ERR("invalid name transformation: %.*s!\n", @@ -2387,6 +2445,22 @@ char* tr_parse_paramlist(str* in, trans_t *t) t->params = tp; tp = 0; while(is_in_str(p, in) && (*p==' ' || *p=='\t' || *p=='\n')) p++; + + if(*p==TR_PARAM_MARKER) + { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params->next = tp; + tp = 0; + if (p - start_pos != 1) + { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + } + if(*p!=TR_RBRACKET) { LM_ERR("invalid name transformation: %.*s!\n", @@ -2396,6 +2470,28 @@ char* tr_parse_paramlist(str* in, trans_t *t) goto done; } else if(name.len==5 && strncasecmp(name.s, "count", 5)==0) { t->subtype = TR_PL_COUNT; + if(*p==TR_PARAM_MARKER) + { + start_pos = ++p; + _tr_parse_sparam(p, p0, tp, spec, ps, in, s); + t->params = tp; + tp = 0; + if (p - start_pos != 1) + { + LM_ERR("invalid separator in transformation: " + "%.*s\n", in->len, in->s); + goto error; + } + + while(*p && (*p==' ' || *p=='\t' || *p=='\n')) p++; + if(*p!=TR_RBRACKET) + { + LM_ERR("invalid name transformation: %.*s!\n", + in->len, in->s); + goto error; + } + } + goto done; }

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
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 September 2013