sr-dev October 2012

sr-dev@lists.kamailio.org

31 participants
241 discussions

git:master: rtpproxy: safety check for rtp stats pv

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 753f511f281b0f4406908086547225c5c0bc0d23 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=753f511… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 9 11:39:16 2012 +0200 rtpproxy: safety check for rtp stats pv - if the rtpproxy is not responding, there is no returned value and could cause crash when doing strlen(NULL) - return $null in case of various errors, being safer to check returned PV value in the script against $null, rather than having undefined value - reported by J. Gallart --- modules/rtpproxy/rtpproxy.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/rtpproxy/rtpproxy.c b/modules/rtpproxy/rtpproxy.c index 18fcb99..d2e145c 100644 --- a/modules/rtpproxy/rtpproxy.c +++ b/modules/rtpproxy/rtpproxy.c @@ -2610,19 +2610,20 @@ pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, str from_tag = {0, 0}; str to_tag = {0, 0}; struct rtpp_node *node; - struct iovec v[1 + 4 + 3 + 1] = {{NULL, 0}, {"Q", 1}, {" ", 1}, {NULL, 0}, {" ", 1}, {NULL, 0}, {";1 ", 3}, {";1", }, {NULL, 0}}; + struct iovec v[1 + 4 + 3 + 1] = {{NULL, 0}, {"Q", 1}, {" ", 1}, {NULL, 0}, + {" ", 1}, {NULL, 0}, {";1 ", 3}, {";1", }, {NULL, 0}}; if (get_callid(msg, &callid) == -1 || callid.len == 0) { LM_ERR("can't get Call-Id field\n"); - return -1; + return pv_get_null(msg, param, res); } if (get_to_tag(msg, &to_tag) == -1) { LM_ERR("can't get To tag\n"); - return -1; + return pv_get_null(msg, param, res); } if (get_from_tag(msg, &from_tag) == -1 || from_tag.len == 0) { LM_ERR("can't get From tag\n"); - return -1; + return pv_get_null(msg, param, res); } if(msg->id != current_msg_id){ selected_rtpp_set = default_rtpp_set; @@ -2649,6 +2650,8 @@ pv_get_rtpstat_f(struct sip_msg *msg, pv_param_t *param, nitems = 6; } ret_val.s = send_rtpp_command(node, v, nitems); + if(ret_val.s==NULL) + return pv_get_null(msg, param, res); ret_val.len = strlen(ret_val.s); return pv_get_strval(msg, param, res, &ret_val); }

11 years, 7 months

Kamailio FAQ Week

by Daniel-Constantin Mierla

Hello, I'm looking at getting richer content for the FAQ wiki page: * http://www.kamailio.org/wiki/tutorials/faq/main Probably we can get it good enough with a bit of mobilization for one week. If anyone is having some questions fitting the purpose of the FAQ, just add them to the page or send via email. If you don't have the right answer, just leave it as TBA in the wiki, via email is fine to send just the question. Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, Nov 5-8, 2012 - http://asipto.com/u/kat Kamailio Advanced Training, Miami, USA, Nov 12-14, 2012 - http://asipto.com/u/katu

11 years, 7 months

git:master: msrp: fixed copy&paste issue for getting To-Path size

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 146873cf2b101d6363bb20c235b7dcdb8bb54134 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=146873c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Oct 9 09:13:15 2012 +0200 msrp: fixed copy&paste issue for getting To-Path size - the parsing of From-Path was used instead - reported by Peter Dunkley --- modules/msrp/msrp_vars.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/msrp/msrp_vars.c b/modules/msrp/msrp_vars.c index 0debdc6..cb1dbb9 100644 --- a/modules/msrp/msrp_vars.c +++ b/modules/msrp/msrp_vars.c @@ -260,7 +260,7 @@ int pv_get_msrp(sip_msg_t *msg, pv_param_t *param, pv_value_t *res) sar = (str_array_t*)hdr->parsed.data; return pv_get_uintval(msg, param, res, sar->size); case 18: - if(msrp_parse_hdr_from_path(mf)<0) + if(msrp_parse_hdr_to_path(mf)<0) return pv_get_null(msg, param, res); hdr = msrp_get_hdr_by_id(mf, MSRP_HDR_TO_PATH); if(hdr==NULL)

11 years, 7 months

moving all to kamailio namespace

by Daniel-Constantin Mierla

Hello, some bits were left with the old project name OpenSER, not to disturb too much at that time and see where everything goes. Other voices expressed same idea in the past, now everything is stable and development goes smooth, so it is good to make a decision because openser is too way back and new comers could be confused. In my list is renaming from openser to kamailio next attributes: - default database name (exiting configs should not be impacted that much as most of them have database provided by module parameter) - default database access usernames and passwords, respectively openser, openserro and openserrw should become kamailio, kamailioro and kamailiorw - perl module API is packed as OpenSER - this could affect some people using it, but a search and replace should do it - snmpstats mibs - probably it is going to have some impact as well Eventually we can start doing it gradually, one or two per release, but is probably better to do all at once, so people will do one upgrade with next major release. Another thing is sercmd, it is in conflict for packaging as both ser and kamailio install it. It means that one cannot install both kamailio and ser at same time from packages. One option is to install it as kamcmd. Because these changes affect users and devels, I sent the message to both mailing lists. Opinions? Cheers, Daniel -- Daniel-Constantin Mierla - http://www.asipto.com http://twitter.com/#!/miconda - http://www.linkedin.com/in/miconda Kamailio Advanced Training, Berlin, Nov 5-8, 2012 - http://asipto.com/u/kat Kamailio Advanced Training, Miami, USA, Nov 12-14, 2012 - http://asipto.com/u/katu

11 years, 7 months

git:3.3: core: Fix parser sdp bug. Reset connection IP for each stream.

by Vicente Hernando

Module: sip-router Branch: 3.3 Commit: befbee07c453dfb3364e33b6587efa8d57bf2ea5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=befbee0… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Fri Sep 7 07:01:11 2012 -0400 core: Fix parser sdp bug. Reset connection IP for each stream. If connection IP is not reset, then when a stream has no IP connection, it uses former stream one instead of session default one. (cherry picked from commit 971386c346d72a016d00c8808059bd4f0a050059) --- parser/sdp/sdp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 5521aec..28e8ab0 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -451,6 +451,8 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ /* c2p will point to per-media "c=" */ c2p = find_sdp_line(m1p, m2p, 'c'); + sdp_ip.s = NULL; + sdp_ip.len = 0; if (c2p) { /* Extract stream address */ tmpstr1.s = c2p;

11 years, 7 months

git:master: core: Fix parser sdp bug. Reset connection IP for each stream.

by Vicente Hernando

Module: sip-router Branch: master Commit: 971386c346d72a016d00c8808059bd4f0a050059 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=971386c… Author: Vicente Hernando <vhernando(a)systemonenoc.com> Committer: Vicente Hernando <vhernando(a)systemonenoc.com> Date: Fri Sep 7 07:01:11 2012 -0400 core: Fix parser sdp bug. Reset connection IP for each stream. If connection IP is not reset, then when a stream has no IP connection, it uses former stream one instead of session default one. --- parser/sdp/sdp.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index fb51f3f..134a676 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -449,6 +449,8 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ /* c2p will point to per-media "c=" */ c2p = find_sdp_line(m1p, m2p, 'c'); + sdp_ip.s = NULL; + sdp_ip.len = 0; if (c2p) { /* Extract stream address */ tmpstr1.s = c2p;

11 years, 7 months

auth_db module not compiling

by Shane Harrison

Hi all, A bit new to this open source environment so not sure of the etiquette re. compile errors in master branch. Looks like pvar.h (line 167) has been changed post 3.3 branch. Struct pv_elem_t has a member 'spec' that is now a pointer and previously wasn't. This is causing auth_db to choke on compile. Should I raise a bug report or is correct thing to do to discuss here first. When I feel more "at home" would be happy to submit a patch to fix if that is the more correct road to follow - assuming it is not simply an issue my end. Cheers Shane -- Imagination NZ Ltd Level 6 92 Queens Drive P0 Box 30449 Lower Hutt 5040 New Zealand

11 years, 7 months

git:master: modules/sipcapture: Fixed crash in module initialization

by Marius Zbihlei

Module: sip-router Branch: master Commit: f86ab01f7e3c6a4b196c5fe42543b18168f6d969 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f86ab01… Author: Dragos Dinu <dragos.dinu(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Oct 8 17:42:20 2012 +0300 modules/sipcapture: Fixed crash in module initialization Leaving the default table_name parameter caused a segmentation fault Reported by Juha Heinanen --- modules/sipcapture/sipcapture.c | 20 +++++++++++++++++--- 1 files changed, 17 insertions(+), 3 deletions(-) diff --git a/modules/sipcapture/sipcapture.c b/modules/sipcapture/sipcapture.c index 818c342..14a3b4c 100644 --- a/modules/sipcapture/sipcapture.c +++ b/modules/sipcapture/sipcapture.c @@ -189,6 +189,7 @@ db1_con_t *db_con = NULL; /*!< database connection */ db_func_t db_funcs; /*!< Database functions */ str* table_names = NULL; +char* table_name_cpy = NULL; unsigned int no_tables = 0; /*multiple table mode*/ @@ -253,7 +254,7 @@ static param_export_t params[] = { {"destination_ip_column", STR_PARAM, &dest_ip_column.s }, {"destination_port_column", STR_PARAM, &dest_port_column.s }, {"contact_ip_column", STR_PARAM, &contact_ip_column.s }, - {"contact_port_column", STR_PARAM, &contact_port_column.s }, + {"contact_port_column", STR_PARAM, &contact_port_column.s}, {"originator_ip_column", STR_PARAM, &orig_ip_column.s }, {"originator_port_column", STR_PARAM, &orig_port_column.s }, {"proto_column", STR_PARAM, &proto_column.s }, @@ -324,7 +325,16 @@ static int mt_init(void) { /*parse and save table names*/ no_tables = 1; - p = table_name.s; + + table_name_cpy = (char *) pkg_malloc(sizeof(char) * table_name.len + 1 ); + if (table_name_cpy == NULL){ + LM_ERR("no more pkg memory left\n"); + return -1; + } + memcpy (table_name_cpy, table_name.s, table_name.len); + table_name_cpy[table_name.len] = '\0'; + + p = table_name_cpy; while (*p) { @@ -340,7 +350,7 @@ static int mt_init(void) { LM_ERR("no more pkg memory left\n"); return -1; } - p = strtok (table_name.s,"| \t"); + p = strtok (table_name_cpy,"| \t"); while (p != NULL) { LM_INFO ("INFO: table name:%s\n",p); @@ -666,6 +676,10 @@ static void destroy(void) } close(raw_sock_desc); } + + if (table_name_cpy){ + pkg_free(table_name_cpy); + } if (table_names){ pkg_free(table_names); }

11 years, 7 months

Bug in sdp parser

by Vicente Hernando

Hello, if we have a SDP content like this one: v=0 o=alice 2890844526 2890844527 IN IP4 host.example.com s= c=IN IP4 session.foo.org t=0 0 m=audio 49170 RTP/AVP 97 c=IN IP4 stream.bar.org a=rtpmap:97 iLBC/8000 m=audio 49170 RTP/AVP 97 a=rtpmap:97 iLBC/8000 m=audio 49170 RTP/AVP 97 c=IN IP4 bar.baz.net a=rtpmap:97 iLBC/8000 When parsing this function three streams are created: first one will have ip_addr string equal to "stream.bar.org" second one: "stream.bar.org" <-- Wrong! it is using same as first one, instead using session default third one: "bar.baz.net" Attached patch solves it. Kind regards, Vicente.

11 years, 7 months

git:master: utils/misc/vim: added Makefile to install vim scripts

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 1371eeab4ca3d3f666e52bb42d904059ce77c4ac URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1371eea… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Oct 6 09:56:06 2012 +0200 utils/misc/vim: added Makefile to install vim scripts - 'make install' copies the files to home .vim folder - updated README to reflect the new command --- utils/misc/vim/Makefile | 7 +++++++ utils/misc/vim/README | 14 ++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/utils/misc/vim/Makefile b/utils/misc/vim/Makefile new file mode 100644 index 0000000..c223e8d --- /dev/null +++ b/utils/misc/vim/Makefile @@ -0,0 +1,7 @@ +all: + +install: + mkdir -p ~/.vim/ftdetect + mkdir -p ~/.vim/syntax + cp ftdetect/ser.vim ~/.vim/ftdetect/ + cp syntax/ser.vim ~/.vim/syntax/ diff --git a/utils/misc/vim/README b/utils/misc/vim/README index 5217f8c..a7d2694 100644 --- a/utils/misc/vim/README +++ b/utils/misc/vim/README @@ -1,12 +1,18 @@ +Overview +-------- + Vim scripts to auto-detect SER and Kamailio configuration files and enable syntax highlighting for them. -Install: +Install +------- -- copy ftdetect/ser.vim to ~/.vim/ftdetect/ser.vim -- copy syntax/ser.vim to ~/.vim/syntax/ser.vim +Run 'make install' in this folder, or: + - copy ftdetect/ser.vim to ~/.vim/ftdetect/ser.vim + - copy syntax/ser.vim to ~/.vim/syntax/ser.vim -Usage: +Usage +----- - autodetection is based on .cfg extension and match of #!SER, #!KAMAILIO (and other variants), modparam or route keywords in

11 years, 7 months

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2012