sr-dev

sr-dev@lists.kamailio.org

13 participants
44202 discussions

git:master: core: error handling for non-sip hooks

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 471589c5c0ae27e9d3937e3b9318982a8ec96fc7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=471589c… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 6 22:54:52 2009 +0200 core: error handling for non-sip hooks receive_msg will exit with error if a non-sip msg hook returns NONSIP_MSG_ERROR. --- receive.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/receive.c b/receive.c index ac92867..d5215bf 100644 --- a/receive.c +++ b/receive.c @@ -125,8 +125,11 @@ int receive_msg(char* buf, unsigned int len, struct receive_info* rcv_info) if (msg->first_line.type==SIP_REQUEST){ if (!IS_SIP(msg)){ - if (nonsip_msg_run_hooks(msg)!=NONSIP_MSG_ACCEPT) + if ((ret=nonsip_msg_run_hooks(msg))!=NONSIP_MSG_ACCEPT){ + if (unlikely(ret==NONSIP_MSG_ERROR)) + goto error03; goto end; /* drop the message */ + } } /* sanity checks */ if ((msg->via1==0) || (msg->via1->error!=PARSE_OK)){ @@ -257,6 +260,7 @@ error_req: DBG("receive_msg: error:...\n"); /* execute post request-script callbacks */ exec_post_script_cb(msg, REQUEST_CB_TYPE); +error03: /* free possible loaded avps -bogdan */ reset_avps(); error02:

15 years, 6 months

git:master: xmlrpc: propagate route error exit

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 78120e1cad5769d18899e77f1583b863a03ecbea URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78120e1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 6 22:58:19 2009 +0200 xmlrpc: propagate route error exit If the xmlrpc route exits with error, propagate the error downwards (return NONSIP_MSG_ERROR instead of NONSIP_MSG_DROP). --- modules_s/xmlrpc/xmlrpc.c | 21 ++++++++++++++------- 1 files changed, 14 insertions(+), 7 deletions(-) diff --git a/modules_s/xmlrpc/xmlrpc.c b/modules_s/xmlrpc/xmlrpc.c index 6b90298..56b2151 100644 --- a/modules_s/xmlrpc/xmlrpc.c +++ b/modules_s/xmlrpc/xmlrpc.c @@ -1737,9 +1737,11 @@ static char* http_xmlrpc2sip(sip_msg_t* msg, int* new_msg_len) static int em_receive_request(sip_msg_t* orig_msg, char* new_buf, unsigned int new_len) { + int ret; sip_msg_t tmp_msg, *msg; struct run_act_ctx ra_ctx; + ret=0; if (new_buf && new_len) { memset(&tmp_msg, 0, sizeof(sip_msg_t)); tmp_msg.buf = new_buf; @@ -1772,7 +1774,8 @@ static int em_receive_request(sip_msg_t* orig_msg, /* exec routing script */ init_run_actions_ctx(&ra_ctx); if (run_actions(&ra_ctx, main_rt.rlist[xmlrpc_route_no], msg) < 0) { - WARN("xmlrpc: error while trying script\n"); + ret=-1; + DBG("xmlrpc: error while trying script\n"); goto end; } end: @@ -1782,7 +1785,7 @@ static int em_receive_request(sip_msg_t* orig_msg, too) */ free_sip_msg(msg); } - return 0; + return ret; error: return -1; } @@ -1793,11 +1796,13 @@ static int em_receive_request(sip_msg_t* orig_msg, */ static int process_xmlrpc(sip_msg_t* msg) { + int ret; char* fake_msg; int fake_msg_len; unsigned char* method; unsigned int method_len, n_method; + ret=NONSIP_MSG_DROP; if (IS_HTTP(msg)) { method = (unsigned char*)msg->first_line.u.request.method.s; method_len = msg->first_line.u.request.method.len; @@ -1815,21 +1820,23 @@ static int process_xmlrpc(sip_msg_t* msg) fake_msg = http_xmlrpc2sip(msg, &fake_msg_len); if (fake_msg == 0) { ERR("xmlrpc: out of memory\n"); + ret=NONSIP_MSG_ERROR; } else { /* send it */ DBG("new fake xml msg created (%d bytes):\n<%.*s>\n", fake_msg_len, fake_msg_len, fake_msg); - em_receive_request(msg, fake_msg, fake_msg_len); - /* ignore the return code */ + if (em_receive_request(msg, fake_msg, fake_msg_len)<0) + ret=NONSIP_MSG_ERROR; pkg_free(fake_msg); } - return NONSIP_MSG_DROP; /* we "ate" the message, + return ret; /* we "ate" the message, stop processing */ } else { /* the message has a via */ DBG("http xml msg unchanged (%d bytes):\n<%.*s>\n", msg->len, msg->len, msg->buf); - em_receive_request(msg, 0, 0); - return NONSIP_MSG_DROP; + if (em_receive_request(msg, 0, 0)<0) + ret=NONSIP_MSG_ERROR; + return ret; } } else { ERR("xmlrpc: bad HTTP request method: \"%.*s\"\n",

15 years, 6 months

[tracker] Task opened: (kamailio) Modify branch attributes via psuedo variables

by sip-router

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Bob McGilvray (rmcgilvr) Attached to Project - sip-router Summary - (kamailio) Modify branch attributes via psuedo variables Task Type - Feature Request Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - It's not currently possible (in kamailio) to modify the Q value of a branch via psuedo variables and since append_branch doesn't support avps or script variables it's not possible to do at all dynamically (at least from the script itself). It would be nice to see something along the lines of what was just introduced into opensips, using the $branch(...) pv, or a modification to $br to allow assignment of a Q when creating the branch. $br = "<sip:" + $avp(s:newuri) + ";q=" + $avp(s:newuri_q); $(branch(q)[0]) = 1.0; $(branch(q)[1]) = 0.9; I apologize if this isn't the right tracker, I'm following a suggestion by someone on the kam users list. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=8 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.

15 years, 6 months

missing core features

by Klaus Darilion

Hi! Kamailio allows to set the Server: and User-Agent: header in configuration script. AFAIS this is not possible in sip-router. In Kamailio we have the parameters: user_agent_header and server_header I thought about copy/paste from Kamailio, but I think this is not possible as core is BSD now, not GPL anymore? regards klaus

15 years, 6 months

SF.net SVN: openser:[5894] branches/1.5/modules

by Henning Westerholt

Revision: 5894 http://openser.svn.sourceforge.net/openser/?rev=5894&view=rev Author: henningw Date: 2009-07-06 15:27:00 +0000 (Mon, 06 Jul 2009) Log Message: ----------- - fix error in module initialization which happened if a custom table name was configured in carrierroute and also userblacklist - it was reported as table version mismatch, which was of course really misleading - many thanks to Uriel Rozenbaum (uriel dot rozenbaum at gmail dot com) for his help in debugging this problem with a sample cfg and a binary build Modified Paths: -------------- branches/1.5/modules/carrierroute/db_carrierroute.h branches/1.5/modules/userblacklist/db_userblacklist.h This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

15 years, 6 months

git:master: core: pvars support in ser *var fixups

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b25e31aaab556941d4f3057d7f6b106b2ed749bb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b25e31a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 6 12:26:19 2009 +0200 core: pvars support in ser *var fixups - all ser generic fixups (fixup_var_{int,str}_*) work with pvars (e.g. the fallback order for str is: pvar->avp->select->str). - fixed FPARAM_* definitions to allow better fallback for fix_param_types (int->select->pvar->avp->str) - fix_param() does not print anymore error messages for invalid pvars or avps, to allow fallback --- sr_module.c | 34 +++++++++++++++++++--------------- sr_module.h | 26 +++++++++++++++----------- 2 files changed, 34 insertions(+), 26 deletions(-) diff --git a/sr_module.c b/sr_module.c index 3641df3..5414529 100644 --- a/sr_module.c +++ b/sr_module.c @@ -54,6 +54,7 @@ #include "trim.h" #include "globals.h" #include "rpc_lookup.h" +#include "sr_compat.h" #include <sys/stat.h> #include <regex.h> @@ -1052,7 +1053,7 @@ int fix_param(int type, void** param) goto error; case FPARAM_STRING: p->v.asciiz = *param; - + /* no break */ case FPARAM_STR: p->v.str.s = (char*)*param; p->v.str.len = strlen(p->v.str.s); @@ -1080,8 +1081,8 @@ int fix_param(int type, void** param) REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { pkg_free(p->v.regex); p->v.regex=0; - ERR("Bad regular expression '%s'\n", (char*)*param); - goto error; + /* not a valid regex */ + goto no_match; } p->fixed = p->v.regex; break; @@ -1091,14 +1092,13 @@ int fix_param(int type, void** param) trim(&name); if (!name.len || name.s[0] != '$') { /* Not an AVP identifier */ - pkg_free(p); - return 1; + goto no_match; } name.s++; name.len--; if (parse_avp_ident(&name, &p->v.avp) < 0) { - ERR("Error while parsing attribute name\n"); - goto error; + /* invalid avp identifier (=> no match) */ + goto no_match; } p->fixed = &p->v; break; @@ -1108,8 +1108,7 @@ int fix_param(int type, void** param) trim(&name); if (!name.len || name.s[0] != '@') { /* Not a select identifier */ - pkg_free(p); - return 1; + goto no_match; } if (parse_select(&name.s, &p->v.select) < 0) { ERR("Error while parsing select identifier\n"); @@ -1133,20 +1132,18 @@ int fix_param(int type, void** param) trim(&name); if (!name.len || name.s[0] != '$'){ /* not a pvs identifier */ - pkg_free(p); - return 1; + goto no_match; } p->v.pvs=pkg_malloc(sizeof(pv_spec_t)); if (p->v.pvs==0){ ERR("out of memory while parsing pv_spec_t\n"); goto error; } - if (pv_parse_spec(&name, p->v.pvs)==0){ - ERR("unsupported user field indentifier \"%.*s\"\n", - name.len, name.s); + if (pv_parse_spec2(&name, p->v.pvs, 1)==0){ + /* not a valid pvs identifier (but it might be an avp) */ pkg_free(p->v.pvs); p->v.pvs=0; - goto error; + goto no_match; } p->fixed = p->v.pvs; break; @@ -1165,6 +1162,9 @@ int fix_param(int type, void** param) *param = (void*)p; return 0; +no_match: + pkg_free(p); + return 1; error: pkg_free(p); return E_UNSPEC; @@ -1261,6 +1261,8 @@ int fix_param_types(int types, void** param) int fixup_var_str_12(void** param, int param_no) { int ret; + if ((sr_cfg_compat!=SR_COMPAT_SER) && + ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_STR, param)) <= 0) return ret; @@ -1296,6 +1298,8 @@ int fixup_var_str_2(void** param, int param_no) int fixup_var_int_12(void** param, int param_no) { int ret; + if ((sr_cfg_compat!=SR_COMPAT_SER) && + ((ret = fix_param(FPARAM_PVS, param)) <= 0)) return ret; if ((ret = fix_param(FPARAM_AVP, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_SELECT, param)) <= 0) return ret; if ((ret = fix_param(FPARAM_INT, param)) <= 0) return ret; diff --git a/sr_module.h b/sr_module.h index 0b1d74b..426729c 100644 --- a/sr_module.h +++ b/sr_module.h @@ -231,21 +231,25 @@ struct param_export_ { /** allowed parameter types. - * the types that cannot be deduced from the string, should - * be at the end (e.g. FPARAM_STR), to allow fallback - * (e.g. fix_param_types(FPARAM_AVP|FPARAM_SELECT|FPARAM_STR, param)) + * the types _must_ be in "fallback" order, + * e.g. FPARAM_STR should be the last to allow fallback to it, + * F_PARAM_PVS should be in front of F_PARAM_AVP (so that + * for fix_param_types(FPARAM_AVP|FPARAM_PVS|FPARAM_STR, param) and $foo + * the pvars will be checked first and only if no pvar is found the + * param will be resolved to an avp) */ enum { FPARAM_UNSPEC = 0, FPARAM_INT = (1 << 0), - FPARAM_REGEX = (1 << 1), - FPARAM_AVP = (1 << 2), - FPARAM_SELECT = (1 << 3), - FPARAM_SUBST = (1 << 4), - FPARAM_PVS = (1 << 5), - FPARAM_PVE = (1 << 6), - FPARAM_STRING = (1 << 7), - FPARAM_STR = (1 << 8) + FPARAM_SELECT = (1 << 1), + FPARAM_PVS = (1 << 2), + FPARAM_AVP = (1 << 3), + FPARAM_STRING = (1 << 4), + FPARAM_STR = (1 << 5), + /* special types: no fallback between them possible */ + FPARAM_REGEX = (1 << 6), + FPARAM_SUBST = (1 << 7), + FPARAM_PVE = (1 << 8) }; /*

15 years, 6 months

git:master: tm: t_reply() first param. can be any var. type

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ed6838004eef2734a1a9667bbe56526de1463bf2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ed68380… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Jul 6 12:36:22 2009 +0200 tm: t_reply() first param. can be any var. type Switched first param. fixup to fixup_var_int_12(), thus allowing it to be a pvar. --- modules/tm/tm.c | 6 +----- 1 files changed, 1 insertions(+), 5 deletions(-) diff --git a/modules/tm/tm.c b/modules/tm/tm.c index e769b75..034b8c7 100644 --- a/modules/tm/tm.c +++ b/modules/tm/tm.c @@ -508,12 +508,8 @@ static int fixup_routes(char* r_type, struct route_list* rt, void** param) static int fixup_t_reply(void** param, int param_no) { - int ret; - if (param_no == 1) { - ret = fix_param(FPARAM_AVP, param); - if (ret <= 0) return ret; - if (fix_param(FPARAM_INT, param) != 0) return -1; + if (fixup_var_int_12(param, 1) != 0) return -1; } else if (param_no == 2) { return fixup_var_str_12(param, 2); }

15 years, 6 months

git:master: modules_s/domain: log message level changes

by Juha Heinanen

Module: sip-router Branch: master Commit: 537fbbea7382d6a47d41e6789dd84428f9b1e1ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=537fbbe… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon Jul 6 13:06:35 2009 +0300 modules_s/domain: log message level changes - Made module less noisy by turning INFOs to DBGs. - Print error instead of debug message if domain name to be looked for cannot be accessed. --- modules_s/domain/domain_mod.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules_s/domain/domain_mod.c b/modules_s/domain/domain_mod.c index 3cb24b7..30766da 100644 --- a/modules_s/domain/domain_mod.c +++ b/modules_s/domain/domain_mod.c @@ -208,14 +208,14 @@ static int init_db(void) if (db_add_db(db, db_url.s) < 0) return -1; if (db_connect(db) < 0) return -1; - INFO("prepare load_domains_cmd\n"); + DBG("prepare load_domains_cmd\n"); load_domains_cmd = db_cmd(DB_GET, db, domain_table.s, load_domains_columns, NULL, NULL); if (load_domains_cmd == NULL) { ERR("Error while preparing load_domains database command\n"); return -1; } - INFO("prepare get_did_cmd\n"); + DBG("prepare get_did_cmd\n"); get_did_cmd = db_cmd(DB_GET, db, domain_table.s, get_did_columns, get_did_match, NULL); if (get_did_cmd == NULL) { ERR("Error while preparing get_did database command\n"); @@ -223,7 +223,7 @@ static int init_db(void) } if (load_domain_attrs) { - INFO("prepare load_attrs_cmd\n"); + DBG("prepare load_attrs_cmd\n"); load_attrs_cmd = db_cmd(DB_GET, db, domattr_table.s, load_attrs_columns, load_attrs_match, NULL); if (load_attrs_cmd == NULL) { ERR("Error while preparing load_attrs database command\n"); @@ -528,7 +528,7 @@ static int lookup_domain(struct sip_msg* msg, char* flags, char* fp) track = 0; if (get_str_fparam(&domain, msg, (fparam_t*)fp) != 0) { - DBG("Cannot get domain name to lookup\n"); + ERR("Cannot get domain name to lookup\n"); return -1; } @@ -540,7 +540,7 @@ static int lookup_domain(struct sip_msg* msg, char* flags, char* fp) memcpy(tmp.s, domain.s, domain.len); tmp.len = domain.len; strlower(&tmp); - + if (db_mode) { if (hash_lookup(&d, *active_hash, &tmp) == 1) { set_avp_list((unsigned long)flags, &d->attrs);

15 years, 6 months

version of s tables

by jh＠tutpro.com

in scripts/mysql/my_create.sql there is no version table. does it mean that s ser database tables don't have any version number? if so, they have to be added in order to allow easy db table upgrade. -- juha

15 years, 6 months

[ openser-Bugs-2817317 ] Kamailio crash completly when receiving empty Record-Route

by SourceForge.net

Bugs item #2817317, was opened at 2009-07-06 10:46 Message generated for change (Comment added) made by ibc_sf You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2817317&group_… Please note that this message will contain a full copy of the comment thread, including the initial issue submission, for this request, not just the latest update. >Category: modules Group: ver 1.5.x >Status: Closed >Resolution: Duplicate Priority: 5 Private: No Submitted By: Nobody/Anonymous (nobody) Assigned to: Nobody/Anonymous (nobody) Summary: Kamailio crash completly when receiving empty Record-Route Initial Comment: Hello! I found a serious bug: Our Kamailio 1.5.1 crashes, when it receives an empty Record-Route-Field. In my situation a SNOM-M3 with Firmware 2.2 produces this bug. I attached a File where you can see the INVITE which produces the cash. The field "Record-Route" contains only a space. ---------------------------------------------------------------------- >Comment By: Iñaki Baz Castillo (ibc_sf) Date: 2009-07-06 10:54 Message: This is already reported and supposed to be fixed (I reported it but I've tested the commited patch yet): https://sourceforge.net/tracker/?func=detail&aid=2798154&group_id=139143&at… Please try upgrading to the trunk version since I think the patch was commited just for trunk version. ---------------------------------------------------------------------- Comment By: Nobody/Anonymous (nobody) Date: 2009-07-06 10:54 Message: I forgot: I am using the following modules: loadmodule "/usr/local/lib/kamailio/modules/pv.so" loadmodule "/usr/local/lib/kamailio/modules/sl.so" loadmodule "/usr/local/lib/kamailio/modules/tm.so" loadmodule "/usr/local/lib/kamailio/modules/rr.so" loadmodule "/usr/local/lib/kamailio/modules/db_mysql.so" loadmodule "/usr/local/lib/kamailio/modules/maxfwd.so" loadmodule "/usr/local/lib/kamailio/modules/usrloc.so" loadmodule "/usr/local/lib/kamailio/modules/registrar.so" loadmodule "/usr/local/lib/kamailio/modules/auth.so" loadmodule "/usr/local/lib/kamailio/modules/auth_db.so" loadmodule "/usr/local/lib/kamailio/modules/siputils.so" loadmodule "/usr/local/lib/kamailio/modules/uri_db.so" loadmodule "/usr/local/lib/kamailio/modules/acc.so" loadmodule "/usr/local/lib/kamailio/modules/textops.so" loadmodule "/usr/local/lib/kamailio/modules/avpops.so" loadmodule "/usr/local/lib/kamailio/modules/xlog.so" loadmodule "/usr/local/lib/kamailio/modules/uac.so" loadmodule "/usr/local/lib/kamailio/modules/alias_db.so" loadmodule "/usr/local/lib/kamailio/modules/dialog.so" loadmodule "/usr/local/lib/kamailio/modules/nathelper.so" If you need more information please post what you need. Thank you! ---------------------------------------------------------------------- You can respond by visiting: https://sourceforge.net/tracker/?func=detail&atid=743020&aid=2817317&group_…

15 years, 6 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev