sr-dev January 2010

sr-dev@lists.kamailio.org

28 participants
289 discussions

git:kamailio_3.0: Backport of the changes (see previous commits).
by Carsten Bock 07 Jan '10

07 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 7956c7387a1217016d0e5192e7583e8385b27e14 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7956c73… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Jan 6 16:53:17 2010 +0100 Backport of the changes (see previous commits). --- modules_k/nathelper/rtpproxy_stream.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules_k/nathelper/rtpproxy_stream.c b/modules_k/nathelper/rtpproxy_stream.c index 437cc5c..520bd2d 100644 --- a/modules_k/nathelper/rtpproxy_stream.c +++ b/modules_k/nathelper/rtpproxy_stream.c @@ -38,7 +38,6 @@ int fixup_var_str_int(void **param, int param_no) { - unsigned long go_to; int ret; pv_elem_t *model; str s; @@ -57,10 +56,14 @@ fixup_var_str_int(void **param, int param_no) } *param = (void *)model; } else if (param_no == 2) { - go_to = str2s(*param, strlen(*param), &ret); - if (ret == 0) { + /* According to + * http://www.kamailio.org/docs/modules/1.5.x/nathelper.html#rtpproxy_stream2x… + * this could be -1 */ + s.s = (char *)(*param); + s.len = strlen(s.s); + if (str2sint(&s, &ret)==0) { pkg_free(*param); - *param = (void *)go_to; + *param = (void *)ret; } else { LM_ERR("bad number <%s>\n", (char *)(*param)); return E_CFG;

3 2

[tracker] Comment added: Strange symbols in NOTIFY dialog-info+xml body
by sip-router 07 Jan '10

07 Jan '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#25 - Strange symbols in NOTIFY dialog-info+xml body User who did this - Klaus Darilion (klaus3000) ---------- Hi Andrey! I checked the code but could not find a bug. Can you send me the MI command you use to generate the PUBLISH, so that I can reproduce the bug? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=25#comment24 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:kamailio_3.0: presence(k): aliased MLA to SLA
by Daniel-Constantin Mierla 06 Jan '10

06 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 1a9f379ed66dbcc05f7750ff961c0a7a6607b0db URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1a9f379… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 6 18:50:31 2010 +0100 presence(k): aliased MLA to SLA - doc updated to reflect RFCs and drafts --- modules_k/presence/subscribe.c | 19 +++++++++------- modules_k/presence/utils_func.h | 3 +- modules_k/presence_xml/README | 11 ++++++--- modules_k/presence_xml/doc/presence_xml_admin.xml | 24 ++++++++++++++++---- 4 files changed, 39 insertions(+), 18 deletions(-) diff --git a/modules_k/presence/subscribe.c b/modules_k/presence/subscribe.c index 3067919..6ea70ae 100644 --- a/modules_k/presence/subscribe.c +++ b/modules_k/presence/subscribe.c @@ -802,7 +802,7 @@ int extract_sdialog_info(subs_t* subs,struct sip_msg* msg, int mexp, else { memset( &TO , 0, sizeof(TO) ); - if( !parse_to(msg->to->body.s,msg->to->body.s + msg->to->body.len + 1, &TO)); + if( !parse_to(msg->to->body.s,msg->to->body.s + msg->to->body.len + 1, &TO)) { LM_DBG("'To' header NOT parsed\n"); goto error; @@ -1030,16 +1030,19 @@ int get_stored_info(struct sip_msg* msg, subs_t* subs, int* reply_code, { lock_get(&subs_htable[i].lock); s= search_shtable(subs_htable, subs->callid,subs->to_tag,subs->from_tag, i); - if (s && !EVENT_DIALOG_SLA(s->event->evp)) + if (s) { - pres_uri.s= (char*)pkg_malloc(s->pres_uri.len* sizeof(char)); - if(pres_uri.s== NULL) + if(!EVENT_DIALOG_SLA(s->event->evp)) { - lock_release(&subs_htable[i].lock); - ERR_MEM(PKG_MEM_STR); + pres_uri.s= (char*)pkg_malloc(s->pres_uri.len* sizeof(char)); + if(pres_uri.s== NULL) + { + lock_release(&subs_htable[i].lock); + ERR_MEM(PKG_MEM_STR); + } + memcpy(pres_uri.s, s->pres_uri.s, s->pres_uri.len); + pres_uri.len= s->pres_uri.len; } - memcpy(pres_uri.s, s->pres_uri.s, s->pres_uri.len); - pres_uri.len= s->pres_uri.len; goto found_rec; } lock_release(&subs_htable[i].lock); diff --git a/modules_k/presence/utils_func.h b/modules_k/presence/utils_func.h index c6590c8..5f94f0b 100644 --- a/modules_k/presence/utils_func.h +++ b/modules_k/presence/utils_func.h @@ -50,7 +50,8 @@ #define EVENT_DIALOG_SLA(ev) \ - ((ev)->type == EVENT_DIALOG && (ev)->params.dialog.sla) + ((ev)->type == EVENT_DIALOG \ + && ((ev)->params.dialog.sla || (ev)->params.dialog.ma)) static inline int uandd_to_uri(str user, str domain, str *out) diff --git a/modules_k/presence_xml/README b/modules_k/presence_xml/README index e38262c..1b6e0d6 100644 --- a/modules_k/presence_xml/README +++ b/modules_k/presence_xml/README @@ -90,10 +90,13 @@ Chapter 1. Admin Guide The module does specific handling for notify-subscribe events using xml bodies. It is used with the general event handling module, presence. It - constructs and adds 3 events to it: presence, presence.winfo, - dialog;sla. By default all these events will be handled. If you do want - to activate only certain events then disable the unneeded events via - the module parameters. + constructs and adds 3 events to it: + * presence - SIMPLE status presence: RFC 3856 + * presence.winfo - SIMPLE watcher info: RFC 3857 + * dialog;sla (or dialog;ma) - Bridged Line Appearances (BLA) (or + Multiple Line Appearances (MLA)): draft-anil-sipping-bla + + You can control which events are enabled via module parameters. This module takes the XCAP permission rule documents from xcap_table. The presence permission rules are interpreted according to the diff --git a/modules_k/presence_xml/doc/presence_xml_admin.xml b/modules_k/presence_xml/doc/presence_xml_admin.xml index cefadf0..1ee17c6 100644 --- a/modules_k/presence_xml/doc/presence_xml_admin.xml +++ b/modules_k/presence_xml/doc/presence_xml_admin.xml @@ -16,11 +16,25 @@ <section> <title>Overview</title> <para> - The module does specific handling for notify-subscribe events using xml bodies. - It is used with the general event handling module, presence. It constructs and adds - 3 events to it: presence, presence.winfo, dialog;sla. By default all these events - will be handled. If you do want to activate only certain events then disable the - unneeded events via the module parameters. + The module does specific handling for notify-subscribe events using xml + bodies. It is used with the general event handling module, presence. + It constructs and adds 3 events to it: + <itemizedlist> + <listitem> + <para>presence - SIMPLE status presence: RFC 3856</para> + </listitem> + <listitem> + <para>presence.winfo - SIMPLE watcher info: RFC 3857</para> + </listitem> + <listitem> + <para>dialog;sla (or dialog;ma) - Bridged Line Appearances + (BLA) (or Multiple Line Appearances (MLA)): + draft-anil-sipping-bla</para> + </listitem> + </itemizedlist> + </para> + <para> + You can control which events are enabled via module parameters. </para> <para> This module takes the XCAP permission rule documents from xcap_table.

1 0

git:kamailio_3.0: core: event parsing enahced for dialog; ma
by Daniel-Constantin Mierla 06 Jan '10

06 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: 1e99795d2ddebe8a6794c3b407f96d30378b872f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1e99795… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 6 18:47:36 2010 +0100 core: event parsing enahced for dialog;ma - event defined by draft-anil-sipping-bla for Multiple Line Appearances, folloing to Shared/Bridged Line Appearances (SLA, BLA) - draft is defunct but still some implementations out there --- parser/parse_param.c | 9 +++++++++ parser/parse_param.h | 4 +++- 2 files changed, 12 insertions(+), 1 deletions(-) diff --git a/parser/parse_param.c b/parser/parse_param.c index 5f204bb..20491f8 100644 --- a/parser/parse_param.c +++ b/parser/parse_param.c @@ -99,6 +99,15 @@ static inline void parse_event_dialog_class(param_hooks_t* h, param_t* p) h->event_dialog.sla = p; } break; + + case 'm': + case 'M': + if ((p->name.len == 2) && + (!strncasecmp(p->name.s + 1, "a", 1))) { + p->type = P_MA; + h->event_dialog.ma = p; + } + break; } } diff --git a/parser/parse_param.h b/parser/parse_param.h index 9d1060d..c50edd9 100644 --- a/parser/parse_param.h +++ b/parser/parse_param.h @@ -61,7 +61,8 @@ typedef enum ptype { P_FROM_TAG, /* Dialog event package: from-tag */ P_TO_TAG, /* Dialog event package: to-tag */ P_ISD, /* Dialog event package: include-session-description */ - P_SLA /* Dialog event package: sla */ + P_SLA, /* Dialog event package: sla */ + P_MA /* Dialog event package: ma */ } ptype_t; @@ -121,6 +122,7 @@ struct event_dialog_hooks { struct param* to_tag; struct param* include_session_description; struct param* sla; + struct param* ma; }; /*

1 0

SF.net SVN: openser:[5964] branches/1.5
by Daniel-Constantin Mierla 06 Jan '10

06 Jan '10

Revision: 5964 http://openser.svn.sourceforge.net/openser/?rev=5964&view=rev Author: miconda Date: 2010-01-06 17:30:19 +0000 (Wed, 06 Jan 2010) Log Message: ----------- - aliased event dialog;ma to dialog;sla, specified by latest version of same draft - draf expired for 2 years, threfore handling of the event is now disabled by default, can be enabled via module parameter - upon a report from Damien Sandras, ekiga Modified Paths: -------------- branches/1.5/modules/presence/subscribe.c branches/1.5/modules/presence_xml/README branches/1.5/modules/presence_xml/doc/presence_xml_admin.xml branches/1.5/modules/presence_xml/presence_xml.c branches/1.5/parser/parse_event.c branches/1.5/parser/parse_event.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

[tracker] Task opened: Strange symbols in NOTIFY dialog-info+xml body (Attachment added)
by sip-router 06 Jan '10

06 Jan '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Andrey 'Krieger' Utkin (andrey.utkin.2) Attached to Project - sip-router Summary - Strange symbols in NOTIFY dialog-info+xml body Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Happy New Year to all! I notice such things frequently in NOTIFYies generated by Kamailio from my PUBLISHes (injected by MI command). <code><dialog-info xmlns="urn:ietf:params:xml:ns:dialog-info" version="2" ll" entity="sip:1010@192.168.1.113"></code> This looks to be xml syntax violation, and i think it may be reason why my snom phone does not react to NOTIFY with desired BLF behaviour. One or more files have been attached. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=25 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.

2 1

git:master: According to the docs, stream2uac / stream2uas should accept a "-1" as a valid parameter, in order to repeat forever. With the old conversion, a value of "-1" would be considered invalid.
by Carsten Bock 06 Jan '10

06 Jan '10

Module: sip-router Branch: master Commit: 2cf0bb2cf1b98ea54c0085a48da27e0db0f9d522 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2cf0bb2… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Jan 6 16:38:04 2010 +0100 According to the docs, stream2uac / stream2uas should accept a "-1" as a valid parameter, in order to repeat forever. With the old conversion, a value of "-1" would be considered invalid. Credits go to Min Wang (wang(a)basis-audionet.com) for finding and fixing this. --- modules_k/nathelper/rtpproxy_stream.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules_k/nathelper/rtpproxy_stream.c b/modules_k/nathelper/rtpproxy_stream.c index 437cc5c..520bd2d 100644 --- a/modules_k/nathelper/rtpproxy_stream.c +++ b/modules_k/nathelper/rtpproxy_stream.c @@ -38,7 +38,6 @@ int fixup_var_str_int(void **param, int param_no) { - unsigned long go_to; int ret; pv_elem_t *model; str s; @@ -57,10 +56,14 @@ fixup_var_str_int(void **param, int param_no) } *param = (void *)model; } else if (param_no == 2) { - go_to = str2s(*param, strlen(*param), &ret); - if (ret == 0) { + /* According to + * http://www.kamailio.org/docs/modules/1.5.x/nathelper.html#rtpproxy_stream2x… + * this could be -1 */ + s.s = (char *)(*param); + s.len = strlen(s.s); + if (str2sint(&s, &ret)==0) { pkg_free(*param); - *param = (void *)go_to; + *param = (void *)ret; } else { LM_ERR("bad number <%s>\n", (char *)(*param)); return E_CFG;

1 0

git:master: We need to parse all headers here. Otherwise, the Record-Route-Headers may be incomplete.
by Carsten Bock 06 Jan '10

06 Jan '10

Module: sip-router Branch: master Commit: 9efc2f5f5195bbb8321e0e1a59d028e3c3358fb2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9efc2f5… Author: Carsten Bock <lists(a)bock.info> Committer: Carsten Bock <lists(a)bock.info> Date: Wed Jan 6 16:38:56 2010 +0100 We need to parse all headers here. Otherwise, the Record-Route-Headers may be incomplete. --- modules_k/dialog/dlg_handlers.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 491a1f1..9b10614 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -226,7 +226,7 @@ int populate_leg_info( struct dlg_cell *dlg, struct sip_msg *msg, contact = ((contact_body_t *)msg->contact->parsed)->contacts->uri; /* extract the RR parts */ - if(!msg->record_route && (parse_headers(msg,HDR_RECORDROUTE_F,0)<0) ){ + if(!msg->record_route && (parse_headers(msg,HDR_EOH_F,0)<0) ){ LM_ERR("failed to parse record route header\n"); goto error0; }

1 0

SF.net SVN: openser:[5963] branches/1.5/modules/nathelper/rtpproxy_stream.c
by Carsten Bock 06 Jan '10

06 Jan '10

Revision: 5963 http://openser.svn.sourceforge.net/openser/?rev=5963&view=rev Author: carstenbock Date: 2010-01-06 15:34:00 +0000 (Wed, 06 Jan 2010) Log Message: ----------- According to the docs, stream2uac / stream2uas should accept a "-1" as a valid parameter, in order to repeat forever. With the old conversion, a value of "-1" would be cosidered invalid. Credits go to Min Wang (wang(a)basis-audionet.com) for finding and fixing this. Modified Paths: -------------- branches/1.5/modules/nathelper/rtpproxy_stream.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

git:kamailio_3.0: tm: documented t_relay_to() function
by Daniel-Constantin Mierla 06 Jan '10

06 Jan '10

Module: sip-router Branch: kamailio_3.0 Commit: d8af3a4b17bf1ca71df1d977d986f407ff34cfc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8af3a4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jan 6 15:39:46 2010 +0100 tm: documented t_relay_to() function --- modules/tm/README | 39 +++++++++++++++++++++- modules/tm/doc/functions.xml | 74 ++++++++++++++++++++++++++++++++++++++++- 2 files changed, 109 insertions(+), 4 deletions(-) diff --git a/modules/tm/README b/modules/tm/README index 33125c8..a971836 100644 --- a/modules/tm/README +++ b/modules/tm/README @@ -104,6 +104,7 @@ Juha Heinanen 1.5.34. t_set_disable_6xx(0|1) 1.5.35. t_set_disable_failover(0|1) 1.5.36. t_replicate(params) + 1.5.37. t_relay_to(proxy, flags) 1.6. TM Module API @@ -2014,14 +2015,48 @@ route { # sent to 1.2.3.4:5060 over tcp t_replicate("sip:1.2.3.4:5060;transport=tcp"); -# sent to 1.2.3.4:5060 over tls -$var(h) = "1.2.3.4:5060"; +# sent to 1.2.3.4:5061 over tls +$var(h) = "1.2.3.4:5061"; t_replicate("sip:$var(h);transport=tls"); # sent to 1.2.3.4:5060 over udp t_replicate_to_udp("1.2.3.4", "5060"); ... +1.5.37. t_relay_to(proxy, flags) + + Forward the SIP request to a specific address, controlling internal + behavior via flags. + + There are several function prototypes: + * t_relay_to(), + * t_relay_to(proxy), + * t_relay_to(flags) + * t_relay_to(proxy, flags) + + Meaning of the parameters is as follows: + * proxy - address where the request should be sent. Format is: + "proto:host:port" - any of proto or port can be ommitted, along + with the semicolon after or before. + * flags - bitmask integer value to control the internal behavior. + Bits can be: + + 0x01 - do not generate 100 reply. + + 0x02 - do not generate reply on internal error (NOTE: has no + effect anymore). + + 0x04 - disable dns failover. + + Example 74. t_replicate usage +... +# sent to 1.2.3.4:5060 over tcp +t_relay_to("tcp:1.2.3.4:5060"); + +# sent to 1.2.3.4 over tls +t_relay_to("tls:1.2.3.4"); + +# sent to dst URI or R-URI without a 100 reply +t_relay_to("0x01"); +... + 1.6. TM Module API Revision History diff --git a/modules/tm/doc/functions.xml b/modules/tm/doc/functions.xml index dc2835d..dc4207c 100644 --- a/modules/tm/doc/functions.xml +++ b/modules/tm/doc/functions.xml @@ -1387,8 +1387,8 @@ route { # sent to 1.2.3.4:5060 over tcp t_replicate("sip:1.2.3.4:5060;transport=tcp"); -# sent to 1.2.3.4:5060 over tls -$var(h) = "1.2.3.4:5060"; +# sent to 1.2.3.4:5061 over tls +$var(h) = "1.2.3.4:5061"; t_replicate("sip:$var(h);transport=tls"); # sent to 1.2.3.4:5060 over udp @@ -1397,5 +1397,75 @@ t_replicate_to_udp("1.2.3.4", "5060"); </programlisting> </example> </section> + <section id="t_relay_to"> + <title> + <function>t_relay_to(proxy, flags)</function> + </title> + <para> + Forward the SIP request to a specific address, controlling internal + behavior via flags. + </para> + <para> + There are several function prototypes: + <itemizedlist> + <listitem> + <function>t_relay_to()</function>, + </listitem> + <listitem> + <function>t_relay_to(proxy)</function>, + </listitem> + <listitem> + <function>t_relay_to(flags)</function> + </listitem> + <listitem> + <function>t_relay_to(proxy, flags)</function> + </listitem> + </itemizedlist> + </para> + <para>Meaning of the parameters is as follows:</para> + <itemizedlist> + <listitem> + <para><emphasis>proxy</emphasis> - address where the request should + be sent. Format is: "proto:host:port" - any of proto or port can be + ommitted, along with the semicolon after or before. + </para> + </listitem> + <listitem> + <para><emphasis>flags</emphasis> - bitmask integer value to control + the internal behavior. Bits can be: + </para> + <itemizedlist> + <listitem> + <para><emphasis>0x01</emphasis> - do not generate 100 reply. + </para> + </listitem> + <listitem> + <para><emphasis>0x02</emphasis> - do not generate reply on internal + error (NOTE: has no effect anymore). + </para> + </listitem> + <listitem> + <para><emphasis>0x04</emphasis> - disable dns failover. + </para> + </listitem> + </itemizedlist> + </listitem> + </itemizedlist> + <example> + <title><function>t_replicate</function> usage</title> + <programlisting> +... +# sent to 1.2.3.4:5060 over tcp +t_relay_to("tcp:1.2.3.4:5060"); + +# sent to 1.2.3.4 over tls +t_relay_to("tls:1.2.3.4"); + +# sent to dst URI or R-URI without a 100 reply +t_relay_to("0x01"); +... + </programlisting> + </example> + </section> </section>

1 0

← Newer
1
...
21
22
23
24
25
26
27
28
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2010