sr-dev November 2015

sr-dev@lists.kamailio.org

27 participants
315 discussions

curl/utils HTTP-query crashes
by Olle E. Johansson 18 Nov '15

18 Nov '15

Hi! I have some strange crashes in the CURL module that I’ve been working on. Yesterday I heard from a customer that use the http_query function in the utils module that they get a lot of crashes too, so unfortunately it’s something I copied from the http_query module that cause the crash. I haven’t yet gotten any dump files from them, but in one case I have all core dumps pointing to the neighbourhood of the code where the module assigning the result of the query to the PV variable. I’ll continue working on this and will try to repeat it on my own systems so I can track it down, but if anyone else have been using http_query and got crashes, please let me know and we can possibly work on this together. /O

1 0

git:master:16bc7b72: dmq: removed params field from dmq_node_t
by Daniel-Constantin Mierla 17 Nov '15

17 Nov '15

Module: kamailio Branch: master Commit: 16bc7b726a21108458f354aea840cdbf5d89d6d8 URL: https://github.com/kamailio/kamailio/commit/16bc7b726a21108458f354aea840cdb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-17T22:51:01+01:00 dmq: removed params field from dmq_node_t - used only for setting a flag - duplicating a node caused issues with param field not being duplicated, resulting in potential many free of same pointer, reported by Sebastian Damm --- Modified: modules/dmq/dmqnode.c Modified: modules/dmq/dmqnode.h Modified: modules/dmq/notification_peer.c --- Diff: https://github.com/kamailio/kamailio/commit/16bc7b726a21108458f354aea840cdb… Patch: https://github.com/kamailio/kamailio/commit/16bc7b726a21108458f354aea840cdb… --- diff --git a/modules/dmq/dmqnode.c b/modules/dmq/dmqnode.c index 7b0bf63..f9816cb 100644 --- a/modules/dmq/dmqnode.c +++ b/modules/dmq/dmqnode.c @@ -185,20 +185,12 @@ dmq_node_t* build_dmq_node(str* uri, int shm) { } /* if any params found */ if(params) { - if(shm) { - if(shm_duplicate_params(&ret->params, params) < 0) { - LM_ERR("error duplicating params\n"); - free_params(params); - goto error; - } + if(set_dmq_node_params(ret, params) < 0) { free_params(params); - } else { - ret->params = params; - } - if(set_dmq_node_params(ret, ret->params) < 0) { LM_ERR("error setting parameters\n"); goto error; } + free_params(params); } else { LM_DBG("no dmqnode params found\n"); } @@ -248,12 +240,8 @@ dmq_node_t* find_dmq_node_uri2(str* uri) void destroy_dmq_node(dmq_node_t* node, int shm) { if(shm) { - if (node->params!=NULL) - shm_free_params(node->params); shm_free_node(node); } else { - if (node->params!=NULL) - free_params(node->params); pkg_free_node(node); } } diff --git a/modules/dmq/dmqnode.h b/modules/dmq/dmqnode.h index 2ef7b5f..7bc7ff6 100644 --- a/modules/dmq/dmqnode.h +++ b/modules/dmq/dmqnode.h @@ -43,7 +43,6 @@ typedef struct dmq_node { str orig_uri; /* original uri string - e.g. sip:127.0.0.1:5060;passive=true */ struct sip_uri uri; /* parsed uri string */ struct ip_addr ip_address; /* resolved IP address */ - param_t* params; /* uri parameters */ int status; /* reserved - maybe something like active,timeout,disabled */ int last_notification; /* last notificatino receied from the node */ struct dmq_node* next; /* pointer to the next struct dmq_node */ diff --git a/modules/dmq/notification_peer.c b/modules/dmq/notification_peer.c index 3abefde..3bcff96 100644 --- a/modules/dmq/notification_peer.c +++ b/modules/dmq/notification_peer.c @@ -406,7 +406,7 @@ int extract_node_list(dmq_node_list_t* update_list, struct sip_msg* msg) update_list->nodes = cur; update_list->count++; total_nodes++; - } else if (find->params && ret->status != find->status) { + } else if (find->uri.params.s && ret->status != find->status) { LM_DBG("updating status on %.*s from %d to %d\n", STR_FMT(&tmp_uri), ret->status, find->status); ret->status = find->status;

1 0

siremis login problems php 5.6
by Peter Villeneuve 17 Nov '15

17 Nov '15

Hi all, Just decided to upgrade my infrastructure do Debian Jessie. Installed latest stable kamailio from deb package and latest siremis (4.2). Anyway, everything seems ok until I try logging in. I presume that siremis 4.2 is not compatible with php 5.6. Is this correct? Any plans on updating siremis so it can work with newer software? Cheers, Peter Here's the error: [{"target":"ERROR","content":" \n[2015-11-17 11:07:55 (GMT)] An exception occurred while executing this script: \nError message: #8192, Non-static method BizSystem::getConfiguration() should not be called statically, assuming $this from incompatible context<\/font> \nScript name and line number of error: \/var\/www\/html\/siremis-4.2.0\/openbiz\/bin\/data\/BizDataObj_Abstract.php:268<\/font> \n *function:<\/b> errorHandler ( 8192, \"Non-static method BizSystem::getConfiguration() should not be ca...\", \"\/var\/www\/html\/siremis-4.2.0\/openbiz\/bin\/data\/BizDataObj_Abstract...\", 268, Array(0) ) @ \/var\/www\/html\/siremis-4.2.0\/openbiz\/bin\/sysheader.inc 117\nfunction:<\/b> userErrorHandler ( 8192, \"Non-static method BizSystem::getConfiguration() should not be ca...\", \"\/var\/www\/html\/siremis-4.2.0\/openbiz\/bin\/data\/BizDataObj_Abstract...\", 268, Array(0) ) @ \/var\/www\/html\/siremis-4.2.0\/openbiz\/bin\/data\/BizDataObj_Abstract.php 268\nfunction:<\/b> setQuoteIdentifiers ( ) @ \/var\/www\/html\/siremis-4.2.0\/openbiz\/bin\/data\/BizDataObj_Abstract.php 177\n* Here's the php version: php -v PHP 5.6.14-0+deb8u1 (cli) (built: Oct 4 2015 16:13:10) Copyright (c) 1997-2015 The PHP Group Zend Engine v2.6.0, Copyright (c) 1998-2015 Zend Technologies with Zend OPcache v7.0.6-dev, Copyright (c) 1999-2015, by Zend Technologies

2 3

git:master:4da5d898: lib/srdb1: url parser extracts the db name before the url parameters
by Daniel-Constantin Mierla 17 Nov '15

17 Nov '15

Module: kamailio Branch: master Commit: 4da5d898da9a0a8f2780dcdf864354098268a7e9 URL: https://github.com/kamailio/kamailio/commit/4da5d898da9a0a8f2780dcdf8643540… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-17T09:16:06+01:00 lib/srdb1: url parser extracts the db name before the url parameters - some database urls can have parameters after db name, like: driver://username:password@dbhost:port/dbname?params - reported by Kelvin Chua for db_mongodb --- Modified: lib/srdb1/db_id.c --- Diff: https://github.com/kamailio/kamailio/commit/4da5d898da9a0a8f2780dcdf8643540… Patch: https://github.com/kamailio/kamailio/commit/4da5d898da9a0a8f2780dcdf8643540… --- diff --git a/lib/srdb1/db_id.c b/lib/srdb1/db_id.c index f1969c1..5a283f0 100644 --- a/lib/srdb1/db_id.c +++ b/lib/srdb1/db_id.c @@ -55,6 +55,30 @@ static int dupl_string(char** dst, const char* begin, const char* end) return 0; } +/** + * Duplicate a string name (until a params separator found) + * \param dst destination + * \param begin start of the string + * \param end end of the string + */ +static int dupl_string_name(char** dst, const char* begin, const char* end) +{ + char *p; + if (*dst) pkg_free(*dst); + + for(p=(char*)begin; p<end; p++) { + if(*p=='?') break; + } + *dst = pkg_malloc(p - begin + 1); + if ((*dst) == NULL) { + return -1; + } + + memcpy(*dst, begin, p - begin); + (*dst)[p - begin] = '\0'; + return 0; +} + /** * Parse a database URL of form @@ -151,7 +175,7 @@ static int parse_db_url(struct db_id* id, const str* url) case '/': if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; - if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; + if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; @@ -178,7 +202,7 @@ static int parse_db_url(struct db_id* id, const str* url) id->host = prev_token; prev_token = 0; id->port = str2s(begin, url->s + i - begin, 0); - if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; + if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; @@ -193,7 +217,7 @@ static int parse_db_url(struct db_id* id, const str* url) case '/': if (dupl_string(&id->host, begin, url->s + i) < 0) goto err; - if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; + if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break; @@ -202,7 +226,7 @@ static int parse_db_url(struct db_id* id, const str* url) switch(url->s[i]) { case '/': id->port = str2s(begin, url->s + i - begin, 0); - if (dupl_string(&id->database, url->s + i + 1, url->s + len) < 0) goto err; + if (dupl_string_name(&id->database, url->s + i + 1, url->s + len) < 0) goto err; return 0; } break;

1 0

git:master:6a738a91: carrierroute: addind db_load_description parameter
by Lucian Balaceanu 16 Nov '15

16 Nov '15

Module: kamailio Branch: master Commit: 6a738a9123affb08a870e8fac839bf04994faa5b URL: https://github.com/kamailio/kamailio/commit/6a738a9123affb08a870e8fac839bf0… Author: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Committer: Lucian Balaceanu <lucian.balaceanu(a)1and1.ro> Date: 2015-11-16T18:59:05+02:00 carrierroute: addind db_load_description parameter - toggle on/off loading in memory the description column in the carrierroute/carrierfailureroute database tables. This reduces the shared memory used by the module --- Modified: modules/carrierroute/carrierroute.c Modified: modules/carrierroute/cr_db.c Modified: modules/carrierroute/cr_db.h Modified: modules/carrierroute/cr_rule.c Modified: modules/carrierroute/doc/carrierroute_admin.xml --- Diff: https://github.com/kamailio/kamailio/commit/6a738a9123affb08a870e8fac839bf0… Patch: https://github.com/kamailio/kamailio/commit/6a738a9123affb08a870e8fac839bf0…

1 0

git:master:73c29912: tmx: added $T(ruid)
by Daniel-Constantin Mierla 16 Nov '15

16 Nov '15

Module: kamailio Branch: master Commit: 73c29912aa69f1acd43ba156191bead4a1289bb1 URL: https://github.com/kamailio/kamailio/commit/73c29912aa69f1acd43ba156191bead… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T16:38:57+01:00 tmx: added $T(ruid) - return current branch ruid attribute - same as $T_reply_ruid, but works also for branch route --- Modified: modules/tmx/t_var.c --- Diff: https://github.com/kamailio/kamailio/commit/73c29912aa69f1acd43ba156191bead… Patch: https://github.com/kamailio/kamailio/commit/73c29912aa69f1acd43ba156191bead… --- diff --git a/modules/tmx/t_var.c b/modules/tmx/t_var.c index 7b61a49..bcd5839 100644 --- a/modules/tmx/t_var.c +++ b/modules/tmx/t_var.c @@ -646,6 +646,11 @@ int pv_parse_t_name(pv_spec_p sp, str *in) sp->pvp.pvn.u.isname.name.n = 6; else goto error; break; + case 4: + if(strncmp(in->s, "ruid", 4) == 0) + sp->pvp.pvn.u.isname.name.n = 7; + else goto error; + break; case 5: if(strncmp(in->s, "flags", 5) == 0) sp->pvp.pvn.u.isname.name.n = 5; @@ -773,6 +778,19 @@ int pv_get_t_branch(struct sip_msg *msg, pv_param_t *param, return pv_get_null(msg, param, res); } return pv_get_strval(msg, param, res, &t->uac[branch].uri); + case 7: /* $T_branch(ruid) */ + switch(route_type) { + case BRANCH_ROUTE: + /* branch and branch_failure routes have their index set */ + tcx = _tmx_tmb.tm_ctx_get(); + if(tcx == NULL) + return pv_get_null(msg, param, res); + return pv_get_strval(msg, param, res, &t->uac[tcx->branch_index].ruid); + break; + default: + return pv_get_tm_reply_ruid(msg, param, res); + } + } return 0; }

1 0

git:4.3:040a3667: cnxcc: make cnxcc locks re-entrant
by Federico Cabiddu 16 Nov '15

16 Nov '15

Module: kamailio Branch: 4.3 Commit: 040a36678f104905a0066c8b6a352da59c539fee URL: https://github.com/kamailio/kamailio/commit/040a36678f104905a0066c8b6a352da… Author: Federico Cabiddu <federico.cabiddu(a)gmail.com> Committer: Federico Cabiddu <federico.cabiddu(a)gmail.com> Date: 2015-11-16T16:30:17+01:00 cnxcc: make cnxcc locks re-entrant (cherry picked from commit a4cdd61afad027c9bb431ceda4e71941274610ce) --- Modified: modules/cnxcc/cnxcc_check.c Modified: modules/cnxcc/cnxcc_mod.c Modified: modules/cnxcc/cnxcc_mod.h Modified: modules/cnxcc/cnxcc_redis.c Modified: modules/cnxcc/cnxcc_rpc.c --- Diff: https://github.com/kamailio/kamailio/commit/040a36678f104905a0066c8b6a352da… Patch: https://github.com/kamailio/kamailio/commit/040a36678f104905a0066c8b6a352da…

1 0

[kamailio] cnxcc: make cnxcc locks re-entrant (#398)
by Federico Cabiddu 16 Nov '15

16 Nov '15

Cnxcc call termination is not working anymore since commit 265dc95aac8eb4b5cee7992dde55ff08c92a7ac5. That commit introduced the call to DLGCB_TERMINATED callbacks for the locally generated BYE, which leads to a deadlock in cnxcc when it tries to end the calls because the credit (money or time) is exhausted. This patch introduces a new structure cnxcc_lock which implements re-entrant locks. As a side question I'm wondering if, since other modules need re-entrant locks, this structure should be defined in lock_ops.h like the other kamailio's locks. You can view, comment on, or merge this pull request online at: https://github.com/kamailio/kamailio/pull/398 -- Commit Summary -- * cnxcc: make cnxcc locks re-entrant -- File Changes -- M modules/cnxcc/cnxcc_check.c (33) M modules/cnxcc/cnxcc_mod.c (182) M modules/cnxcc/cnxcc_mod.h (56) M modules/cnxcc/cnxcc_redis.c (4) M modules/cnxcc/cnxcc_rpc.c (26) -- Patch Links -- https://github.com/kamailio/kamailio/pull/398.patch https://github.com/kamailio/kamailio/pull/398.diff --- Reply to this email directly or view it on GitHub: https://github.com/kamailio/kamailio/pull/398

3 5

git:master:94649326: tls: field for server_id in default init of tls_domain_t structures
by Daniel-Constantin Mierla 16 Nov '15

16 Nov '15

Module: kamailio Branch: master Commit: 9464932676adc8129796f1c981d96859bbb6123b URL: https://github.com/kamailio/kamailio/commit/9464932676adc8129796f1c981d9685… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T12:32:41+01:00 tls: field for server_id in default init of tls_domain_t structures --- Modified: modules/tls/tls_mod.c --- Diff: https://github.com/kamailio/kamailio/commit/9464932676adc8129796f1c981d9685… Patch: https://github.com/kamailio/kamailio/commit/9464932676adc8129796f1c981d9685… --- diff --git a/modules/tls/tls_mod.c b/modules/tls/tls_mod.c index 2d085d0..c4478b2 100644 --- a/modules/tls/tls_mod.c +++ b/modules/tls/tls_mod.c @@ -101,6 +101,7 @@ static tls_domain_t mod_params = { TLS_USE_TLSv1, /* TLS method */ STR_STATIC_INIT(TLS_CRL_FILE), /* Certificate revocation list */ {0, 0}, /* Server name (SNI) */ + {0, 0}, /* Server id */ 0 /* next */ }; @@ -123,6 +124,7 @@ tls_domain_t srv_defaults = { TLS_USE_TLSv1, /* TLS method */ STR_STATIC_INIT(TLS_CRL_FILE), /* Certificate revocation list */ {0, 0}, /* Server name (SNI) */ + {0, 0}, /* Server id */ 0 /* next */ }; @@ -145,6 +147,7 @@ tls_domain_t cli_defaults = { TLS_USE_TLSv1, /* TLS method */ {0, 0}, /* Certificate revocation list */ {0, 0}, /* Server name (SNI) */ + {0, 0}, /* Server id */ 0 /* next */ };

1 0

git:4.3:2665a0e7: core: print runtime dir in log message
by Daniel-Constantin Mierla 16 Nov '15

16 Nov '15

Module: kamailio Branch: 4.3 Commit: 2665a0e7d2a2b3a02cfeb2809ec9dd0d3bafcb25 URL: https://github.com/kamailio/kamailio/commit/2665a0e7d2a2b3a02cfeb2809ec9dd0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2015-11-16T12:01:11+01:00 core: print runtime dir in log message - do logging to syslog, along with stderror for runtime dir related errors (cherry picked from commit 5e9f144ca214f43b2fd01917fb4983716c8916f8) --- Modified: main.c --- Diff: https://github.com/kamailio/kamailio/commit/2665a0e7d2a2b3a02cfeb2809ec9dd0… Patch: https://github.com/kamailio/kamailio/commit/2665a0e7d2a2b3a02cfeb2809ec9dd0… --- diff --git a/main.c b/main.c index acb8ce4..a990cf7 100644 --- a/main.c +++ b/main.c @@ -2316,12 +2316,14 @@ int main(int argc, char** argv) /* create runtime dir if doesn't exist */ if (stat(runtime_dir, &st) == -1) { if(mkdir(runtime_dir, 0700) == -1) { - fprintf(stderr, "failed to create runtime dir\n"); + LM_ERR("failed to create runtime dir %s\n", runtime_dir); + fprintf(stderr, "failed to create runtime dir %s\n", runtime_dir); goto error; } if(sock_uid!=-1 || sock_gid!=-1) { if(chown(runtime_dir, sock_uid, sock_gid) == -1) { - fprintf(stderr, "failed to change owner of runtime dir\n"); + LM_ERR("failed to change owner of runtime dir %s\n", runtime_dir); + fprintf(stderr, "failed to change owner of runtime dir %s\n", runtime_dir); goto error; } }

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
32
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2015