sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

git:master: modules_k/presence Change delete sql query to use key

by Anca Vamanu

Module: sip-router Branch: master Commit: 5ccf1eedb4e38d85d7cd29ea5d69f29b40289755 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5ccf1ee… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Mar 15 18:38:43 2012 +0200 modules_k/presence Change delete sql query to use key The delete operation in active_watchers is now performed on callid, to_tag, from_tag. --- modules_k/presence/notify.c | 22 ++++++++++++++++------ modules_k/presence/notify.h | 3 ++- modules_k/presence/subscribe.c | 28 +++++++++++++++------------- modules_k/presence/subscribe.h | 2 +- 4 files changed, 34 insertions(+), 21 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 52cb958..6ebf9fe 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -1591,9 +1591,9 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) c_back_param* cb; if(ps->param==NULL || *ps->param==NULL || - ((c_back_param*)(*ps->param))->pres_uri.s == NULL || - ((c_back_param*)(*ps->param))->ev_name.s== NULL || - ((c_back_param*)(*ps->param))->to_tag.s== NULL) + ((c_back_param*)(*ps->param))->callid.s == NULL || + ((c_back_param*)(*ps->param))->to_tag.s== NULL || + ((c_back_param*)(*ps->param))->from_tag.s== NULL) { LM_DBG("message id not received, probably a timeout notify\n"); if(ps->param != NULL && *ps->param !=NULL) @@ -1606,7 +1606,8 @@ void p_tm_callback( struct cell *t, int type, struct tmcb_params *ps) ps->code, cb->to_tag.len, cb->to_tag.s); if(ps->code == 481 || (ps->code == 408 && timeout_rm_subs)) - delete_subs(&cb->pres_uri, &cb->ev_name, &cb->to_tag); + delete_subs(&cb->pres_uri, &cb->ev_name, + &cb->to_tag, &cb->from_tag, &cb->callid); free_cbparam(cb); } @@ -1622,8 +1623,9 @@ c_back_param* shm_dup_cbparam(subs_t* subs) int size; c_back_param* cb_param = NULL; - size = sizeof(c_back_param) + subs->pres_uri.len+ - subs->event->name.len + subs->to_tag.len; + size = sizeof(c_back_param) + subs->pres_uri.len + + subs->event->name.len + subs->to_tag.len + + subs->from_tag.len + subs->callid.len; cb_param= (c_back_param*)shm_malloc(size); LM_DBG("=== %d/%d/%d\n", subs->pres_uri.len, @@ -1645,6 +1647,14 @@ c_back_param* shm_dup_cbparam(subs_t* subs) memcpy(cb_param->to_tag.s, subs->to_tag.s, subs->to_tag.len); cb_param->to_tag.len = subs->to_tag.len; + cb_param->from_tag.s = (char*)(cb_param->to_tag.s) + cb_param->to_tag.len; + memcpy(cb_param->from_tag.s, subs->from_tag.s, subs->from_tag.len); + cb_param->from_tag.len = subs->from_tag.len; + + cb_param->callid.s = (char*)(cb_param->from_tag.s) + cb_param->from_tag.len; + memcpy(cb_param->callid.s, subs->callid.s, subs->callid.len); + cb_param->callid.len = subs->callid.len; + return cb_param; } diff --git a/modules_k/presence/notify.h b/modules_k/presence/notify.h index 9a03f56..8af54a0 100644 --- a/modules_k/presence/notify.h +++ b/modules_k/presence/notify.h @@ -65,7 +65,8 @@ typedef struct wid_cback str pres_uri; str ev_name; str to_tag; /* to identify the exact record */ - subs_t* wi_subs; + str from_tag; + str callid; }c_back_param; extern str str_to_user_col; diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 7e45a9b..0c914c7 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -138,30 +138,30 @@ error: } -int delete_db_subs(str* pres_uri, str* ev_stored_name, str* to_tag) +int delete_db_subs(str* to_tag, str* from_tag, str* callid) { - db_key_t query_cols[5]; - db_val_t query_vals[5]; + db_key_t query_cols[3]; + db_val_t query_vals[3]; int n_query_cols= 0; - query_cols[n_query_cols] = &str_presentity_uri_col; + query_cols[n_query_cols] = &str_callid_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = *pres_uri; + query_vals[n_query_cols].val.str_val = *callid; n_query_cols++; - query_cols[n_query_cols] = &str_event_col; + query_cols[n_query_cols] = &str_to_tag_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = *ev_stored_name; + query_vals[n_query_cols].val.str_val = *to_tag; n_query_cols++; - query_cols[n_query_cols] = &str_to_tag_col; + query_cols[n_query_cols] = &str_from_tag_col; query_vals[n_query_cols].type = DB1_STR; query_vals[n_query_cols].nul = 0; - query_vals[n_query_cols].val.str_val = *to_tag; + query_vals[n_query_cols].val.str_val = *from_tag; n_query_cols++; - + if (pa_dbf.use_table(pa_db, &active_watchers_table) < 0) { LM_ERR("in use table sql operation\n"); @@ -405,7 +405,8 @@ int update_subs_db(subs_t* subs, int type) return 0; } -void delete_subs(str* pres_uri, str* ev_name, str* to_tag) +void delete_subs(str* pres_uri, str* ev_name, str* to_tag, + str* from_tag, str* callid) { /* delete record from hash table also if not in dbonly mode */ if(subs_dbmode != DB_ONLY) @@ -415,7 +416,7 @@ void delete_subs(str* pres_uri, str* ev_name, str* to_tag) LM_ERR("Failed to delete subscription from memory\n"); } - if(subs_dbmode != NO_DB && delete_db_subs(pres_uri, ev_name, to_tag)< 0) + if(subs_dbmode != NO_DB && delete_db_subs(to_tag, from_tag, callid)< 0) LM_ERR("Failed to delete subscription from database\n"); } @@ -436,7 +437,8 @@ int update_subscription(struct sip_msg* msg, subs_t* subs, int to_tag_gen, { LM_DBG("expires =0 -> deleting record\n"); - delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag); + delete_subs(&subs->pres_uri, &subs->event->name, &subs->to_tag, + &subs->from_tag, &subs->callid); if(subs->event->type & PUBL_TYPE) { diff --git a/modules_k/presence/subscribe.h b/modules_k/presence/subscribe.h index bf7d189..8ba3893 100644 --- a/modules_k/presence/subscribe.h +++ b/modules_k/presence/subscribe.h @@ -116,6 +116,6 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int max_expire, int* to_tag_gen, str scontact); typedef int (*extract_sdialog_info_t)(subs_t* subs, struct sip_msg* msg, int max_expire, int* to_tag_gen, str scontact); -void delete_subs(str* pres_uri, str* ev_name, str* to_tag); +void delete_subs(str* pres_uri, str* ev_name, str* to_tag, str* from_tag, str* callid); #endif

12 years, 8 months

git:master: modules_k/presence Reverted a change from last commit

by Anca Vamanu

Module: sip-router Branch: master Commit: a87298867d48de1daea58f5058e43ac264d6a076 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a872988… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Mar 15 18:33:38 2012 +0200 modules_k/presence Reverted a change from last commit Do not use affected_rows on delete (the send notify part relies on finding the record in database) --- modules_k/presence/presentity.c | 41 ++++++++++++-------------------------- 1 files changed, 13 insertions(+), 28 deletions(-) diff --git a/modules_k/presence/presentity.c b/modules_k/presence/presentity.c index 8da45a6..bb69df6 100644 --- a/modules_k/presence/presentity.c +++ b/modules_k/presence/presentity.c @@ -471,17 +471,17 @@ after_dialog_check: if(presentity->expires == 0) { - if (!pa_dbf.affected_rows && !db_record_exists) + if (!db_record_exists) { if (pa_dbf.query (pa_db, query_cols, query_ops, query_vals, - result_cols, n_query_cols, n_result_cols, 0, &result) < 0) + result_cols, n_query_cols, n_result_cols, 0, &result) < 0) { LM_ERR("unsuccessful sql query\n"); goto error; } if(result== NULL) goto error; - + if (!(result->n > 0)) goto send_412; @@ -491,30 +491,6 @@ after_dialog_check: result = NULL; } - LM_DBG("expires =0 -> deleting from database\n"); - if(pa_dbf.delete(pa_db,query_cols,0,query_vals,n_query_cols)<0) - { - LM_ERR("unsuccessful sql delete operation"); - goto error; - } - - if (pa_dbf.affected_rows && !db_record_exists) - { - if ((affected_rows = pa_dbf.affected_rows ( pa_db ))<0) - { - LM_ERR("unsuccessful sql affected rows operation"); - goto error; - } - - LM_DBG ("affected rows after delete: %d\n", affected_rows ); - } - /*if either affected_rows (if exists) or select query show that there is no line in database*/ - if ((pa_dbf.affected_rows && !affected_rows) || (!pa_dbf.affected_rows && !db_record_exists)) - goto send_412; - - LM_DBG("deleted from db %.*s\n", presentity->user.len, - presentity->user.s); - if( publ_send200ok(msg, presentity->expires, presentity->etag)< 0) { LM_ERR("sending 200OK reply\n"); @@ -526,6 +502,16 @@ after_dialog_check: LM_ERR("while sending notify\n"); goto error; } + + LM_DBG("expires =0 -> deleting from database\n"); + if(pa_dbf.delete(pa_db,query_cols,0,query_vals,n_query_cols)<0) + { + LM_ERR("unsuccessful sql delete operation"); + goto error; + } + + LM_DBG("deleted from db %.*s\n", presentity->user.len, presentity->user.s); + /* delete from hash table */ if( publ_cache_enabled && delete_phtable(&pres_uri, presentity->event->evp->type)< 0) @@ -534,7 +520,6 @@ after_dialog_check: goto error; } goto done; - } n_update_cols= 0;

12 years, 8 months

[tracker] Task closed: Some cases when rtp proxy not change port numbers in media

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#200 - Some cases when rtp proxy not change port numbers in media User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=200 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.

12 years, 8 months

[tracker] Comment added: Some cases when rtp proxy not change port numbers in media

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#200 - Some cases when rtp proxy not change port numbers in media User who did this - Daniel-Constantin Mierla (miconda) ---------- Can you try with git devel version? I just pushed a patch to check for quotes around boundary value. v3.0 is quite old, newer versions use a dedicated sdp parser from the core for nat traversal as well, which was not there in the past. If the master branch is working fine, I will backport to 3.2, eventually 3.1, but I guess 3.0 uses the old nathelper embedded sdp parsing. I am closing the item as well, if you still have issues with devel branch, reopen. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=200#comment510 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.

12 years, 8 months

[tracker] User took ownership: Some cases when rtp proxy not change port numbers in media

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#200 - Some cases when rtp proxy not change port numbers in media More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=200 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.

12 years, 8 months

git:master: parser/sdp: allow boundary value between quotes

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a66242b4f776b43120014b0c56e21c87d254ddcc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a66242b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 14 10:57:47 2012 +0100 parser/sdp: allow boundary value between quotes - reported by Magnus Nordström, FS#200 --- parser/sdp/sdp_helpr_funcs.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 32e9eb4..7779fff 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -179,6 +179,20 @@ int get_mixed_part_delimiter(str* body, str *mp_delimiter) advance(p,1,str_type,error); mp_delimiter->len = str_type.len - (int)(p-str_type.s); mp_delimiter->s = p; + /* check if the boundary value is enclosed in quotes */ + if(*p=='"' || *p=='\'') { + if(mp_delimiter->s[mp_delimiter->len-1]==*p) { + mp_delimiter->s = p+1; + mp_delimiter->len -= 2; + if(mp_delimiter->len<=0) { + LM_ERR("invalid boundary field value\n"); + goto error; + } + } else { + LM_ERR("missing closing quote in boundary field value\n"); + goto error; + } + } return 1; error:

12 years, 8 months

[tracker] Task closed: nathelper path support with registrar on private network.

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#131 - nathelper path support with registrar on private network. User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug Additional comments about closing: I checked the nathelper module and it uses path for doing SIP keepalives. Closing this item due to no followup for very long time. Reopen if there is still a problem and add more info (log messages, sip capture). More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=131 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.

12 years, 8 months

[tracker] Task closed: Crash when sqlops tries to do a 'select' on db_text

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#208 - Crash when sqlops tries to do a 'select' on db_text User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch committed to GIT master branch, to be backported. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=208 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.

12 years, 8 months

git:master: sqlops: check for DB_CAP_RAW_QUERY of DB connection

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: edc4d902135d484d02272a64b7f27447fcb6854e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=edc4d90… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 14 10:01:00 2012 +0100 sqlops: check for DB_CAP_RAW_QUERY of DB connection - the module is using raw query capability and DB_CAP_ALL does not include it - reported by Pedro Vico, FS#208 --- modules_k/sqlops/sql_api.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/sqlops/sql_api.c b/modules_k/sqlops/sql_api.c index c02ac81..77ff97f 100644 --- a/modules_k/sqlops/sql_api.c +++ b/modules_k/sqlops/sql_api.c @@ -151,7 +151,7 @@ int sql_connect(void) sc->name.len, sc->name.s); return -1; } - if (!DB_CAPABILITY(sc->dbf, DB_CAP_ALL)) + if (!DB_CAPABILITY(sc->dbf, DB_CAP_RAW_QUERY)) { LM_ERR("database module does not have DB_CAP_ALL [%.*s]\n", sc->name.len, sc->name.s);

12 years, 8 months

git:master: mi_xmlrpc: added note about using xmlrpc as better alternative

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 67d11b26dd6740ac8704c601ccfa69cfe27e5517 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67d11b2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Mar 14 09:51:43 2012 +0100 mi_xmlrpc: added note about using xmlrpc as better alternative - no dependency on specific external lib versions --- modules_k/mi_xmlrpc/README | 22 ++++++++++++++-------- modules_k/mi_xmlrpc/doc/mi_xmlrpc_admin.xml | 7 +++++++ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/modules_k/mi_xmlrpc/README b/modules_k/mi_xmlrpc/README index a74cb06..27eddbd 100644 --- a/modules_k/mi_xmlrpc/README +++ b/modules_k/mi_xmlrpc/README @@ -12,7 +12,7 @@ Edited by Juha Heinanen - Copyright © 2006 Voice Sistem SRL + Copyright � 2006 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -67,6 +67,13 @@ Chapter 1. Admin Guide 1. Overview + NOTE: this module depends on specific versions of libxmlrpc-c3, which + may not be available on your OS. You better use the 'xmlrpc' module + located in 'modules/' folder. It can run any MI command by loading + 'mi_rpc' module and executing RPC command 'mi', with first parameter + being the MI command, then followed by other parameters that will be + passed to the MI command. + This module implements a xmlrpc server that handles xmlrpc requests and generates xmlrpc responses. When a xmlrpc message is received a default method is executed. @@ -108,14 +115,13 @@ Chapter 1. Admin Guide The following libraries or applications must be installed before running Kamailio with this module loaded: * libxml. - * libxmlrpc-c3 version 0.9.10. - * libxmlrpc-c3-dev version 0.9.10. + * libxmlrpc-c3 version 0.9.10 or version 1.06.[10-30]. + * libxmlrpc-c3-dev version 0.9.10 or version 1.06.[10-30]. If libxmlrpc-c3[-dev] package is not available on your system, you may check if packages for your OS are not available on the - “xmlrpc-c”project ( http://xmlrpc-c.sourceforge.net/). Otherwise you - need to install the library and devel headers from the sources. In both - cases, keep in mind to use the 0.9.10 version!!. + "xmlrpc-c"project ( http://xmlrpc-c.sourceforge.net/). Otherwise you + need to install the library and devel headers from the sources. 4. Parameters @@ -184,8 +190,8 @@ modparam("mi_xmlrpc", "buffer_size", 8192) 6. Example - This is an example showing the xmlrpc format for the “get_statistics - dialog: tm:” MI commad: response. + This is an example showing the xmlrpc format for the "get_statistics + dialog: tm:" MI commad: response. Example 1.5. XMLRPC request POST /RPC2 HTTP/1.0 diff --git a/modules_k/mi_xmlrpc/doc/mi_xmlrpc_admin.xml b/modules_k/mi_xmlrpc/doc/mi_xmlrpc_admin.xml index f0d7988..dd23798 100644 --- a/modules_k/mi_xmlrpc/doc/mi_xmlrpc_admin.xml +++ b/modules_k/mi_xmlrpc/doc/mi_xmlrpc_admin.xml @@ -16,6 +16,13 @@ <section> <title>Overview</title> <para> + NOTE: this module depends on specific versions of libxmlrpc-c3, which may + not be available on your OS. You better use the 'xmlrpc' module located in + 'modules/' folder. It can run any MI command by loading 'mi_rpc' module and + executing RPC command 'mi', with first parameter being the MI command, + then followed by other parameters that will be passed to the MI command. + </para> + <para> This module implements a xmlrpc server that handles xmlrpc requests and generates xmlrpc responses. When a xmlrpc message is received a default method is executed.

12 years, 8 months

← Newer
1
...
5
6
7
8
9
10
11
...
15
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2012