sr-dev September 2011

sr-dev@lists.kamailio.org

40 participants
299 discussions

git:master: core: parser/sdp - fixed parsing attributes lines
by Daniel-Constantin Mierla 28 Sep '11

28 Sep '11

Module: sip-router Branch: master Commit: e332ea9eaac3035c3ccd1605ef0b623a2b63a733 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e332ea9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 28 15:48:02 2011 +0200 core: parser/sdp - fixed parsing attributes lines - some lines were mistakenly jumped over --- parser/sdp/sdp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/sdp/sdp.c b/parser/sdp/sdp.c index 2f8831d..687d466 100644 --- a/parser/sdp/sdp.c +++ b/parser/sdp/sdp.c @@ -557,7 +557,7 @@ static int parse_sdp_session(str *sdp_body, int session_num, str *cnt_disp, sdp_ /* LM_DBG("else: `%.*s'\n", tmpstr1.len, tmpstr1.s); */ } - a2p = find_next_sdp_line(a1p, m2p, 'a', m2p); + a2p = find_next_sdp_line(a2p, m2p, 'a', m2p); } /* Let's detect if the media is on hold by checking * the good old "0.0.0.0" connection address */

1 0

[tracker] Task closed: infinit loop in sdp parser
by sip-router 28 Sep '11

28 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#160 - infinit loop in sdp parser User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed Additional comments about closing: Different implementation for extract_mediaip() was committed to GIT. It fixes this issue as well. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=160 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

git:master: core: parser/sdp - refactored extract_mediaip()
by Daniel-Constantin Mierla 28 Sep '11

28 Sep '11

Module: sip-router Branch: master Commit: 54040de85443e16a0022a94ab0a9d2d7a8d1bbf4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54040de… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 28 14:45:53 2011 +0200 core: parser/sdp - refactored extract_mediaip() - added ser_memrmem(...) for reverse search of a str in another str - use it to locate IP address in o= and c= lines - this closes also FS#160 reported by Juha Heinanen --- parser/sdp/sdp_helpr_funcs.c | 94 +++++++++++++++++++++++++++++------------- 1 files changed, 65 insertions(+), 29 deletions(-) diff --git a/parser/sdp/sdp_helpr_funcs.c b/parser/sdp/sdp_helpr_funcs.c index e432fd2..6dde0d4 100644 --- a/parser/sdp/sdp_helpr_funcs.c +++ b/parser/sdp/sdp_helpr_funcs.c @@ -98,6 +98,36 @@ static void * ser_memmem(const void *b1, const void *b2, size_t len1, size_t len return NULL; } +/* + * ser_memrmem() returns the location of the last occurrence of data + * pattern b2 of size len2 in memory block b1 of size len1 or + * NULL if none is found. + */ +static void * ser_memrmem(const void *b1, const void *b2, size_t len1, size_t len2) +{ + /* Initialize search pointer */ + char *sp = (char *) b1 + len1 - len2; + + /* Initialize pattern pointer */ + char *pp = (char *) b2; + + /* Initialize end of search address space pointer */ + char *eos = (char *) b1; + + /* Sanity check */ + if(!(b1 && b2 && len1 && len2)) + return NULL; + + while (sp >= eos) { + if (*sp == *pp) + if (memcmp(sp, pp, len2) == 0) + return sp; + + sp--; + } + + return NULL; +} int get_mixed_part_delimiter(str* body, str *mp_delimiter) { @@ -387,7 +417,7 @@ int extract_bwidth(str *body, str *bwtype, str *bwwitdth) int extract_mediaip(str *body, str *mediaip, int *pf, char *line) { char *cp, *cp1; - int len, nextisip; + int len; cp1 = NULL; for (cp = body->s; (len = body->s + body->len - cp) > 0;) { @@ -402,38 +432,44 @@ int extract_mediaip(str *body, str *mediaip, int *pf, char *line) mediaip->s = cp1 + 2; mediaip->len = eat_line(mediaip->s, body->s + body->len - mediaip->s) - mediaip->s; trim_len(mediaip->len, mediaip->s, *mediaip); - - nextisip = 0; - for (cp = mediaip->s; cp < mediaip->s + mediaip->len;) { - len = eat_token_end(cp, mediaip->s + mediaip->len) - cp; - if (nextisip == 1) { - mediaip->s = cp; - mediaip->len = len; - nextisip++; - break; - } - if (len == 3 && memcmp(cp, "IP", 2) == 0) { - switch (cp[2]) { - case '4': - nextisip = 1; - *pf = AF_INET; - break; - - case '6': - nextisip = 1; - *pf = AF_INET6; - break; - - default: - break; - } - } - cp = eat_space_end(cp + len, mediaip->s + mediaip->len); + if (mediaip->len == 0) { + LM_ERR("no [%s] line in SDP\n",line); + return -1; } - if (nextisip != 2 || mediaip->len == 0) { + + /* search reverse for IP[4|6] in c=/o= line */ + cp = (char*)ser_memrmem(mediaip->s, " IP", mediaip->len, 3); + if (cp == NULL) { LM_ERR("no `IP[4|6]' in `%s' field\n",line); return -1; } + /* safety checks: + * - for lenght, at least 6: ' IP[4|6] x...' + * - white space after + */ + if(cp + 6 > mediaip->s + mediaip->len && cp[4]!=' ') { + LM_ERR("invalid content for `%s' line\n",line); + return -1; + } + if(cp[3]!='4' && cp[3]!='6') { + LM_ERR("invalid addrtype IPx for `%s' line\n",line); + return -1; + } + cp += 5; + + /* next token is the IP address */ + cp = eat_space_end(cp, mediaip->s + mediaip->len); + len = eat_token_end(cp, mediaip->s + mediaip->len) - cp; + mediaip->s = cp; + mediaip->len = len; + + if (mediaip->len == 0) { + LM_ERR("no `IP[4|6]' address in `%s' field\n",line); + return -1; + } + + LM_ERR("located IP address [%.*s] in `%s' field\n", + mediaip->len, mediaip->s, line); return 1; }

1 0

[tracker] Assignee added: wrong integer parameters parsing in ndb_redis
by sip-router 28 Sep '11

28 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A user has added themself to the list of users assigned to this task. FS#162 - wrong integer parameters parsing in ndb_redis User who did this - Andrew Pogrebennyk (marduk) http://sip-router.org/tracker/index.php?do=details&task_id=162 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

[tracker] Task opened: wrong integer parameters parsing in ndb_redis
by sip-router 28 Sep '11

28 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Andrew Pogrebennyk (marduk) Attached to Project - sip-router Summary - wrong integer parameters parsing in ndb_redis Task Type - Bug Report Category - Core Status - Assigned Assigned To - Andrei Pelinescu-Onciul Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - There appears to be a problem with integer parameters parsing in ndb_redis (cannot override default db and port). Please review and accept the patch: diff --git a/modules/ndb_redis/redis_client.c b/modules/ndb_redis/redis_client.c index 6a91019..9f4ffc4 100644 --- a/modules/ndb_redis/redis_client.c +++ b/modules/ndb_redis/redis_client.c @@ -71,10 +71,10 @@ int redisc_init(void) addr = pit->body.s; addr[pit->body.len] = '\0'; } else if(pit->name.len==4 && strncmp(pit->name.s, "port", 4)==0) { - if(!str2int(&pit->body, &port)) + if(str2int(&pit->body, &port) < 0) port = 6379; } else if(pit->name.len==2 && strncmp(pit->name.s, "db", 2)==0) { - if(!str2int(&pit->body, &db)) + if(str2int(&pit->body, &db) < 0) db = 0; } } More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=162 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

advertised_address in Record-Route
by Hugh Waite 28 Sep '11

28 Sep '11

Hello developers, We are configuring a kamailio server that will be behind a UCARP virtual IP and/or SIP load balancers. This means we need to use the 'advertised_address:advertised_port' variables. The documentation states that these will be used in "Via headers and other destination lumps (e.g. RR header)", however it only seems to work for Via's and not Record-Route's. We have been using record_route_preset() as a workaround, but this does not allow me to add rr parameters onto it. I would like to fix the record_route code to use advertised address (if set), but the code for inserting Via's and RR's is very different; I'm not sure about the correct way to do this, or if the current behaviour was chosen for a reason. Can someone with knowledge of this area help me out here? Best regards, Hugh -- -- Hugh Waite Senior Design Engineer Crocodile RCS Ltd.

2 1

git:mariuszbihlei/ipv6_fix: core: socket_info Added automatic discovery of IPv6 interfaces on Linux using RT_NETLINK socks
by Marius Zbihlei 28 Sep '11

28 Sep '11

Module: sip-router Branch: mariuszbihlei/ipv6_fix Commit: bcea195d73c85adaa9790320998100b80a00b375 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcea195… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Sep 28 13:39:39 2011 +0300 core:socket_info Added automatic discovery of IPv6 interfaces on Linux using RT_NETLINK socks The behavior now is identical for IPv4 or IPv6 interfaces : if no listen directives are given, either via command line or config file, Kamailio will automatically detect IPv4/IPv6 interfaces and bind to them (well, it will not bind to link-local prefixes) --- socket_info.c | 415 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 403 insertions(+), 12 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=bce…

1 0

git:mariuszbihlei/ipv6_fix: Makefile: version set to 3.2.0-pre3
by Marius Zbihlei 28 Sep '11

28 Sep '11

Module: sip-router Branch: mariuszbihlei/ipv6_fix Commit: 8d58764d5aaffa25b95ae91adb665b415b7c00e1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8d58764… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 27 18:09:41 2011 +0200 Makefile: version set to 3.2.0-pre3 --- Makefile.defs | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index 89f1f79..0a9c1ae 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -162,7 +162,7 @@ INSTALL_FLAVOUR=$(FLAVOUR) VERSION = 3 PATCHLEVEL = 2 SUBLEVEL = 0 -EXTRAVERSION = -pre2 +EXTRAVERSION = -pre3 # memory debugger switcher # 0 - off (release mode)

1 0

[tracker] Comment added: domain class AVPs are not stored in transaction
by sip-router 28 Sep '11

28 Sep '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#161 - domain class AVPs are not stored in transaction User who did this - Juha Heinanen (jh) ---------- I don't mind domain class AVPs being read only, but it is bad when their values are not available in failure and reply routes. If that is by design, then they should not be called APVs at all and there should not be any reference to them in tm module. At some point Jan told that domain class AVPs should be stored in transaction and that there is a bug in the code if that is not the case, but I guess he is now busy with other things. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=161#comment287 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your notification settings at the URL shown above.

1 0

releasing v3.2.0
by Daniel-Constantin Mierla 28 Sep '11

28 Sep '11

Hello, it is time to set the time to release v3.2.0. From my point of view, testing went very well, considering also that core and main modules were not touched much during this devel cycle, the most of the efforts were on new modules and application service components such as presence server, Lua ... A convenient date for me will be Tuesday, October 18, 2011, allowing to work a bit on packaging and docs. If there are other preferences, jump in this discussion. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Oct 10-13, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

2 1

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2011