sr-dev May 2013

sr-dev@lists.kamailio.org

29 participants
317 discussions

Using GRUU and outbound
by Peter Dunkley 03 May '13

03 May '13

Based on the discussions about outbound and in-dialog routing it seems like we need to use GRUU and live with the fact that the route-set changes (in breach of RFC 3261). Can anyone share a Kamailio registrar configuration that uses GRUU to look-up in-dialog requests (preferably one that makes use of t_load_contacts(), t_next_contact(), and t_next_contact_flow())? Regards, Peter

5 17

path module rewrite/additions
by Richard Fuchs 03 May '13

03 May '13

Hello, Since this is a significant rewrite of an existing module, I'd like to ask if anyone has any objections against committing the attached patch. Functionally, it adds a second parameter to add_path() and add_path_received(), enabling the script writer to include arbitrary additional URI parameters in the Path header. It also adds support for SPVE for all parameters. Code wise, it rewrites most parts of prepend_path() to make the code more streamlined, use fewer memory chunks and lumps and (hopefully) make the code easier to read, shorter, and easier to extend in the future. I'm attaching the new path.c as well for readability. I haven't included the updates to docs. cheers

2 2

git:master: modules/rls: added support for escaped chars in rls-services document
by Juha Heinanen 03 May '13

03 May '13

Module: sip-router Branch: master Commit: fa9b8664a3b7c7a035c738a37b8ef0ef44190cb8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa9b866… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri May 3 19:53:12 2013 +0300 modules/rls: added support for escaped chars in rls-services document --- modules/rls/notify.c | 61 ++++++++++++++++++++++++---------------------- modules/rls/subscribe.c | 46 +++++++++++++++++++++++++++------- modules/rls/utils.c | 54 +++++++++++++++++++++++++++++++++++++++++ modules/rls/utils.h | 31 ++++++++++++++++++++++++ 4 files changed, 153 insertions(+), 39 deletions(-) diff --git a/modules/rls/notify.c b/modules/rls/notify.c index f0ec0aa..7b5bec3 100644 --- a/modules/rls/notify.c +++ b/modules/rls/notify.c @@ -48,6 +48,7 @@ #include "../../hashes.h" #include "rls.h" #include "notify.h" +#include "utils.h" #include <libxml/xpath.h> #include <libxml/xpathInternals.h> @@ -1003,7 +1004,7 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, list_func_t function, void* param) { xmlNodePtr node; - char* uri = NULL; + str uri; int res = 0; for(node= list_node->children; node; node= node->next) @@ -1014,16 +1015,33 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, unsigned short port = 0; xmlNodePtr rl_node = NULL; xmlDocPtr rl_doc = NULL; + str unescaped_uri; + char buf[MAX_URI_SIZE]; + - uri= XMLNodeGetNodeContentByName(node, "resource-list", NULL); - - if (uri == NULL) + uri.s = XMLNodeGetNodeContentByName(node, "resource-list", NULL); + if (uri.s == NULL) { LM_ERR("when extracting URI from node\n"); return -1; } + uri.len = strlen(uri.s); + if (uri.len > MAX_URI_SIZE-1) { + LM_ERR("XCAP URI is too long\n"); + return -1; + } + LM_DBG("got resource-list uri <%.*s>\n", uri.len, uri.s); + + unescaped_uri.s = buf; + unescaped_uri.len = 0; + if (un_escape(&uri, &unescaped_uri) < 0) { + LM_ERR("Error un-escaping XCAP URI\n"); + return -1; + } + unescaped_uri.s[unescaped_uri.len] = 0; + LM_DBG("got unescaped uri <%s>\n", unescaped_uri.s); - if(parse_xcap_uri(uri, &hostname, &port, &rl_uri)>0) + if(parse_xcap_uri(unescaped_uri.s, &hostname, &port, &rl_uri)>0) { if (rls_integrated_xcap_server == 1 && (hostname.len == 0 @@ -1034,13 +1052,13 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, { LM_DBG("calling myself for rl_node\n"); res = process_list_and_exec(rl_node, username, domain, function, param); - xmlFree(uri); + xmlFree(uri.s); xmlFreeDoc(rl_doc); } else { LM_ERR("<resource-list/> not found\n"); - xmlFree(uri); + xmlFree(uri.s); return -1; } @@ -1048,7 +1066,7 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, else { LM_ERR("<resource-list/> is not local - unsupported at this time\n"); - xmlFree(uri); + xmlFree(uri.s); return -1; } } @@ -1061,20 +1079,20 @@ int process_list_and_exec(xmlNodePtr list_node, str username, str domain, else if(xmlStrcasecmp(node->name,(unsigned char*)"entry")== 0) { - uri= XMLNodeGetAttrContentByName(node, "uri"); - if(uri== NULL) + uri.s = XMLNodeGetAttrContentByName(node, "uri"); + if(uri.s== NULL) { LM_ERR("when extracting entry uri attribute\n"); return -1; } - LM_DBG("uri= %s\n", uri); - if(function(uri, param)< 0) + LM_DBG("uri= %s\n", uri.s); + if(function(uri.s, param)< 0) { LM_ERR("in function given as a parameter\n"); - xmlFree(uri); + xmlFree(uri.s); return -1; } - xmlFree(uri); + xmlFree(uri.s); } else if(xmlStrcasecmp(node->name,(unsigned char*)"list")== 0) @@ -1253,21 +1271,6 @@ int rls_get_resource_list(str *rl_uri, str *username, str *domain, path.len += 7; checked++; } - else if (checked <= rl_uri->len - 3 && strncmp(rl_uri->s + checked, "\%5b", 3) == 0) - { - path.s[path.len++] = '['; - checked += 3; - } - else if (checked <= rl_uri->len - 3 && strncmp(rl_uri->s + checked, "\%5d", 3) == 0) - { - path.s[path.len++] = ']'; - checked += 3; - } - else if (checked <= rl_uri->len - 3 && strncmp(rl_uri->s + checked, "\%22", 3) == 0) - { - path.s[path.len++] = '\"'; - checked += 3; - } else { path.s[path.len++] = rl_uri->s[checked]; diff --git a/modules/rls/subscribe.c b/modules/rls/subscribe.c index 3bedf65..d15a601 100644 --- a/modules/rls/subscribe.c +++ b/modules/rls/subscribe.c @@ -51,6 +51,7 @@ #include "rls.h" #include "../../mod_fix.h" #include "list.h" +#include "utils.h" int counter= 0; @@ -72,10 +73,12 @@ int remove_expired_rlsubs( subs_t* subs,unsigned int hash_code); /** * return the XML node for rls-services matching uri */ -xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* uri) +xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* service_uri) { xmlNodePtr root, node; - char* val; + struct sip_uri sip_uri; + str uri, uri_str; + str *normalized_uri; root = XMLDocGetNodeByName(doc, "rls-services", NULL); if(root==NULL) @@ -88,16 +91,39 @@ xmlNodePtr rls_get_by_service_uri(xmlDocPtr doc, str* uri) { if(xmlStrcasecmp(node->name, (unsigned char*)"service")==0) { - val = XMLNodeGetAttrContentByName(node, "uri"); - if(val!=NULL) + uri.s = XMLNodeGetAttrContentByName(node, "uri"); + if (uri.s == NULL) { - if((uri->len==strlen(val)) && (strncmp(val, uri->s, uri->len)==0)) - { - xmlFree(val); - return node; - } - xmlFree(val); + LM_DBG("failed to fetch 'uri' in service [invalid XML from XCAP]\n"); + continue; + } + uri.len = strlen(uri.s); + normalized_uri = normalize_sip_uri(&uri); + if (normalized_uri->s == NULL || normalized_uri->len == 0) + { + LM_ERR("failed to normalize service URI\n"); + xmlFree(uri.s); + return NULL; + } + xmlFree(uri.s); + if(parse_uri(normalized_uri->s, normalized_uri->len, &sip_uri)< 0) + { + LM_ERR("failed to parse uri\n"); + return NULL; + } + if(uandd_to_uri(sip_uri.user, sip_uri.host, &uri_str)< 0) + { + LM_ERR("failed to construct uri from user and domain\n"); + return NULL; + } + if(uri_str.len== service_uri->len && + strncmp(uri_str.s, service_uri->s, uri_str.len) == 0) + { + pkg_free(uri_str.s); + return node; } + LM_DBG("match not found, service-uri = [%.*s]\n", uri_str.len, uri_str.s); + pkg_free(uri_str.s); } } return NULL; diff --git a/modules/rls/utils.c b/modules/rls/utils.c new file mode 100644 index 0000000..161529c --- /dev/null +++ b/modules/rls/utils.c @@ -0,0 +1,54 @@ +/* + * rls module - resource list server + * + * Copyright (C) 2012 AG Projects + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#include "../../ut.h" + +#define SIP_PREFIX "sip:" +#define SIP_PREFIX_LEN sizeof(SIP_PREFIX)-1 + +str* normalize_sip_uri(const str *uri) +{ + static str normalized_uri; + static str null_str = {NULL, 0}; + static char buf[MAX_URI_SIZE]; + + normalized_uri.s = buf; + if (un_escape((str *)uri, &normalized_uri) < 0) + { + LM_ERR("un-escaping URI\n"); + return &null_str; + } + + normalized_uri.s[normalized_uri.len] = '\0'; + if (strncasecmp(normalized_uri.s, SIP_PREFIX, SIP_PREFIX_LEN) != 0 && strchr(normalized_uri.s, '@') != NULL) + { + memmove(normalized_uri.s+SIP_PREFIX_LEN, normalized_uri.s, normalized_uri.len+1); + memcpy(normalized_uri.s, SIP_PREFIX, SIP_PREFIX_LEN); + normalized_uri.len += SIP_PREFIX_LEN; + } + + return &normalized_uri; +} + +#undef SIP_PREFIX +#undef SIP_PREFIX_LEN diff --git a/modules/rls/utils.h b/modules/rls/utils.h new file mode 100644 index 0000000..4b245e7 --- /dev/null +++ b/modules/rls/utils.h @@ -0,0 +1,31 @@ +/* + * rls module - resource list server + * + * Copyright (C) 2012 AG Projects + * + * This file is part of Kamailio, a free SIP server. + * + * Kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * Kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + */ + +#ifndef RLS_URILS_H +#define RLS_UTILS_H + +#include "../../ut.h" + +extern str* normalize_sip_uri(const str *uri); + +#endif

1 0

git:master: Make XML-RCP configurable in example scripts
by admin＠sip-router.org 03 May '13

03 May '13

Module: sip-router Branch: master Commit: 86d706bd4a1e31160883a4f094f3e04f9380de04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=86d706b… Author: Carsten Bock <carsten(a)ng-voice.com> Committer: Carsten Bock <carsten(a)ng-voice.com> Date: Fri May 3 18:45:07 2013 +0200 Make XML-RCP configurable in example scripts - Improvement: Automatically enable TCP, if XML-RPC is requested - Improvement: Allow the configuration of TCP-Children (especially for XML-RPC) - Improvement: Add missing configuration information --- examples/icscf/icscf.cfg | 12 ++++++++---- examples/icscf/kamailio.cfg | 27 ++++++++++++++++++++++----- examples/pcscf/kamailio.cfg | 35 ++++++++++++++++++++++++++++++++--- examples/pcscf/pcscf.cfg | 23 ++++++++++++++++++++++- examples/scscf/kamailio.cfg | 33 +++++++++++++++++++++++++++------ examples/scscf/scscf.cfg | 13 ++++++++++++- 6 files changed, 123 insertions(+), 20 deletions(-) diff --git a/examples/icscf/icscf.cfg b/examples/icscf/icscf.cfg index e782557..a8cea37 100644 --- a/examples/icscf/icscf.cfg +++ b/examples/icscf/icscf.cfg @@ -17,16 +17,20 @@ # Set a forced CX/DX-Peer, do not try to find one #!define CXDX_FORCED_PEER "hss.kamailio-ims.org" +# Allowed IPs for XML-RPC-Queries +#!define XMLRPC_WHITELIST_1 "127.0.0.1" +##!define XMLRPC_WHITELIST_2 "127.0.0.1" +##!define XMLRPC_WHITELIST_3 "127.0.0.1" + # *** To run in debug mode: # - define WITH_DEBUG # -# *** To enable TLS support execute: -# - adjust CFGDIR/tls.cfg as needed -# - define WITH_TLS +# *** To enable TCP support execute: +# - define WITH_TCP # # *** To enable XMLRPC support execute: # - define WITH_XMLRPC -# - adjust route[XMLRPC] for access policy +# - this will automagically enable TCP # # *** To enable a Homer SIP-Capter-Node: # - define CAPTURE_NODE with a proper address diff --git a/examples/icscf/kamailio.cfg b/examples/icscf/kamailio.cfg index c68f83f..c66cb25 100644 --- a/examples/icscf/kamailio.cfg +++ b/examples/icscf/kamailio.cfg @@ -60,16 +60,23 @@ dns_srv_lb=yes # Always: Also try IPv6: dns_try_ipv6=yes -#!ifdef WITH_TLS +#!ifdef WITH_XMLRPC +#!ifndef WITH_TCP #!define WITH_TCP -enable_tls=yes +#!endif +#!ifndef TCP_PROCESSES +# Number of TCP Processes +#!define TCP_PROCESSES 3 +#!endif #!endif -/* uncomment the next line to disable TCP (default on) */ #!ifdef WITH_TCP # life time of TCP connection when there is no traffic # - a bit higher than registration expires to cope with UA behind NAT tcp_connection_lifetime=3615 +#!ifdef TCP_PROCESSES +tcp_children=TCP_PROCESSES +#!endif #!else disable_tcp=yes #!endif @@ -260,8 +267,18 @@ route[REQINIT] { ###################################################################### #!ifdef WITH_XMLRPC route[XMLRPC] { - # allow XMLRPC from localhost - if ((method=="POST" || method=="GET") && (src_ip==127.0.0.1)) { + if ((method=="POST" || method=="GET") +#!ifdef XMLRPC_WHITELIST_1 +&& ((src_ip == XMLRPC_WHITELIST_1) +#!ifdef XMLRPC_WHITELIST_2 + || (src_ip == XMLRPC_WHITELIST_2) +#!endif +#!ifdef XMLRPC_WHITELIST_3 + || (src_ip == XMLRPC_WHITELIST_3) +#!endif +) +#!endif +) { # close connection only for xmlrpclib user agents (there is a bug in # xmlrpclib: it waits for EOF before interpreting the response). if ($hdr(User-Agent) =~ "xmlrpclib") diff --git a/examples/pcscf/kamailio.cfg b/examples/pcscf/kamailio.cfg index 8daf8b1..b15b4c0 100644 --- a/examples/pcscf/kamailio.cfg +++ b/examples/pcscf/kamailio.cfg @@ -90,10 +90,19 @@ auto_aliases=no #!ifndef WITH_TCP #!define WITH_TCP #!endif - enable_tls=yes #!endif +#!ifdef WITH_XMLRPC +#!ifndef WITH_TCP +#!define WITH_TCP +#!endif +#!ifndef TCP_PROCESSES +# Number of TCP Processes +#!define TCP_PROCESSES 3 +#!endif +#!endif + # Check, if NAT is enabled (in case you want to Force all calls through the RTPProxy) #!ifdef FORCE_RTPRELAY #!ifndef WITH_NAT @@ -101,6 +110,13 @@ enable_tls=yes #!endif #!endif +# Check, if NAT is enabled (in case you want to Force all calls through the RTPProxy) +#!ifdef WITH_RTPIPV4 +#!ifndef WITH_NAT +#!define WITH_NAT +#!endif +#!endif + #!ifdef WITH_TCP # life time of TCP connection when there is no traffic # - a bit higher than registration expires to cope with UA behind NAT @@ -115,6 +131,9 @@ tcp_connection_lifetime=3615 tcp_accept_aliases=no # Enable SIP outbound TCP keep-alive using PING-PONG (CRLFCRLF - CRLF). tcp_crlf_ping=yes +#!ifdef TCP_PROCESSES +tcp_children=TCP_PROCESSES +#!endif #!else disable_tcp=yes #!endif @@ -455,8 +474,18 @@ route[REQINIT] { ###################################################################### #!ifdef WITH_XMLRPC route[XMLRPC] { - # allow XMLRPC from localhost - if ((method=="POST" || method=="GET") && (src_ip==127.0.0.1)) { + if ((method=="POST" || method=="GET") +#!ifdef XMLRPC_WHITELIST_1 +&& ((src_ip == XMLRPC_WHITELIST_1) +#!ifdef XMLRPC_WHITELIST_2 + || (src_ip == XMLRPC_WHITELIST_2) +#!endif +#!ifdef XMLRPC_WHITELIST_3 + || (src_ip == XMLRPC_WHITELIST_3) +#!endif +) +#!endif +) { # close connection only for xmlrpclib user agents (there is a bug in # xmlrpclib: it waits for EOF before interpreting the response). if ($hdr(User-Agent) =~ "xmlrpclib") diff --git a/examples/pcscf/pcscf.cfg b/examples/pcscf/pcscf.cfg index 69c8cb8..5e38d7f 100644 --- a/examples/pcscf/pcscf.cfg +++ b/examples/pcscf/pcscf.cfg @@ -13,6 +13,11 @@ # SIP-Address of capturing node, if not set, capturing is disabled. ##!define CAPTURE_NODE "sip:10.0.6.1" +# Allowed IPs for XML-RPC-Queries +#!define XMLRPC_WHITELIST_1 "127.0.0.1" +##!define XMLRPC_WHITELIST_2 "127.0.0.1" +##!define XMLRPC_WHITELIST_3 "127.0.0.1" + # IP-Adress(es) of the RTP-Proxy #!define RTPPROXY_ADDRESS "udp:127.0.0.1:22222" # @@ -28,13 +33,25 @@ # - start RTPProxy: # rtpproxy -l _your_public_ip_ -s udp:localhost:7722 # +# *** To force alls calls through the RTP-Proxy +# - this will automagically enable NAT-Traversal +# - define FORCE_RTPRELAY +# +# *** To enable IPv4/IPv6 Translation (RTPProxy) +# - this will automagically enable NAT-Traversal +# - define WITH_RTPIPV4 +# +# *** To enable TCP support execute: +# - define WITH_TCP +# # *** To enable TLS support execute: # - adjust CFGDIR/tls.cfg as needed # - define WITH_TLS +# - this will automagically enable TCP # # *** To enable XMLRPC support execute: # - define WITH_XMLRPC -# - adjust route[XMLRPC] for access policy +# - this will automagically enable TCP # # *** To enable anti-flood detection execute: # - adjust pike and htable=>ipban settings as needed (default is @@ -51,8 +68,12 @@ # Enabled Features for this host: ##!define WITH_DEBUG ##!define WITH_NAT +##!define FORCE_RTPRELAY ##!define WITH_TLS #!define WITH_XMLRPC #!define WITH_ANTIFLOOD ##!define WITH_RX +##!define WITH_TCP +##!define WITH_RTPIPV4 + diff --git a/examples/scscf/kamailio.cfg b/examples/scscf/kamailio.cfg index 444cd74..d8da8ab 100644 --- a/examples/scscf/kamailio.cfg +++ b/examples/scscf/kamailio.cfg @@ -73,15 +73,23 @@ dns_try_ipv6=yes # Try onle IPv6: dns_cache_flags=6 -#!ifdef WITH_TLS +#!ifdef WITH_XMLRPC +#!ifndef WITH_TCP #!define WITH_TCP -enable_tls=yes +#!endif +#!ifndef TCP_PROCESSES +# Number of TCP Processes +#!define TCP_PROCESSES 3 +#!endif #!endif #!ifdef WITH_TCP # life time of TCP connection when there is no traffic # - a bit higher than registration expires to cope with UA behind NAT tcp_connection_lifetime=3615 +#!ifdef TCP_PROCESSES +tcp_children=TCP_PROCESSES +#!endif #!else disable_tcp=yes #!endif @@ -286,9 +294,9 @@ modparam("dispatcher", "ds_probing_mode", 1) # - processing of any incoming SIP request starts with this route route { -#!ifdef WITH_DEBUG +##!ifdef WITH_DEBUG xlog("L_ERR", "$rm ($fu ($si:$sp) to $tu, $ci)\n"); -#!endif +##!endif # per request initial checks route(REQINIT); @@ -411,8 +419,18 @@ route[subscribe] ###################################################################### #!ifdef WITH_XMLRPC route[XMLRPC] { - # allow XMLRPC from localhost - if ((method=="POST" || method=="GET") && (src_ip==127.0.0.1)) { + if ((method=="POST" || method=="GET") +#!ifdef XMLRPC_WHITELIST_1 +&& ((src_ip == XMLRPC_WHITELIST_1) +#!ifdef XMLRPC_WHITELIST_2 + || (src_ip == XMLRPC_WHITELIST_2) +#!endif +#!ifdef XMLRPC_WHITELIST_3 + || (src_ip == XMLRPC_WHITELIST_3) +#!endif +) +#!endif +) { # close connection only for xmlrpclib user agents (there is a bug in # xmlrpclib: it waits for EOF before interpreting the response). if ($hdr(User-Agent) =~ "xmlrpclib") @@ -463,8 +481,11 @@ route[REGISTER] { exit; } } else { + xlog("L_ERR", "Auth succeeded\n"); + setdebug("9"); # We need to check if this user is registered or not if (!impu_registered("location")) { + xlog("L_ERR", "Not REGISTERED\n"); save("location"); if ($avp(saa_return_code) == 1) { isc_match_filter_reg("0","location"); diff --git a/examples/scscf/scscf.cfg b/examples/scscf/scscf.cfg index 5da0b25..b1ffdc1 100644 --- a/examples/scscf/scscf.cfg +++ b/examples/scscf/scscf.cfg @@ -26,14 +26,25 @@ # Let the HSS decide ##!define REG_AUTH_DEFAULT_ALG "HSS-Selected" +# Number of TCP Processes +#!define TCP_PROCESSES 3 + +# Allowed IPs for XML-RPC-Queries +#!define XMLRPC_WHITELIST_1 "127.0.0.1" +##!define XMLRPC_WHITELIST_2 "127.0.0.1" +##!define XMLRPC_WHITELIST_3 "127.0.0.1" + # Several features can be enabled using '#!define WITH_FEATURE' directives: # # *** To run in debug mode: # - define WITH_DEBUG # +# *** To enable TCP support execute: +# - define WITH_TCP +# # *** To enable XMLRPC support execute: # - define WITH_XMLRPC -# - adjust route[XMLRPC] for access policy +# - this will automagically enable TCP # # *** To enable basic dialplan support: # - define WITH_DIALPLAN

1 0

[tracker] Task opened: force_send_socket() doesnt set the source IP address reliably when using uac_req_send()
by sip-router 03 May '13

03 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Hugh James (hugh.james) Attached to Project - sip-router Summary - force_send_socket() doesnt set the source IP address reliably when using uac_req_send() Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - I'm having an issue with force_send_socket(). I have a server with two interfaces on separate sub-nets 192.168.60.xx and 192.168.70.xx , and running Kamailio as a proxy with SIP messaging coming in/out over both interfaces. I have a second Kamailio running on a second IP (192.168.60.101) address and need to send a custom method between the two instances from time to time. The custom message has to go from 192.168.60.102 to 192.168.60.101 when a 200-OK to an INVITE arrives and at other similar points in the call. I'm using the following lines in my configuration script , but it works sometimes and not at other times. Sometimes the message is sent to 192.168.60.101 from 192.168.70.102 (which is the wrong interface) , and therefore doesn't reach the second Kamailio server. It appears as though the message is always sent out on the interface the last message was received on even though I use force_send_socket() to try and set the source IP address for the message Have I misunderstood the purpose of this function? is there some other way of sending an internally generated message from a specific IP address/interface I have attached an example wireshark trace showing this behavior force_send_socket(192.168.60.102:5060); $uac_req(method)="CUSTOMMETHOD"; $uac_req(ruri)="sip:" + "192.168.60.101" ; $uac_req(furi)="sip:" + "192.168.60.102" ; $uac_req(turi)="sip:" + 192.168.60.101 ; $uac_req(ouri)="sip:" + 192.168.60.101 ; $uac_req(hdrs)="CSeq: 22 CUSTOMMETHOD\r\n"; $uac_req(hdrs)="Content-Type: text/custom\r\n"; $var(cseqbody) = $var(MessageType)+"?" \ +$ci+"?" \ +$CCM_x1+"?" \ +$CCM_x2+"?" \ +$CCM_x3+"?" \ +$CCM_x4+"?" \ +$CCM_x5+"?" \ +$CCM_x6+"?"; $uac_req(body)= $var(cseqbody); uac_req_send(); More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=294 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

[tracker] Task opened: utils/kamctl: add contact path parameter (Attachment added)
by sip-router 03 May '13

03 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - utils/kamctl: add contact path parameter Task Type - Improvement Category - utils Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - This patch needs FS#292 + ul add <user> <uri> <expires> <path> .. introduce a temporary usrloc entry 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=293 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

[tracker] Task opened: usrloc: use 6th param on add function to set the contact path (Attachment added)
by sip-router 03 May '13

03 May '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Víctor Seva (linuxmaniac) Attached to Project - sip-router Summary - usrloc: use 6th param on add function to set the contact path Task Type - Improvement Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - This patch modifies RPC ul.add and MI ul_add functions to use the 6th (useless) param as path contact value. 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=292 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:master: memcached: port to more recent memory manager callback structure
by Henning Westerholt 02 May '13

02 May '13

Module: sip-router Branch: master Commit: 141808e9c0789e56f29297e2d2c185e091ebb66a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=141808e… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Thu May 2 23:41:28 2013 +0200 memcached: port to more recent memory manager callback structure * port to more recent memory manager callback structure * add small wrapper for calloc, implemented not optimal at the moment because the pkg_calloc from core/mem is not exported yet * add initial code to check for server connection during startup, not enabled yet as its work in progress * reorder structure a bit to allow for clean shutdown because of internal mm --- modules/memcached/memcached.c | 110 ++++++++++++++++++++++++----------------- 1 files changed, 65 insertions(+), 45 deletions(-) diff --git a/modules/memcached/memcached.c b/modules/memcached/memcached.c index c72ccf1..32852d9 100644 --- a/modules/memcached/memcached.c +++ b/modules/memcached/memcached.c @@ -107,7 +107,7 @@ struct module_exports exports = { * \param mem freed memory * \see pkg_free */ -static inline void mcd_free(void *mem) { +static inline void mcd_free(memcached_st *ptr, void *mem, void *context) { pkg_free(mem); } @@ -118,7 +118,7 @@ static inline void mcd_free(void *mem) { * \return allocated memory, or NULL on failure * \see pkg_malloc */ -static inline void* mcd_malloc(const size_t size) { +static inline void* mcd_malloc(memcached_st *ptr, const size_t size, void *context) { return pkg_malloc(size); } @@ -130,10 +130,43 @@ static inline void* mcd_malloc(const size_t size) { * \return allocated memory, or NULL on failure * \see pkg_realloc */ -static inline void* mcd_realloc(void *mem, const size_t size) { +static inline void* mcd_realloc(memcached_st *ptr, void *mem, const size_t size, void *context) { return pkg_realloc(mem, size); } + +/*! + * \brief Wrapper functions around our internal memory management + * \param mem pointer to allocated memory + * \param size new size of memory area + * \return allocated memory, or NULL on failure + * \see pkg_malloc + * \todo this is not optimal, use internal calloc implemention which is not exported yet + */ +static inline void * mcd_calloc(memcached_st *ptr, size_t nelem, const size_t elsize, void *context) { + void* tmp = NULL; + tmp = pkg_malloc(nelem * elsize); + if (tmp != NULL) { + memset(tmp, 0, nelem * elsize); + } + return tmp; +} + +/** + * \brief Callback to check if we could connect successfully to a server + * \param ptr memcached handler + * \param server server instance + * \param context context for callback + * \return MEMCACHED_SUCCESS on success, MEMCACHED_CONNECTION_FAILURE on failure + * \todo FIXME +static inline memcached_server_fn mcd_check_connection(const memcached_st *ptr, memcached_server_instance_st my_server, void *context) { + if (my_server->fd < 0) { + return MEMCACHED_CONNECTION_FAILURE; + } + return MEMCACHED_SUCCESS; +} +*/ + /*! * \brief Module initialization function * \return 0 on success, -1 on failure @@ -161,54 +194,25 @@ static int mod_init(void) { strncpy(server, mcd_srv_str, len); server[len] = '\0'; - servers = memcached_server_list_append(servers, server, atoi(port), &rc); - memcached_h = memcached_create(NULL); if (memcached_h == NULL) { LM_ERR("could not create memcached structure\n"); return -1; } LM_DBG("allocated new server handle at %p", memcached_h); - - #ifdef MEMCACHED_ENABLE_DEPRECATED - /** - * \note Set callbacks to our internal memory manager - * \bug this don't work for now - * \todo Move to new memcached_set_memory_allocators function, this deprecated since 0.32 - * - * MEMCACHED_CALLBACK_MALLOC_FUNCTION - * This alllows yout to pass in a customized version of malloc that - * will be used instead of the builtin malloc(3) call. The prototype - * for this is: - * void *(*memcached_malloc_function)(memcached_st *ptr, const size_t size); - * - * MEMCACHED_CALLBACK_REALLOC_FUNCTION - * This alllows yout to pass in a customized version of realloc that - * will be used instead of the builtin realloc(3) call. The prototype - * for this is: - * void *(*memcached_realloc_function)(memcached_st *ptr, void *mem, const size_t size); - * - * MEMCACHED_CALLBACK_FREE_FUNCTION - * This alllows yout to pass in a customized version of realloc that - * will be used instead of the builtin free(3) call. The prototype - * for this is: - * typedef void (*memcached_free_function)(memcached_st *ptr, void *mem); - */ - LM_DBG("set memory manager callbacks"); - if (memcached_callback_set(memcached_h, MEMCACHED_CALLBACK_MALLOC_FUNCTION, mcd_free) != MEMCACHED_SUCCESS) { - LM_ERR("could not set malloc callback handler"); - return -1; - } - if (memcached_callback_set(memcached_h, MEMCACHED_CALLBACK_REALLOC_FUNCTION, mcd_realloc) != MEMCACHED_SUCCESS) { - LM_ERR("could not set realloc callback handler"); - return -1; - } - if (memcached_callback_set(memcached_h, MEMCACHED_CALLBACK_FREE_FUNCTION, mcd_free) != MEMCACHED_SUCCESS) { - LM_ERR("could not set free callback handler"); + + LM_DBG("set memory manager callbacks"); + rc = memcached_set_memory_allocators(memcached_h, (memcached_malloc_fn)mcd_malloc, + (memcached_free_fn)mcd_free, (memcached_realloc_fn)mcd_realloc, + (memcached_calloc_fn)mcd_calloc, NULL); + if (rc == MEMCACHED_SUCCESS) { + LM_DBG("memory manager callbacks set"); + } else { + LM_ERR("memory manager callbacks not set, returned %s.\n", memcached_strerror(memcached_h, rc)); return -1; } - LM_DBG("memory manager callbacks set"); - #endif + + servers = memcached_server_list_append(servers, server, atoi(port), &rc); if (memcached_behavior_set(memcached_h, MEMCACHED_BEHAVIOR_CONNECT_TIMEOUT, mcd_timeout) != MEMCACHED_SUCCESS) { LM_ERR("could not set server connection timeout"); @@ -223,6 +227,10 @@ static int mod_init(void) { } pkg_free(server); + + /** \todo FIXME logic to handle connection errors on startup + memcached_server_cursor(memcached_h, (const memcached_server_fn*) &mcd_check_connection, NULL, 1); + */ LM_INFO("libmemcached version is %s\n", memcached_lib_version()); return 0; @@ -233,8 +241,20 @@ static int mod_init(void) { * \brief Module shutdown function */ static void mod_destroy(void) { - if (memcached_h != NULL) - memcached_free(memcached_h); + memcached_return rc; + if (servers != NULL) memcached_server_list_free(servers); + + /* unset custom memory manager to enable clean shutdown of in system memory allocated server structure */ + LM_DBG("remove memory manager callbacks"); + rc = memcached_set_memory_allocators(memcached_h, NULL, NULL, NULL, NULL, NULL); + if (rc == MEMCACHED_SUCCESS) { + LM_DBG("memory manager callbacks removed"); + } else { + LM_ERR("memory manager callbacks not removed, returned %s but continue anyway.\n", memcached_strerror(memcached_h, rc)); + } + + if (memcached_h != NULL) + memcached_free(memcached_h); }

1 0

git:master: memcache: fix "maybe used uninitialized" warning from gcc
by Henning Westerholt 02 May '13

02 May '13

Module: sip-router Branch: master Commit: 0332acbc4cf2339f3b6b068f460d00e92221a8ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0332acb… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Thu May 2 21:36:17 2013 +0200 memcache: fix "maybe used uninitialized" warning from gcc --- modules/memcached/mcd_var.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/modules/memcached/mcd_var.c b/modules/memcached/mcd_var.c index 286eb5d..8efe80e 100644 --- a/modules/memcached/mcd_var.c +++ b/modules/memcached/mcd_var.c @@ -42,6 +42,8 @@ static inline int pv_mcd_key_expiry_split_str(str *data, str *key, unsigned int *exp) { char *p; str str_exp; + str_exp.s = NULL; + str_exp.len = 0; if (data == NULL || data->s == NULL || data->len <= 0) { LM_ERR("invalid parameters\n");

1 0

git:admorten/sca: modules/sca: change logging level for failed lookup by appearance-index.
by Andrew Mortensen 02 May '13

02 May '13

Module: sip-router Branch: admorten/sca Commit: 106b5ad3e3a426946f1da0daf135b38f79d55f94 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=106b5ad… Author: Andrew Mortensen <admorten(a)isc.upenn.edu> Committer: Andrew Mortensen <admorten(a)isc.upenn.edu> Date: Thu May 2 15:12:16 2013 -0400 modules/sca: change logging level for failed lookup by appearance-index. - appearance-index won't be found yet if SCA callee is answering, logging at WARN is misleading. --- modules/sca/sca_call_info.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sca/sca_call_info.c b/modules/sca/sca_call_info.c index fee5898..66c3a1a 100644 --- a/modules/sca/sca_call_info.c +++ b/modules/sca/sca_call_info.c @@ -777,7 +777,7 @@ sca_call_info_uri_update( str *aor, sca_call_info *call_info, app = sca_appearance_for_index_unsafe( sca, aor, call_info->index, slot_idx ); if ( app == NULL ) { - LM_WARN( "sca_call_info_uri_update: no appearance found for %.*s " + LM_DBG( "sca_call_info_uri_update: no appearance found for %.*s " "index %d, looking up by dialog...", STR_FMT( aor ), call_info->index ); app = sca_appearance_for_dialog_unsafe( sca, aor, &dialog, slot_idx );

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 May 2013