sr-dev December 2010

sr-dev@lists.kamailio.org

16 participants
114 discussions

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

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

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

git:master: srdb1: keep PID per DB connection

by Daniel-Constantin Mierla

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/srdb1/db_id.c | 6 ++++++ lib/srdb1/db_id.h | 1 + 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index d55c586..c8db30f 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -30,6 +30,7 @@ #include "db_id.h" #include "../../dprint.h" #include "../../mem/mem.h" +#include "../../pt.h" #include "../../ut.h" #include <stdlib.h> #include <string.h> @@ -241,6 +242,7 @@ struct db_id* new_db_id(const str* url) LM_ERR("error while parsing database URL: '%.*s' \n", url->len, url->s); goto err; } + ptr->pid = my_pid(); return ptr; @@ -274,6 +276,10 @@ unsigned char cmp_db_id(const struct db_id* id1, const struct db_id* id2) } if (strcasecmp(id1->host, id2->host)) return 0; if (strcmp(id1->database, id2->database)) return 0; + if(id1->pid!=id2->pid) { + LM_WARN("identical DB URLs, but different DB connection pid\n"); + return 0; + } return 1; } diff --git a/lib/srdb1/db_id.h b/lib/srdb1/db_id.h index 025855f..20ab846 100644 --- a/lib/srdb1/db_id.h +++ b/lib/srdb1/db_id.h @@ -40,6 +40,7 @@ struct db_id { char* host; /**< Host or IP, case insensitive */ unsigned short port; /**< Port number */ char* database; /**< Database, case sensitive */ + int pid; /**< Process ID (detect cross connections) */ };

14 years

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev December 2010