sr-dev November 2014

sr-dev@lists.kamailio.org

38 participants
207 discussions

git:master: modules/pua_mi: added publish_with_ob_proxy module param
by Juha Heinanen 04 Nov '14

04 Nov '14

Module: sip-router Branch: master Commit: c3fd94ff6867f6d27e7e8e6d763978ed8195dd8b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c3fd94f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Tue Nov 4 17:02:04 2014 +0200 modules/pua_mi: added publish_with_ob_proxy module param - and optional outbound proxy parameter to pua_publish mi command --- modules/pua_mi/README | 56 +++++++++++++++++++++++… [View More]+++--------- modules/pua_mi/doc/pua_mi_admin.xml | 31 +++++++++++++++++++ modules/pua_mi/mi_func.c | 30 ++++++++++++++++++- modules/pua_mi/pua_mi.c | 13 +++++++- modules/pua_mi/pua_mi.h | 2 + 5 files changed, 116 insertions(+), 16 deletions(-) diff --git a/modules/pua_mi/README b/modules/pua_mi/README index bfeaccf..6218ac4 100644 --- a/modules/pua_mi/README +++ b/modules/pua_mi/README @@ -12,7 +12,7 @@ Edited by Juha Heinanen - Copyright � 2006 Voice Sistem SRL + Copyright (c) 2006 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -25,14 +25,19 @@ Juha Heinanen 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. MI Commands + 3. Parameters - 3.1. pua_publish - 3.2. pua_subscribe + 3.1. publish_with_ob_proxy (int) + + 4. MI Commands + + 4.1. pua_publish + 4.2. pua_subscribe List of Examples - 1.1. pua_publish FIFO example + 1.1. Set publish_with_ob_proxy parameter + 1.2. pua_publish FIFO example Chapter 1. Admin Guide @@ -44,10 +49,14 @@ Chapter 1. Admin Guide 2.1. Kamailio Modules 2.2. External Libraries or Applications - 3. MI Commands + 3. Parameters + + 3.1. publish_with_ob_proxy (int) - 3.1. pua_publish - 3.2. pua_subscribe + 4. MI Commands + + 4.1. pua_publish + 4.2. pua_subscribe 1. Overview @@ -76,12 +85,27 @@ Chapter 1. Admin Guide running Kamailio with this module loaded: * none -3. MI Commands +3. Parameters + + 3.1. publish_with_ob_proxy (int) + +3.1. publish_with_ob_proxy (int) + + If 1, pua_publish MI command has outbound proxy parameter. + + Default value is "0". + + Example 1.1. Set publish_with_ob_proxy parameter +... +modparam("pua_mi", "publish_with_ob_proxy", 1) +... + +4. MI Commands - 3.1. pua_publish - 3.2. pua_subscribe + 4.1. pua_publish + 4.2. pua_subscribe -3.1. pua_publish +4.1. pua_publish Command parameters: * presentity_uri - e.g. sip:system@kamailio.org @@ -97,13 +121,17 @@ Chapter 1. Admin Guide user take place. The dialog-id from the dialog-info body qualifies as a suitable id here. * ETag - ETag that publish should match or . if no ETag is given. + * outbound proxy - SIP URI of outbound proxy to be used when sending + PUBLISH request or . if no outbound proxy is given. This parameter + is present only when publish_with_ob_proxy module parameter has + value 1. * extra_headers - Extra headers added to PUBLISH request or . if no extra headers. * body - The body of the publish request containing published information or missing if no published information. It has to be a single line for FIFO transport. - Example 1.1. pua_publish FIFO example + Example 1.2. pua_publish FIFO example ... :pua_publish:fifo_test_reply @@ -121,7 +149,7 @@ le id='0x81475a0'><status><basic>open</basic></status></tuple><dm:person id='pdd 748945'><rpid:activities><rpid:away/>away</rpid:activities><dm:note>CPU:16 MEM:4 76</dm:note></dm:person></presence> -3.2. pua_subscribe +4.2. pua_subscribe Command parameters: * presentity_uri - e.g. sip:presentity@kamailio.org diff --git a/modules/pua_mi/doc/pua_mi_admin.xml b/modules/pua_mi/doc/pua_mi_admin.xml index f10c42f..7d4385f 100644 --- a/modules/pua_mi/doc/pua_mi_admin.xml +++ b/modules/pua_mi/doc/pua_mi_admin.xml @@ -63,6 +63,28 @@ </itemizedlist> </section> </section> + + <section> + <title>Parameters</title> + <section> + <title><varname>publish_with_ob_proxy</varname> (int)</title> + <para> + If 1, pua_publish MI command has outbound proxy parameter. + </para> + <para> + <emphasis>Default value is <quote>0</quote>. + </emphasis> + </para> + <example> + <title>Set <varname>publish_with_ob_proxy</varname> parameter</title> + <programlisting format="linespecific"> +... +modparam("pua_mi", "publish_with_ob_proxy", 1) +... +</programlisting> + </example> + </section> + </section> <section> <title>MI Commands</title> @@ -123,6 +145,15 @@ </listitem> <listitem> <para> + <emphasis>outbound proxy</emphasis> + - SIP URI of outbound proxy to be used when + sending PUBLISH request or . if no outbound proxy is given. This + parameter is present only when publish_with_ob_proxy module + parameter has value 1. + </para> + </listitem> + <listitem> + <para> <emphasis>extra_headers</emphasis> - Extra headers added to PUBLISH request or . if no extra headers. diff --git a/modules/pua_mi/mi_func.c b/modules/pua_mi/mi_func.c index 7bd7dc7..a107c4d 100644 --- a/modules/pua_mi/mi_func.c +++ b/modules/pua_mi/mi_func.c @@ -33,7 +33,6 @@ #include "../../lib/kcore/cmpapi.h" #include "../pua/pua_bind.h" -#include "../pua/pua.h" #include "pua_mi.h" /* @@ -44,6 +43,7 @@ * <content_type> - body type if body of a type different from default * event content-type or . * <ETag> - ETag that publish should match or . if no ETag + * <outbound_proxy> - outbound proxy or . * <extra_headers> - extra headers to be added to the request or . * <publish_body> - may not be present in case of update for expire */ @@ -60,6 +60,7 @@ struct mi_root* mi_pua_publish(struct mi_root* cmd, void* param) str content_type; str id; str etag; + str outbound_proxy; str extra_headers; int result; int sign= 1; @@ -169,6 +170,21 @@ struct mi_root* mi_pua_publish(struct mi_root* cmd, void* param) if(node == NULL) return 0; + /* Get outbound_proxy */ + if (publish_with_ob_proxy) { + + outbound_proxy = node->value; + if(outbound_proxy.s== NULL || outbound_proxy.len== 0) { + LM_ERR("empty outbound proxy parameter\n"); + return init_mi_tree(400, "Empty outbound proxy", 20); + } + LM_DBG("outbound_proxy '%.*s'\n", + outbound_proxy.len, outbound_proxy.s); + + node = node->next; + if(node == NULL) return 0; + } + /* Get extra_headers */ extra_headers = node->value; if(extra_headers.s== NULL || extra_headers.len== 0) @@ -239,10 +255,22 @@ struct mi_root* mi_pua_publish(struct mi_root* cmd, void* param) } publ.expires= exp; + if (publish_with_ob_proxy) { + if (!((outbound_proxy.len == 1) && + (outbound_proxy.s[0] == '.'))) + publ.outbound_proxy = &outbound_proxy; + } + if (!(extra_headers.len == 1 && extra_headers.s[0] == '.')) { publ.extra_headers = &extra_headers; } + if (!(etag.len== 1 && etag.s[0]== '.')) + { + publ.etag= &etag; + } + publ.expires= exp; + if (cmd->async_hdl!=NULL) { publ.source_flag= MI_ASYN_PUBLISH; diff --git a/modules/pua_mi/pua_mi.c b/modules/pua_mi/pua_mi.c index 1e6bf2c..ec5cfa7 100644 --- a/modules/pua_mi/pua_mi.c +++ b/modules/pua_mi/pua_mi.c @@ -48,6 +48,9 @@ MODULE_VERSION pua_api_t pua; +/** module params */ +int publish_with_ob_proxy = 0; + /** module functions */ static int mod_init(void); @@ -56,6 +59,14 @@ send_publish_t pua_send_publish; send_subscribe_t pua_send_subscribe; /* + * Exported params + */ +static param_export_t params[]={ + {"publish_with_ob_proxy", INT_PARAM, &publish_with_ob_proxy}, + {0, 0, 0} +}; + +/* * Exported MI functions */ static mi_export_t mi_cmds[] = { @@ -69,7 +80,7 @@ struct module_exports exports= { "pua_mi", /* module name */ DEFAULT_DLFLAGS, /* dlopen flags */ 0, /* exported functions */ - 0, /* exported parameters */ + params, /* exported parameters */ 0, /* exported statistics */ mi_cmds, /* exported MI functions */ 0, /* exported pseudo-variables */ diff --git a/modules/pua_mi/pua_mi.h b/modules/pua_mi/pua_mi.h index c1eadbc..74af4e1 100644 --- a/modules/pua_mi/pua_mi.h +++ b/modules/pua_mi/pua_mi.h @@ -27,6 +27,8 @@ #include "../pua/pua_bind.h" +extern int publish_with_ob_proxy; + extern send_publish_t pua_send_publish; extern send_subscribe_t pua_send_subscribe; [View Less]

1 0

any reason why pua publ_info does not include outbound_proxy?
by Juha Heinanen 04 Nov '14

04 Nov '14

pua subs_info has str* outbound_proxy; /* the outbound_proxy to use when sending the Subscribe request*/ but publ_info for publish requests does not have it? is there some good reason or just that no-one has needed it? -- juha

2 7

git:master: dialog: Don't destroy dialogs in timer while they' re still being referenced
by Alex Hermann 04 Nov '14

04 Nov '14

Module: sip-router Branch: master Commit: 3eef4c8be5cc2b6ccba993a62f8c8039d1adf7da URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3eef4c8… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Thu Oct 23 15:09:05 2014 +0200 dialog: Don't destroy dialogs in timer while they're still being referenced --- modules/dialog/dlg_hash.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/… [View More]

2 7

git:master: Revert "dialog: Don't destroy dialogs in timer while they' re still being referenced"
by Alex Hermann 04 Nov '14

04 Nov '14

Module: sip-router Branch: master Commit: e673771368c25a70c5b289435694df6e9880f969 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e673771… Author: Alex Hermann <alex(a)speakup.nl> Committer: Alex Hermann <alex(a)speakup.nl> Date: Tue Nov 4 14:24:46 2014 +0100 Revert "dialog: Don't destroy dialogs in timer while they're still being referenced" This reverts commit 3eef4c8be5cc2b6ccba993a62f8c8039d1adf7da. Reintroduces possible segfault in cleanup … [View More]

1 0

Re: [sr-dev] Is there a sense in calling run_onsend() after the msg_send() function?
by Lucian Balaceanu 04 Nov '14

04 Nov '14

Hello Daniel, I must admit I only saw your mail last Friday. Until the 10th of October I was also on vacation. I know that you actually committed some of the changes together with your comments on the 12th this month. I don't know if we can consider the topic of the patch closed. As far as I understand, the state-full replies have not been addressed, right? (There should be a change in the t_reply.c) I followed the code to the relay_reply but I did not yet come to find the send function. … [View More]Should I pursue further? Thank you, Lucian Balaceanu > Hi Lucian, > > somehow I forgot to follow up on this. But we need to get sorted out > soon, before we release, so it works as expected with the new version. > See more comments inline. > > > On 17/09/14 18:09, Lucian Balaceanu wrote: >> Hi Daniel, >> >> Please forgive me for my delay in responding to your mail. >> Please find attached a second version of the onsend_route_reply patch >> (which again has some problems). As per your previous indications I >> did the following: >> >> *Issue1* >>> From performances point of view, there can be added a config >>> parameter to enable running of onsend_route for replies: >>> >>> onsend_route_reply = 0|1 >> >> Following >> http://www.asipto.com/pub/kamailio-devel-guide/#c08add_parameters I >> have tried to add onsend_route_reply parameter. The code compiles, >> but when trying to start kamailio with this parameter inside, the >> parsing fails with syntax errors signaling: >> >> / 0(1321) :<core> [cfg.y:3423]: yyerror_at(): parse error in config >> file kamailio-basic.cfg.4.1, from line 107, column 1 to line 108, >> column 0: syntax error >> 0(1321) : <core> [cfg.y:3423]: yyerror_at(): parse error in config >> file kamailio-basic.cfg.4.1, from line 107, column 1 to line 108, >> column 0: >> ERROR: bad config file (2 errors)/ > > The issue is: > > +<INITIAL>{ONSEND_RT_REPLY} { yylval.intval=atoi(yytext); > + yy_number_str=yytext; return NUMBER; } > > It should be: > > +<INITIAL>{ONSEND_RT_REPLY} { yylval.intval=atoi(yytext); > + yy_number_str=yytext; return ONSEND_RT_REPLY; } > >> >> *Issue2* >>> #define onsend_enabled(rtype) >>> (onsend_rt.rlist[DEFAULT_RT]?((rtype==SIP_REPLY)?onsend_route_reply:1):0) >> That is to say you see it best to take the chek for >> onsend_rt.list[DEFAULT_RT] from inside run_onsend() function and call >> this onsend_enabled(...) before the run_onsend()? > > This is to detect whether the onsend_route should be executed for SIP > replies. The condition being: > > - if is a sip reply and onsend_route is set and the onsend_route_reply > parameter is 1 >> >> *Issue3* >>> On the other hand, is onsend_route also executed for local requests? >>> I had in mind it is only for received requests that are forwarded >>> ... Iirc, on onsend_route, the sip message is the one received, the >>> outgoing content being accessible via $snd(buf). >>> >> I agree with you with taking out the locally generated requests and >> only left the run_onsend call in do_forward_reply function (inside >> forward.c). >> Could you point me to the reply relaying function that is called for >> state-full processing? > Stateful processing for replies is mainly done in t_reply.c from tm > module. At some point there should be a send buffer function call. > > Cheers, > Daniel >> >> Thank you and sorry again for my late answer, >> Lucian > > -- > Daniel-Constantin Mierla > http://twitter.com/#!/miconda -http://www.linkedin.com/in/miconda > > [View Less]

2 2

git:4.2: benchmark: sync'ed log level values in documentation
by Daniel-Constantin Mierla 04 Nov '14

04 Nov '14

Module: sip-router Branch: 4.2 Commit: 3ddda387934842542c2952ee912db55ba91f1c0e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3ddda38… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 4 10:20:46 2014 +0100 benchmark: sync'ed log level values in documentation (cherry picked from commit 61ab723bb46f46f9013587e26ee07f39e5388ff8) --- modules/benchmark/README … [View More] | 14 ++++++++------ modules/benchmark/doc/benchmark_admin.xml | 14 ++++++++------ 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/modules/benchmark/README b/modules/benchmark/README index c01e575..a2193de 100644 --- a/modules/benchmark/README +++ b/modules/benchmark/README @@ -174,13 +174,15 @@ modparam("benchmark", "granularity", 500) 3.3. loglevel (int) Set the log level for the benchmark logs. These levels should be used: - * -3 - L_ALERT - * -2 - L_CRIT + * -5 - L_ALERT + * -4 - L_BUG + * -3 - L_CRIT + * -2 - L_CRIT (no prefix) * -1 - L_ERR - * 1 - L_WARN - * 2 - L_NOTICE - * 3 - L_INFO - * 4 - L_DBG + * 0 - L_WARN + * 1 - L_NOTICE + * 2 - L_INFO + * 3 - L_DBG Default value is "3" (L_INFO). diff --git a/modules/benchmark/doc/benchmark_admin.xml b/modules/benchmark/doc/benchmark_admin.xml index 73e9ff5..903ef00 100644 --- a/modules/benchmark/doc/benchmark_admin.xml +++ b/modules/benchmark/doc/benchmark_admin.xml @@ -127,13 +127,15 @@ modparam("benchmark", "granularity", 500) <para> Set the log level for the benchmark logs. These levels should be used: <itemizedlist> - <listitem><para>-3 - L_ALERT</para></listitem> - <listitem><para>-2 - L_CRIT</para></listitem> + <listitem><para>-5 - L_ALERT</para></listitem> + <listitem><para>-4 - L_BUG</para></listitem> + <listitem><para>-3 - L_CRIT</para></listitem> + <listitem><para>-2 - L_CRIT (no prefix)</para></listitem> <listitem><para>-1 - L_ERR</para></listitem> - <listitem><para>1 - L_WARN</para></listitem> - <listitem><para>2 - L_NOTICE</para></listitem> - <listitem><para>3 - L_INFO</para></listitem> - <listitem><para>4 - L_DBG</para></listitem> + <listitem><para>0 - L_WARN</para></listitem> + <listitem><para>1 - L_NOTICE</para></listitem> + <listitem><para>2 - L_INFO</para></listitem> + <listitem><para>3 - L_DBG</para></listitem> </itemizedlist> </para> <para> [View Less]

1 0

git:master: benchmark: sync'ed log level values in documentation
by Daniel-Constantin Mierla 04 Nov '14

04 Nov '14

Module: sip-router Branch: master Commit: 61ab723bb46f46f9013587e26ee07f39e5388ff8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61ab723… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 4 10:20:46 2014 +0100 benchmark: sync'ed log level values in documentation --- modules/benchmark/README | 14 ++++++++------ modules/benchmark/doc/benchmark_admin.… [View More]

1 0

git:master: uac: use transaction to propagate uac_auth() flag
by Daniel-Constantin Mierla 03 Nov '14

03 Nov '14

Module: sip-router Branch: master Commit: 952227ef749da464c7990fa7f056764daf4bda0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=952227e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 3 18:41:01 2014 +0100 uac: use transaction to propagate uac_auth() flag - needed by dialog to increase the cseq - local request is no longer accessible at forwarding callback --- … [View More]

2 2

[tracker] Task closed: Content of $dlg_vars are mixed with each other when writing cdr values on version 4.1.5-1.1
by sip-router 03 Nov '14

03 Nov '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#463 - Content of $dlg_vars are mixed with each other when writing cdr values on version 4.1.5-1.1 User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug Additional comments about closing: No follow up for two months - upgrade to latest version in the branch and reopen if it is still an issue, providing the requested details. More information can be found at the following URL: http:/… [View More]

1 0

git:master: modules/ims_qos, modules/ims_usrloc_pcscf, modules/ ims_registrar_pcscf: improvement over nat handling in p-cscf contact storage:
by Jason Penton 03 Nov '14

03 Nov '14

Module: sip-router Branch: master Commit: fce92c5eba817cbb1303ab4174e8cc7d98ed524d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fce92c5… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Mon Nov 3 16:18:19 2014 +0200 modules/ims_qos, modules/ims_usrloc_pcscf, modules/ims_registrar_pcscf: improvement over nat handling in p-cscf contact storage: - useful for locating contacts where SIP requerst … [View More]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2014