sr-dev

sr-dev@lists.kamailio.org

44307 discussions

by Juha Heinanen

i noticed that if i add ;alias param to contact header that does not surround its contact uri in <>s like this: Contact: sip:foo@bar;alias=value then some sip entities interpret ;alias as header param rather than uri param. so i went and added <>s if they are not present resulting to this: Contact: <sip:foo@bar;alias=value> i have tried to figure out from rfc3261 what kind of param ;alias is in the first example, but have not found the answer. looks like it is unspecified in rfc3261. any comments on this? -- juha

14 years, 2 months

git:master: dispatcher(k): exported inter-module API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 86e03df9b1dbac5be70747bcd9f57a97fe5256c7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86e03df… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Nov 27 00:04:17 2010 +0100 dispatcher(k): exported inter-module API --- modules_k/dispatcher/api.h | 75 +++++++++++++++++++++++++++++++++++++ modules_k/dispatcher/dispatch.c | 13 ++++++ modules_k/dispatcher/dispatcher.c | 3 + 3 files changed, 91 insertions(+), 0 deletions(-) diff --git a/modules_k/dispatcher/api.h b/modules_k/dispatcher/api.h new file mode 100644 index 0000000..7171b0c --- /dev/null +++ b/modules_k/dispatcher/api.h @@ -0,0 +1,75 @@ +/** + * $Id$ + * + * dispatcher module + * + * Copyright (C) 2004-2006 FhG Fokus + * + * 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 + * + */ + +/*! \file + * \ingroup dispatcher + * \brief Dispatcher :: API + */ + +#ifndef _DISPATCHER_API_H_ +#define _DISPATCHER_API_H_ + +#include "../../sr_module.h" + +typedef int (*ds_select_dst_f)(struct sip_msg *msg, int set, + int alg, int mode); +typedef int (*ds_next_dst_f)(struct sip_msg *msg, int mode); +typedef int (*ds_mark_dst_f)(struct sip_msg *msg, int mode); + +typedef int (*ds_is_from_list_f)(struct sip_msg *_m, int group); + +typedef struct dispatcher_api { + ds_select_dst_f select; + ds_next_dst_f next; + ds_mark_dst_f mark; + ds_is_from_list_f is_from; +} dispatcher_api_t; + +typedef int (*bind_dispatcher_f)(dispatcher_api_t* api); +int bind_dispatcher(dispatcher_api_t* api); + +/** + * @brief Load the dispatcher API + */ +static inline int dispatcher_load_api(dispatcher_api_t *api) +{ + bind_dispatcher_f binddispatcher; + + binddispatcher = (bind_dispatcher_f)find_export("bind_dispatcher", 0, 0); + if(binddispatcher == 0) { + LM_ERR("cannot find bind_dispatcher\n"); + return -1; + } + if(binddispatcher(api)<0) + { + LM_ERR("cannot bind dispatcher api\n"); + return -1; + } + return 0; +} + + +#endif + diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 46b7b03..bcd7f7c 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -71,6 +71,7 @@ #include "../../str.h" #include "ds_ht.h" +#include "api.h" #include "dispatch.h" #define DS_TABLE_VERSION 1 @@ -2374,3 +2375,15 @@ void ds_ht_timer(unsigned int ticks, void *param) return; } +int bind_dispatcher(dispatcher_api_t* api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->select = ds_select_dst; + api->next = ds_next_dst; + api->mark = ds_mark_dst; + api->is_from = ds_is_from_list; + return 0; +} diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 59fe0bb..ab412a6 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -66,6 +66,7 @@ #include "ds_ht.h" #include "dispatch.h" #include "config.h" +#include "api.h" MODULE_VERSION @@ -180,6 +181,8 @@ static cmd_export_t cmds[]={ 0, 0, ANY_ROUTE}, {"ds_load_update", (cmd_function)w_ds_load_update, 0, 0, 0, ANY_ROUTE}, + {"bind_dispatcher", (cmd_function)bind_dispatcher, 0, + 0, 0, 0}, {0,0,0,0,0,0} };

14 years, 2 months

git:master: htable: exported inter-module API

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 6b2081df15344300ccdeda67c5447a512920fe98 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b2081d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Nov 26 22:42:46 2010 +0100 htable: exported inter-module API --- modules_k/htable/api.c | 128 +++++++++++++++++++++++++++++++++++++++++++++ modules_k/htable/api.h | 73 +++++++++++++++++++++++++ modules_k/htable/htable.c | 18 +++--- 3 files changed, 210 insertions(+), 9 deletions(-) diff --git a/modules_k/htable/api.c b/modules_k/htable/api.c new file mode 100644 index 0000000..4a2d0df --- /dev/null +++ b/modules_k/htable/api.c @@ -0,0 +1,128 @@ +/** + * $Id$ + * + * Copyright (C) 2008 Elena-Ramona Modroiu (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * openser 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 + * + * openser 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 <stdio.h> +#include <string.h> +#include <stdlib.h> + +#include "../../dprint.h" + +#include "ht_api.h" +#include "api.h" + +/** + * + */ +int ht_api_set_cell(str *hname, str *name, int type, + int_str *val, int mode) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + return ht_set_cell(ht, name, type, val, mode); +} + +/** + * + */ +int ht_api_del_cell(str *hname, str *name) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + return ht_del_cell(ht, name); +} + +/** + * + */ +int ht_api_set_cell_expire(str *hname, str *name, + int type, int_str *val) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + return ht_set_cell_expire(ht, name, type, val); +} + +/** + * + */ +int ht_api_get_cell_expire(str *hname, str *name, + unsigned int *val) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + return ht_get_cell_expire(ht, name, val); +} + +/** + * + */ +int ht_api_rm_cell_re(str *hname, str *sre, int mode) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + if(ht_rm_cell_re(sre, ht, mode /* 0 - name; 1 - value */)<0) + return -1; + return 0; +} + +/** + * + */ +int ht_api_count_cells_re(str *hname, str *sre, int mode) +{ + ht_t* ht; + ht = ht_get_table(hname); + if(ht==NULL) + return -1; + if(ht_count_cells_re(sre, ht, mode /* 0 - name; 1 - value */)<0) + return -1; + return 0; +} + +/** + * + */ +int bind_htable(htable_api_t* api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->set = ht_api_set_cell; + api->rm = ht_api_del_cell; + api->set_expire = ht_api_set_cell_expire; + api->get_expire = ht_api_get_cell_expire; + api->rm_re = ht_api_rm_cell_re; + api->count_re = ht_api_count_cells_re; + return 0; +} + diff --git a/modules_k/htable/api.h b/modules_k/htable/api.h new file mode 100644 index 0000000..868abf2 --- /dev/null +++ b/modules_k/htable/api.h @@ -0,0 +1,73 @@ +/** + * $Id$ + * + * Copyright (C) 2008 Elena-Ramona Modroiu (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * openser 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 + * + * openser 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 _HT_MOD_API_H_ +#define _HT_MOD_API_H_ + +#include "../../sr_module.h" +#include "../../usr_avp.h" + +typedef int (*ht_api_set_cell_f)(str *hname, str *name, int type, + int_str *val, int mode); +typedef int (*ht_api_del_cell_f)(str *hname, str *name); + +typedef int (*ht_api_set_cell_expire_f)(str *hname, str *name, + int type, int_str *val); +typedef int (*ht_api_get_cell_expire_f)(str *hname, str *name, + unsigned int *val); + +typedef int (*ht_api_rm_cell_re_f)(str *hname, str *sre, int mode); +typedef int (*ht_api_count_cells_re_f)(str *hname, str *sre, int mode); + +typedef struct htable_api { + ht_api_set_cell_f set; + ht_api_del_cell_f rm; + ht_api_set_cell_expire_f set_expire; + ht_api_get_cell_expire_f get_expire; + ht_api_rm_cell_re_f rm_re; + ht_api_count_cells_re_f count_re; +} htable_api_t; + +typedef int (*bind_htable_f)(htable_api_t* api); +int bind_htable(htable_api_t* api); + +/** + * @brief Load the Sanity API + */ +static inline int htable_load_api(htable_api_t *api) +{ + bind_htable_f bindhtable; + + bindhtable = (bind_htable_f)find_export("bind_htable", 0, 0); + if(bindhtable == 0) { + LM_ERR("cannot find bind_htable\n"); + return -1; + } + if(bindhtable(api)<0) + { + LM_ERR("cannot bind htable api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/modules_k/htable/htable.c b/modules_k/htable/htable.c index 85d238b..ac01e32 100644 --- a/modules_k/htable/htable.c +++ b/modules_k/htable/htable.c @@ -42,6 +42,7 @@ #include "ht_api.h" #include "ht_db.h" #include "ht_var.h" +#include "api.h" MODULE_VERSION @@ -86,15 +87,14 @@ static mi_export_t mi_cmds[] = { static cmd_export_t cmds[]={ - {"sht_print", (cmd_function)ht_print, 0, 0, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | ERROR_ROUTE | LOCAL_ROUTE}, - {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_rm, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | ERROR_ROUTE | LOCAL_ROUTE}, - {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_rm, 0, - REQUEST_ROUTE | FAILURE_ROUTE | - ONREPLY_ROUTE | BRANCH_ROUTE | ERROR_ROUTE | LOCAL_ROUTE}, + {"sht_print", (cmd_function)ht_print, 0, 0, 0, + ANY_ROUTE}, + {"sht_rm_name_re", (cmd_function)ht_rm_name_re, 1, fixup_ht_rm, 0, + ANY_ROUTE}, + {"sht_rm_value_re", (cmd_function)ht_rm_value_re, 1, fixup_ht_rm, 0, + ANY_ROUTE}, + {"bind_htable", (cmd_function)bind_htable, 0, 0, 0, + ANY_ROUTE}, {0,0,0,0,0,0} };

14 years, 2 months

[tracker] Comment added: $Ts returns wrong timestamp

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#105 - $Ts returns wrong timestamp User who did this - Alex Hermann (axlh) ---------- Ok, that explains the first case in technical terms. Logically i still find it strange the $Ts in failure_route is not the same as the one in request_route because it is supposed to handle the same message/request. The 2nd case of the timestamp being from an entirely different message is a bit more worrying. Besides the annoyance of the wrong timestamp, I fear the timestamp may not be the only variable not correctly being cleared/initialized when a fake reply is created. I still haven't dared to look into tm though, so can't say for sure. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=105#comment140 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, 2 months

[tracker] Comment added: $Ts returns wrong timestamp

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#105 - $Ts returns wrong timestamp User who did this - Daniel-Constantin Mierla (miconda) ---------- The caching is done based on message id and process handling the message. So it should be same value for a request all along to forward in a route block. But for failure_route can be another process, therefore it is different except a very unlikely case when it is same process that did the forward and was no other message processed there meanwhile. Also, reply processing in onreply route is a different message than reprocessing request again in failure route even due to that reply. There is a small potential of overlapping because of using only message ids for caching (this is not only for $Ts) -- there were some discussions to add PID as part of the ID for a better message unique key. if you need the time of the moment when the request was received, the option is to store it in avp. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=105#comment139 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, 2 months

[tracker] User took ownership: $Ts returns wrong timestamp

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#105 - $Ts returns wrong timestamp More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=105 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, 2 months

[tracker] Comment added: $Ts returns wrong timestamp

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#105 - $Ts returns wrong timestamp User who did this - Alex Hermann (axlh) ---------- Changed my mind, I still don't understand the first case. In failure_route I would expect $Ts is either the same as $Ts in request_route for the same request or the same as $Ts in reply_route, certainly not yet another value. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=105#comment138 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, 2 months

[tracker] Comment added: $Ts returns wrong timestamp

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#105 - $Ts returns wrong timestamp User who did this - Alex Hermann (axlh) ---------- Ok, the first case I can understand if the timestamp is strictly bound to the message, not the request. I can workaround it by storing the timestamp in an avp while handling the initial message. But the 2nd case (the locally generated reply) seems to point to a serious failure to initialize memory locations. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=105#comment137 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, 2 months

[tracker] Assignee added: $Ts returns wrong timestamp

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#105 - $Ts returns wrong timestamp User who did this - Alex Hermann (axlh) http://sip-router.org/tracker/index.php?do=details&task_id=105 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, 2 months

[tracker] Task opened: $Ts returns wrong timestamp

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 - Alex Hermann (axlh) Attached to Project - sip-router Summary - $Ts returns wrong timestamp Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - According to the docs on the wiki, $Ts should always return the same time for the same message. It doesn't, it returns the same time as $TS in most cases. It gets worse if the reply is locally generated (408), then the timestamp of the previous request handled by that process is returned. Reproduce: <code> route { xlog("Ts:$Ts TS:$TS request"); t_on_reply(REPLY); t_on_failure(FAILURE); t_relay(); } on_reply_route[REPLY] { xlog("Ts:$Ts TS:$TS reply"); } failure_route[FAILURE] { sleep(1); xlog("Ts:$Ts TS:$TS failure"); } </code> Log: First call: <code> Nov 26 14:10:08 wsproxy1[29897]: ERROR: <script>: Ts:1290777008 TS:1290777008 request Nov 26 14:10:08 wsproxy1[29901]: ERROR: <script>: Ts:1290777008 TS:1290777008 reply Nov 26 14:10:09 wsproxy1[29901]: ERROR: <script>: Ts:1290777009 TS:1290777009 failure </code> Expected would be that $Ts would always read 1290777008 for this call. As in failure_route the original request is handled, the expected value of $Ts would be the same as the initial value. Next call: <code> Nov 26 14:10:09 wsproxy1[29908]: ERROR: <script>: Ts:1290777009 TS:1290777009 failure </code> Last call: <code> Nov 26 14:10:15 wsproxy1[29900]: ERROR: <script>: Ts:1290777015 TS:1290777015 request <timeout> Nov 26 14:10:16 wsproxy1[29908]: ERROR: <script>: Ts:1290777009 TS:1290777016 failure </code> Expected would be that $Ts would always read 1290777015 for this call, certainly not 1290777009. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=105 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, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev