sr-dev August 2014

sr-dev@lists.kamailio.org

25 participants
196 discussions

git:master: modules/ims_usrloc_pcscf: fixed bug when updating DB record for P-CSCF contact
by Jason Penton 15 Aug '14

15 Aug '14

Module: sip-router Branch: master Commit: f1f227e661697cd527f6ab7077c275ddfc8ba23d URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f1f227e… Author: Jason Penton <jason.penton(a)gmail.com> Committer: Jason Penton <jason.penton(a)gmail.com> Date: Fri Aug 8 11:38:00 2014 +0200 modules/ims_usrloc_pcscf: fixed bug when updating DB record for P-CSCF contact --- modules/ims_usrloc_pcscf/usrloc_db.c | 18 +++++++++++++----- 1 files changed, 13 insertions(+), 5 deletions(-) diff --git a/modules/ims_usrloc_pcscf/usrloc_db.c b/modules/ims_usrloc_pcscf/usrloc_db.c index c80f6ad..cc85163 100644 --- a/modules/ims_usrloc_pcscf/usrloc_db.c +++ b/modules/ims_usrloc_pcscf/usrloc_db.c @@ -121,18 +121,20 @@ int db_update_pcontact(pcontact_t* _c) db_val_t match_values[1]; db_key_t match_keys[1] = { &aor_col }; + db_op_t op[1]; db_key_t update_keys[8] = { &expires_col, &reg_state_col, &service_routes_col, &received_col, &received_port_col, &received_proto_col, &rx_session_id_col, &public_ids_col }; db_val_t values[8]; - - LM_DBG("updating pcontact: %.*s\n", _c->aor.len, _c->aor.s); + + LM_DBG("updating pcontact: %.*s\n", _c->aor.len, _c->aor.s); VAL_TYPE(match_values) = DB1_STR; VAL_NULL(match_values) = 0; VAL_STR(match_values) = _c->aor; + op[0]=OP_EQ; if (use_location_pcscf_table(_c->domain) < 0) { LM_ERR("Error trying to use table %.*s\n", _c->domain->len, _c->domain->s); @@ -180,7 +182,7 @@ int db_update_pcontact(pcontact_t* _c) SET_PROPER_NULL_FLAG(impus, values, 7); SET_STR_VALUE(values + 7, impus); - if((ul_dbf.update(ul_dbh, match_keys, NULL, match_values, update_keys,values, 1, 8)) !=0){ + if((ul_dbf.update(ul_dbh, match_keys, op, match_values, update_keys,values, 1, 8)) !=0){ LM_ERR("could not update database info\n"); return -1; } @@ -323,6 +325,7 @@ int db_insert_pcontact(struct pcontact* _c) int db_update_pcontact_security_temp(struct pcontact* _c, security_type _t, security_t* _s) { db_val_t match_values[1]; db_key_t match_keys[1] = { &aor_col }; + db_op_t op[1]; db_key_t update_keys[13] = { &t_security_type_col, &t_protocol_col, &t_mode_col, &t_ck_col, &t_ik_col, &t_ealg_col, &t_ialg_col, &t_port_uc_col, &t_port_us_col, &t_spi_pc_col, &t_spi_ps_col, &t_spi_uc_col, &t_spi_us_col }; @@ -333,6 +336,7 @@ int db_update_pcontact_security_temp(struct pcontact* _c, security_type _t, secu VAL_TYPE(match_values) = DB1_STR; VAL_NULL(match_values) = 0; VAL_STR(match_values) = _c->aor; + op[0]=OP_EQ; if (use_location_pcscf_table(_c->domain) < 0) { LM_ERR("Error trying to use table %.*s\n", _c->domain->len, _c->domain->s); @@ -387,7 +391,7 @@ int db_update_pcontact_security_temp(struct pcontact* _c, security_type _t, secu VAL_NULL(values + i) = ipsec?0:1; VAL_BIGINT(values + i) = ipsec?ipsec->spi_us:0; - if ((ul_dbf.update(ul_dbh, match_keys, NULL, match_values, update_keys, + if ((ul_dbf.update(ul_dbh, match_keys, op, match_values, update_keys, values, 1, 13)) != 0) { LM_ERR("could not update database info\n"); return -1; @@ -412,6 +416,8 @@ int db_update_pcontact_security_temp(struct pcontact* _c, security_type _t, secu int db_update_pcontact_security(struct pcontact* _c, security_type _t, security_t* _s) { db_val_t match_values[1]; db_key_t match_keys[1] = { &aor_col }; + db_op_t op[1]; + db_key_t update_keys[13] = { &security_type_col, &protocol_col, &mode_col, &ck_col, &ik_col, &ealg_col, &ialg_col, &port_uc_col, &port_us_col, &spi_pc_col, &spi_ps_col, &spi_uc_col, &spi_us_col }; @@ -422,6 +428,7 @@ int db_update_pcontact_security(struct pcontact* _c, security_type _t, security_ VAL_TYPE(match_values) = DB1_STR; VAL_NULL(match_values) = 0; VAL_STR(match_values) = _c->aor; + op[0]=OP_EQ; if (use_location_pcscf_table(_c->domain) < 0) { LM_ERR("Error trying to use table %.*s\n", _c->domain->len, _c->domain->s); @@ -431,6 +438,7 @@ int db_update_pcontact_security(struct pcontact* _c, security_type _t, security_ VAL_TYPE(values) = DB1_INT; VAL_TIME(values) = _s?_s->type:0; VAL_NULL(values) = 0; + switch (_t) { case SECURITY_IPSEC: { @@ -485,7 +493,7 @@ int db_update_pcontact_security(struct pcontact* _c, security_type _t, security_ VAL_NULL(values + i) = ipsec?0:1; VAL_BIGINT(values + i) = ipsec?ipsec->spi_us:0; - if ((ul_dbf.update(ul_dbh, match_keys, NULL, match_values, update_keys, + if ((ul_dbf.update(ul_dbh, match_keys, op, match_values, update_keys, values, 1, 13)) != 0) { LM_ERR("could not update database info\n"); return -1;

1 0

New Kamailio module Obfuscate
by Muhammad Shahzad 15 Aug '14

15 Aug '14

Hi, As already discussed in detail in following email thread, https://www.mail-archive.com/sr-users@lists.sip-router.org/msg19922.html The new Kamailio module obfuscate is ready for testing and can be downloaded at, http://webrtc.voip-demos.com/obfuscate.tbz2 It contains full code, with documentation and usage scenarios etc. Adding Kamailio dev team, can you guys review the code and add this module to Kamailio trunk if possible? I will be responsible for its maintenance and bug fixes etc. if any. Thank you.

2 23

git:master: added support for network io intercept
by Daniel-Constantin Mierla 15 Aug '14

15 Aug '14

Module: sip-router Branch: master Commit: 0640f7cd971115429f9d573f02e41b21a8642cb0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0640f7c… Author: Muhammad Shahzad Shafi <shahzad(a)voip-demos.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 8 14:00:24 2014 +0200 added support for network io intercept --- modules/corex/README | 281 ++++++++++++++++++++++++++++++++++--- modules/corex/corex_mod.c | 17 ++- modules/corex/corex_nio.c | 199 ++++++++++++++++++++++++++ modules/corex/corex_nio.h | 53 +++++++ modules/corex/doc/corex.xml | 5 + modules/corex/doc/corex_admin.xml | 257 +++++++++++++++++++++++++++++++++ 6 files changed, 793 insertions(+), 19 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=064…

1 0

git:master: jsonrpc-s: implemented rpc struct_printf() api function
by Daniel-Constantin Mierla 15 Aug '14

15 Aug '14

Module: sip-router Branch: master Commit: 4b5f137891767264688523dfa5a12bd29e998565 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4b5f137… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri Aug 15 12:55:33 2014 +0200 jsonrpc-s: implemented rpc struct_printf() api function --- modules/jsonrpc-s/jsonrpc-s_mod.c | 60 +++++++++++++++++++++++++++++++++++- 1 files changed, 58 insertions(+), 2 deletions(-) diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index 9e9fb64..cdb54ea 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -489,6 +489,7 @@ static int jsonrpc_printf(jsonrpc_ctx_t* ctx, char* fmt, ...) nj = srjson_CreateString(ctx->jrpl, buf); if(nj==NULL) { LM_ERR("failed to create the value node\n"); + if(buf && buf!=tbuf) jsonrpc_free(buf); return -1; } if(ctx->flags & RET_ARRAY) { @@ -496,6 +497,7 @@ static int jsonrpc_printf(jsonrpc_ctx_t* ctx, char* fmt, ...) ctx->rpl_node = srjson_CreateArray(ctx->jrpl); if(ctx->rpl_node == 0) { LM_ERR("failed to create the root array node\n"); + if(buf && buf!=tbuf) jsonrpc_free(buf); return -1; } } @@ -637,9 +639,63 @@ static int jsonrpc_struct_scan(void* s, char* fmt, ...) /** Create a new member from formatting string and add it to a structure. */ -static int jsonrpc_struct_printf(void* s, char* member_name, char* fmt, ...) +static int jsonrpc_struct_printf(srjson_t *jnode, char* mname, char* fmt, ...) { - LM_ERR("Not implemented\n"); + jsonrpc_ctx_t* ctx; + int n, buf_size; + char *buf = 0; + char tbuf[JSONRPC_PRINT_VALUE_BUF_LEN]; + va_list ap; + srjson_t *nj = NULL; + + if(jnode==NULL || mname==NULL) { + LM_ERR("invalid json node or member name parameter (%p/%p)\n", + jnode, mname); + return -1; + } + if(jnode->type!=srjson_Object) { + LM_ERR("json node parameter is not object (%d)\n", jnode->type); + return -1; + } + + ctx = &_jsonrpc_ctx; + if(ctx->jrpl==NULL) { + LM_ERR("reply object not initialized in rpl context\n"); + return -1; + } + + buf = tbuf; + buf_size = JSONRPC_PRINT_VALUE_BUF_LEN; + while (1) { + /* try to print in the allocated space. */ + va_start(ap, fmt); + n = vsnprintf(buf, buf_size, fmt, ap); + va_end(ap); + /* if that worked, return the string. */ + if (n > -1 && n < buf_size) { + nj = srjson_CreateString(ctx->jrpl, buf); + if(nj==NULL) { + LM_ERR("failed to create the value node\n"); + if(buf && buf!=tbuf) jsonrpc_free(buf); + return -1; + } + srjson_AddItemToObject(ctx->jrpl, jnode, mname, nj); + if(buf && buf!=tbuf) jsonrpc_free(buf); + return 0; + } + /* else try again with more space. */ + if (n > -1) { /* glibc 2.1 */ + buf_size = n + 1; /* precisely what is needed */ + } else { /* glibc 2.0 */ + buf_size *= 2; /* twice the old size */ + } + if(buf && buf!=tbuf) jsonrpc_free(buf); + if ((buf = jsonrpc_malloc(buf_size)) == 0) { + jsonrpc_fault(ctx, 500, "Internal Server Error (No memory left)"); + LM_ERR("no memory left for rpc printf\n"); + return -1; + } + } return -1; }

1 0

[tracker] Comment added: Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs
by sip-router 14 Aug '14

14 Aug '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#459 - Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs User who did this - Daniel-Constantin Mierla (miconda) ---------- You have to configure kamctl by editing kamctlrc file from the same folder as kamailio.cfg -- mainly look for DBENGINE variable. ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=459#comment1587 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] Comment added: Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs
by sip-router 14 Aug '14

14 Aug '14

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#459 - Dispatcher Round Robin Logic not Working with Dispatcher Table with FQDNs User who did this - Ed James (erj01) ---------- I get: WARNING: database engine not found - tried 'MYSQL' ERROR: This command requires a database engine - none was loaded If I log into MySQL and run it from the MySQL prompt I get nothing. I'm obviously missing something... ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=459#comment1586 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: Free rr correctly in error cases
by Hugh Waite 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: b40d92962b680ac29dd38ffe3c8f1aa1e39d3a97 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b40d929… 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 --- 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 fd6d3d9..bba0f7a 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;

2 1

git:4.1: parser/rr: free_rr() is expecting rr_t** parameter
by Daniel-Constantin Mierla 14 Aug '14

14 Aug '14

Module: sip-router Branch: 4.1 Commit: 1d44d71e1786182df3f81f7abf206e13faae9d26 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1d44d71… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 14 18:24:31 2014 +0200 parser/rr: free_rr() is expecting rr_t** parameter - give the parameter as &r, following the commit b40d92962b680ac29dd38ffe3c8f1aa1e39d3a97 (cherry picked from commit 34ba948cdabf7139c8563e531f18c4a486b31a00) --- 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;

1 0

git:master: parser/rr: free_rr() is expecting rr_t** parameter
by Daniel-Constantin Mierla 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: 34ba948cdabf7139c8563e531f18c4a486b31a00 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=34ba948… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 14 18:24:31 2014 +0200 parser/rr: free_rr() is expecting rr_t** parameter - give the parameter as &r, following the 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 bba0f7a..2ab5a93 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;

1 0

git:master: jsonrpc-s: removed unused variable
by Daniel-Constantin Mierla 14 Aug '14

14 Aug '14

Module: sip-router Branch: master Commit: 6a7c9fafd6ec44ad76e5914b57371a8412c04697 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6a7c9fa… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Thu Aug 14 18:14:11 2014 +0200 jsonrpc-s: removed unused variable --- modules/jsonrpc-s/jsonrpc-s_mod.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/modules/jsonrpc-s/jsonrpc-s_mod.c b/modules/jsonrpc-s/jsonrpc-s_mod.c index 5928e90..9e9fb64 100644 --- a/modules/jsonrpc-s/jsonrpc-s_mod.c +++ b/modules/jsonrpc-s/jsonrpc-s_mod.c @@ -730,7 +730,6 @@ static int jsonrpc_dispatch(sip_msg_t* msg, char* s1, char* s2) { rpc_export_t* rpce; jsonrpc_ctx_t* ctx; - str arg = {NULL, 0}; int ret = 0; srjson_t *nj = NULL; str val;

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev August 2014