sr-dev

sr-dev@lists.kamailio.org

44307 discussions

[tracker] Task opened: Bug in dispatcher module and fix

by sip-router

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.

14 years, 5 months

git:mariusbucur/conference: removed redundant xmlCleanupParser. also the constant memory dumps.

by Marius Ovidiu Bucur

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:

14 years, 5 months

git:mariusbucur/conference: extending support for reseting a conference state.

by Marius Ovidiu Bucur

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

14 years, 5 months

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

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));

14 years, 5 months

git:mariusbucur/conference: added some small modifications regarding using snprintf instead of sprintf for buffer overruns

by Marius Ovidiu Bucur

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; }

14 years, 5 months

[tracker] Task closed: presence, add_event(), missing handler on subscribe

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#82 - presence, add_event(), missing handler on subscribe User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Patch committed. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=82 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.

14 years, 5 months

[tracker] User took ownership: presence, add_event(), missing handler on subscribe

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#82 - presence, add_event(), missing handler on subscribe More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=82 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.

14 years, 5 months

[tracker] Comment added: presence, add_event(), missing handler on subscribe

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#82 - presence, add_event(), missing handler on subscribe User who did this - Daniel-Constantin Mierla (miconda) ---------- Indeed, copy of that attribute was missing. I committed your patch on master and kamailio_3.0. Thanks! ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=82#comment113 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.

14 years, 5 months

git:kamailio_3.0: presence(k): copy evs_subs_handl to presence event list

by Daniel-Constantin Mierla

Module: sip-router Branch: kamailio_3.0 Commit: d61051672432a9d323389dbf8051de83fa069189 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d610516… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 12 17:14:38 2010 +0200 presence(k): copy evs_subs_handl to presence event list - patch by Nikita Kozlov, closes FS#82 (cherry picked from commit 9216a2ffa4c6ffd4bdd387530cad359f75acf0d7) --- modules_k/presence/event_list.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/event_list.c b/modules_k/presence/event_list.c index 1ccf39b..1a34f3a 100644 --- a/modules_k/presence/event_list.c +++ b/modules_k/presence/event_list.c @@ -240,6 +240,7 @@ int add_event(pres_ev_t* event) ev->get_auth_status= event->get_auth_status; ev->get_rules_doc= event->get_rules_doc; ev->evs_publ_handl= event->evs_publ_handl; + ev->evs_subs_handl= event->evs_subs_handl; ev->etag_not_new= event->etag_not_new; ev->aux_body_processing= event->aux_body_processing; ev->aux_free_body= event->aux_free_body;

14 years, 5 months

git:master: presence(k): copy evs_subs_handl to presence event list

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9216a2ffa4c6ffd4bdd387530cad359f75acf0d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9216a2f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 12 17:14:38 2010 +0200 presence(k): copy evs_subs_handl to presence event list - patch by Nikita Kozlov, closes FS#82 --- modules_k/presence/event_list.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/event_list.c b/modules_k/presence/event_list.c index 2ffdfba..b9ed39e 100644 --- a/modules_k/presence/event_list.c +++ b/modules_k/presence/event_list.c @@ -240,6 +240,7 @@ int add_event(pres_ev_t* event) ev->get_auth_status= event->get_auth_status; ev->get_rules_doc= event->get_rules_doc; ev->evs_publ_handl= event->evs_publ_handl; + ev->evs_subs_handl= event->evs_subs_handl; ev->etag_not_new= event->etag_not_new; ev->aux_body_processing= event->aux_body_processing; ev->aux_free_body= event->aux_free_body;

14 years, 5 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev