sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: added module presence_conference to master branch

by Marius Ovidiu Bucur

Module: sip-router Branch: master Commit: 70b39e55c21341229cad5810b590d291f3fb7381 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=70b39e5… Author: mariusbucur <marius(a)marius-bucur.ro> Committer: mariusbucur <marius(a)marius-bucur.ro> Date: Mon Oct 4 10:51:38 2010 +0300 added module presence_conference to master branch --- modules_k/presence_conference/Makefile | 33 +++ modules_k/presence_conference/README | 3 + modules_k/presence_conference/add_events.c | 69 +++++ modules_k/presence_conference/add_events.h | 33 +++ modules_k/presence_conference/doc/Makefile | 4 + modules_k/presence_conference/notify_body.c | 266 ++++++++++++++++++++ modules_k/presence_conference/notify_body.h | 41 +++ modules_k/presence_conference/pidf.c | 201 +++++++++++++++ modules_k/presence_conference/pidf.h | 53 ++++ .../presence_conference/presence_conference.c | 133 ++++++++++ .../presence_conference/presence_conference.h | 33 +++ .../presence_conference/test_framework/client.sh | 72 ++++++ .../presence_conference/test_framework/dereg.sh | 53 ++++ .../test_framework/functions/notify.sh | 8 + .../test_framework/functions/publish.sh | 23 ++ .../test_framework/functions/register.sh | 22 ++ .../test_framework/functions/subscribe.sh | 25 ++ .../presence_conference/test_framework/scen.sh | 63 +++++ .../test_framework/xml/notify.xml | 17 ++ .../test_framework/xml/publish.xml | 103 ++++++++ .../test_framework/xml/register.xml | 18 ++ .../test_framework/xml/subscribe.xml | 35 +++ 22 files changed, 1308 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=70b…

14 years, 4 months

git:master: Updated generated README with doc changes for is_known_dlg() as well.

by Alex Balashov

Module: sip-router Branch: master Commit: c676d5303fe928c21ec17ed2ecb6353eaf4f1b5a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c676d53… Author: Alex Balashov <abalashov(a)evaristesys.com> Committer: Alex Balashov <abalashov(a)evaristesys.com> Date: Sun Oct 3 22:08:53 2010 -0400 Updated generated README with doc changes for is_known_dlg() as well. --- modules_k/dialog/README | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules_k/dialog/README b/modules_k/dialog/README index 348b694..0cb0730 100644 --- a/modules_k/dialog/README +++ b/modules_k/dialog/README @@ -1113,11 +1113,16 @@ if(dlg_get("abcdef", "123", "456")) 6.13. is_known_dlg() - This function checks if the dialog module is aware of this dialog, - regardless of whether it is in any profiles. The dialog module tracks - all dialogs irrespectively of profile usage; as such, this function - will return affirmatively if the request corresponds to a dialog that - is currently active. + This function checks if the current SIP message being processed belongs + to any transaction within an active dialog that the dialog module is + currently tracking. This is a check for tracking of any kind, without + regard to profiles. + + This function has numerous potential applications, among which is that + it can be used to strengthen security for loose-routing sequential + (in-dialog) requests or responses to them, as by providing a + preventative check against spoofing on the proxy level instead of + leaving the issue purely to the receiving UA. This function can be used from REQUEST_ROUTE, BRANCH_ROUTE, REPLY_ROUTE and FAILURE_ROUTE.

14 years, 4 months

git:master: Improved documentation for is_known_dlg() function and added some

by Alex Balashov

Module: sip-router Branch: master Commit: 8c0bdbd5f70d9a6f61b206ecc918404c880fdf24 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c0bdbd… Author: Alex Balashov - Diminuendo-2 <evariste-admins(a)evaristesys.com> Committer: Alex Balashov - Diminuendo-2 <evariste-admins(a)evaristesys.com> Date: Sun Oct 3 20:52:35 2010 -0400 Improved documentation for is_known_dlg() function and added some clarifications, and also tested my commit rights. --- modules_k/dialog/doc/dialog_admin.xml | 17 ++++++++++++----- 1 files changed, 12 insertions(+), 5 deletions(-) diff --git a/modules_k/dialog/doc/dialog_admin.xml b/modules_k/dialog/doc/dialog_admin.xml index ec80223..d6ecfe2 100644 --- a/modules_k/dialog/doc/dialog_admin.xml +++ b/modules_k/dialog/doc/dialog_admin.xml @@ -1394,11 +1394,18 @@ if(dlg_get("abcdef", "123", "456")) <function moreinfo="none">is_known_dlg()</function> </title> <para> - This function checks if the dialog module is aware of this - dialog, regardless of whether it is in any profiles. The - dialog module tracks all dialogs irrespectively of profile usage; - as such, this function will return affirmatively if the request - corresponds to a dialog that is currently active. + This function checks if the current SIP message being processed + belongs to any transaction within an active dialog that the + dialog module is currently tracking. This is a check for + tracking of any kind, without regard to profiles. + </para> + <para> + This function has numerous potential applications, among which + is that it can be used to strengthen security for + loose-routing sequential (in-dialog) requests or responses + to them, as by providing a preventative check against + spoofing on the proxy level instead of leaving the issue + purely to the receiving UA. </para> <para> This function can be used from REQUEST_ROUTE, BRANCH_ROUTE,

14 years, 4 months

git:master: tmx: fixed t_reply_callid() name in example

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 308b61934998c15630a801f8cb98e32a4fe8a830 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=308b619… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 3 23:02:54 2010 +0200 tmx: fixed t_reply_callid() name in example --- modules_k/tmx/README | 6 +++--- modules_k/tmx/doc/tmx_admin.xml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_k/tmx/README b/modules_k/tmx/README index 658ea42..6b3f050 100644 --- a/modules_k/tmx/README +++ b/modules_k/tmx/README @@ -56,7 +56,7 @@ Daniel-Constantin Mierla 1.1. t_cancel_branches usage 1.2. t_cancel_callid usage - 1.3. t_cancel_reply usage + 1.3. t_reply_callid usage Chapter 1. Admin Guide @@ -175,9 +175,9 @@ if (t_cancel_callid("123qaz", "5", "22")) { This function can be used in ANY_ROUTE. - Example 1.3. t_cancel_reply usage + Example 1.3. t_reply_callid usage ... -if (t_cancel_reply("123qaz", "5", "458", "Replied remotely")) { +if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { xlog("transaction replied\n"); } ... diff --git a/modules_k/tmx/doc/tmx_admin.xml b/modules_k/tmx/doc/tmx_admin.xml index c546723..1012972 100644 --- a/modules_k/tmx/doc/tmx_admin.xml +++ b/modules_k/tmx/doc/tmx_admin.xml @@ -161,10 +161,10 @@ if (t_cancel_callid("123qaz", "5", "22")) { This function can be used in ANY_ROUTE. </para> <example> - <title><function>t_cancel_reply</function> usage</title> + <title><function>t_reply_callid</function> usage</title> <programlisting format="linespecific"> ... -if (t_cancel_reply("123qaz", "5", "458", "Replied remotely")) { +if (t_reply_callid("123qaz", "5", "458", "Replied remotely")) { xlog("transaction replied\n"); } ...

14 years, 4 months

git:master: db_postgres: null-terminate blob buffers

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 7370685a2eb6d27d6775c8cffa59f6f17cdb76b5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7370685… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 3 21:51:35 2010 +0200 db_postgres: null-terminate blob buffers - reapply part of patch done for FS#77: fix BLOBs with postgres - fix BLOBs with postgres, also add a null-termination as the other SQL databases in order to be able to work with the presence modules - change: do not increment the lenght of blob - initial fix by Henning Westerholt, commit 2e56720769913c55cacc83fe3a31f44f072e7590 --- modules/db_postgres/km_val.c | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/modules/db_postgres/km_val.c b/modules/db_postgres/km_val.c index cb3fe9f..b2e97c0 100644 --- a/modules/db_postgres/km_val.c +++ b/modules/db_postgres/km_val.c @@ -55,9 +55,11 @@ * \param _l string length * \return 0 on success, negative on error */ -int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const int _l) +int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, + const int _l) { - /* use common function for non BLOB, NULL setting and input parameter checking */ + /* use common function for non BLOB, NULL setting and input + * parameter checking */ if ( _t != DB1_BLOB || _s == NULL || _v == NULL) { return db_str2val(_t, _v, _s, _l, 1); } else { @@ -67,21 +69,24 @@ int db_postgres_str2val(const db_type_t _t, db_val_t* _v, const char* _s, const * The string is stored in new allocated memory, which we could * not free later thus we need to copy it to some new memory here. */ - tmp_s = (char*)PQunescapeBytea((unsigned char*)_s, (size_t*)(void*)&(VAL_BLOB(_v).len)); + tmp_s = (char*)PQunescapeBytea((unsigned char*)_s, + (size_t*)(void*)&(VAL_BLOB(_v).len)); if(tmp_s==NULL) { LM_ERR("PQunescapeBytea failed\n"); return -7; } - VAL_BLOB(_v).s = pkg_malloc(VAL_BLOB(_v).len); + VAL_BLOB(_v).s = pkg_malloc(VAL_BLOB(_v).len + 1); if (VAL_BLOB(_v).s == NULL) { LM_ERR("no private memory left\n"); PQfreemem(tmp_s); return -8; } - LM_DBG("allocate %d bytes memory for BLOB at %p", VAL_BLOB(_v).len, VAL_BLOB(_v).s); + LM_DBG("allocate %d+1 bytes memory for BLOB at %p", + VAL_BLOB(_v).len, VAL_BLOB(_v).s); memcpy(VAL_BLOB(_v).s, tmp_s, VAL_BLOB(_v).len); PQfreemem(tmp_s); + VAL_BLOB(_v).s[VAL_BLOB(_v).len] = '\0'; VAL_TYPE(_v) = DB1_BLOB; VAL_FREE(_v) = 1;

14 years, 4 months

git:master: kamdbctl: fixed lcr tables name

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 3f8928724428cf691041fe2fa9b429c547f5fcf2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3f89287… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 3 21:08:59 2010 +0200 kamdbctl: fixed lcr tables name - reported by Klaus Feichtinger --- utils/kamctl/kamdbctl.base | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/utils/kamctl/kamdbctl.base b/utils/kamctl/kamdbctl.base index 83f5a8a..85d8fa2 100644 --- a/utils/kamctl/kamdbctl.base +++ b/utils/kamctl/kamdbctl.base @@ -32,10 +32,10 @@ INSTALL_PRESENCE_TABLES=${INSTALL_PRESENCE_TABLES:-ask} # Used by dbtext and db_berkeley to define tables to be created, used by # postgres to do the grants -STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases lcr domain grp - uri speed_dial gw pdt subscriber location re_grp trusted - address missed_calls usr_preferences aliases silo dialog - dispatcher dialplan} +STANDARD_TABLES=${STANDARD_TABLES:-version acc dbaliases domain grp + uri speed_dial lcr_gw lcr_rule lcr_rule_target pdt subscriber + location re_grp trusted address missed_calls usr_preferences + aliases silo dialog dispatcher dialplan} EXTRA_TABLES=${EXTRA_TABLES:-imc_members imc_rooms cpl sip_trace domainpolicy carrierroute carrier_name domain_name carrierfailureroute userblacklist globalblacklist htable purplemap} PRESENCE_TABLES=${PRESENCE_TABLES:-presentity active_watchers watchers xcap

14 years, 4 months

git:master: dialog(k): fixed db mode realtime

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0b8226f9fa7c33eb2716cd79ac4446c1713b6bb5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0b8226f… Author: root <root(a)boyce.voipuser.org> Committer: root <root(a)boyce.voipuser.org> Date: Sat Oct 2 22:08:22 2010 +0100 dialog(k): fixed db mode realtime - main proc was reseting the db mode value, resulting in propagation to children if the context switching policy choosed first child init in main proc --- modules_k/dialog/dialog.c | 7 ++++++- modules_k/dialog/dlg_db_handler.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 00024a5..7a731ed 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -111,6 +111,8 @@ struct tm_binds d_tmb; struct rr_binds d_rrb; pv_spec_t timeout_avp; +int dlg_db_mode_param = DB_MODE_NONE; + /* db stuff */ static str db_url = str_init(DEFAULT_DB_URL); static unsigned int db_update_period = DB_DEFAULT_UPDATE_PERIOD; @@ -189,7 +191,7 @@ static param_export_t mod_params[]={ { "dlg_match_mode", INT_PARAM, &seq_match_mode }, { "detect_spirals", INT_PARAM, &detect_spirals, }, { "db_url", STR_PARAM, &db_url.s }, - { "db_mode", INT_PARAM, &dlg_db_mode }, + { "db_mode", INT_PARAM, &dlg_db_mode_param }, { "table_name", STR_PARAM, &dialog_table_name }, { "call_id_column", STR_PARAM, &call_id_column.s }, { "from_uri_column", STR_PARAM, &from_uri_column.s }, @@ -574,6 +576,7 @@ static int mod_init(void) } /* if a database should be used to store the dialogs' information */ + dlg_db_mode = dlg_db_mode_param; if (dlg_db_mode==DB_MODE_NONE) { db_url.s = 0; db_url.len = 0; } else { @@ -601,6 +604,8 @@ static int mod_init(void) static int child_init(int rank) { + dlg_db_mode = dlg_db_mode_param; + if (rank==1) { if_update_stat(dlg_enable_stats, active_dlgs, active_dlgs_cnt); if_update_stat(dlg_enable_stats, early_dlgs, early_dlgs_cnt); diff --git a/modules_k/dialog/dlg_db_handler.c b/modules_k/dialog/dlg_db_handler.c index 08d3443..0a6ab04 100644 --- a/modules_k/dialog/dlg_db_handler.c +++ b/modules_k/dialog/dlg_db_handler.c @@ -422,7 +422,9 @@ int remove_dialog_from_db(struct dlg_cell * cell) db_key_t match_keys[2] = { &h_entry_column, &h_id_column}; /*if the dialog hasn 't been yet inserted in the database*/ - LM_DBG("trying to remove a dialog, update_flag is %i\n", cell->dflags); + LM_DBG("trying to remove dialog [%.*s], update_flag is %i\n", + cell->callid.len, cell->callid.s, + cell->dflags); if (cell->dflags & DLG_FLAG_NEW) return 0;

14 years, 4 months

git:master: dialog: fix setting the name of route in dlg structure

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 2429ddf4afe45fc72a11c9cc53c8f8efbad36f1e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2429ddf… Author: root <root(a)boyce.voipuser.org> Committer: root <root(a)boyce.voipuser.org> Date: Sat Oct 2 20:56:11 2010 +0100 dialog: fix setting the name of route in dlg structure --- modules_k/dialog/dlg_hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index 2e94731..3ec22a4 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -775,7 +775,7 @@ int dlg_set_toroute(struct dlg_cell *dlg, str *route) dlg->toroute_name.len = 0; } dlg->toroute_name.s = (char*)shm_malloc((route->len+1)*sizeof(char)); - if(dlg->toroute_name.s!=NULL) { + if(dlg->toroute_name.s==NULL) { LM_ERR("no more shared memory\n"); return -1; }

14 years, 4 months

git:master: presence(k): fallback2db==1 mode updates

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 647a786907178bfa3c709497678afe1589646943 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=647a786… Author: root <root(a)boyce.voipuser.org> Committer: root <root(a)boyce.voipuser.org> Date: Sat Oct 2 20:09:09 2010 +0100 presence(k): fallback2db==1 mode updates - go through all the list of active subcriptions when sync'ing to db, even one db operation throws error - if fallback2db==1, don't attempt to insert the record back --- modules_k/presence/hash.c | 10 ++++++---- modules_k/presence/subscribe.c | 26 ++++++++++---------------- 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/modules_k/presence/hash.c b/modules_k/presence/hash.c index bc31b87..9d36642 100644 --- a/modules_k/presence/hash.c +++ b/modules_k/presence/hash.c @@ -261,10 +261,12 @@ int insert_shtable(shtable_t htable,unsigned int hash_code, subs_t* subs) } new_rec->expires+= (int)time(NULL); - if(fallback2db!=0) - new_rec->db_flag= INSERTDB_FLAG; - else - new_rec->db_flag= NO_UPDATEDB_FLAG; + if(fallback2db!=0) { + if(new_rec->db_flag==0) + new_rec->db_flag = INSERTDB_FLAG; + } else { + new_rec->db_flag = NO_UPDATEDB_FLAG; + } lock_get(&htable[hash_code].lock); diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index c6f4aa2..94bf9d8 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -1536,12 +1536,10 @@ void update_db_subs(db1_con_t *db,db_func_t dbf, shtable_t hash_table, switch(s->db_flag) { case NO_UPDATEDB_FLAG: - { LM_DBG("NO_UPDATEDB_FLAG\n"); break; - } + case UPDATEDB_FLAG: - { LM_DBG("UPDATEDB_FLAG\n"); query_vals[pres_uri_col].val.str_val= s->pres_uri; @@ -1560,14 +1558,12 @@ void update_db_subs(db1_con_t *db,db_func_t dbf, shtable_t hash_table, update_vals, n_query_update, n_update_cols)< 0) { LM_ERR("updating in database\n"); - if(!no_lock) - lock_release(&hash_table[i].lock); - return ; + } else { + s->db_flag= NO_UPDATEDB_FLAG; } break; - } + case INSERTDB_FLAG: - { LM_DBG("INSERTDB_FLAG\n"); query_vals[pres_uri_col].val.str_val= s->pres_uri; @@ -1594,15 +1590,11 @@ void update_db_subs(db1_con_t *db,db_func_t dbf, shtable_t hash_table, if(dbf.insert(db,query_cols,query_vals,n_query_cols )<0) { LM_ERR("unsuccessful sql insert\n"); - if(!no_lock) - lock_release(&hash_table[i].lock); - return ; + } else { + s->db_flag= NO_UPDATEDB_FLAG; } break; - } - - } - s->db_flag= NO_UPDATEDB_FLAG; + } /* switch */ prev_s= s; s= s->next; } @@ -1808,7 +1800,9 @@ int restore_db_subs(void) s.sockinfo_str.s=(char*)row_vals[sockinfo_col].val.string_val; s.sockinfo_str.len= strlen(s.sockinfo_str.s); - + + if(fallback2db!=0) + s.db_flag = NO_UPDATEDB_FLAG; hash_code= core_hash(&s.pres_uri, &s.event->name, shtable_size); if(insert_shtable(subs_htable, hash_code, &s)< 0) {

14 years, 4 months

git:master: msilo: don't print error for no contact in register

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b837d50ffb96667dfb424f19d553c4277ea37a34 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b837d50… Author: root <root(a)boyce.voipuser.org> Committer: root <root(a)boyce.voipuser.org> Date: Sat Oct 2 20:07:53 2010 +0100 msilo: don't print error for no contact in register - register requests without contact are valid, querying the list of contacts for user --- modules_k/msilo/msilo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/msilo/msilo.c b/modules_k/msilo/msilo.c index b7ffd6a..f9571a9 100644 --- a/modules_k/msilo/msilo.c +++ b/modules_k/msilo/msilo.c @@ -1424,7 +1424,7 @@ int check_message_support(struct sip_msg* msg) if (!msg->contact) { - LM_ERR("no Contact found\n"); + LM_DBG("no Contact found\n"); return -1; } if (parse_contact(msg->contact) < 0)

14 years, 4 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev