sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: uac: safety checks for empty values in uacreg

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: dd663a733845510a9ee0557b8d49f058c77ef02c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=dd663a7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 3 10:59:05 2010 +0100 uac: safety checks for empty values in uacreg - the values in uacreg table must not be empty - reported by Bernhard Suttner --- modules_k/uac/uac_reg.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules_k/uac/uac_reg.c b/modules_k/uac/uac_reg.c index d378bc7..8fb4e78 100644 --- a/modules_k/uac/uac_reg.c +++ b/modules_k/uac/uac_reg.c @@ -663,6 +663,11 @@ void uac_reg_timer(unsigned int ticks) reg.attr.s = \ (char*)(RES_ROWS(db_res)[i].values[pos].val.string_val); \ reg.attr.len = strlen(reg.attr.s); \ + if(reg.attr.len == 0) { \ + LM_ERR("empty value not allowed for column[%d]=%.*s\n", \ + pos, db_cols[pos]->len, db_cols[pos]->s); \ + goto error; \ + } \ } \ } while(0);

14 years, 2 months

git:master: dispatcher(k): fixed use of use_default parameter

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 0f5e21c668e46492fb9f9ec69e5b5aafe41bd272 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f5e21c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Dec 3 10:45:00 2010 +0100 dispatcher(k): fixed use of use_default parameter - when there was a single destination in destination set and it was in inactive state, then having parameter use_default=1 caused a divion by 0 while atteptimpting to look for active destaintaion - reported by Eric Hiller --- modules_k/dispatcher/dispatch.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index bcd7f7c..e42f5d8 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1717,15 +1717,20 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) while ((idx->dlist[i].flags & DS_INACTIVE_DST) || (idx->dlist[i].flags & DS_PROBING_DST)) { - if(ds_use_default!=0) + if(ds_use_default!=0 && idx->nr!=1) i = (i+1)%(idx->nr-1); else i = (i+1)%idx->nr; if(i==hash) { + /* back to start -- looks like no active dst */ if(ds_use_default!=0) { i = idx->nr-1; + if((idx->dlist[i].flags & DS_INACTIVE_DST) + || (idx->dlist[i].flags & DS_PROBING_DST)) + return -1; + break; } else { return -1; } @@ -1751,6 +1756,7 @@ int ds_select_dst(struct sip_msg *msg, int set, int alg, int mode) if(dst_avp_name.n!=0) { + /* add default dst to last position in AVP list */ if(ds_use_default!=0 && hash!=idx->nr-1) { avp_val.s = idx->dlist[idx->nr-1].uri;

14 years, 2 months

UAC Module Bug and Feature-Request

by Bernhard Suttner

Hi, first of all - thanks to all these great modules, the kamailio core, the very well documented features. This project is really very well maintained. I am using the UAC module (V 3.1.0) to make an outbound registration. During testing I used the wrong "realm" for the registration. The result within the log was thousands line of: ... 41(13280) ERROR: uac [uac_reg.c:505]: realms are different - ignire?!?! 44(13286) ERROR: uac [uac_reg.c:505]: realms are different - ignire?!?! 46(13290) ERROR: uac [uac_reg.c:505]: realms are different - ignire?!?! 42(13282) ERROR: uac [uac_reg.c:505]: realms are different - ignire?!?! 44(13286) ERROR: uac [uac_reg.c:505]: realms are different - ignire?!?! 43(13284) ERROR: uac [uac_reg.c:505]: realms are different - ignire?!?! 47(13292) ERROR: uac [uac_reg.c:505]: realms are different - ignire?!?! 45(13288) ERROR: uac [uac_reg.c:505]: realms are different - ignire?!?! ... And a REGISTER flood from Kamailio to the registration endpoint. After that, I recognized that I have to restart kamailio to fix the realm. It would be cool to have a "kamctl" function to reload this module. Best regards and have a nice weekend. Bernhard Suttner

14 years, 2 months

Kamailio v3.1.1 Released

by Daniel-Constantin Mierla

Hello, Kamailio SIP Server v3.1.1 is released. This is a maintenance release of latest stable branch, 3.1, that includes fixes since release of v3.1.0. There is no change to database or configuration file required to upgrade to 3.1.1 from 3.1.0 version. If you run v3.1.0 from tarball or packages, it is strongly recommended to upgrade to v3.1.1. For more details about version 3.1.1, visit: http://www.kamailio.org/w/2010/12/kamailio-v3-1-1-released/ Cheers, Daniel -- Daniel-Constantin Mierla Kamailio (OpenSER) Advanced Training Jan 24-26, 2011, Irvine, CA, USA http://www.asipto.com

14 years, 2 months

git:3.1: ChangeLog: commit log updated for v3.1.0

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: c274ce53a62a8d5f3ab911761ac8a5f7e3361592 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c274ce5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 2 22:18:36 2010 +0100 ChangeLog: commit log updated for v3.1.0 --- ChangeLog | 560 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 560 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c27…

14 years, 2 months

git:3.1: Makefile: version set to 3.1.1

by Daniel-Constantin Mierla

Module: sip-router Branch: 3.1 Commit: 44a154b4c5db9f0f49461ea3bf8ae8768dfcf440 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=44a154b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Dec 2 22:16:59 2010 +0100 Makefile: version set to 3.1.1 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index e07654e..1ceb63b 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -159,7 +159,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) #version number VERSION = 3 PATCHLEVEL = 1 -SUBLEVEL = 0 +SUBLEVEL = 1 EXTRAVERSION = # memory debugger switcher

14 years, 2 months

git:master: modules_k/textops: new function is_audio_on_hold()

by Ovidiu Sas

Module: sip-router Branch: master Commit: bd18d55dc1a5225a58483132b578723a155958e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd18d55… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Dec 2 14:56:11 2010 -0500 modules_k/textops: new function is_audio_on_hold() - returns true if at least one 'audio' stream is on hold - only 'audio' streams are checked --- modules_k/textops/textops.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/modules_k/textops/textops.c b/modules_k/textops/textops.c index cb3907d..5b0e3b5 100644 --- a/modules_k/textops/textops.c +++ b/modules_k/textops/textops.c @@ -64,6 +64,7 @@ #include "../../parser/parse_methods.h" #include "../../parser/parse_content.h" #include "../../parser/parse_param.h" +#include "../../parser/sdp/sdp.h" #include "../../lib/kcore/parse_privacy.h" #include "../../msg_translator.h" #include "../../ut.h" @@ -93,6 +94,9 @@ MODULE_VERSION #define TIME_FORMAT "Date: %a, %d %b %Y %H:%M:%S GMT" #define MAX_TIME 64 +#define AUDIO_STR "audio" +#define AUDIO_STR_LEN 5 + static int search_body_f(struct sip_msg*, char*, char*); static int replace_f(struct sip_msg*, char*, char*); @@ -124,7 +128,7 @@ static int cmp_istr_f(struct sip_msg *msg, char *str1, char *str2 ); static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ); static int remove_hf_re_f(struct sip_msg* msg, char* key, char* foo); static int is_present_hf_re_f(struct sip_msg* msg, char* key, char* foo); - +static int is_audio_on_hold_f(struct sip_msg *msg, char *str1, char *str2 ); static int fixup_substre(void**, int); static int hname_fixup(void** param, int param_no); static int free_hname_fixup(void** param, int param_no); @@ -246,6 +250,9 @@ static cmd_export_t cmds[]={ {"starts_with", (cmd_function)starts_with_f, 2, fixup_spve_spve, 0, REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, + {"is_audio_on_hold", (cmd_function)is_audio_on_hold_f, 0, + 0, 0, + REQUEST_ROUTE|ONREPLY_ROUTE|FAILURE_ROUTE|BRANCH_ROUTE|LOCAL_ROUTE}, {0,0,0,0,0,0} }; @@ -1874,6 +1881,32 @@ static int starts_with_f(struct sip_msg *msg, char *str1, char *str2 ) return -2; } +static int is_audio_on_hold_f(struct sip_msg *msg, char *str1, char *str2 ) +{ + int sdp_session_num = 0, sdp_stream_num; + sdp_session_cell_t* sdp_session; + sdp_stream_cell_t* sdp_stream; + + if (0 == parse_sdp(msg)) { + for(;;) { + sdp_session = get_sdp_session(msg, sdp_session_num); + if(!sdp_session) break; + sdp_stream_num = 0; + for(;;) { + sdp_stream = get_sdp_stream(msg, sdp_session_num, sdp_stream_num); + if(!sdp_stream) break; + if(sdp_stream->media.len==AUDIO_STR_LEN && + strncmp(sdp_stream->media.s,AUDIO_STR,AUDIO_STR_LEN)==0 && + sdp_stream->is_on_hold) + return 1; + sdp_stream_num++; + } + sdp_session_num++; + } + } + return -1; +} + int fixup_regexpNL_none(void** param, int param_no) { regex_t* re;

14 years, 2 months

git:master: sdp parser: detect on hold media during sdp parsing

by Ovidiu Sas

Module: sip-router Branch: master Commit: 27e1d6f41a7b2545af39ad040b6cf2d824a28f25 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27e1d6f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Thu Dec 2 13:49:34 2010 -0500 sdp parser: detect on hold media during sdp parsing --- parser/sdp/sdp.c | 20 +++++++++++++++++++- parser/sdp/sdp.h | 3 ++- parser/sdp/sdp_helpr_funcs.c | 12 ++++++++---- parser/sdp/sdp_helpr_funcs.h | 2 +- 4 files changed, 30 insertions(+), 7 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index b35447e..2f8831d 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -29,6 +29,7 @@ */ +#include "../../ut.h" #include "../../mem/mem.h" #include "../../mem/shm_mem.h" #include "../parser_f.h" @@ -39,6 +40,9 @@ #define USE_PKG_MEM 0 #define USE_SHM_MEM 1 +#define HOLD_IP_STR "0.0.0.0" +#define HOLD_IP_LEN 7 + /** * Creates and initialize a new sdp_info structure */ @@ -524,7 +528,8 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ if (parse_payload_attr && extract_ptime(&tmpstr1, &stream->ptime) == 0) { a1p = stream->ptime.s + stream->ptime.len; - } else if (parse_payload_attr && extract_sendrecv_mode(&tmpstr1, &stream->sendrecv_mode) == 0) { + } else if (parse_payload_attr && extract_sendrecv_mode(&tmpstr1, + &stream->sendrecv_mode, &stream->is_on_hold) == 0) { a1p = stream->sendrecv_mode.s + stream->sendrecv_mode.len; } else if (parse_payload_attr && extract_rtpmap(&tmpstr1, &rtp_payload, &rtp_enc, &rtp_clock, &rtp_params) == 0) { if (rtp_params.len != 0 && rtp_params.s != NULL) { @@ -554,6 +559,19 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ a2p = find_next_sdp_line(a1p, m2p, 'a', m2p); } + /* Let's detect if the media is on hold by checking + * the good old "0.0.0.0" connection address */ + if (!stream->is_on_hold) { + if (stream->ip_addr.s && stream->ip_addr.len) { + if (stream->ip_addr.len == HOLD_IP_LEN && + strncmp(stream->ip_addr.s, HOLD_IP_STR, HOLD_IP_LEN)==0) + stream->is_on_hold = 1; + } else if (session->ip_addr.s && session->ip_addr.len) { + if (session->ip_addr.len == HOLD_IP_LEN && + strncmp(session->ip_addr.s, HOLD_IP_STR, HOLD_IP_LEN)==0) + stream->is_on_hold = 1; + } + } ++stream_num; } /* Iterate medias/streams in session */ return 0; diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index bdbf593..353580c 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -50,7 +50,8 @@ typedef struct sdp_stream_cell { int pf; /**< connection address family: AF_INET/AF_INET6 */ str ip_addr; /**< connection address */ int stream_num; /**< stream index inside a session */ - int is_rtp; /**< flag indicating is this is an RTP stream */ + int is_rtp; /**< flag indicating if this is an RTP stream */ + int is_on_hold; /**< flag indicating if this stream is on hold */ /* m=<media> <port> <transport> <payloads> */ str media; str port; diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index 8b521f9..e432fd2 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -321,15 +321,19 @@ int extract_rtcp(str *body, str *rtcp) return extract_field(body, rtcp, field); } -int extract_sendrecv_mode(str *body, str *sendrecv_mode) +int extract_sendrecv_mode(str *body, str *sendrecv_mode, int *is_on_hold) { char *cp1; cp1 = body->s; if ( !( (strncasecmp(cp1, "a=sendrecv", 10) == 0) || - (strncasecmp(cp1, "a=inactive", 10) == 0) || - (strncasecmp(cp1, "a=recvonly", 10) == 0) || - (strncasecmp(cp1, "a=sendonly", 10) == 0) )) { + (strncasecmp(cp1, "a=recvonly", 10) == 0))) { + if ( !( (strncasecmp(cp1, "a=inactive", 10) == 0) || + (strncasecmp(cp1, "a=sendonly", 10) == 0) )) { + return -1; + } else { + *is_on_hold = 1; + } return -1; } diff --git a/parser/sdp/sdp_helpr_funcs.h b/parser/sdp/sdp_helpr_funcs.h index 21512e6..c815845 100644 --- a/parser/sdp/sdp_helpr_funcs.h +++ b/parser/sdp/sdp_helpr_funcs.h @@ -47,7 +47,7 @@ int get_mixed_part_delimiter(str * body, str * mp_delimiter); int extract_rtpmap(str *body, str *rtpmap_payload, str *rtpmap_encoding, str *rtpmap_clockrate, str *rtpmap_parmas); int extract_fmtp( str *body, str *fmtp_payload, str *fmtp_string ); int extract_ptime(str *body, str *ptime); -int extract_sendrecv_mode(str *body, str *sendrecv_mode); +int extract_sendrecv_mode(str *body, str *sendrecv_mode, int *is_on_hold); int extract_mediaip(str *body, str *mediaip, int *pf, char *line); int extract_media_attr(str *body, str *mediamedia, str *mediaport, str *mediatransport, str *mediapayload, int *is_rtp); int extract_bwidth(str *body, str *bwtype, str *bwwitdth);

14 years, 2 months

Releasing Kamailio 3.1.1

by Daniel-Constantin Mierla

Hello, there are almost 2 months since release of Kamailio 3.1.0, so it is time for 3.1.1 as there were several important fixes done. I propose Thursday, next week, by that time we should sort out most of the issues reported lately. Other opinions? Cheers, Daniel -- Daniel-Constantin Mierla Kamailio (OpenSER) Advanced Training Jan 24-26, 2011, Irvine, CA, USA http://www.asipto.com

14 years, 2 months

memory debugging

by Jason Penton

Hi All, thought I would give you a small little perl program I quickly hacked up to help with some memory leaks I was getting. Turns out I was forgetting to call release_urecord after a get_urecord on the usrloc module. Because I use Kamailio in DBOnly mode - the memory was never being freed. This little program helped me to find the source in no time at all. I hope it helps you too. A little info: The program works on the log file. NB you have to have memlog debugging enabled for this program to do anything useful. Effectively the program continuously monitors the log file looking for allocs and frees. It tallies all the fragments in use and gives a report of all the fragments and where they weer allocated. It also keeps a running counter of bytes used. Here is an example of the output: ***************************************************************************************************************************************************** DUMPING ALL UNFREED MEMORY FRAGMENTS (25) ***************************************************************************************************************************************************** called from h_table.c: build_cell(251) 6 21312 called from dlg.c: new_dlg_uac(169) 1 128 called from t_msgbuilder.c: build_uac_req(921) 6 1896 called from pv_svar.c: set_var_value(104) 3 132 called from ../../ut.h: shm_str_dup(501) 2 48 called from reply.c: build_contact(127) 1 132 called from t_hooks.c: insert_tmcb(108) 6 144 ************************************************************TOTAL BYTES HELD IN FRAGMENTS: 23792*************************************************************** To use - simply untar into a directory and run ./memalyze.pl Hope it helps Cheers Jason

14 years, 2 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev