sr-dev March 2012

sr-dev@lists.kamailio.org

26 participants
149 discussions

git:master: modules_k/pua: PUA DB-only mode performance improvements
by Peter Dunkley 19 Mar '12

19 Mar '12

Module: sip-router Branch: master Commit: 888d1d5644a38e8c36ed706ee51015984971cc5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=888d1d5… Author: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Committer: Peter Dunkley <peter.dunkley(a)crocodile-rcs.com> Date: Mon Mar 19 15:54:23 2012 +0000 modules_k/pua: PUA DB-only mode performance improvements - When the PUA DB-only mode was implemented it was designed to do (as close as possible) exactly what the hash-table mode did in the same way the hash-table mode did it. This means lots of hash-table lookups (which are fast) result in lots of DB selects (which are slow). It also means where an entry is found in the hash-table and modified in place, in DB mode a select must be done and then an update. A lot of these DB transactions are not strictly necessary, and often fields were retrieved or updated in the DB even when they hadn't changed. - This change refactors the DB-only code (in pua_db.c) and re-orders the functional code (in send_(publish|subscribe).c) to make the DB operations as simple as possible and as few as few as possible. --- modules_k/pua/pua_db.c | 882 +++++++++++++++++----------------------- modules_k/pua/pua_db.h | 16 +- modules_k/pua/send_publish.c | 157 ++++---- modules_k/pua/send_subscribe.c | 298 +++++--------- 4 files changed, 571 insertions(+), 782 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=888…

1 0

git:master: xmpp: readme updated with more details about how the module operates
by Daniel-Constantin Mierla 19 Mar '12

19 Mar '12

Module: sip-router Branch: master Commit: d34b5c98a24ac0ca0d7ae2e0c6f1dda059ebdbaf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d34b5c9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 19 15:10:08 2012 +0100 xmpp: readme updated with more details about how the module operates - added the gwmap parameter --- modules_k/xmpp/README | 81 +++++++++++++----- modules_k/xmpp/doc/xmpp_admin.xml | 173 +++++++++++++++++++++++++++++------- 2 files changed, 199 insertions(+), 55 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=d34…

1 0

git:master: xmpp: new parameter gwmap for sip-xmpp domain translation
by Daniel-Constantin Mierla 19 Mar '12

19 Mar '12

Module: sip-router Branch: master Commit: 671ce93e7e51a0a01c5675bac154f3dfaec6c3fb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=671ce93… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 19 14:09:40 2012 +0100 xmpp: new parameter gwmap for sip-xmpp domain translation - gwmap can get a valus as a list of 'sipdomain1=xmppdomain1;...;sipdomainN=xmppdomainN' - whenever a sip-to-xmpp message is sent, any matching sipdomain in src or dst address is translated to appropiate xmppdomain - the other way around, when a xmpp-to-sip message is sent, then any matching xmpp domain in src or dst address is translated to appropiate sip domain - this allow getting rid of the URI encoding with delimiter - if a domain is not found, the src/dst domains are preserved as they are in SIP to XMPP and vice versa - if the xmppdomain is not provided explicitely, sipdomain is considered to be also the xmpp domain --- modules_k/xmpp/util.c | 203 ++++++++++++++++++++++++++++++++++++++++--------- modules_k/xmpp/xmpp.c | 40 ++++++++++ modules_k/xmpp/xode.h | 3 +- 3 files changed, 210 insertions(+), 36 deletions(-) diff --git a/modules_k/xmpp/util.c b/modules_k/xmpp/util.c index bdce7f6..143b170 100644 --- a/modules_k/xmpp/util.c +++ b/modules_k/xmpp/util.c @@ -34,16 +34,21 @@ #include "xmpp.h" #include "../../parser/parse_uri.h" +#include "../../parser/parse_param.h" -/*! \brief decode sip:user*domain1\@domain2 -> user\@domain1 - \note In many kinds of gateway scenarios, the % sign is a common character used - See the MSN XMPP transports for an example. +extern param_t *_xmpp_gwmap_list; + +/*! \brief decode sip:user*domain1\@domain2 -> user\@domain1 + * or based on gwmap sip:user\@sipdomain -> user\@xmppdomain + * \note In many kinds of gateway scenarios, the % sign is a common character used + * See the MSN XMPP transports for an example. */ char *decode_uri_sip_xmpp(char *uri) { - struct sip_uri puri; + sip_uri_t puri; static char buf[512]; char *p; + param_t *it = NULL; if (!uri) return NULL; @@ -51,21 +56,43 @@ char *decode_uri_sip_xmpp(char *uri) LM_ERR("failed to parse URI\n"); return NULL; } - strncpy(buf, puri.user.s, sizeof(buf)); - buf[puri.user.len] = 0; + if(_xmpp_gwmap_list==0) + { + strncpy(buf, puri.user.s, sizeof(buf)); + buf[puri.user.len] = 0; - /* replace domain separator */ - if ((p = strchr(buf, domain_separator))) - *p = '@'; - + /* replace domain separator */ + if ((p = strchr(buf, domain_separator))) + *p = '@'; + } else { + for(it=_xmpp_gwmap_list; it; it=it->next) + { + if(it->name.len==puri.host.len + && strncasecmp(it->name.s, puri.host.s, it->name.len)==0) + { + break; + } + } + if(it && it->body.len>0) + { + snprintf(buf, 512, "%.*s(a)%.*s", puri.user.len, puri.user.s, + it->body.len, it->body.s); + } else { + snprintf(buf, 512, "%.*s(a)%.*s", puri.user.len, puri.user.s, + puri.host.len, puri.host.s); + } + } return buf; } -/*! \brief encode sip:user\@domain -> user*domain\@xmpp_domain */ +/*! \brief encode sip:user\@domain -> user*domain\@xmpp_domain + * or based on gwmap sip:user\@sipdomain -> user\@xmppdomain + */ char *encode_uri_sip_xmpp(char *uri) { - struct sip_uri puri; + sip_uri_t puri; static char buf[512]; + param_t *it = NULL; if (!uri) return NULL; @@ -73,51 +100,157 @@ char *encode_uri_sip_xmpp(char *uri) LM_ERR("failed to parse URI\n"); return NULL; } - snprintf(buf, sizeof(buf), "%.*s%c%.*s@%s", - puri.user.len, puri.user.s, - domain_separator, - puri.host.len, puri.host.s, - xmpp_domain); + if(_xmpp_gwmap_list==0) + { + snprintf(buf, sizeof(buf), "%.*s%c%.*s@%s", + puri.user.len, puri.user.s, + domain_separator, + puri.host.len, puri.host.s, + xmpp_domain); + } else { + for(it=_xmpp_gwmap_list; it; it=it->next) + { + if(it->name.len==puri.host.len + && strncasecmp(it->name.s, puri.host.s, it->name.len)==0) + { + break; + } + } + if(it && it->body.len>0) + { + snprintf(buf, 512, "%.*s(a)%.*s", puri.user.len, puri.user.s, + it->body.len, it->body.s); + } else { + snprintf(buf, 512, "%.*s(a)%.*s", puri.user.len, puri.user.s, + puri.host.len, puri.host.s); + } + } return buf; } -/*! \brief decode user*domain1\@domain2 -> sip:user\@domain1 */ +/*! \brief decode user*domain1\@domain2 -> sip:user\@domain1 + * or based on gwmap sip:user\@xmppdomain -> user\@sipdomain + */ char *decode_uri_xmpp_sip(char *jid) { static char buf[512]; char *p; + char tbuf[512]; + sip_uri_t puri; + str sd; + param_t *it = NULL; if (!jid) return NULL; - snprintf(buf, sizeof(buf), "sip:%s", jid); - /* strip off resource */ - if ((p = strchr(buf, '/'))) - *p = 0; - /* strip off domain */ - if ((p = strchr(buf, '@'))) - *p = 0; - /* replace domain separator */ - if ((p = strchr(buf, domain_separator))) - *p = '@'; + if(_xmpp_gwmap_list==0) + { + snprintf(buf, sizeof(buf), "sip:%s", jid); + + /* strip off resource */ + if ((p = strchr(buf, '/'))) + *p = 0; + /* strip off domain */ + if ((p = strchr(buf, '@'))) + *p = 0; + /* replace domain separator */ + if ((p = strchr(buf, domain_separator))) + *p = '@'; + } else { + snprintf(tbuf, sizeof(tbuf), "sip:%s", jid); + + /* strip off resource */ + if ((p = strchr(tbuf, '/'))) + *p = 0; + if (parse_uri(tbuf, strlen(tbuf), &puri) < 0) { + LM_ERR("failed to parse URI\n"); + return NULL; + } + for(it=_xmpp_gwmap_list; it; it=it->next) + { + if(it->body.len>0) + { + sd = it->body; + } else { + sd = it->name; + } + if(sd.len==puri.host.len + && strncasecmp(sd.s, puri.host.s, sd.len)==0) + { + break; + } + } + if(it) + { + snprintf(buf, 512, "sip:%.*s@%.*s", puri.user.len, puri.user.s, + it->name.len, it->name.s); + } else { + snprintf(buf, 512, "sip:%.*s@%.*s", puri.user.len, puri.user.s, + puri.host.len, puri.host.s); + } + } return buf; } -/*! \brief encode user\@domain -> sip:user*domain\@gateway_domain */ +/*! \brief encode user\@domain -> sip:user*domain\@gateway_domain + * or based on gwmap sip:user\@xmppdomain -> user\@sipdomain + */ char *encode_uri_xmpp_sip(char *jid) { static char buf[512]; char *p; + char tbuf[512]; + sip_uri_t puri; + str sd; + param_t *it = NULL; if (!jid) return NULL; - /* TODO: maybe not modify jid? */ - if ((p = strchr(jid, '/'))) - *p = 0; - if ((p = strchr(jid, '@'))) - *p = domain_separator; - snprintf(buf, sizeof(buf), "sip:%s@%s", jid, gateway_domain); + + if(_xmpp_gwmap_list==0) + { + /* TODO: maybe not modify jid? */ + if ((p = strchr(jid, '/'))) + *p = 0; + if ((p = strchr(jid, '@'))) + *p = domain_separator; + snprintf(buf, sizeof(buf), "sip:%s@%s", jid, gateway_domain); + } else { + snprintf(tbuf, sizeof(tbuf), "sip:%s", jid); + + /* strip off resource */ + if ((p = strchr(tbuf, '/'))) + *p = 0; + if (parse_uri(tbuf, strlen(tbuf), &puri) < 0) { + LM_ERR("failed to parse URI\n"); + return NULL; + } + for(it=_xmpp_gwmap_list; it; it=it->next) + { + if(it->body.len>0) + { + sd = it->body; + } else { + sd = it->name; + } + if(sd.len==puri.host.len + && strncasecmp(sd.s, puri.host.s, sd.len)==0) + { + break; + } + } + if(it) + { + snprintf(buf, 512, "sip:%.*s@%.*s", puri.user.len, puri.user.s, + it->name.len, it->name.s); + } else { + snprintf(buf, 512, "sip:%.*s@%.*s", puri.user.len, puri.user.s, + puri.host.len, puri.host.s); + } + + } + return buf; } diff --git a/modules_k/xmpp/xmpp.c b/modules_k/xmpp/xmpp.c index ad087e4..98ba4cf 100644 --- a/modules_k/xmpp/xmpp.c +++ b/modules_k/xmpp/xmpp.c @@ -117,6 +117,7 @@ #include "../../parser/msg_parser.h" #include "../../parser/parse_content.h" #include "../../parser/parse_from.h" +#include "../../parser/parse_param.h" #include "../../modules/tm/tm_load.h" #include "../../cfg/cfg_struct.h" @@ -139,6 +140,8 @@ static int child_init(int rank); static void xmpp_process(int rank); static int cmd_send_message(struct sip_msg* msg, char* _foo, char* _bar); +int xmpp_gwmap_param(modparam_t type, void *val); + static int pipe_fds[2] = {-1,-1}; /* @@ -154,6 +157,8 @@ int xmpp_port = 0; char *xmpp_password = "secret"; str outbound_proxy= {0, 0}; +param_t *_xmpp_gwmap_list = NULL; + #define DEFAULT_COMPONENT_PORT 5347 #define DEFAULT_SERVER_PORT 5269 @@ -184,6 +189,7 @@ static param_export_t params[] = { { "xmpp_port", INT_PARAM, &xmpp_port }, { "xmpp_password", STR_PARAM, &xmpp_password }, { "outbound_proxy", STR_PARAM, &outbound_proxy.s}, + { "gwmap", STR_PARAM|USE_FUNC_PARAM, (void*)xmpp_gwmap_param}, {0, 0, 0} }; @@ -484,3 +490,37 @@ int xmpp_send_xnotify(str *from, str *to, str *msg, str *id) return xmpp_send_pipe_cmd(XMPP_PIPE_SEND_PNOTIFY, from, to, msg, id); } +/*! + * + */ +int xmpp_gwmap_param(modparam_t type, void *val) +{ + str inv; + param_hooks_t phooks; + param_t *params = NULL; + param_t *it = NULL; + + if(val==NULL) + return -1; + inv.s = (char*)val; + inv.len = strlen(inv.s); + if(inv.len<=0) + return -1; + + if(inv.s[inv.len-1]==';') + inv.len--; + if (parse_params(&inv, CLASS_ANY, &phooks, &params)<0) + { + LM_ERR("failed parsing params value\n"); + return -1; + } + if(_xmpp_gwmap_list==NULL) + { + _xmpp_gwmap_list = params; + } else { + it = _xmpp_gwmap_list; + while(it->next) it = it->next; + it->next = params; + } + return 0; +} diff --git a/modules_k/xmpp/xode.h b/modules_k/xmpp/xode.h index d1b3b52..2e009c1 100644 --- a/modules_k/xmpp/xode.h +++ b/modules_k/xmpp/xode.h @@ -71,7 +71,7 @@ extern "C" { #endif - +#ifndef __OS_darwin #ifndef HAVE_SNPRINTF extern int ap_snprintf(char *, size_t, const char *, ...); #define snprintf ap_snprintf @@ -81,6 +81,7 @@ extern int ap_snprintf(char *, size_t, const char *, ...); extern int ap_vsnprintf(char *, size_t, const char *, va_list ap); #define vsnprintf ap_vsnprintf #endif +#endif /* --------------------------------------------------------- */ /* */

1 0

git:master: xmpp: added clarification about xmpp server mode
by Daniel-Constantin Mierla 19 Mar '12

19 Mar '12

Module: sip-router Branch: master Commit: d37b62d269f499ea817ef2bba1e9b3c9cc5506cc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d37b62d… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Mar 19 11:22:11 2012 +0100 xmpp: added clarification about xmpp server mode - make it more clear that it is not a full xmpp server implementation, but more like an xmpp server connector --- modules_k/xmpp/README | 23 +++++++++++++---------- modules_k/xmpp/doc/xmpp_admin.xml | 2 +- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/modules_k/xmpp/README b/modules_k/xmpp/README index 99cd471..d352a2d 100644 --- a/modules_k/xmpp/README +++ b/modules_k/xmpp/README @@ -10,7 +10,7 @@ Edited by Andreea Spirea - Copyright © 2006 Voice Sistem SRL + Copyright � 2006 Voice Sistem SRL __________________________________________________________________ Table of Contents @@ -91,12 +91,15 @@ Chapter 1. Admin Guide your XMPP services. The connection is done over TCP/IP with authorization. * XMPP Server. In this mode, the Kamailio XMPP module is a - stand-alone XMPP server, with no requirement for another XMPP - server in the system. This server uses XMPP S2S (Server to Server) - connections to connect to other XMPP servers or receive connections - from other servers. NOTE: this is limited implementation of a XMPP - server, it does not support SRV or TLS so far. This mode is in beta - stage for the moment. + stand-alone XMPP server connector, with no requirement for another + XMPP server in the system. This server uses XMPP S2S (Server to + Server) connections to connect to other XMPP servers or receive + connections from other servers. NOTE: this is limited + implementation of a XMPP server, it does not support SRV or TLS so + far. Also, in this mode it cannot get XMPP clients connected, only + XMPP servers (in other words, you cannot use it to replace an XMPP + full server implementation). This mode is in beta stage for the + moment. In the component mode, you need a local XMPP server (recommended Jabberd2). The XMPP module will connect by using TCP/IP connection to @@ -146,11 +149,11 @@ Chapter 1. Admin Guide In both cases, the destination address must have the same pattern: - “sip:username<delim>jabber_server@gateway_domain” + "sip:username<delim>jabber_server@gateway_domain" From a jabber client's point of view, the destination will look like: - “sip_username<delim>openser_domain@xmpp_domain” + "sip_username<delim>openser_domain@xmpp_domain" 2. Dependencies @@ -301,7 +304,7 @@ Chapter 1. Admin Guide 4.1. xmpp_send_message() -4.1. xmpp_send_message() +4.1. xmpp_send_message() Converts SIP messages to XMPP(jabber) messages, in order to be relayed to a XMPP(jabber) client. diff --git a/modules_k/xmpp/doc/xmpp_admin.xml b/modules_k/xmpp/doc/xmpp_admin.xml index 10dcf3c..6397d0c 100644 --- a/modules_k/xmpp/doc/xmpp_admin.xml +++ b/modules_k/xmpp/doc/xmpp_admin.xml @@ -24,7 +24,7 @@ <para> <emphasis role='bold'>XMPP Component Mode</emphasis>. In this mode, &kamailio; connects to an XMPP server using the standardized XMPP component interface, extending your XMPP services. The connection is done over TCP/IP with authorization.</para> </listitem> <listitem> - <para><emphasis role='bold'>XMPP Server</emphasis>. In this mode, the &kamailio; XMPP module is a stand-alone XMPP server, with no requirement for another XMPP server in the system. This server uses XMPP S2S (Server to Server) connections to connect to other XMPP servers or receive connections from other servers. NOTE: this is limited implementation of a XMPP server, it does not support SRV or TLS so far. This mode is in beta stage for the moment.</para> + <para><emphasis role='bold'>XMPP Server</emphasis>. In this mode, the &kamailio; XMPP module is a stand-alone XMPP server connector, with no requirement for another XMPP server in the system. This server uses XMPP S2S (Server to Server) connections to connect to other XMPP servers or receive connections from other servers. NOTE: this is limited implementation of a XMPP server, it does not support SRV or TLS so far. Also, in this mode it cannot get XMPP clients connected, only XMPP servers (in other words, you cannot use it to replace an XMPP full server implementation). This mode is in beta stage for the moment.</para> </listitem> </itemizedlist> <para> In the component mode, you need a local XMPP server (recommended Jabberd2). The XMPP module will connect by using TCP/IP connection to the local jabber server. The documentation and the source for Jabberd server are located at the following link:

1 0

git:master: diversion(k): added optional uri parameter to add_diversion()
by Daniel-Constantin Mierla 16 Mar '12

16 Mar '12

Module: sip-router Branch: master Commit: ef6b531dfaf08476932d44b23c82b94e0f06a86a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef6b531… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Mar 16 18:36:37 2012 +0100 diversion(k): added optional uri parameter to add_diversion() - both parameters can be now PVs --- modules_k/diversion/README | 24 ++++++++++------ modules_k/diversion/diversion.c | 41 ++++++++++++++++++-------- modules_k/diversion/doc/diversion_admin.xml | 16 ++++++++-- 3 files changed, 55 insertions(+), 26 deletions(-) diff --git a/modules_k/diversion/README b/modules_k/diversion/README index 81111fa..ff9d75d 100644 --- a/modules_k/diversion/README +++ b/modules_k/diversion/README @@ -8,7 +8,7 @@ Edited by Jan Janak - Copyright © 2004 FhG FOKUS + Copyright � 2004 FhG FOKUS __________________________________________________________________ Table of Contents @@ -27,7 +27,7 @@ Jan Janak 4. Functions - 4.1. add_diversion(reason) + 4.1. add_diversion(reason [, uri]) 5. Diversion Example @@ -54,7 +54,7 @@ Chapter 1. Admin Guide 4. Functions - 4.1. add_diversion(reason) + 4.1. add_diversion(reason [, uri]) 5. Diversion Example @@ -95,31 +95,37 @@ Warning the parameter to specify additional parameters to be added to the header field, see the example. - Default value is “” (empty string). + Default value is "" (empty string). Example 1.1. suffix usage modparam("diversion", "suffix", ";privacy=full") 4. Functions - 4.1. add_diversion(reason) + 4.1. add_diversion(reason [, uri]) -4.1. add_diversion(reason) +4.1. add_diversion(reason [, uri]) The function adds a new diversion header field before any other existing Diversion header field in the message (the newly added Diversion header field will become the topmost Diversion header field). - The inbound (without any modifications done by the proxy server) - Request-URI will be used as the Diversion URI. + If 'uri' parameter is missing, the inbound (without any modifications + done by the proxy server) Request-URI will be used as the Diversion + URI. Meaning of the parameters is as follows: * reason - The reason string to be added as the reason parameter + * uri - The URI to be set in Diversion header - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + The parameters can contain pseudo-variables. + + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, + BRANCH_ROUTE. Example 1.2. add_diversion usage ... add_diversion("user-busy"); +add_diversion("user-busy", "$ru"); ... 5. Diversion Example diff --git a/modules_k/diversion/diversion.c b/modules_k/diversion/diversion.c index 06f3c43..46a51ae 100644 --- a/modules_k/diversion/diversion.c +++ b/modules_k/diversion/diversion.c @@ -48,7 +48,7 @@ MODULE_VERSION str suffix = {"", 0}; -int add_diversion(struct sip_msg* msg, char* r, char* s); +int add_diversion(struct sip_msg* msg, char* r, char* u); /* * Module initialization function prototype @@ -60,8 +60,10 @@ static int mod_init(void); * Exported functions */ static cmd_export_t cmds[] = { - {"add_diversion", (cmd_function)add_diversion, 1, fixup_str_null, - 0, REQUEST_ROUTE|FAILURE_ROUTE|LOCAL_ROUTE}, + {"add_diversion", (cmd_function)add_diversion, 1, fixup_spve_null, + 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, + {"add_diversion", (cmd_function)add_diversion, 2, fixup_spve_spve, + 0, REQUEST_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE}, {0, 0, 0, 0, 0, 0} }; @@ -136,18 +138,31 @@ static inline int add_diversion_helper(struct sip_msg* msg, str* s) } -int add_diversion(struct sip_msg* msg, char* r, char* s) +int add_diversion(struct sip_msg* msg, char* r, char* u) { str div_hf; char *at; - str* uri; - str* reason; + str uri; + str reason; + + if(fixup_get_svalue(msg, (gparam_t*)r, &reason)<0) + { + LM_ERR("cannot get the script\n"); + return -1; + } - reason = (str*)r; - uri = &msg->first_line.u.request.uri; + if(u==NULL) { + uri = msg->first_line.u.request.uri; + } else { + if(fixup_get_svalue(msg, (gparam_t*)u, &uri)<0) + { + LM_ERR("cannot get the uri parameter\n"); + return -1; + } + } - div_hf.len = DIVERSION_PREFIX_LEN + uri->len + DIVERSION_SUFFIX_LEN + reason->len + CRLF_LEN; + div_hf.len = DIVERSION_PREFIX_LEN + uri.len + DIVERSION_SUFFIX_LEN + reason.len + CRLF_LEN; div_hf.s = pkg_malloc(div_hf.len); if (!div_hf.s) { LM_ERR("no pkg memory left\n"); @@ -158,14 +173,14 @@ int add_diversion(struct sip_msg* msg, char* r, char* s) memcpy(at, DIVERSION_PREFIX, DIVERSION_PREFIX_LEN); at += DIVERSION_PREFIX_LEN; - memcpy(at, uri->s, uri->len); - at += uri->len; + memcpy(at, uri.s, uri.len); + at += uri.len; memcpy(at, DIVERSION_SUFFIX, DIVERSION_SUFFIX_LEN); at += DIVERSION_SUFFIX_LEN; - memcpy(at, reason->s, reason->len); - at += reason->len; + memcpy(at, reason.s, reason.len); + at += reason.len; memcpy(at, CRLF, CRLF_LEN); diff --git a/modules_k/diversion/doc/diversion_admin.xml b/modules_k/diversion/doc/diversion_admin.xml index 3ddd1bf..81cb428 100644 --- a/modules_k/diversion/doc/diversion_admin.xml +++ b/modules_k/diversion/doc/diversion_admin.xml @@ -73,13 +73,13 @@ modparam("diversion", "suffix", ";privacy=full") <section> <title>Functions</title> <section> - <title><function moreinfo="none">add_diversion(reason)</function></title> + <title><function moreinfo="none">add_diversion(reason [, uri])</function></title> <para> The function adds a new diversion header field before any other existing Diversion header field in the message (the newly added Diversion header field will become the topmost Diversion header field). - The inbound (without any modifications done by the - proxy server) Request-URI will be used as the Diversion URI. + If 'uri' parameter is missing, the inbound (without any modifications done + by the proxy server) Request-URI will be used as the Diversion URI. </para> <para>Meaning of the parameters is as follows:</para> <itemizedlist> @@ -88,15 +88,23 @@ modparam("diversion", "suffix", ";privacy=full") as the reason parameter </para> </listitem> + <listitem> + <para><emphasis>uri</emphasis> - The URI to be set in Diversion header + </para> + </listitem> </itemizedlist> <para> - This function can be used from REQUEST_ROUTE, FAILURE_ROUTE. + The parameters can contain pseudo-variables. + </para> + <para> + This function can be used from REQUEST_ROUTE, FAILURE_ROUTE, BRANCH_ROUTE. </para> <example> <title><function moreinfo="none">add_diversion</function> usage</title> <programlisting format="linespecific"> ... add_diversion("user-busy"); +add_diversion("user-busy", "$ru"); ... </programlisting> </example>

1 0

git:master: modules_k/presence Fixed last commit - use_table before delete
by Anca Vamanu 16 Mar '12

16 Mar '12

Module: sip-router Branch: master Commit: 78e7405eb227f684e156466b55335f401d17a139 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78e7405… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Fri Mar 16 13:52:49 2012 +0200 modules_k/presence Fixed last commit - use_table before delete Reported by Peter Dunkley --- modules_k/presence/presentity.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules_k/presence/presentity.c b/modules_k/presence/presentity.c index bb69df6..368afc5 100644 --- a/modules_k/presence/presentity.c +++ b/modules_k/presence/presentity.c @@ -503,6 +503,12 @@ after_dialog_check: goto error; } + if (pa_dbf.use_table(pa_db, &presentity_table) < 0) + { + LM_ERR("unsuccessful use table sql operation\n"); + goto error; + } + LM_DBG("expires =0 -> deleting from database\n"); if(pa_dbf.delete(pa_db,query_cols,0,query_vals,n_query_cols)<0) {

2 1

git:master: modules_k/presence Used affected_rows SQL statement
by Anca Vamanu 16 Mar '12

16 Mar '12

Module: sip-router Branch: master Commit: 42f2d990d022cb67b051ac563ee8cde916a0d14a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=42f2d99… Author: Dragos Dinu <dragos.dinu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Tue Mar 13 11:33:06 2012 +0200 modules_k/presence Used affected_rows SQL statement In case affected_rows function is available in the DB driver, this function is used instead of an extra query in presentity table that only verified if the record existed. Patch author Dragos Dinu <dragos.dinu(a)1and1.ro> --- modules_k/presence/presentity.c | 436 ++++++++++++++++++++++---------------- 1 files changed, 252 insertions(+), 184 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=42f…

2 6

git:3.2: modules_k/dialog: fix dlg_var return-value in case of an empty result.
by Sven Knoblich 16 Mar '12

16 Mar '12

Module: sip-router Branch: 3.2 Commit: 29fec623839ece4e4521995b5cd9fbf1d1c0ae5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=29fec62… Author: Sven Knoblich <sven.knoblich(a)1und1.de> Committer: Sven Knoblich <sven.knoblich(a)1und1.de> Date: Fri Mar 16 10:40:56 2012 +0100 modules_k/dialog: fix dlg_var return-value in case of an empty result. - replace 0 with pv_get_null(...) (cherry picked from commit eec1c60cb518aa2d37216fb00ef4a2910623c53e) --- modules_k/dialog/dlg_var.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 31afc10..ac0bdf9 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -306,7 +306,7 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, value); - return 0; + return pv_get_null(msg, param, res); } int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val)

1 0

git:master: modules_k/dialog: fix dlg_var return-value in case of an empty result.
by Sven Knoblich 16 Mar '12

16 Mar '12

Module: sip-router Branch: master Commit: eec1c60cb518aa2d37216fb00ef4a2910623c53e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=eec1c60… Author: Sven Knoblich <sven.knoblich(a)1und1.de> Committer: Sven Knoblich <sven.knoblich(a)1und1.de> Date: Fri Mar 16 10:40:56 2012 +0100 modules_k/dialog: fix dlg_var return-value in case of an empty result. - replace 0 with pv_get_null(...) --- modules_k/dialog/dlg_var.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index d7645b8..dfccdd2 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -306,7 +306,7 @@ int pv_get_dlg_variable(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) return pv_get_strval(msg, param, res, value); - return 0; + return pv_get_null(msg, param, res); } int pv_set_dlg_variable(struct sip_msg* msg, pv_param_t *param, int op, pv_value_t *val)

1 0

git:master: modules_k/presence Added an index to active_watchers table
by Anca Vamanu 15 Mar '12

15 Mar '12

Module: sip-router Branch: master Commit: 25ce428ab1b165654e35b3433060beab0effdd9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=25ce428… Author: Anca Vamanu <anca.vamanu(a)1and1.ro> Committer: Anca Vamanu <anca.vamanu(a)1and1.ro> Date: Thu Mar 15 18:47:56 2012 +0200 modules_k/presence Added an index to active_watchers table For DB_ONLY mode an index on presentity_uri is needed. (Used for queries when sending Notifies as a consequence of a received Publish) --- lib/srdb1/schema/pr_active_watchers.xml | 6 ++++++ utils/kamctl/db_sqlite/presence-create.sql | 1 + utils/kamctl/mysql/presence-create.sql | 1 + utils/kamctl/oracle/presence-create.sql | 1 + utils/kamctl/postgres/presence-create.sql | 1 + 5 files changed, 10 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/schema/pr_active_watchers.xml b/lib/srdb1/schema/pr_active_watchers.xml index 73d5e2f..b638e0d 100644 --- a/lib/srdb1/schema/pr_active_watchers.xml +++ b/lib/srdb1/schema/pr_active_watchers.xml @@ -185,4 +185,10 @@ <colref linkend="expires"/> </index> + <index> + <name>active_watchers_pres</name> + <colref linkend="presentity_uri"/> + <description>This index is needed only if you use DB_ONLY mode.</description> + </index> + </table> diff --git a/utils/kamctl/db_sqlite/presence-create.sql b/utils/kamctl/db_sqlite/presence-create.sql index 8a4a07c..24d12b2 100644 --- a/utils/kamctl/db_sqlite/presence-create.sql +++ b/utils/kamctl/db_sqlite/presence-create.sql @@ -42,6 +42,7 @@ CREATE TABLE active_watchers ( ); CREATE INDEX active_watchers_active_watchers_expires ON active_watchers (expires); +CREATE INDEX active_watchers_active_watchers_pres ON active_watchers (presentity_uri); INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( diff --git a/utils/kamctl/mysql/presence-create.sql b/utils/kamctl/mysql/presence-create.sql index 1ba1e05..7a03705 100644 --- a/utils/kamctl/mysql/presence-create.sql +++ b/utils/kamctl/mysql/presence-create.sql @@ -42,6 +42,7 @@ CREATE TABLE active_watchers ( ) ENGINE=MyISAM; CREATE INDEX active_watchers_expires ON active_watchers (expires); +CREATE INDEX active_watchers_pres ON active_watchers (presentity_uri); INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( diff --git a/utils/kamctl/oracle/presence-create.sql b/utils/kamctl/oracle/presence-create.sql index 2e9c932..e445dca 100644 --- a/utils/kamctl/oracle/presence-create.sql +++ b/utils/kamctl/oracle/presence-create.sql @@ -58,6 +58,7 @@ END active_watchers_tr; BEGIN map2users('active_watchers'); END; / CREATE INDEX ORA_active_watchers_expires ON active_watchers (expires); +CREATE INDEX ORA_active_watchers_pres ON active_watchers (presentity_uri); INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers ( diff --git a/utils/kamctl/postgres/presence-create.sql b/utils/kamctl/postgres/presence-create.sql index 8be1dcc..b36a407 100644 --- a/utils/kamctl/postgres/presence-create.sql +++ b/utils/kamctl/postgres/presence-create.sql @@ -42,6 +42,7 @@ CREATE TABLE active_watchers ( ); CREATE INDEX active_watchers_active_watchers_expires ON active_watchers (expires); +CREATE INDEX active_watchers_active_watchers_pres ON active_watchers (presentity_uri); INSERT INTO version (table_name, table_version) values ('watchers','3'); CREATE TABLE watchers (

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
15
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev March 2012