sr-dev June 2012

sr-dev@lists.kamailio.org

31 participants
250 discussions

Dispatcher and xmlrpc
by Olle E. Johansson 10 Jun '12

10 Jun '12

Hi! When I run sercmd to test dispatcher.list I get a nice output sercmd> dispatcher.list { SET_NO: 2 SET: { SET_ID: 1 DEST: { URI: sip:pstn1.astritech.org;transport=udp2 FLAGS: AX PRIORITY: 0 ATTRS: } DEST: { URI: sip:pstn2.astritech.org;transport=udp FLAGS: AX PRIORITY: 0 ATTRS: } SET_ID: 2 DEST: { URI: sip:127.0.0.1:5080 FLAGS: AX PRIORITY: 200 ATTRS: } DEST: { URI: sip:127.0.0.1:5084 FLAGS: AX PRIORITY: 50 ATTRS: } DEST: { URI: sip:127.0.0.1:5082 FLAGS: IX PRIORITY: 10 ATTRS: } } } When trying to use the same over XMLrpc I get this response HTTP/1.0 200 OK Via: SIP/2.0/TCP 212.3.14.204:48603 Server: Alvondo Core - Bbtele, Sweden Content-Length: 220 <?xml version="1.0"?> <methodResponse> <params> <param> <value><struct><member><name>SET_NO</name><value><int>2</int></value></member><member><name>SET</name><value></struct> </value> </param> </params> </methodResponse> Seems like the structure of the data in the dispacther list fails to be propagated in the xmlrpc interface. Is this possibly because of the structure of the data? The XMLRPC docs say "1.3.4. Limitations SER xmlrpc modules does not implement all data types allowed in XML-RPC. As well it does not implement arrays and nested structures. " Maybe we could implement a dispatcher.listflat that just publishes a flat list.. /O

3 3

one compiler warning left
by Juha Heinanen 09 Jun '12

09 Jun '12

make of tls module still complains about calls of this macro: #define TLS_ERR(s) \ do { \ int ret; \ TLS_ERR_RET(ret, s); \ } while(0) the reason is that none of the calls use ret variable. does anyone know how to easily fix this? -- juha

1 0

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router
by admin＠sip-router.org 09 Jun '12

09 Jun '12

Module: sip-router Branch: master Commit: e02024681e4c4b4d4c1a61f9b2c1fac675673b83 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e020246… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Jun 9 17:05:49 2012 +0300 Merge branch 'master' of ssh://git.sip-router.org/sip-router Forgot pull before push. ---

1 0

git:master: modules/tls/sbufq.h: got rid of compiler warning
by admin＠sip-router.org 09 Jun '12

09 Jun '12

Module: sip-router Branch: master Commit: 7dbb31e78422186a740067feb136d956f20cc0d4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7dbb31e… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Jun 9 17:04:30 2012 +0300 modules/tls/sbufq.h: got rid of compiler warning --- modules/tls/sbufq.h | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules/tls/sbufq.h b/modules/tls/sbufq.h index d50a1a4..5c1de5b 100644 --- a/modules/tls/sbufq.h +++ b/modules/tls/sbufq.h @@ -81,9 +81,8 @@ inline static int sbufq_add(struct sbuffer_queue* q, const void* data, unsigned int last_free; unsigned int b_size; unsigned int crt_size; - ticks_t t; - t=get_ticks_raw(); + get_ticks_raw(); if (likely(q->last==0)) { b_size=MAX_unsigned(min_buf_size, size);

1 0

wiki upgrade links don't work
by Juha Heinanen 09 Jun '12

09 Jun '12

Upgrade links on page http://www.kamailio.org/wiki/ do not currently work. -- juha

2 1

git:master: sdpops: documented sdp_get() function
by Daniel-Constantin Mierla 08 Jun '12

08 Jun '12

Module: sip-router Branch: master Commit: 61050f35d1d617ef6e1cefab44a36e26ffa44479 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61050f3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 8 22:55:40 2012 +0200 sdpops: documented sdp_get() function --- modules/sdpops/README | 16 ++++++++++++++++ modules/sdpops/doc/sdpops_admin.xml | 20 ++++++++++++++++++++ 2 files changed, 36 insertions(+), 0 deletions(-) diff --git a/modules/sdpops/README b/modules/sdpops/README index 7bad70c..9d32c78 100644 --- a/modules/sdpops/README +++ b/modules/sdpops/README @@ -35,6 +35,7 @@ Daniel-Constantin Mierla 4.7. sdp_with_codecs_by_id(list) 4.8. sdp_with_codecs_by_name(list) 4.9. sdp_print(level) + 4.10. sdp_get(avpvar) List of Examples @@ -47,6 +48,7 @@ Daniel-Constantin Mierla 1.7. sdp_with_codecs_by_id usage 1.8. sdp_with_codecs_by_name usage 1.9. sdp_print usage + 1.10. sdp_get usage Chapter 1. Admin Guide @@ -70,6 +72,7 @@ Chapter 1. Admin Guide 4.7. sdp_with_codecs_by_id(list) 4.8. sdp_with_codecs_by_name(list) 4.9. sdp_print(level) + 4.10. sdp_get(avpvar) 1. Overview @@ -112,6 +115,7 @@ Chapter 1. Admin Guide 4.7. sdp_with_codecs_by_id(list) 4.8. sdp_with_codecs_by_name(list) 4.9. sdp_print(level) + 4.10. sdp_get(avpvar) 4.1. sdp_remove_codecs_by_id(list) @@ -263,3 +267,15 @@ if(sdp_with_codecs_by_id("PCMU,PCMA,GSM")) { ... } # print the SDP sdp_print("1"); ... + +4.10. sdp_get(avpvar) + + Store the SDP part of message body in an AVP. Return 1 if SDP is found, + -1 on error and -2 if there is no SDP part in the message body. + + This function can be used from ANY_ROUTE. + + Example 1.10. sdp_get usage +... +sdp_get("$avp(sdp)"); +... diff --git a/modules/sdpops/doc/sdpops_admin.xml b/modules/sdpops/doc/sdpops_admin.xml index 85df224..8681d03 100644 --- a/modules/sdpops/doc/sdpops_admin.xml +++ b/modules/sdpops/doc/sdpops_admin.xml @@ -299,6 +299,26 @@ sdp_print("1"); </programlisting> </example> </section> + <section> + <title> + <function moreinfo="none">sdp_get(avpvar)</function> + </title> + <para> + Store the SDP part of message body in an AVP. Return 1 if SDP is found, + -1 on error and -2 if there is no SDP part in the message body. + </para> + <para> + This function can be used from ANY_ROUTE. + </para> + <example> + <title><function>sdp_get</function> usage</title> + <programlisting format="linespecific"> +... +sdp_get("$avp(sdp)"); +... +</programlisting> + </example> + </section> </section> </chapter>

1 0

git:master: sdpops: use PV cache to lookup the parameter
by Daniel-Constantin Mierla 08 Jun '12

08 Jun '12

Module: sip-router Branch: master Commit: 8c7e90f87e90e07fa93da04994013383bdf79e49 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8c7e90f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 8 22:47:21 2012 +0200 sdpops: use PV cache to lookup the parameter - parsing PV names at runtime is a memory leak risk as PVs support dynamic names and allocate memory for them (applies for AVPs as well) - don't add an avps with a string value pointing to NULL in case SDP is missing - potential risk of seg fault in very strict OSes as later there is a memcpy() to clone the value. Return -2 if there is no SDP --- modules/sdpops/sdpops_mod.c | 16 ++++++++++------ 1 files changed, 10 insertions(+), 6 deletions(-) diff --git a/modules/sdpops/sdpops_mod.c b/modules/sdpops/sdpops_mod.c index 402ca30..df7d6e6 100644 --- a/modules/sdpops/sdpops_mod.c +++ b/modules/sdpops/sdpops_mod.c @@ -942,17 +942,22 @@ static int w_get_sdp(sip_msg_t* msg, char *avp) int_str avp_name; static unsigned short avp_type = 0; str s; - pv_spec_t avp_spec; + pv_spec_t *avp_spec = NULL; int sdp_missing=1; s.s = avp; s.len = strlen(s.s); - if (pv_parse_spec(&s, &avp_spec)==0 - || avp_spec.type!=PVT_AVP) { + if (pv_locate_name(&s) != s.len) + { + LM_ERR("invalid parameter\n"); + return -1; + } + if (((avp_spec = pv_cache_get(&s)) == NULL) + || avp_spec->type!=PVT_AVP) { LM_ERR("malformed or non AVP %s AVP definition\n", avp); return -1; } - if(pv_get_avp_name(0, &avp_spec.pvp, &avp_name, &avp_type)!=0) + if(pv_get_avp_name(0, &avp_spec->pvp, &avp_name, &avp_type)!=0) { LM_ERR("[%s]- invalid AVP definition\n", avp); return -1; @@ -966,9 +971,8 @@ static int w_get_sdp(sip_msg_t* msg, char *avp) sdp = (sdp_info_t*)msg->body; if (sdp_missing) { - avp_val.s.s = NULL; - avp_val.s.len = 0; LM_DBG("No SDP\n"); + return -2; } else { avp_val.s.s = pkg_malloc(sdp->raw_sdp.len); avp_val.s.len = sdp->raw_sdp.len;

1 0

git:master: mqueue: use received sip msg if availabe instead of faked one
by Daniel-Constantin Mierla 08 Jun '12

08 Jun '12

Module: sip-router Branch: master Commit: 5919c2a7ee1090ac08d76e153d8497ad6970f30f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5919c2a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Jun 8 22:32:00 2012 +0200 mqueue: use received sip msg if availabe instead of faked one - fake msg has meaningless attributes which may give different results to PVs than people expect when processing a real sip message --- modules/mqueue/mqueue_api.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/mqueue/mqueue_api.c b/modules/mqueue/mqueue_api.c index efa6290..7f856f4 100644 --- a/modules/mqueue/mqueue_api.c +++ b/modules/mqueue/mqueue_api.c @@ -362,7 +362,7 @@ int pv_parse_mq_name(pv_spec_t *sp, str *in) return 0; } -str *pv_get_mq_name(str *in) +str *pv_get_mq_name(sip_msg_t *msg, str *in) { str *queue; @@ -385,12 +385,12 @@ str *pv_get_mq_name(str *in) } memset(&pvv, 0, sizeof(pv_value_t)); - if (faked_msg_init() < 0) + if (msg==NULL && faked_msg_init() < 0) { LM_ERR("faked_msg_init() failed\n"); return NULL; } - if (pv_get_spec_value(faked_msg_next(), pvs, &pvv) != 0) + if (pv_get_spec_value((msg)?msg:faked_msg_next(), pvs, &pvv) != 0) { LM_ERR("failed to get pv value for [%.*s]\n", in->len, in->s); return NULL; @@ -409,7 +409,7 @@ int pv_get_mqk(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { mq_pv_t *mp = NULL; - str *in = pv_get_mq_name(&param->pvn.u.isname.name.s); + str *in = pv_get_mq_name(msg, &param->pvn.u.isname.name.s); if (in == NULL) { @@ -436,7 +436,7 @@ int pv_get_mqv(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { mq_pv_t *mp = NULL; - str *in = pv_get_mq_name(&param->pvn.u.isname.name.s); + str *in = pv_get_mq_name(msg, &param->pvn.u.isname.name.s); if (in == NULL) {

1 0

git:master: modules/xmlrpc: got rid of unused variable
by admin＠sip-router.org 08 Jun '12

08 Jun '12

Module: sip-router Branch: master Commit: 7044af6a38beb0b0ae11925b49403c398c9a82ed URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7044af6… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jun 8 23:15:46 2012 +0300 modules/xmlrpc: got rid of unused variable --- modules/xmlrpc/xmlrpc.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/xmlrpc/xmlrpc.c b/modules/xmlrpc/xmlrpc.c index 4f8fa4d..aa5d3aa 100644 --- a/modules/xmlrpc/xmlrpc.c +++ b/modules/xmlrpc/xmlrpc.c @@ -1467,7 +1467,6 @@ static int get_string(char** val, struct xmlrpc_reply* reply, static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) { int read; - int fmt_len; int* int_ptr; char** char_ptr; str* str_ptr; @@ -1484,7 +1483,6 @@ static int rpc_scan(rpc_ctx_t* ctx, char* fmt, ...) /* clear the previously saved error code */ clear_xmlrpc_reply(reply); - fmt_len = strlen(fmt); va_start(ap, fmt); modifiers=0; read = 0;

1 0

git:master: msg_translator.c: got rid of compiler warning
by admin＠sip-router.org 08 Jun '12

08 Jun '12

Module: sip-router Branch: master Commit: 85de7fe6e1d4771f7759c1da68b330a153d5794b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=85de7fe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jun 8 23:10:43 2012 +0300 msg_translator.c: got rid of compiler warning - Many more to go before 3.3 release. --- msg_translator.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/msg_translator.c b/msg_translator.c index 1ef2032..f45cb66 100644 --- a/msg_translator.c +++ b/msg_translator.c @@ -195,16 +195,20 @@ static int check_via_address(struct ip_addr* ip, str *name, struct hostent* he; int i; char* s; + #ifdef USE_IPV6 int len; + #endif /* maybe we are lucky and name it's an ip */ s=ip_addr2a(ip); if (s){ DBG("check_via_address(%s, %.*s, %d)\n", s, name->len, name->s, resolver); - len=strlen(s); #ifdef USE_IPV6 + + len=strlen(s); + /* check if name->s is an ipv6 address or an ipv6 address ref. */ if ((ip->af==AF_INET6) && ( ((len==name->len)&&(strncasecmp(name->s, s, name->len)==0))

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2012