sr-dev June 2013

sr-dev@lists.kamailio.org

33 participants
235 discussions

git:master: modules/ims_isc: Add support for P-Serverd-User header

by Jason Penton

Module: sip-router Branch: master Commit: 2e466866468a71d4a6e7589cae69ae606b194716 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2e46686… Author: Jason Penton <jason.penton(a)smilecoms.com> Committer: Jason Penton <jason.penton(a)smilecoms.com> Date: Wed Jun 5 08:46:13 2013 +0200 modules/ims_isc: Add support for P-Serverd-User header - This header allows a triggered Application Server to know the IMS user for who it was triggered, and in what state (originating/terminating, registered/unregistered) - Thanks to Camille Oudot for patch! --- modules/ims_isc/doc/ims_isc_admin.xml | 20 +++++++++ modules/ims_isc/mark.c | 70 +++++++++++++++++++++++++++++++++ modules/ims_isc/mark.h | 1 + modules/ims_isc/mod.c | 2 + 4 files changed, 93 insertions(+), 0 deletions(-) diff --git a/modules/ims_isc/doc/ims_isc_admin.xml b/modules/ims_isc/doc/ims_isc_admin.xml index adc6f5e..33dac0a 100644 --- a/modules/ims_isc/doc/ims_isc_admin.xml +++ b/modules/ims_isc/doc/ims_isc_admin.xml @@ -126,6 +126,26 @@ modparam("ims_isc", "isc_fr_inv_timeout", 20000) </programlisting> </example> </section> + + <section> + <title><varname>add_p_served_user</varname> (integer)</title> + + <para>This boolean indicates if a P-Served-User should be added on the ISC + interface, according to RFC 5502.</para> + + <para><emphasis> Default value is 0 (false)</emphasis></para> + + <example> + <title><varname>add_p_served_user</varname> parameter usage</title> + + <programlisting format="linespecific"> +... +modparam("ims_isc", "add_p_served_user", 1) +# p-served user header will be enabled +... + </programlisting> + </example> + </section> </section> <section> diff --git a/modules/ims_isc/mark.c b/modules/ims_isc/mark.c index a1a73e4..c879604 100644 --- a/modules/ims_isc/mark.c +++ b/modules/ims_isc/mark.c @@ -44,6 +44,16 @@ */ #include "mark.h" +#include "../../str.h" +#include "../../data_lump.h" + +const str psu_hdr_s = str_init("P-Served-User: <%.*s>;sescase=%.*s;regstate=%.*s\r\n"); +const str sescase_orig = str_init("orig"); +const str sescase_term = str_init("term"); +const str regstate_reg = str_init("reg"); +const str regstate_unreg = str_init("unreg"); + +extern int add_p_served_user; /** base16 char constants */ char *hexchars = "0123456789abcdef"; @@ -243,6 +253,9 @@ int isc_mark_set(struct sip_msg *msg, isc_match *match, isc_mark *mark) { if (match) as = match->server_name; isc_mark_write_route(msg, &as, &route); + if (add_p_served_user) { + isc_mark_write_psu(msg, mark); + } LM_DBG("isc_mark_set: NEW mark <%s>\n", chr_mark); return 1; @@ -291,3 +304,60 @@ inline int isc_mark_write_route(struct sip_msg *msg, str *as, str *iscmark) { return 1; } +/** + * Inserts the P-Served-User header on a SIP message + * as specified in RFC 5502 + * @param msg - SIP message + * @param mark - the mark containing all required information + * @returns 1 on success, else 0 + */ +int isc_mark_write_psu(struct sip_msg *msg, isc_mark *mark) { + struct lump *l = msg->add_rm; + int hlen; + char * hstr = NULL; + const str *regstate, *sescase; + + switch(mark->direction) { + case IFC_ORIGINATING_SESSION: + regstate = &regstate_reg; + sescase = &sescase_orig; + break; + case IFC_TERMINATING_SESSION: + regstate = &regstate_reg; + sescase = &sescase_term; + break; + case IFC_TERMINATING_UNREGISTERED: + regstate = &regstate_unreg; + sescase = &sescase_term; + break; + default: + LM_ERR("isc_mark_write_psu: unknown direction: %d\n", mark->direction); + return 0; + } + + hlen = psu_hdr_s.len - /* 3 "%.*s" */ 12 + mark->aor.len + regstate->len + sescase->len + 1; + hstr = pkg_malloc(hlen); + if (hstr == NULL) { + LM_ERR("isc_mark_write_psu: could not allocate %d bytes\n", hlen); + return 0; + } + + int ret = snprintf(hstr, hlen, psu_hdr_s.s, + mark->aor.len, mark->aor.s, + sescase->len, sescase->s, + regstate->len, regstate->s); + if (ret >= hlen) { + LM_ERR("isc_mark_write_psu: invalid string buffer size: %d, required: %d\n", hlen, ret); + pkg_free(hstr); + return 0; + } + + LM_DBG("isc_mark_write_psu: %.*s\n", hlen - 3 /* don't print \r\n\0 */, hstr); + if (append_new_lump(&l, hstr, hlen - 1, HDR_OTHER_T) == 0) { + LM_ERR("isc_mark_write_psu: append_new_lump(%p, \"%.*s\\\r\\n\", %d, 0) failed\n", &l, hlen - 3 /* don't print \r\n\0 */, hstr, hlen - 1); + pkg_free(hstr); + return 0; + } + /* hstr will be deallocated when msg will be destroyed */ + return 1; +} diff --git a/modules/ims_isc/mark.h b/modules/ims_isc/mark.h index e6912f3..9121eaa 100644 --- a/modules/ims_isc/mark.h +++ b/modules/ims_isc/mark.h @@ -76,6 +76,7 @@ int base16_to_bin(char *from,int len, char *to); inline int isc_mark_drop_route(struct sip_msg *msg); int isc_mark_set(struct sip_msg *msg, isc_match *match, isc_mark *mark); inline int isc_mark_write_route(struct sip_msg *msg,str *as,str *iscmark); +int isc_mark_write_psu(struct sip_msg *msg, isc_mark *mark); int bin_to_base16(char *from,int len, char *to); #endif diff --git a/modules/ims_isc/mod.c b/modules/ims_isc/mod.c index 3b69bbd..5c54453 100644 --- a/modules/ims_isc/mod.c +++ b/modules/ims_isc/mod.c @@ -62,6 +62,7 @@ str isc_my_uri_sip = {0, 0}; /**< Uri of myself to loop the message in str with int isc_expires_grace = 120; /**< expires value to add to the expires in the 3rd party register*/ int isc_fr_timeout = 5000; /**< default ISC response timeout in ms */ int isc_fr_inv_timeout = 20000; /**< default ISC invite response timeout in ms */ +int add_p_served_user = 0; /**< should the P-Served-User header be inserted? */ /** module functions */ static int mod_init(void); @@ -92,6 +93,7 @@ static param_export_t params[] = { consider it dead. Has to be lower than SIP transaction timeout to prevent downstream timeouts. Not too small though because AS are usually slow as hell... */ + { "add_p_served_user", INT_PARAM, &add_p_served_user}, /**< boolean indicating if the P-Served-User (RFC5502) should be added on the ISC interface or not */ { 0, 0, 0} };

11 years, 5 months

git:master: sercmd: possibility to enable EXTRA_DEBUG via compile time option

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: af1c2af129edeb49c6f2c826ec2c675e72c2486d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=af1c2af… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 4 22:17:52 2013 +0200 sercmd: possibility to enable EXTRA_DEBUG via compile time option - should get rid of empty DBG() resulting in unused init variable --- utils/sercmd/parse_listen_id.c | 18 ++++++++++++++++-- 1 files changed, 16 insertions(+), 2 deletions(-) diff --git a/utils/sercmd/parse_listen_id.c b/utils/sercmd/parse_listen_id.c index 02c2f1e..5cef9cd 100644 --- a/utils/sercmd/parse_listen_id.c +++ b/utils/sercmd/parse_listen_id.c @@ -42,11 +42,25 @@ #define pkg_malloc malloc #define pkg_free free +#ifdef EXTRA_DEBUG +static int _debug = 1; +#else +static int _debug = 0; +#endif + #ifdef __SUNPRO_C -#define DBG(...) +#define DBG(...) \ + do { \ + if(_debug==1) \ + fprintf(stderr, __VA_ARGS__); \ + } while(0) #define LOG(lev, ...) fprintf(stderr, __VA_ARGS__) #else -#define DBG(fmt, args...) +#define DBG(fmt, args...) \ + do { \ + if(_debug==1) \ + fprintf(stderr, fmt, ## args); \ + } while(0) #define LOG(lev, fmt, args...) fprintf(stderr, fmt, ## args) #endif

11 years, 5 months

git:master: sercmd: pass OS define at compile time

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: cb4cfa492aa977df3f80b7d93001559ecb1bcdec URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cb4cfa4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Jun 4 23:21:11 2013 +0200 sercmd: pass OS define at compile time --- utils/sercmd/Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index dacd064..86db185 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -27,7 +27,7 @@ endif #ifneq (,$(MAKECMDGOALS)) # erase common DEFS (not needed) C_DEFS:= -DEFS:= -DNAME='"$(NAME)"' -DSRNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' \ +DEFS:= -DNAME='"$(NAME)"' -DSRNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -D__OS_$(OS) \ $(filter -D%HAVE -DARCH% -DOS% -D__CPU% -D__OS%, $(DEFS)) # use proper libs (we can't rely on LIBS value since we might be called

11 years, 5 months

git:master: htable: documented the new rpc commands

by Elena-Ramona Modroiu

Module: sip-router Branch: master Commit: 5d45ea50a7ebb53cfcfb04553a3152e61d1e6831 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d45ea5… Author: Elena-Ramona Modroiu <ramona(a)asipto.com> Committer: Elena-Ramona Modroiu <ramona(a)asipto.com> Date: Mon Jun 3 11:13:56 2013 +0200 htable: documented the new rpc commands - htable.sets and htable.seti --- modules/htable/README | 70 +++++++++++++++++++++++++++------- modules/htable/doc/htable_admin.xml | 60 ++++++++++++++++++++++++++++++ 2 files changed, 115 insertions(+), 15 deletions(-) diff --git a/modules/htable/README b/modules/htable/README index bf28a7a..2cf178e 100644 --- a/modules/htable/README +++ b/modules/htable/README @@ -17,7 +17,7 @@ Alex Balashov <abalashov(a)evaristesys.com> - Copyright (c) 2008-2011 http://www.asipto.com + Copyright © 2008-2011 http://www.asipto.com __________________________________________________________________ Table of Contents @@ -63,9 +63,11 @@ Alex Balashov 7.1. htable.get htable key 7.2. htable.delete htable key - 7.3. htable.dump htable - 7.4. htable.reload htable - 7.5. htable.listTables + 7.3. htable.sets htable key value + 7.4. htable.seti htable key value + 7.5. htable.dump htable + 7.6. htable.reload htable + 7.7. htable.listTables 8. Event routes @@ -134,9 +136,11 @@ Chapter 1. Admin Guide 7.1. htable.get htable key 7.2. htable.delete htable key - 7.3. htable.dump htable - 7.4. htable.reload htable - 7.5. htable.listTables + 7.3. htable.sets htable key value + 7.4. htable.seti htable key value + 7.5. htable.dump htable + 7.6. htable.reload htable + 7.7. htable.listTables 8. Event routes @@ -160,7 +164,7 @@ Chapter 1. Admin Guide You can read more about hash tables at: http://en.wikipedia.org/wiki/Hash_table. - The "name" can be a static string or can include pseudo- variables that + The “name” can be a static string or can include pseudo- variables that will be replaced at runtime. Example 1.1. Accessing $sht(htname=>key) @@ -183,7 +187,7 @@ $sht(a=>$ci::srcip) = $si; the failed authentications per user and one for storing the time of last authentication attempt. To ensure unique name per user, the hash table uses a combination of authentication username and text - "::auth_count" and "::last_auth". + “::auth_count” and “::last_auth”. Example 1.2. Dictionary attack limitation ... @@ -553,9 +557,11 @@ sht_rm_value_re("ha=>.*"); 7.1. htable.get htable key 7.2. htable.delete htable key - 7.3. htable.dump htable - 7.4. htable.reload htable - 7.5. htable.listTables + 7.3. htable.sets htable key value + 7.4. htable.seti htable key value + 7.5. htable.dump htable + 7.6. htable.reload htable + 7.7. htable.listTables 7.1. htable.get htable key @@ -589,7 +595,41 @@ kamcmd htable.get students daniel kamcmd htable.get students anna ... -7.3. htable.dump htable +7.3. htable.sets htable key value + + Set an item in hash table to string value. + + Name: htable.sets + + Parameters: + * htable : Name of the hash table + * key : Key name in the hash table + * Value : String value for the item + + Example: +... +# Set $sht(test=>x) +kamcmd htable.sets test x abc +... + +7.4. htable.seti htable key value + + Set an item in hash table to integer value. + + Name: htable.seti + + Parameters: + * htable : Name of the hash table + * key : Key name in the hash table + * Value : Integer value for the item + + Example: +... +# Set $sht(test=>x) +kamcmd htable.sets test x 123 +... + +7.5. htable.dump htable Lists all the values in a hash table @@ -603,7 +643,7 @@ kamcmd htable.get students anna kamcmd htable.dump ipban ... -7.4. htable.reload htable +7.6. htable.reload htable Reload hash table from database. @@ -617,7 +657,7 @@ kamcmd htable.dump ipban kamcmd htable.reload ipban ... -7.5. htable.listTables +7.7. htable.listTables Lists all defined tables diff --git a/modules/htable/doc/htable_admin.xml b/modules/htable/doc/htable_admin.xml index 978298f..ae7dc3d 100644 --- a/modules/htable/doc/htable_admin.xml +++ b/modules/htable/doc/htable_admin.xml @@ -733,6 +733,66 @@ kamcmd htable.get students anna ... </programlisting> </section> + <section> + <title> + <function moreinfo="none">htable.sets htable key value</function> + </title> + <para> + Set an item in hash table to string value. + </para> + <para> + Name: <emphasis>htable.sets</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable : Name of the hash table</para> + </listitem> + <listitem><para>key : Key name in the hash table</para> + </listitem> + <listitem><para>Value : String value for the item</para> + </listitem> + + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +# Set $sht(test=>x) +kamcmd htable.sets test x abc +... +</programlisting> + </section> + <section> + <title> + <function moreinfo="none">htable.seti htable key value</function> + </title> + <para> + Set an item in hash table to integer value. + </para> + <para> + Name: <emphasis>htable.seti</emphasis> + </para> + <para>Parameters:</para> + <itemizedlist> + <listitem><para>htable : Name of the hash table</para> + </listitem> + <listitem><para>key : Key name in the hash table</para> + </listitem> + <listitem><para>Value : Integer value for the item</para> + </listitem> + + </itemizedlist> + <para> + Example: + </para> +<programlisting format="linespecific"> +... +# Set $sht(test=>x) +kamcmd htable.sets test x 123 +... +</programlisting> + </section> <section> <title> <function moreinfo="none">htable.dump htable</function>

11 years, 5 months

[tracker] Task opened: ims_registrar_scscf: unexpected 200 OK response after calling assign_server_unreg()

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 - Camille Oudot (coudot) Attached to Project - sip-router Summary - ims_registrar_scscf: unexpected 200 OK response after calling assign_server_unreg() Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - High Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Calling assign_server_unreg() leads to an unexpected 200 OK response, that seems to be sent by the registrar module itself (a Service-Route header is added): SIP/2.0 200 OK Via: (...) Via: (...) From: "+33XXXXXXXXX" <sip:+33XXXXXXXXX@(...)>;tag=as1202e009 To: <sip:+33YYYYYYYYY@(...)>;tag=d076ed28abef1b854449e88a91b18042-9f9b Call-ID: 3e2203d25ce6ed30692ab44508d1eef7@(...):5060 CSeq: 102 INVITE Service-Route: <sip:orig@scscf1.xxxxx.net;lr> Server: SCSCF OIC G01R01C00 Content-Length: 0 No response should be sent by the ims_registrar_scscf module for this particular function. The response should probably be sent later by the script or an application server. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=309 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.

11 years, 5 months

[tracker] User took ownership: Crash in ims_registrar_scscf caused by log

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Jason Penton has taken ownership of the following task: FS#305 - Crash in ims_registrar_scscf caused by log More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=305 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.

11 years, 5 months

[tracker] User took ownership: P-Served-User header on IMS ISC interface

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Jason Penton has taken ownership of the following task: FS#308 - P-Served-User header on IMS ISC interface More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=308 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.

11 years, 5 months

[tracker] User took ownership: Segfault in ims_auth's ims_proxy_authenticate function when IMPU != IMPI

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Jason Penton has taken ownership of the following task: FS#304 - Segfault in ims_auth's ims_proxy_authenticate function when IMPU != IMPI More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=304 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.

11 years, 5 months

[tracker] Task opened: P-Served-User header on IMS ISC interface (Attachment added)

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 - Camille Oudot (coudot) Attached to Project - sip-router Summary - P-Served-User header on IMS ISC interface Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Medium Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi, I have made a patch for the ims_isc module to add support for P-Served-User header on the ISC interface. This header allows a triggered Application Server to know the IMS user for who it was triggered, and in what state (originating/terminating, registered/unregistered). Our application servers can't live without it. Moreover, this header have been normalized in RFC 5502, so it would be nice to support it in ims_isc. This patch doesn't do anything complicated, only text formating, since all required informations were available in the module's internal data. 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=308 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.

11 years, 5 months

Dialog onroute requests.

by Eduardo Lejarreta

Good evening. Playing with latest "dialog module" versions (3.2, 3.3 and 4.0) I think there could be an open "issue" with regard to dialog state management. You can see on "dlg_handlers.c" on "dlg_onroute" function. On this last when you receive a BYE message it fires some CallBacks. I you receive a close second BYE, this last one destroys the dialog because "dlg_release" function is called from a parallel process avoiding the other processes callback execution. I know a second BYE it's not a normal circumstance but you know, the real world . I think dialog_ng doesn't have this issue but also it has no DB support. Thanks and regards. -- Eduardo Lejarreta.

11 years, 5 months

← Newer
1
...
17
18
19
20
21
22
23
24
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2013