sr-dev December 2010

sr-dev@lists.kamailio.org

16 participants
115 discussions

git:master: modules_k/textops: new function is_audio_on_hold()
by Ovidiu Sas 02 Dec '10

02 Dec '10

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 | … [View More]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; [View Less]

1 0

git:master: sdp parser: detect on hold media during sdp parsing
by Ovidiu Sas 02 Dec '10

02 Dec '10

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.… [View More]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); [View Less]

1 0

Releasing Kamailio 3.1.1
by Daniel-Constantin Mierla 02 Dec '10

02 Dec '10

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

1 2

memory debugging
by Jason Penton 02 Dec '10

02 Dec '10

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 … [View More]

2 3

git:master: srdb1: keep PID per DB connection
by Daniel-Constantin Mierla 01 Dec '10

01 Dec '10

Module: sip-router Branch: master Commit: f138cce2c0968872f26538983e06a128a1b41344 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f138cce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Dec 1 23:30:34 2010 +0100 srdb1: keep PID per DB connection - print warning when PID mismatches - it is cross-process shared DB connection - initial patch by Robert Verspuy --- lib/… [View More]

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2010