sr-dev March 2011

sr-dev@lists.kamailio.org

25 participants
194 discussions

Re: [sr-dev] modules_k/dialog: no referencing to current dialog possible when using dlg_manage()

by Timo Reimann

Hey, On 09.03.2011 07:10, 侯旭光 wrote: > well, all my config files are in the attachment. There are no attachments in your email (at least not for me). Cheers, --Timo > 在 2011年3月8日下午7:57，Timo Reimann <timo.reimann(a)1und1.de> 写道： >> Hey, >> >> >> On 08.03.2011 12:37, 侯旭光 wrote: >>> I modified the source code and took the solutions in cfg file that >>> you guys suggested and no error exist. >>> >>> But my problem isn't totally solved. >>> >>> Actually when I use the dispatcher module and set the profile , in >>> case the "invite" request forwarded by ds_select_domain function , >>> then the dialog terminated. >>> dlg_list and get_profile_size get nothing. >>> >>> In detail: >>> >>> there're two proxys : server #1 192.168.1.12 and server #2 192.168.1.13 >>> >>> two users: 1012 register on 192.168.1.12 and 2013 register on > 192.168.1.13 >>> >>> when user 1012 dial 2013, server 1# use the dispatcher module, >>> forward the request to server #2 and set the profile.server #2 get >>> the invite request and set the profile too, then call user 2013,Dialog >>> Establish. >>> >>> At this time,server #2 has the dialog info,but server #1 doesn't. >>> >>> How can I trace the dialog info at both server #1 and server #2 ? >> >> Unless the dispatcher module terminates the dialog in a B2BUA fashion >> (which I think it doesn't but I am not familiar with the module), calls >> routed in the setup you described should be listed via dlg_list through >> the course of dialog lifetime. >> >> Are you 100% sure you are tracking dialogs on proxy #1? (I think >> set_dlg_profile() fails silently if the dialog isn't being tracked.) >> Maybe you want to provide the relevant configuration snippet of the >> proxy so we can double-check. >> >> >> Cheers, >> >> --Timo

13 years, 8 months

Multiple Parameters

by Carsten Bock

Hi, short question: I think i remember something about the fact, that there was a way to define multiple parameters, e.g. modparam("module", "var_name", "a") modparam("module", "var_name", "b") modparam("module", "var_name", "c") => Parameter "var_name" has the values "a", "b" and "c" Does anyone remember, if i am correct and, if yes, can anyone give me a pointer, where such construct was used (or where a "howto" is)? Thanks, Carsten -- Carsten Bock http://www.ng-voice.com mailto:carsten@ng-voice.com

13 years, 8 months

git:tma0/iptrtpproxy-v2: Fix for iptables 1.4.8

by Tomas Mandys

Module: sip-router Branch: tma0/iptrtpproxy-v2 Commit: 4a92475e612ea27fcbcb471cabafd8bf87f83c8d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a92475… Author: Tomas Mandys <tomas.mandys(a)iptel.org> Committer: Tomas Mandys <tomas.mandys(a)iptel.org> Date: Wed Mar 9 10:38:50 2011 +0100 Fix for iptables 1.4.8 Some type fixes to be compilable at Debian squeeze --- modules/iptrtpproxy/iptrtpproxy.c | 38 +++++++++++++++--------------------- 1 files changed, 16 insertions(+), 22 deletions(-) diff --git a/modules/iptrtpproxy/iptrtpproxy.c b/modules/iptrtpproxy/iptrtpproxy.c index 8970469..51312d8 100644 --- a/modules/iptrtpproxy/iptrtpproxy.c +++ b/modules/iptrtpproxy/iptrtpproxy.c @@ -3050,6 +3050,18 @@ struct module_exports exports = { #include <stdarg.h> +#ifdef xtables_error +/* iptables 1.4.8 */ + +struct xtables_globals *xt_params = NULL; +int xtables_check_inverse(const char option[], int *invert, int *optind, int argc, char **argv) { + return FALSE; +} +void xtables_register_target(struct xtables_target *me) { +} + +#else /* xtables_error */ + #ifdef _IPTABLES_COMMON_H /* old iptables API, it uses iptables_common.h (instead of xtables.h) included from iptables.h */ /* #ifndef XTABLES_VERSION ... optional test */ @@ -3067,7 +3079,7 @@ void xtables_register_target(struct xtables_target *me) { #if IPT_RTPPROXY_IPTABLES_API void exit_error(enum exittype status, char *msg, ...) #else - void exit_error(enum exittype status, const char *msg, ...) +void exit_error(enum exittype status, const char *msg, ...) #endif { va_list args; @@ -3078,28 +3090,10 @@ void exit_error(enum exittype status, char *msg, ...) va_end(args); } -#ifndef TRUE -#define TRUE 1 -#endif -#ifndef FALSE -#define FALSE 0 -#endif - -int check_inverse(const char option[], int *invert, int *optind, int argc) -{ - if (option && strcmp(option, "!") == 0) { - if (*invert) - exit_error(PARAMETER_PROBLEM, "Multiple `!' flags not allowed"); - *invert = TRUE; - if (optind) { - *optind = *optind+1; - if (argc && *optind > argc) - exit_error(PARAMETER_PROBLEM, "no argument following `!'"); - } - return TRUE; - } - return FALSE; +int check_inverse(const char option[], int *invert, int *optind, int argc) { + return 0; } +#endif /* xtables_error */ #endif

13 years, 8 months

[RFC] Patches ready for merge

by Alex Hermann

Hello all, i'm clearing up my patch queue and have some patches ready for merge. Unless i receive any comments or objections, i'll merge them to master by the end of the week. They're in branch alexh/master now. -- Greetings, Alex Hermann

13 years, 8 months

Re: [sr-dev] modules_k/dialog: no referencing to current dialog possible when using dlg_manage()

by Timo Reimann

Hey, On 08.03.2011 12:37, 侯旭光 wrote: > I modified the source code and took the solutions in cfg file that > you guys suggested and no error exist. > > But my problem isn't totally solved. > > Actually when I use the dispatcher module and set the profile , in > case the "invite" request forwarded by ds_select_domain function , > then the dialog terminated. > dlg_list and get_profile_size get nothing. > > In detail: > > there're two proxys : server #1 192.168.1.12 and server #2 192.168.1.13 > > two users: 1012 register on 192.168.1.12 and 2013 register on 192.168.1.13 > > when user 1012 dial 2013, server 1# use the dispatcher module, > forward the request to server #2 and set the profile.server #2 get > the invite request and set the profile too, then call user 2013,Dialog > Establish. > > At this time,server #2 has the dialog info,but server #1 doesn't. > > How can I trace the dialog info at both server #1 and server #2 ? Unless the dispatcher module terminates the dialog in a B2BUA fashion (which I think it doesn't but I am not familiar with the module), calls routed in the setup you described should be listed via dlg_list through the course of dialog lifetime. Are you 100% sure you are tracking dialogs on proxy #1? (I think set_dlg_profile() fails silently if the dialog isn't being tracked.) Maybe you want to provide the relevant configuration snippet of the proxy so we can double-check. Cheers, --Timo

13 years, 8 months

git:alexh/master: modules_k/permissions: allow_trusted(): make the multiple matches feature configurable, defaulting to single match .

by Alex Hermann

Module: sip-router Branch: alexh/master Commit: 65c3448f2d74b803573d7cc79fbfc81961b40e7b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=65c3448… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Mar 8 11:59:01 2011 +0100 modules_k/permissions: allow_trusted(): make the multiple matches feature configurable, defaulting to single match. --- modules_k/permissions/doc/permissions_admin.xml | 21 +++++++++++++++++++++ modules_k/permissions/hash.c | 5 +++++ modules_k/permissions/permissions.c | 2 ++ modules_k/permissions/permissions.h | 2 ++ modules_k/permissions/trusted.c | 2 ++ 5 files changed, 32 insertions(+), 0 deletions(-) diff --git a/modules_k/permissions/doc/permissions_admin.xml b/modules_k/permissions/doc/permissions_admin.xml index 0470224..b29f2c7 100644 --- a/modules_k/permissions/doc/permissions_admin.xml +++ b/modules_k/permissions/doc/permissions_admin.xml @@ -672,6 +672,27 @@ modparam("permissions", "peer_tag_avp", "$avp(i:707)") </programlisting> </example> </section> + <section> + <title><varname>peer_tag_mode</varname> (integer)</title> + <para> + Tag mode for allow_trusted(). 0 sets only the tag of the + first match. 1 adds the tags of all matches to the avp. In addition + the return value of allow_trusted() is the number of matches. + </para> + <para> + <emphasis> + Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>peer_tag_mode</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("permissions", "peer_tag_mode", "1") +... +</programlisting> + </example> + </section> </section> <section> diff --git a/modules_k/permissions/hash.c b/modules_k/permissions/hash.c index 1261227..9675f4c 100644 --- a/modules_k/permissions/hash.c +++ b/modules_k/permissions/hash.c @@ -40,6 +40,9 @@ static int tag_avp_type; static int_str tag_avp; +extern int peer_tag_mode; + + /* * Parse and set tag AVP specs @@ -247,6 +250,8 @@ int match_hash_table(struct trusted_list** table, struct sip_msg* msg, return -1; } } + if (!peer_tag_mode) + return 1; count++; } } diff --git a/modules_k/permissions/permissions.c b/modules_k/permissions/permissions.c index 5beb016..609b1c1 100644 --- a/modules_k/permissions/permissions.c +++ b/modules_k/permissions/permissions.c @@ -68,6 +68,7 @@ str proto_col = str_init("proto"); /* Name of protocol column */ str from_col = str_init("from_pattern"); /* Name of from pattern column */ str tag_col = str_init("tag"); /* Name of tag column */ str tag_avp_param = {NULL, 0}; /* Peer tag AVP spec */ +int peer_tag_mode = 0; /* Add tags form all mathcing peers to avp */ /* for allow_address function */ str address_table = str_init("address"); /* Name of address table */ @@ -159,6 +160,7 @@ static param_export_t params[] = { {"from_col", STR_PARAM, &from_col.s }, {"tag_col", STR_PARAM, &tag_col.s }, {"peer_tag_avp", STR_PARAM, &tag_avp_param.s }, + {"peer_tag_mode", INT_PARAM, &peer_tag_mode }, {"address_table", STR_PARAM, &address_table.s }, {"grp_col", STR_PARAM, &grp_col.s }, {"ip_addr_col", STR_PARAM, &ip_addr_col.s }, diff --git a/modules_k/permissions/permissions.h b/modules_k/permissions/permissions.h index ef3d899..0e4d110 100644 --- a/modules_k/permissions/permissions.h +++ b/modules_k/permissions/permissions.h @@ -61,6 +61,8 @@ extern str grp_col; /* Name of address group column */ extern str ip_addr_col; /* Name of ip address column */ extern str mask_col; /* Name of mask column */ extern str port_col; /* Name of port column */ +extern int peer_tag_mode; /* Matching mode */ + typedef struct int_or_pvar { unsigned int i; diff --git a/modules_k/permissions/trusted.c b/modules_k/permissions/trusted.c index 32e1313..67d0a04 100644 --- a/modules_k/permissions/trusted.c +++ b/modules_k/permissions/trusted.c @@ -384,6 +384,8 @@ static int match_res(struct sip_msg* msg, int proto, db1_res_t* _r) return -1; } } + if (!peer_tag_mode) + return 1; count++; } }

13 years, 8 months

[tracker] Comment added: t_check_trans is not allowed in onreply_route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#117 - t_check_trans is not allowed in onreply_route User who did this - Alex Hermann (axlh) ---------- Sorry, i was trying both as t_check_trans gave an error. But the same probably applies to t_lookup_request. I noticed the fix you committed, even though that works (and matches my patch :)), it is a bit different from the 1.5 implementation. There this additional code is present to set the branch value: trans = get_t(); if ((trans == 0) || (trans == T_UNDEFINED)) return -1; msg->branch_index = branch+1; return 1; Isn't that necessary anymore in 3.1? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=117#comment168 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.

13 years, 8 months

[tracker] Task closed: $snd(name) pvar contains local instead of remote socket info

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#103 - $snd(name) pvar contains local instead of remote socket info User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Implemented Additional comments about closing: In the repository branches. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=103 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.

13 years, 8 months

[tracker] Comment added: t_check_trans is not allowed in onreply_route

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#117 - t_check_trans is not allowed in onreply_route User who did this - Daniel-Constantin Mierla (miconda) ---------- You use t_lookup_request() in the config and mention t_check_trans() in the message. Which one you are looking for? For t_check_trans() I updated the exports flag, it was enabled only for tm module specific onreply route. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=117#comment167 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.

13 years, 8 months

git:3.1: tm: t_cehck_trans() allowed inside all onreply routes

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: aae2b913e2008d18d1ad58910398765948f334ca URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aae2b91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Mar 8 10:59:37 2011 +0100 tm: t_cehck_trans() allowed inside all onreply routes - starting with v3.0 there is the option to enable a function only for core onreply route or tm onreply route - t_check_trans() was enabled only for tm - this patch enables it also for core onreply route - reported by Alex Hermann --- modules/tm/tm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index e5ca753..160da26 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -460,8 +460,8 @@ static cmd_export_t cmds[]={ FAILURE_ROUTE}, {"t_save_lumps", w_t_save_lumps, 0, 0, REQUEST_ROUTE}, - {"t_check_trans", t_check_trans, 0, 0, - REQUEST_ROUTE|TM_ONREPLY_ROUTE|BRANCH_ROUTE }, + {"t_check_trans", t_check_trans, 0, 0, + REQUEST_ROUTE|ONREPLY_ROUTE|BRANCH_ROUTE }, {"t_load_contacts", t_load_contacts, 0, 0, REQUEST_ROUTE | FAILURE_ROUTE},

13 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2011