Module: sip-router Branch: master Commit: 54040de85443e16a0022a94ab0a9d2d7a8d1bbf4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54040de8...

Author: Daniel-Constantin Mierla miconda@gmail.com Committer: Daniel-Constantin Mierla miconda@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; }