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

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 | 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:

9 years, 8 months

[tracker] Comment added: CRASH: Program terminated with signal 6, Aborted.

by sip-router

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, eventually, as suggested. Thanks and keep up the good work. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=449#comment1609 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.

9 years, 8 months

git:master: xhttp_pi: proper handling for unknown db column types

by Ovidiu Sas

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/xhttp_pi_fnc.c b/modules/xhttp_pi/xhttp_pi_fnc.c index 4d7f0a4..a51e692 100644 --- a/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/modules/xhttp_pi/xhttp_pi_fnc.c @@ -570,7 +570,7 @@ int ph_getDbTableCols(ph_db_url_t *ph_db_urls, ph_db_table_t *db_tables, db_tables->cols = cols; cols = &db_tables->cols[db_tables->cols_size]; memset(cols, 0, sizeof(ph_table_col_t)); - cols->type=-1; + cols->type=DB1_UNKNOWN; /* Populate the field */ field.s = ph_xmlNodeGetNodeContentByName(node->children, @@ -683,7 +683,7 @@ int ph_getDbTableCols(ph_db_url_t *ph_db_urls, ph_db_table_t *db_tables, if(strncmp("DB1_DATETIME",val,12)==0) cols->type=DB1_DATETIME; } - if(cols->type==-1){ + if(cols->type==DB1_UNKNOWN){ LM_ERR("unexpected type [%s] for %s %s %s\n", val, table_node->name, node->name, XHTTP_PI_XML_TYPE_NODE);

9 years, 8 months

git:master: lib/srdb1: new col type DB1_UNKNOWN

by Ovidiu Sas

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 0badf9c..4e03412 100644 --- a/lib/srdb1/db_val.h +++ b/lib/srdb1/db_val.h @@ -56,7 +56,8 @@ typedef enum { DB1_STR, /**< represents a string of 'str' type */ DB1_DATETIME, /**< represents date and time */ DB1_BLOB, /**< represents a large binary object */ - DB1_BITMAP /**< an one-dimensional array of 32 flags */ + DB1_BITMAP, /**< an one-dimensional array of 32 flags */ + DB1_UNKNOWN /**< represents an unknown type */ } db_type_t;

9 years, 8 months

git:master: xhttp_pi: proper sizeof for memset

by Ovidiu Sas

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/modules/xhttp_pi/xhttp_pi_fnc.c index 720b1d9..4d7f0a4 100644 --- a/modules/xhttp_pi/xhttp_pi_fnc.c +++ b/modules/xhttp_pi/xhttp_pi_fnc.c @@ -889,7 +889,7 @@ int ph_getColVals(ph_mod_t *module, ph_cmd_t *cmd, if(vals==NULL||ids==NULL) {LM_ERR("oom\n"); return -1;} col_vals = vals; col_ids = ids; vals = &col_vals[size]; ids = &col_ids[size]; - memset(vals, 0, sizeof(str*)); memset(ids, 0, sizeof(str*)); + memset(vals, 0, sizeof(str)); memset(ids, 0, sizeof(str)); /* Retrieve the node attribute */ attr.s = ph_xmlNodeGetAttrContentByName(node, XHTTP_PI_XML_ID_ATTR);

9 years, 8 months

Re: [sr-dev] Offline message handling

by Bhupendra Singh

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, Please review this change and advise accordingly. Thanks On Mon, Aug 25, 2014 at 11:35 PM, Bhupendra Singh <bsingh(a)bsingh.net> wrote: > Hi Guys, > > Has anyone used/using offline message handling and storage in "silo" table? > My issue is cleanup of stored message is taking very long time specially > when many messages are left for target users. > After further investigation I realized, only one message gets deleted in > one pass and next in next pass ( after 30 second default timer). > Is it intentional ? How can we make sure that all delivered messages get > deleted right away for that user? > > Thanks > > >

9 years, 8 months

git:master: htable: Add event route when htable entries expire

by Hugh Waite

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) access the expired content --- modules/htable/README | 299 ++++++++++++++++++++++++----------- modules/htable/doc/htable_admin.xml | 34 ++++- modules/htable/ht_api.c | 63 ++++++++ modules/htable/ht_api.h | 2 + modules/htable/ht_var.c | 51 ++++++ modules/htable/ht_var.h | 3 + modules/htable/htable.c | 3 + 7 files changed, 355 insertions(+), 100 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=61a…

9 years, 8 months

git:4.0: core/parser: Free rr correctly in error cases

by Hugh Waite

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) --- parser/parse_rr.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/parser/parse_rr.c b/parser/parse_rr.c index d3a2938..e3df4f3 100644 --- a/parser/parse_rr.c +++ b/parser/parse_rr.c @@ -138,7 +138,7 @@ static inline int do_parse_rr_body(char *buf, int len, rr_t **head) } error: - if (r) pkg_free(r); + if (r) free_rr(r); free_rr(head); /* Free any contacts created so far */ return -1;

9 years, 8 months

git:4.0: parser/rr: Fix free_rr() parameter

by Hugh Waite

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/parse_rr.c b/parser/parse_rr.c index e3df4f3..0f293eb 100644 --- a/parser/parse_rr.c +++ b/parser/parse_rr.c @@ -138,7 +138,7 @@ static inline int do_parse_rr_body(char *buf, int len, rr_t **head) } error: - if (r) free_rr(r); + if (r) free_rr(&r); free_rr(head); /* Free any contacts created so far */ return -1;

9 years, 8 months

git:4.0: outbound: Fix memory leak

by Hugh Waite

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 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/modules/outbound/ob_mod.c b/modules/outbound/ob_mod.c index 6318b16..9865272 100644 --- a/modules/outbound/ob_mod.c +++ b/modules/outbound/ob_mod.c @@ -365,6 +365,8 @@ static int use_outbound_non_reg(struct sip_msg *msg) LM_ERR("parsing Route-URI parameters\n"); return 0; } + /* Not interested in param body - just the hooks */ + free_params(params); if (hooks.uri.ob) { @@ -422,6 +424,9 @@ static int use_outbound_non_reg(struct sip_msg *msg) LM_ERR("parsing Contact-URI parameters\n"); return 0; } + /* Not interested in param body - just the hooks */ + free_params(params); + if (hooks.contact.ob) { LM_DBG("found ;ob parameter on Contact-URI - outbound"

9 years, 8 months

← Newer
1
...
31
32
33
34
35
36
37
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2014