sr-dev September 2014

sr-dev@lists.kamailio.org

33 participants
375 discussions

git:master: jsonrpc-s: auto-convert int to str if required by scanning spec
by Daniel-Constantin Mierla 03 Sep '14

03 Sep '14

Module: sip-router Branch: master Commit: 09cff24f443123b78ae7443c324ee9038aa96069 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=09cff24… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Sep 3 05:27:15 2014 +0200 jsonrpc-s: auto-convert int to str if required by scanning spec - check if there spec string has still mandatory chars --- modules/jsonrpc-s/jsonrpc-s_mod.c | … [View More]38 ++++++++++++++++++++++++++++++++++-- 1 files changed, 35 insertions(+), 3 deletions(-) diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index 9991fb9..4e65894 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -404,6 +404,7 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) int auto_convert = 0; char* orig_fmt; va_list ap; + str stmp; if(ctx->req_node==NULL) return 0; @@ -434,12 +435,39 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) break; case 's': /* zero terminated string */ char_ptr = va_arg(ap, char**); - *char_ptr = ctx->req_node->valuestring; + if(ctx->req_node->type==srjson_String) { + *char_ptr = ctx->req_node->valuestring; + } else if(auto_convert == 1) { + if(ctx->req_node->type==srjson_Number) { + *char_ptr = int2str(ctx->req_node->valueint, &stmp.len); + } else { + *char_ptr = NULL; + goto error; + } + } else { + *char_ptr = NULL; + goto error; + } break; case 'S': /* str structure */ str_ptr = va_arg(ap, str*); - str_ptr->s = ctx->req_node->valuestring; - str_ptr->len = strlen(ctx->req_node->valuestring); + if(ctx->req_node->type==srjson_String) { + str_ptr->s = ctx->req_node->valuestring; + str_ptr->len = strlen(ctx->req_node->valuestring); + } else if(auto_convert == 1) { + if(ctx->req_node->type==srjson_Number) { + str_ptr->s = int2str(ctx->req_node->valueint, + &str_ptr->len); + } else { + str_ptr->s = NULL; + str_ptr->len = 0; + goto error; + } + } else { + str_ptr->s = NULL; + str_ptr->len = 0; + goto error; + } break; case '{': case '[': @@ -456,6 +484,10 @@ static int jsonrpc_scan(jsonrpc_ctx_t* ctx, char* fmt, ...) auto_convert = 0; ctx->req_node = ctx->req_node->next; } + /* error if there is still a scan char type and it is not optional */ + if(*fmt && mandatory_param==1) + goto error; + va_end(ap); return (int)(fmt-orig_fmt)-modifiers; error: [View Less]

1 0

[tracker] Comment added: CRASH: Program terminated with signal 6, Aborted.
by sip-router 03 Sep '14

03 Sep '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#449 - CRASH: Program terminated with signal 6, Aborted. User who did this - Nuno Miguel Reis (nmreis) ---------- Hi Daniel. I've just started working this Monday again, after a 2 week vacation period and in the meanwhile didn't have the opportunity to test this issue better. Nevertheless since you felt confident with your patches ans closed the issue, i'll let you know if the bug pops up again, … [View More]

1 0

git:master: xhttp_pi: proper handling for unknown db column types
by Ovidiu Sas 02 Sep '14

02 Sep '14

Module: sip-router Branch: master Commit: 4b7cd3fd867eca3d82cf4668d2ad37c0bc4f7780 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b7cd3f… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Sep 2 14:30:52 2014 -0400 xhttp_pi: proper handling for unknown db column types --- modules/xhttp_pi/xhttp_pi_fnc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/xhttp_pi/… [View More]

1 0

git:master: lib/srdb1: new col type DB1_UNKNOWN
by Ovidiu Sas 02 Sep '14

02 Sep '14

Module: sip-router Branch: master Commit: 1378ccf131885f027d1e1cd4bbaac1347a29e317 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1378ccf… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Sep 2 14:29:44 2014 -0400 lib/srdb1: new col type DB1_UNKNOWN --- lib/srdb1/db_val.h | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/db_val.h b/lib/srdb1/db_val.h index … [View More]

1 0

git:master: xhttp_pi: proper sizeof for memset
by Ovidiu Sas 02 Sep '14

02 Sep '14

Module: sip-router Branch: master Commit: 613d188f92401c60549ea0337ea0dcf3c68067d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=613d188… Author: Ovidiu Sas <osas(a)voipembedded.com> Committer: Ovidiu Sas <osas(a)voipembedded.com> Date: Tue Sep 2 14:25:42 2014 -0400 xhttp_pi: proper sizeof for memset --- modules/xhttp_pi/xhttp_pi_fnc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules/xhttp_pi/xhttp_pi_fnc.c b/… [View More]

1 0

Re: [sr-dev] Offline message handling
by Bhupendra Singh 02 Sep '14

02 Sep '14

Hello Folks, I found the root cause of this issue. In file ms_msg_list.c, issue is on line 290. (https://github.com/sipwise/kamailio/blob/master/modules/msilo/ms_msg_list.c ) Line 290: p0 = p0->next; should be like this below : p0 = ml->lsent; The issue is p0->next becomes null in first iteration so it won't process more than one element in 'while' loop. Hence this is the main cause of slowness of message deletion. I have tested modified code and it works fine now. Develoerps, … [View More]

2 2

git:master: htable: Add event route when htable entries expire
by Hugh Waite 02 Sep '14

02 Sep '14

Module: sip-router Branch: master Commit: 61af5c6b3523fe866f1d884ba4e9e077cce1588a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=61af5c6… Author: James Wyatt <james.wyatt(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Sep 2 12:52:47 2014 +0100 htable: Add event route when htable entries expire - event_route[htable:expired:<table>] called when an entry expires - pseudo-vars $shtrecord(key) and $shtrecord(value) … [View More]

2 1

git:4.0: core/parser: Free rr correctly in error cases
by Hugh Waite 02 Sep '14

02 Sep '14

Module: sip-router Branch: 4.0 Commit: 5980733615e8ea4d79b6b4c8e8c3cec00e871277 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5980733… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Aug 12 19:56:45 2014 +0100 core/parser: Free rr correctly in error cases - Fix potential memory leak if parameters are parsed into rr structure (cherry picked from commit b40d92962b680ac29dd38ffe3c8f1aa1e39d3a97) … [View More]

3 2

git:4.0: parser/rr: Fix free_rr() parameter
by Hugh Waite 02 Sep '14

02 Sep '14

Module: sip-router Branch: 4.0 Commit: 0a6ce4bfe5c8af8063b38f8e00909eff7610c05f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0a6ce4b… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Sep 2 16:58:11 2014 +0100 parser/rr: Fix free_rr() parameter - free_rr() expects an rr_t ** parameter --- parser/parse_rr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/… [View More]

1 0

git:4.0: outbound: Fix memory leak
by Hugh Waite 02 Sep '14

02 Sep '14

Module: sip-router Branch: 4.0 Commit: 67aff0acbae4bcc7e68577c9f94ac5156b03d87c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=67aff0a… Author: Hugh Waite <hugh.waite(a)acision.com> Committer: Hugh Waite <hugh.waite(a)acision.com> Date: Tue Aug 12 19:52:27 2014 +0100 outbound: Fix memory leak - Free parameters parsed when checking for ob markers (cherry picked from commit 392689597376eb6f047c12504bcce367f5940260) --- modules/outbound/ob_mod.c | … [View More]

1 0

← Newer
1
...
31
32
33
34
35
36
37
38
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 2014