sr-dev June 2010

sr-dev@lists.kamailio.org

26 participants
164 discussions

sr_3.0 branch: git screaming while trying to cherry-pick
by Timo Reimann 26 Jun '10

26 Jun '10

Hey, I just tried to cherry-pick my really short one-char typo fix (touching timer.h only) from master branch (commit e5d313913b34e05) into the sr_3.0 branch when git started to scream at me because of unmerged files: $ git cherry-pick -x e5d313913b34e05a9e0529a907b87a54ba354d26 Added pkg/kamailio/debian-lenny/changelog Added pkg/kamailio/debian-lenny/rules Auto-merged timer.h pkg/kamailio/debian-lenny/compat: unmerged (7ed6ff82de6bcc2a78243fc9c54d3ef5ac14da69) pkg/kamailio/debian-lenny/… [View More]

3 5

git:master: core: sdp parser
by Ovidiu Sas 25 Jun '10

25 Jun '10

Module: sip-router Branch: master Commit: 88429acf0776bb76dae0448416f4f5ebe8295b0d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88429ac… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jun 25 13:59:15 2010 -0400 core: sdp parser - added support for session common IP and session origin IP --- parser/sdp/sdp.c | 45 +++++++++++++++++++++++++++++++++++++++++---- parser/sdp/sdp.h | 6 +++++… [View More]+ 2 files changed, 47 insertions(+), 4 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 367651b..11aa8f1 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -396,7 +396,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ } /* get session origin */ o1p = find_sdp_line(v1p, bodylimit, 'o'); - if (o1p==0) { + if (o1p == NULL) { LM_ERR("no o= in session\n"); return -1; } @@ -408,12 +408,29 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ } /* Allocate a session cell */ session = add_sdp_session(_sdp, session_num, cnt_disp); - if (session == 0) return -1; + if (session == NULL) return -1; + + /* Get origin IP */ + tmpstr1.s = o1p; + tmpstr1.len = bodylimit - tmpstr1.s; /* limit is session limit text */ + if (extract_mediaip(&tmpstr1, &session->o_ip_addr, &session->o_pf,"o=") == -1) { + LM_ERR("can't extract origin media IP from the message\n"); + return -1; + } /* Find c1p only between session begin and first media. * c1p will give common c= for all medias. */ c1p = find_sdp_line(o1p, m1p, 'c'); + if (c1p) { + tmpstr1.s = c1p; + tmpstr1.len = bodylimit - tmpstr1.s; /* limit is session limit text */ + if (extract_mediaip(&tmpstr1, &session->ip_addr, &session->pf,"c=") == -1) { + LM_ERR("can't extract common media IP from the message\n"); + return -1; + } + } + /* Find b1p only between session begin and first media. * b1p will give common b= for all medias. */ b1p = find_sdp_line(o1p, m1p, 'b'); @@ -1080,8 +1097,12 @@ sdp_session_cell_t * clone_sdp_session_cell(sdp_session_cell_t *session) LM_ERR("arg:NULL\n"); return NULL; } - len = sizeof(sdp_session_cell_t) + session->cnt_disp.len + - session->bw_type.len + session->bw_width.len; + len = sizeof(sdp_session_cell_t) + + session->cnt_disp.len + + session->ip_addr.len + + session->o_ip_addr.len + + session->bw_type.len + + session->bw_width.len; clone_session = (sdp_session_cell_t*)shm_malloc(len); if (clone_session == NULL) { LM_ERR("no more shm mem (%d)\n",len); @@ -1111,6 +1132,8 @@ sdp_session_cell_t * clone_sdp_session_cell(sdp_session_cell_t *session) } clone_session->session_num = session->session_num; + clone_session->pf = session->pf; + clone_session->o_pf = session->o_pf; clone_session->streams_num = session->streams_num; if (session->cnt_disp.len) { @@ -1120,6 +1143,20 @@ sdp_session_cell_t * clone_sdp_session_cell(sdp_session_cell_t *session) p += session->cnt_disp.len; } + if (session->ip_addr.len) { + clone_session->ip_addr.s = p; + clone_session->ip_addr.len = session->ip_addr.len; + memcpy( p, session->ip_addr.s, session->ip_addr.len); + p += session->ip_addr.len; + } + + if (session->o_ip_addr.len) { + clone_session->o_ip_addr.s = p; + clone_session->o_ip_addr.len = session->o_ip_addr.len; + memcpy( p, session->o_ip_addr.s, session->o_ip_addr.len); + p += session->o_ip_addr.len; + } + if (session->bw_type.len) { clone_session->bw_type.s = p; clone_session->bw_type.len = session->bw_type.len; diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index 481afec..c26a568 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -76,6 +76,12 @@ typedef struct sdp_session_cell { struct sdp_session_cell *next; int session_num; /**< session index inside sdp */ str cnt_disp; /**< the Content-Disposition header (for Content-Type:multipart/mixed) */ + /* c=<network type> <address type> <connection address> */ + int pf; /**< connection address family: AF_INET/AF_INET6 */ + str ip_addr; /**< connection address */ + /* o=<username> <session id> <version> <network type> <address type> <address> */ + int o_pf; /**< origin address family: AF_INET/AF_INET6 */ + str o_ip_addr; /**< origin address */ /* b=<bwtype>:<bandwidth> */ str bw_type; /**< alphanumeric modifier giving the meaning of the <bandwidth> figure: CT - conference total; [View Less]

1 0

git:master: core: sdp parser
by Ovidiu Sas 25 Jun '10

25 Jun '10

Module: sip-router Branch: master Commit: 0e608506687a171529d2d60f22aade8a72a7f7c4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0e60850… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jun 25 13:06:12 2010 -0400 core: sdp parser - added support for rtcp attribute (RFC3605) --- parser/sdp/sdp.c | 27 +++++++++++++++++++-------- parser/sdp/sdp.h | 3 +++ parser/… [View More]sdp/sdp_helpr_funcs.c | 5 +++++ parser/sdp/sdp_helpr_funcs.h | 3 +++ 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index fa1394d..367651b 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -524,6 +524,8 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ } payload_attr = (sdp_payload_attr_t*)get_sdp_payload4payload(stream, &rtp_payload); set_sdp_payload_attr(payload_attr, &rtp_enc, &rtp_clock, &rtp_params); + } else if (extract_rtcp(&tmpstr1, &stream->rtcp_port) == 0) { + a1p = stream->rtcp_port.s + stream->rtcp_port.len; } else if (extract_accept_types(&tmpstr1, &stream->accept_types) == 0) { a1p = stream->accept_types.s + stream->accept_types.len; } else if (extract_accept_wrapped_types(&tmpstr1, &stream->accept_wrapped_types) == 0) { @@ -766,11 +768,12 @@ void print_sdp_stream(sdp_stream_cell_t *stream) { sdp_payload_attr_t *payload; - LM_DBG("....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s' '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s'\n", + LM_DBG("....stream[%d]:%p=>%p {%p} '%.*s' '%.*s:%.*s' [%.*s] '%.*s' '%.*s' '%.*s:%.*s' (%d)=>%p '%.*s' '%.*s' '%.*s' '%.*s'\n", stream->stream_num, stream, stream->next, stream->p_payload_attr, stream->media.len, stream->media.s, stream->ip_addr.len, stream->ip_addr.s, stream->port.len, stream->port.s, + stream->rtcp_port.len, stream->rtcp_port.s, stream->transport.len, stream->transport.s, stream->payloads.len, stream->payloads.s, stream->bw_type.len, stream->bw_type.s, stream->bw_width.len, stream->bw_width.s, @@ -961,13 +964,14 @@ sdp_stream_cell_t * clone_sdp_stream_cell(sdp_stream_cell_t *stream) /* NOTE: we are not cloning RFC4975 attributes */ len = sizeof(sdp_stream_cell_t) + + stream->ip_addr.len + stream->media.len + stream->port.len + stream->transport.len + stream->payloads.len + stream->bw_type.len + stream->bw_width.len + - stream->ip_addr.len; + stream->rtcp_port.len; clone_stream = (sdp_stream_cell_t*)shm_malloc(len); if (clone_stream == NULL) { LM_ERR("no more shm mem (%d)\n",len); @@ -998,6 +1002,13 @@ sdp_stream_cell_t * clone_sdp_stream_cell(sdp_stream_cell_t *stream) clone_stream->stream_num = stream->stream_num; clone_stream->pf = stream->pf; + if (stream->ip_addr.len) { + clone_stream->ip_addr.s = p; + clone_stream->ip_addr.len = stream->ip_addr.len; + memcpy( p, stream->ip_addr.s, stream->ip_addr.len); + p += stream->ip_addr.len; + } + if (stream->media.len) { clone_stream->media.s = p; clone_stream->media.len = stream->media.len; @@ -1038,11 +1049,11 @@ sdp_stream_cell_t * clone_sdp_stream_cell(sdp_stream_cell_t *stream) p += stream->bw_width.len; } - if (stream->ip_addr.len) { - clone_stream->ip_addr.s = p; - clone_stream->ip_addr.len = stream->ip_addr.len; - memcpy( p, stream->ip_addr.s, stream->ip_addr.len); - //p += stream->payloads.len; + if (stream->rtcp_port.len) { + clone_stream->rtcp_port.s = p; + clone_stream->rtcp_port.len = stream->rtcp_port.len; + memcpy( p, stream->rtcp_port.s, stream->rtcp_port.len); + p += stream->rtcp_port.len; } /* NOTE: we are not cloning RFC4975 attributes: @@ -1120,7 +1131,7 @@ sdp_session_cell_t * clone_sdp_session_cell(sdp_session_cell_t *session) clone_session->bw_width.s = p; clone_session->bw_width.len = session->bw_width.len; memcpy( p, session->bw_width.s, session->bw_width.len); - //p += session->bw_type.len; + p += session->bw_width.len; } return clone_session; diff --git a/parser/sdp/sdp.h b/parser/sdp/sdp.h index 9c9b9c7..481afec 100644 --- a/parser/sdp/sdp.h +++ b/parser/sdp/sdp.h @@ -61,6 +61,9 @@ typedef struct sdp_stream_cell { CT - conference total; AS - application specific */ str bw_width; /**< The <bandwidth> is interpreted as kilobits per second by default */ + /* RFC3605: Real Time Control Protocol (RTCP) attribute in Session Description Protocol (SDP) */ + /* a=rtcp: port [nettype space addrtype space connection-address] CRLF */ + str rtcp_port; /**< RFC3605: rtcp attribute */ str path; /**< RFC4975: path attribute */ str max_size; /**< RFC4975: max-size attribute */ str accept_types; /**< RFC4975: accept-types attribute */ diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index d6270a6..681dd23 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -267,6 +267,11 @@ int extract_path(str *body, str *path) return extract_field(body, path, field); } +int extract_rtcp(str *body, str *rtcp) +{ + static const str field = str_init("a=rtcp:"); + return extract_field(body, rtcp, field); +} int extract_sendrecv_mode(str *body, str *sendrecv_mode) { diff --git a/parser/sdp/sdp_helpr_funcs.h b/parser/sdp/sdp_helpr_funcs.h index de845ea..d7b02ee 100644 --- a/parser/sdp/sdp_helpr_funcs.h +++ b/parser/sdp/sdp_helpr_funcs.h @@ -50,6 +50,9 @@ 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 extract_bwidth(str *body, str *bwtype, str *bwwitdth); +/* RFC3605 attributes */ +int extract_rtcp(str *body, str *rtcp); + /* RFC4975 attributes */ int extract_accept_types(str *body, str *accept_types); int extract_accept_wrapped_types(str *body, str *accept_wrapped_types); [View Less]

1 0

git:master: core: sdp parser fixes
by Ovidiu Sas 25 Jun '10

25 Jun '10

Module: sip-router Branch: master Commit: 92761dbd0a2be28577829b919c250ae9d2680352 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92761db… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Fri Jun 25 12:14:14 2010 -0400 core: sdp parser fixes - fix sdp session and stream getters --- parser/sdp/sdp.c | 18 +++++++----------- 1 files changed, 7 insertions(+), 11 deletions(-) diff --git a/parser/… [View More]

1 0

git:kamailio_3.0: modules_k/dialog: Reduce log verbosity for list traversal of
by Timo Reimann 25 Jun '10

25 Jun '10

Module: sip-router Branch: kamailio_3.0 Commit: a5f03adcad92993e170be1d2a5dbb879b4777347 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a5f03ad… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jun 24 15:01:13 2010 +0200 modules_k/dialog: Reduce log verbosity for list traversal of expired dialogs. - Change logging of start/previous/next pointers from WARN to DBG when traversing the list of … [View More]

1 0

git:kamailio_3.0: modules_k/dialog: Fix timer reset and improve timeout value logging
by Timo Reimann 25 Jun '10

25 Jun '10

Module: sip-router Branch: kamailio_3.0 Commit: 3d1d941dde7a2b4a764dcfc9939501e5ddf83f04 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3d1d941… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jun 24 18:39:49 2010 +0200 modules_k/dialog: Fix timer reset and improve timeout value logging - Fix a bug that caused dialog timeout values to be refreshed only when a custom timeout was provided by … [View More]

1 0

git:kamailio_3.0: Correct typo in comment referring to other file.
by Timo Reimann 25 Jun '10

25 Jun '10

Module: sip-router Branch: kamailio_3.0 Commit: 927351a2c4bd222db8a58b877a5fb018fdce2d00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=927351a… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Jun 24 15:50:52 2010 +0200 Correct typo in comment referring to other file. --- timer.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/timer.h b/timer.h index a14c342..… [View More]

1 0

git:kamailio_3.0: Do not consider in-early-dialog requests to be bogus.
by Timo Reimann 25 Jun '10

25 Jun '10

Module: sip-router Branch: kamailio_3.0 Commit: cbbc5eff256565a3eae29a9353bbb4e3064640bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cbbc5ef… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Wed Jun 23 15:39:21 2010 +0200 Do not consider in-early-dialog requests to be bogus. --- modules_k/dialog/dlg_hash.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/… [View More]

1 0

SF.net SVN: openser:[6010] branches/1.5/modules/dialog/dlg_handlers.c
by Marius Zbihlei 25 Jun '10

25 Jun '10

Revision: 6010 http://openser.svn.sourceforge.net/openser/?rev=6010&view=rev Author: mariuszbihlei Date: 2010-06-25 12:51:15 +0000 (Fri, 25 Jun 2010) Log Message: ----------- modules/dialog: Fix timer reset and improve timeout value logging - Fix a bug that caused dialog timeout values to be refreshed only when a custom timeout was provided by the user via AVP. - Do not log failure to get timeout from AVP when in fact no AVP was used. - Patch by Timo Reimann (timo.… [View More]

1 0

[tracker] Comment added: presence_xml with db_postgres
by sip-router 24 Jun '10

24 Jun '10

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#77 - presence_xml with db_postgres User who did this - Henning Westerholt (henningw) ---------- Indeed the BLOBs in db_mysql driver module are also null-terminated. This behaviour is really old, its has been this way since 0.9 times. But you're right, BLOBs normally don't need to be inserted this way. I could guess it was done in the past because BLOBs were not represented as own dedicated datatype … [View More]

1 0

← Newer
1
2
3
4
5
6
7
8
...
17
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2010