sr-dev August 2010

sr-dev@lists.kamailio.org

26 participants
346 discussions

[ openser-Patches-3035802 ] Add locking to pua for serializing PUBLISHes
by SourceForge.net 13 Aug '10

13 Aug '10

Patches item #3035802, was opened at 2010-07-28 09:58 Message generated for change (Comment added) made by axlh You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3035802&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x >Status: Closed >Resolution: Rejected Priority: 5 Private: No Submitted By: Alex Hermann (axlh) Assigned to: Nobody/Anonymous (nobody) Summary: Add locking to pua for serializing PUBLISHes Initial Comment: pua must not send multiple PUBLISH with the same id before receiving a reply as the ETag must be updated on subsequent publishes. Patch by Anca Vamanu. Stolen from opensips r5924. Original commit message: introduced a locking mechanism to prevent sending a new Publish before the reply for a previous one is received (thanks to Piotr Sobolewski <sobolewski at gmail dot com> for help with debugging) ---------------------------------------------------------------------- >Comment By: Alex Hermann (axlh) Date: 2010-08-13 10:24 Message: Skip this one, it still has a locking issue. A better one is in the works. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3035802&group_…

1 0

[ openser-Patches-3035794 ] Add option to keep subscriptions on timed out NOTIFY
by SourceForge.net 12 Aug '10

12 Aug '10

Patches item #3035794, was opened at 2010-07-28 10:33 Message generated for change (Comment added) made by miconda You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3035794&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. Category: modules Group: ver 1.5.x >Status: Closed >Resolution: Accepted Priority: 5 Private: No Submitted By: Alex Hermann (axlh) >Assigned to: Daniel-Constantin Mierla (miconda) Summary: Add option to keep subscriptions on timed out NOTIFY Initial Comment: This parameter is a flag that should be set if subscriptions should be removed from the active_watchers when a NOTIFY times out. RFC3265 section 3.2.2 defines this behaviour as a SHOULD, so by default it is on. Disabling this will keep subscriptions active on unreliable networks. ---------------------------------------------------------------------- >Comment By: Daniel-Constantin Mierla (miconda) Date: 2010-08-12 23:27 Message: Patch committed, considered as fix to comply SHOULD requirement of RFC. ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743022&aid=3035794&group_…

1 0

SF.net SVN: openser:[6041] branches/1.5/modules/presence
by Daniel-Constantin Mierla 12 Aug '10

12 Aug '10

Revision: 6041 http://openser.svn.sourceforge.net/openser/?rev=6041&view=rev Author: miconda Date: 2010-08-12 20:25:53 +0000 (Thu, 12 Aug 2010) Log Message: ----------- - add option to keep subscriptions on timed out NOTIFY - patch by Alex Hermann, closes SF#3035794 Modified Paths: -------------- branches/1.5/modules/presence/doc/presence_admin.xml branches/1.5/modules/presence/notify.c branches/1.5/modules/presence/presence.c branches/1.5/modules/presence/presence.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:master: presence(k): add option to keep subscriptions on timed out NOTIFY
by Daniel-Constantin Mierla 12 Aug '10

12 Aug '10

Module: sip-router Branch: master Commit: 7007cde13f33a56aab14fc4db6d44dac567e7905 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7007cde… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 12 20:41:08 2010 +0200 presence(k): add option to keep subscriptions on timed out NOTIFY - patch by Alex Hermann, closes SF#3035794 --- modules_k/presence/README | 75 ++++++++++++++++++----------- modules_k/presence/doc/presence_admin.xml | 23 +++++++++ modules_k/presence/notify.c | 2 +- modules_k/presence/presence.c | 2 + modules_k/presence/presence.h | 1 + 5 files changed, 74 insertions(+), 29 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=700…

1 0

[tracker] Comment added: Bug in dispatcher module and fix
by sip-router 12 Aug '10

12 Aug '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#85 - Bug in dispatcher module and fix User who did this - Daniel-Constantin Mierla (miconda) ---------- Are you using latest git branch kamailio_3.0? There was a fix for an issue that affected all mi commands executed with sercmd. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=85#comment114 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

[tracker] Task opened: Bug in dispatcher module and fix
by sip-router 12 Aug '10

12 Aug '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Alexandr Gevlichenko (sanya) Attached to Project - sip-router Summary - Bug in dispatcher module and fix Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - When you call "mi ds_reload" using sercmd not restart the configuration. In the log error "invalid DB handler" The error occurs when storing configuration in a database. The problem is fixed by editing line 568 file dispatcher.c. You should replace the line: if (ds_load_db () <0) at: if (init_ds_db () <0) - Alexandr More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=85 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:mariusbucur/conference: added some small modifications regarding using snprintf instead of sprintf for buffer overruns
by Marius Ovidiu Bucur 12 Aug '10

12 Aug '10

Module: sip-router Branch: mariusbucur/conference Commit: eb80b2d4162b0fd1790cf575d764291504e8a5a7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eb80b2d… Author: mariusbucur <marius(a)marius-bucur.ro> Committer: mariusbucur <marius(a)marius-bucur.ro> Date: Thu Aug 12 18:09:23 2010 +0300 added some small modifications regarding using snprintf instead of sprintf for buffer overruns --- modules_k/presence_conference/notify_body.c | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules_k/presence_conference/notify_body.c b/modules_k/presence_conference/notify_body.c index b1f2dcb..ead7653 100644 --- a/modules_k/presence_conference/notify_body.c +++ b/modules_k/presence_conference/notify_body.c @@ -45,7 +45,7 @@ #include "notify_body.h" #include "pidf.h" -str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n); +str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n, int off_index); void free_xml_body(char* body) { @@ -53,7 +53,6 @@ void free_xml_body(char* body) return; xmlFree(body); - //body= NULL; // useless } @@ -67,7 +66,7 @@ str* conf_agg_nbody(str* pres_user, str* pres_domain, str** body_array, int n, i if(body_array== NULL) return NULL; - n_body = agregate_xmls(pres_user, pres_domain, body_array, n); + n_body = agregate_xmls(pres_user, pres_domain, body_array, n, off_index); LM_DBG("[n_body]=%p\n", n_body); if(n_body) { LM_DBG("[*n_body]=%.*s\n", @@ -247,8 +246,8 @@ error: } str *conf_body_setversion(subs_t *subs, str *body) { - char version_str[MAX_INT_LEN + 2]; - sprintf(version_str, "%d", subs->version); + char version_str[MAX_INT_LEN + 2];//for the null terminating character \0 + snprintf(version_str, MAX_INT_LEN, "%d", subs->version); if (!body) { return NULL; }

1 0

git:mariusbucur/conference: fixed signature of the publish body aggregation function so that it includes the off_index parameter for the sent expired publish messages
by Marius Ovidiu Bucur 12 Aug '10

12 Aug '10

Module: sip-router Branch: mariusbucur/conference Commit: f56ce11e7816ef29830867ea1584d85d8d1459e0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f56ce11… Author: mariusbucur <marius(a)marius-bucur.ro> Committer: mariusbucur <marius(a)marius-bucur.ro> Date: Thu Aug 12 17:37:55 2010 +0300 fixed signature of the publish body aggregation function so that it includes the off_index parameter for the sent expired publish messages --- modules_k/presence_conference/notify_body.c | 36 +++++++++----------------- 1 files changed, 13 insertions(+), 23 deletions(-) diff --git a/modules_k/presence_conference/notify_body.c b/modules_k/presence_conference/notify_body.c index 19c0bd1..5631bf0 100644 --- a/modules_k/presence_conference/notify_body.c +++ b/modules_k/presence_conference/notify_body.c @@ -84,7 +84,7 @@ str* conf_agg_nbody(str* pres_user, str* pres_domain, str** body_array, int n, i return n_body; } -str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) +str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n, int off_index) { if(body_array == NULL || n == 0) return 0; @@ -175,14 +175,8 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) } xmlSetNs(root_node, namespace); /* The version must be increased for each new document and is a 32bit int. - As the version is different for each watcher, we can not set here the - correct value. Thus, we just put here a placeholder which will be - replaced by the correct value in the aux_body_processing callback. - Thus we have CPU intensive XML aggregation only once and can use - quick search&replace in the per-watcher aux_body_processing callback. - We use 11 chracters as an signed int (although RFC says unsigned int we - use signed int as presence module stores "version" in DB as - signed int) has max. 10 characters + 1 character for the sign + The aux_body_processing function will take care of setting the right attribute + depending on the subscription for which the notify is being sent. */ xmlNewProp(root_node, BAD_CAST "version", BAD_CAST "0"); xmlNewProp(root_node, BAD_CAST "state", BAD_CAST "full" ); @@ -191,7 +185,6 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) /* loop over all bodies and create the aggregated body */ for(i=0; i<j; i++) { - LM_DBG("[n]=%d, [i]=%d, [j]=%d xml_array[i]=%p\n", n, i, j, xml_array[i]); p_root= xmlDocGetRootElement(xml_array[i]); if(unlikely(p_root == NULL)) { LM_ERR("while geting the xml_tree root element\n"); @@ -205,21 +198,18 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n) } /* the root "conference-info" element should always have children */ if (p_root->children) { - for (node = p_root->children; node != NULL; node = node->next) { - /*if (node->type == XML_ELEMENT_NODE) */{ - /* we do not copy the node, but unlink it and then add it to the new node. - * This destroys the original document but we do not need it anyway. - * using "copy" instead of "unlink" would also copy the namespace which - * would then be declared redundant (libxml unfortunately cannot remove - * namespaces) - */ - if(xmlAddChild(root_node, xmlCopyNode(node, 1)) == NULL) { - LM_ERR("while adding child\n"); - goto error; - } + for (node = p_root->children; node != NULL; node = node->next) { + if(xmlAddChild(root_node, xmlCopyNode(node, 1)) == NULL) { + LM_ERR("while adding child\n"); + goto error; + } } } - } + /* we only take the most recent subscription as + in this phase non partial states will be sent + */ + if(i != off_index) + break; } body = (str*)pkg_malloc(sizeof(str));

1 0

git:mariusbucur/conference: extending support for reseting a conference state.
by Marius Ovidiu Bucur 12 Aug '10

12 Aug '10

Module: sip-router Branch: mariusbucur/conference Commit: 3495dddeb1fcb9a21630e6baac40edbb6e0801e2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3495ddd… Author: mariusbucur <marius(a)marius-bucur.ro> Committer: mariusbucur <marius(a)marius-bucur.ro> Date: Thu Aug 12 18:33:33 2010 +0300 extending support for reseting a conference state. --- .../presence_conference/presence_conference.c | 23 +++++++++++++------- 1 files changed, 15 insertions(+), 8 deletions(-) diff --git a/modules_k/presence_conference/presence_conference.c b/modules_k/presence_conference/presence_conference.c index 709fa81..c2c4df0 100644 --- a/modules_k/presence_conference/presence_conference.c +++ b/modules_k/presence_conference/presence_conference.c @@ -52,13 +52,7 @@ add_event_t pres_add_event; int use_partial_states = 0; /* module mi command functions */ - -//presence_conference reset mi command -static struct mi_root* conference_reset(struct mi_root* cmd, void* param) -{ - LM_ERR("Conference received mi command [reason %*.s] [code %d]...\n", cmd->reason.len, cmd->reason.s, cmd->code); - return cmd; -} +static struct mi_root* conference_reset(struct mi_root* cmd, void* param); /* module exported commands */ static cmd_export_t cmds[] = @@ -78,6 +72,9 @@ static mi_export_t mi_cmds[] = { { 0, 0, 0, 0, 0 } }; +/* presence api bind structure */ +presence_api_t pres; + /* module exports */ struct module_exports exports= { "presence_conference", /* module name */ @@ -99,7 +96,6 @@ struct module_exports exports= { */ static int mod_init(void) { - presence_api_t pres; bind_presence_t bind_presence; bind_presence= (bind_presence_t)find_export("bind_presence", 1,0); @@ -123,4 +119,15 @@ static int mod_init(void) } return 0; +} + + +/* module mi command functions */ + +//presence_conference reset mi command +static struct mi_root* conference_reset(struct mi_root* cmd, void* param) +{ + LM_ERR("Conference received mi command [reason %*.s] [code %d]...\n", cmd->reason.len, cmd->reason.s, cmd->code); + //reset subscriptions to the event package for some presentity (conference) + return cmd; } \ No newline at end of file

1 0

git:mariusbucur/conference: removed redundant xmlCleanupParser. also the constant memory dumps.
by Marius Ovidiu Bucur 12 Aug '10

12 Aug '10

Module: sip-router Branch: mariusbucur/conference Commit: 49b5be9faac6bbc22909b840a5383b3248f7bdcf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=49b5be9… Author: mariusbucur <marius(a)marius-bucur.ro> Committer: mariusbucur <marius(a)marius-bucur.ro> Date: Thu Aug 12 18:03:43 2010 +0300 removed redundant xmlCleanupParser. also the constant memory dumps. --- modules_k/presence_conference/notify_body.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/modules_k/presence_conference/notify_body.c b/modules_k/presence_conference/notify_body.c index 5631bf0..b1f2dcb 100644 --- a/modules_k/presence_conference/notify_body.c +++ b/modules_k/presence_conference/notify_body.c @@ -78,9 +78,6 @@ str* conf_agg_nbody(str* pres_user, str* pres_domain, str** body_array, int n, i LM_ERR("while aggregating body\n"); } - xmlCleanupParser(); - xmlMemoryDump(); - return n_body; } @@ -230,9 +227,6 @@ str* agregate_xmls(str* pres_user, str* pres_domain, str** body_array, int n, in if(xml_array!=NULL) pkg_free(xml_array); - xmlCleanupParser(); - xmlMemoryDump(); - return body; error:

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
35
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2010