sr-dev April 2014

sr-dev@lists.kamailio.org

26 participants
305 discussions

git:master: Makefile.defs: version set to 4.2.0-dev4
by Daniel-Constantin Mierla 08 Apr '14

08 Apr '14

Module: sip-router Branch: master Commit: ee6aa89811d7e02beb250f6b3831b32c2dbeeea7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ee6aa89… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 8 11:52:01 2014 +0200 Makefile.defs: version set to 4.2.0-dev4 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index b992d83..37b88f5 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -165,7 +165,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 4 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -dev3 +EXTRAVERSION = -dev4 # memory manager switcher # 0 - f_malloc (fast malloc)

1 0

rtpengine trouble
by Juha Heinanen 07 Apr '14

07 Apr '14

today i replaced mediaproxy-ng with rtpengine. then i made a test call from baresip to jssip web ua. rtpengine module gave this kind of offer to rtpengine: Apr 7 10:56:34 siika /usr/sbin/sip-proxy[24013]: INFO: ===== rtpengine_offer(via-branch=1 ICE=force trust-address) and this kind of answer: Apr 7 11:07:18 siika /usr/sbin/sip-proxy[24013]: INFO: ===== rtpengine_answer(replace-session-connection replace-origin via-branch=2 trust-address) there was problem with media (baresip console output included below). the same test call works fine with mediaproxy-ng, i.e., everything else in the test is same except that mediaproxy-ng is replaced with rtpproxy. -- juha ------------------------------------------------------------------ call: connecting to 'sip:test@test.tutpro.com'.. ice: audio: Default local candidates: ? / ? call: SIP Progress: 100 Trying () call: SIP Progress: 100 Trying () call: SIP Progress: 180 Ringing () { audio.1} Set default remote candidate: host:192.98.102.30:50002 { audio.2} Set default remote candidate: host:192.98.102.30:50003 audio: Set audio decoder: opus 48000Hz 2ch audio: Set audio encoder: opus 48000Hz 2ch audio tx pipeline: alsa ---> opus audio rx pipeline: alsa <--- opus jh(a)test.tutpro.com: Call established: sip:test@test.tutpro.com opus: decode error: buffer too small audio: opus codec decode 273 bytes: Protocol error opus: decode error: buffer too small audio: opus codec decode 289 bytes: Protocol error opus: decode error: corrupted stream audio: opus codec decode 323 bytes: Protocol error opus: decode error: buffer too small audio: opus codec decode 323 bytes: Protocol error opus: decode error: buffer too small audio: opus codec decode 323 bytes: Protocol error opus: decode error: buffer too small audio: opus codec decode 323 bytes: Protocol error opus: decode error: corrupted stream audio: opus codec decode 323 bytes: Protocol error opus: decode error: corrupted stream audio: opus codec decode 323 bytes: Protocol error opus: decode error: buffer too small audio: opus codec decode 323 bytes: Protocol error opus: decode error: corrupted stream audio: opus codec decode 323 bytes: Protocol error opus: decode error: buffer too small audio: opus codec decode 323 bytes: Protocol error opus: decode error: corrupted stream ...

2 6

mi_xmlrpc module compiling error in 4.0.6
by andoni 07 Apr '14

07 Apr '14

Hi, I've been having problems with mi-xmlrpc module in Kamailio 4.0.6 + Debian Wheezy (7.4) The error seems to be related with libxmlrpc-c3 version. root@debian:/usr/local/src/kamailio/modules/mi_xmlrpc# make Makefile:46: You are using an unsupported libxmlrpc-c3 version (1.16.33), compile at your own risk! Makefile:46: You are using an unsupported libxmlrpc-c3 version (1.16.33), compile at your own risk! CC (gcc) [M mi_xmlrpc.so] abyss_conf.o CC (gcc) [M mi_xmlrpc.so] abyss_conn.o CC (gcc) [M mi_xmlrpc.so] abyss_data.o CC (gcc) [M mi_xmlrpc.so] abyss_date.o CC (gcc) [M mi_xmlrpc.so] abyss_file.o CC (gcc) [M mi_xmlrpc.so] abyss_http.o abyss_http.c: In function 'RequestInit': abyss_http.c:105:5: warning: implicit declaration of function 'StringAlloc' [-Wimplicit-function-declaration] abyss_http.c: In function 'RequestFree': abyss_http.c:120:5: warning: implicit declaration of function 'StringFree' [-Wimplicit-function-declaration] CC (gcc) [M mi_xmlrpc.so] abyss_response.o abyss_response.c:590:6: error: conflicting types for 'Base64Encode' In file included from abyss_response.c:20:0: /usr/include/xmlrpc-c/abyss.h:513:1: note: previous declaration of 'Base64Encode' was here make: *** [abyss_response.o] Error 1 Some months ago was a commit related with that (I think so): http://lists.sip-router.org/pipermail/sr-dev/2013-October/021513.html It was a patch witten by Muhammad Shahzad and was applied in 4.0.4 version, but seems to be incomplete. I've solved the error, patching in the same way "abyss_response.c" (there are still some warnings) --- abyss_response.c 2014-03-26 16:57:07.468091972 +0100 +++ abyss_response.c 2014-03-06 16:40:16.000000000 +0100 @@ -582,6 +582,8 @@ } +#ifdef XMLRPC_OLD_VERSION /********************************************************************* ** Base64 *********************************************************************/ @@ -622,6 +624,7 @@ /* ...and zero-terminate it. */ *p = '\0'; } +#endif /****************************************************************************** ** In 4.1.2 version compiles OK (I've backported the fix from here) Cheers, P.D.: Kamailio 4.0 deb packages have same problem I guess, cause there is no mi_xmlrpc.so -- Andoni Izurza You got it!! ;P

1 0

rtpengine ice candidate type
by Juha Heinanen 07 Apr '14

07 Apr '14

before switching to mediaproxy-ng, i was using mediaproxy and kamailio mediaproxy module. when it added ice candidate, candidate type was 'relay'. now i noticed that rtpengine adds candidate of type 'host' and there seems to be no offer argument to change that. i'm thinking of scenario where parties of the call may be able to find out a way to communicate directly in which case rtpengine should not be forced on them. that could be achieved by adding 'relay' type candidate to sdp instead of 'host' type candidate. what is rtpengine motivation for adding 'host' type candidate instead of 'relay' type candidate? -- juha

3 5

git:master: modules/sipt: finalise $sipt_event_info support
by Torrey Searle 07 Apr '14

07 Apr '14

Module: sip-router Branch: master Commit: a42976948e1b6cabd978c1d61d30cea9cdc27cc2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a429769… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Mon Apr 7 11:18:27 2014 +0200 modules/sipt: finalise $sipt_event_info support --- modules/sipt/README | 18 ++++++++++++++++++ modules/sipt/doc/sipt_admin.xml | 22 ++++++++++++++++++++++ modules/sipt/sipt.c | 2 +- 3 files changed, 41 insertions(+), 1 deletions(-) diff --git a/modules/sipt/README b/modules/sipt/README index 36801f6..0866646 100644 --- a/modules/sipt/README +++ b/modules/sipt/README @@ -27,6 +27,7 @@ Torrey Searle 4.4. $sipt_cpc 4.5. $sipt_calling_party_nai 4.6. $sipt_called_party_nai + 4.7. $sipt_event_info List of Tables @@ -34,6 +35,7 @@ Torrey Searle 1.2. Screening Indicator Values 1.3. Calling Nature of Address Values 1.4. Called Nature of Address Values + 1.5. Event Info Values List of Examples @@ -65,6 +67,7 @@ Chapter 1. Admin Guide 4.4. $sipt_cpc 4.5. $sipt_calling_party_nai 4.6. $sipt_called_party_nai + 4.7. $sipt_event_info 1. Overview @@ -121,6 +124,7 @@ sipt_set_calling($fU, 4, 0, 3); 4.4. $sipt_cpc 4.5. $sipt_calling_party_nai 4.6. $sipt_called_party_nai + 4.7. $sipt_event_info 4.1. $sipt_presentation @@ -244,3 +248,17 @@ if($sipt_called_party_nai == 3) } ... + +4.7. $sipt_event_info + + Returns the value of the Event Info header of the CPG message. Returns + -1 if there is a parsing error. + + Table 1.5. Event Info Values + 0 Spare + 1 ALERTING + 2 PROGRESS + 3 In-band information or an appropriate pattern is now available + 4 Call forward on busy + 5 Call forward on no reply + 6 Call forward unconditional diff --git a/modules/sipt/doc/sipt_admin.xml b/modules/sipt/doc/sipt_admin.xml index 9c33e8c..35f6034 100644 --- a/modules/sipt/doc/sipt_admin.xml +++ b/modules/sipt/doc/sipt_admin.xml @@ -251,6 +251,28 @@ if($sipt_called_party_nai == 3) </programlisting> </example> </section> + <section id="sipt.v.sipt_event_info"> + <title><varname>$sipt_event_info</varname></title> + <para> + Returns the value of the Event Info header + of the CPG message. + Returns -1 if there is a parsing error. + </para> + <table> + <title>Event Info Values</title> + <tgroup cols="2"> + <tbody> + <row><entry>0</entry><entry>Spare</entry></row> + <row><entry>1</entry><entry>ALERTING</entry></row> + <row><entry>2</entry><entry>PROGRESS</entry></row> + <row><entry>3</entry><entry>In-band information or an appropriate pattern is now available</entry></row> + <row><entry>4</entry><entry>Call forward on busy</entry></row> + <row><entry>5</entry><entry>Call forward on no reply</entry></row> + <row><entry>6</entry><entry>Call forward unconditional</entry></row> + </tbody> + </tgroup> + </table> + </section> </section> </chapter> diff --git a/modules/sipt/sipt.c b/modules/sipt/sipt.c index 5a979c0..56c9fc6 100644 --- a/modules/sipt/sipt.c +++ b/modules/sipt/sipt.c @@ -104,7 +104,7 @@ static pv_export_t mod_items[] = { 0, 0, 0, 0 }, { {"sipt_hop_counter", sizeof("sipt_hop_counter")-1}, PVT_OTHER, sipt_get_hop_counter, 0, 0, 0, 0, 0 }, - { {"sipt_event_info", sizeof("sipt_cpc")-1}, PVT_OTHER, sipt_get_event_info, 0, + { {"sipt_event_info", sizeof("sipt_event_info")-1}, PVT_OTHER, sipt_get_event_info, 0, 0, 0, 0, 0 }, { {"sipt_cpc", sizeof("sipt_cpc")-1}, PVT_OTHER, sipt_get_cpc, 0, 0, 0, 0, 0 },

2 1

git:4.1: modules/sipt: Fix a bug in updating calling party
by Torrey Searle 07 Apr '14

07 Apr '14

Module: sip-router Branch: 4.1 Commit: d9f256f123a903b54a45122de99e59a9475dd272 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d9f256f… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Mon Apr 7 09:43:11 2014 +0200 modules/sipt: Fix a bug in updating calling party (cherry picked from commit 2da4dc5b0054f0182f67560fe15958565c0e360b) --- modules/sipt/ss7_parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sipt/ss7_parser.c b/modules/sipt/ss7_parser.c index 3c6d8ff..528e10d 100644 --- a/modules/sipt/ss7_parser.c +++ b/modules/sipt/ss7_parser.c @@ -415,7 +415,7 @@ int isup_update_calling(struct sdp_mangler * mangle, char * origin, int nai, int case ISUP_PARM_CALLING_PARTY_NUM: res2 = encode_calling_party(origin, nai, presentation, screening, &new_party[1], 255-1); new_party[0] = (char)res2; - replace_body_segment(mangle, offset+1,(int)buf[offset+1],new_party, res2+1); + replace_body_segment(mangle, offset+1,(int)buf[offset+1]+1,new_party, res2+1); has_calling = 1; break;

1 0

[tracker] Task closed: module cdp fails to start - undefined symbol: sem_post + patch
by sip-router 07 Apr '14

07 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#415 - module cdp fails to start - undefined symbol: sem_post + patch User who did this - Jason Penton (jaybeepee) Reason for closing: Not a bug Additional comments about closing: already patched in 4.2 and master More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=415 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: modules/sipt: initial support for parsing CPG and ACM messages
by Torrey Searle 07 Apr '14

07 Apr '14

Module: sip-router Branch: master Commit: 2639e3ddcb82434544012b537d2ca72264a5c9ee URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2639e3d… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Mon Apr 7 09:23:16 2014 +0200 modules/sipt: initial support for parsing CPG and ACM messages --- modules/sipt/sipt.c | 24 +++++++++++++++++++ modules/sipt/ss7.h | 23 ++++++++++++++++++- modules/sipt/ss7_parser.c | 55 +++++++++++++++++++++++++++++++++++++------- 3 files changed, 92 insertions(+), 10 deletions(-) diff --git a/modules/sipt/sipt.c b/modules/sipt/sipt.c index 8b712e7..5a979c0 100644 --- a/modules/sipt/sipt.c +++ b/modules/sipt/sipt.c @@ -42,6 +42,7 @@ MODULE_VERSION static int sipt_destination(struct sip_msg *msg, char *_destination, char *_hops, char * _nai); static int sipt_set_calling(struct sip_msg *msg, char *_origin, char *_nai, char *_pres, char * _screen); static int sipt_get_hop_counter(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +static int sipt_get_event_info(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int sipt_get_cpc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int sipt_get_calling_party_nai(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); static int sipt_get_presentation(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); @@ -103,6 +104,8 @@ static pv_export_t mod_items[] = { 0, 0, 0, 0 }, { {"sipt_hop_counter", sizeof("sipt_hop_counter")-1}, PVT_OTHER, sipt_get_hop_counter, 0, 0, 0, 0, 0 }, + { {"sipt_event_info", sizeof("sipt_cpc")-1}, PVT_OTHER, sipt_get_event_info, 0, + 0, 0, 0, 0 }, { {"sipt_cpc", sizeof("sipt_cpc")-1}, PVT_OTHER, sipt_get_cpc, 0, 0, 0, 0, 0 }, { {"sipt_calling_party_nai", sizeof("sipt_calling_party_nai")-1}, PVT_OTHER, sipt_get_calling_party_nai, 0, @@ -148,6 +151,27 @@ static int sipt_get_hop_counter(struct sip_msg *msg, pv_param_t *param, pv_value return 0; } +static int sipt_get_event_info(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) +{ + str body; + body.s = get_body_part(msg, TYPE_APPLICATION,SUBTYPE_ISUP,&body.len); + + if(body.s == NULL) + { + LM_INFO("No ISUP Message Found"); + return -1; + } + + if(body.s[0] != ISUP_CPG) + { + LM_DBG("message not an CPG\n"); + return -1; + } + + pv_get_sintval(msg, param, res, isup_get_event_info((unsigned char*)body.s, body.len)); + return 0; +} + static int sipt_get_cpc(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { str body; diff --git a/modules/sipt/ss7.h b/modules/sipt/ss7.h index 24127fc..610db23 100644 --- a/modules/sipt/ss7.h +++ b/modules/sipt/ss7.h @@ -163,7 +163,6 @@ struct isup_parm_opt { unsigned char data[0]; }; - struct isup_iam_fixed { unsigned char type; unsigned char nature_of_connection; @@ -175,7 +174,29 @@ struct isup_iam_fixed { unsigned char called_party_number[0]; }; +struct isup_acm_fixed { + unsigned char type; + unsigned char backwards_call_ind[2]; + unsigned char fixed_pointer; + unsigned char optional_pointer; +}; + +struct isup_cpg_fixed { + unsigned char type; + unsigned char event_info; + unsigned char fixed_pointer; + unsigned char optional_pointer; +}; + +union isup_msg { + unsigned char type; + struct isup_iam_fixed iam; + struct isup_acm_fixed acm; + struct isup_cpg_fixed cpg; +}; + int isup_get_hop_counter(unsigned char *buf, int len); +int isup_get_event_info(unsigned char *buf, int len); int isup_get_cpc(unsigned char *buf, int len); int isup_get_calling_party_nai(unsigned char *buf, int len); int isup_get_called_party_nai(unsigned char *buf, int len); diff --git a/modules/sipt/ss7_parser.c b/modules/sipt/ss7_parser.c index 3c6d8ff..b80ebcc 100644 --- a/modules/sipt/ss7_parser.c +++ b/modules/sipt/ss7_parser.c @@ -143,33 +143,51 @@ static int encode_calling_party(char * number, int nai, int presentation, int sc return datalen + 2; } -// returns start of specified optional header of IAM, otherwise return -1 +// returns start of specified optional header of IAM or CPG, otherwise return -1 static int get_optional_header(unsigned char header, unsigned char *buf, int len) { - struct isup_iam_fixed * message = (struct isup_iam_fixed*)buf; int offset = 0; int res; + union isup_msg * message = (union isup_msg*)buf; + unsigned char optional_pointer = 0; - // not an iam? do nothing - if(message->type != ISUP_IAM) + + if(message->type == ISUP_IAM) + { + len -= offsetof(struct isup_iam_fixed, optional_pointer); + offset += offsetof(struct isup_iam_fixed, optional_pointer); + optional_pointer = message->iam.optional_pointer; + } + else if(message->type == ISUP_ACM) { + len -= offsetof(struct isup_acm_fixed, optional_pointer); + offset += offsetof(struct isup_acm_fixed, optional_pointer); + optional_pointer = message->acm.optional_pointer; + } + else if(message->type == ISUP_CPG) + { + len -= offsetof(struct isup_cpg_fixed, optional_pointer); + offset += offsetof(struct isup_cpg_fixed, optional_pointer); + optional_pointer = message->cpg.optional_pointer; + } + else + { + // don't recognize the type? do nothing return -1; } - len -= offsetof(struct isup_iam_fixed, optional_pointer); - offset += offsetof(struct isup_iam_fixed, optional_pointer); if (len < 1) return -1; - offset += message->optional_pointer; - len -= message->optional_pointer; + offset += optional_pointer; + len -= optional_pointer; if (len < 1 ) return -1; /* Optional paramter parsing code */ - if (message->optional_pointer) { + if (optional_pointer) { while ((len > 0) && (buf[offset] != 0)) { struct isup_parm_opt *optparm = (struct isup_parm_opt *)(buf + offset); @@ -197,6 +215,25 @@ int isup_get_hop_counter(unsigned char *buf, int len) return -1; } +int isup_get_event_info(unsigned char *buf, int len) +{ + struct isup_cpg_fixed * message = (struct isup_cpg_fixed*)buf; + + // not a CPG? do nothing + if(message->type != ISUP_CPG) + { + return -1; + } + + /* Message Type = 1 */ + len -= offsetof(struct isup_cpg_fixed, event_info); + + if (len < 1) + return -1; + + return (int)message->event_info; +} + int isup_get_cpc(unsigned char *buf, int len) { struct isup_iam_fixed * message = (struct isup_iam_fixed*)buf;

1 0

git:master: modules/sipt: Fix a bug in updating calling party
by Torrey Searle 07 Apr '14

07 Apr '14

Module: sip-router Branch: master Commit: 2da4dc5b0054f0182f67560fe15958565c0e360b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2da4dc5… Author: Torrey Searle <tsearle(a)gmail.com> Committer: Torrey Searle <tsearle(a)gmail.com> Date: Mon Apr 7 09:43:11 2014 +0200 modules/sipt: Fix a bug in updating calling party --- modules/sipt/ss7_parser.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/sipt/ss7_parser.c b/modules/sipt/ss7_parser.c index b80ebcc..c6d7023 100644 --- a/modules/sipt/ss7_parser.c +++ b/modules/sipt/ss7_parser.c @@ -452,7 +452,7 @@ int isup_update_calling(struct sdp_mangler * mangle, char * origin, int nai, int case ISUP_PARM_CALLING_PARTY_NUM: res2 = encode_calling_party(origin, nai, presentation, screening, &new_party[1], 255-1); new_party[0] = (char)res2; - replace_body_segment(mangle, offset+1,(int)buf[offset+1],new_party, res2+1); + replace_body_segment(mangle, offset+1,(int)buf[offset+1]+1,new_party, res2+1); has_calling = 1; break;

1 0

[tracker] Comment added: module cdp fails to start - undefined symbol: sem_post + patch
by sip-router 06 Apr '14

06 Apr '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#415 - module cdp fails to start - undefined symbol: sem_post + patch User who did this - Leon de Rooij (leonderooij) ---------- aah, thanks, I'm on 4.1 branch - I see it's fixed in master :-) regards, Leon ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=415#comment1384 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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2014