sr-dev June 2009

sr-dev@lists.kamailio.org

33 participants
284 discussions

by jh＠tutpro.com

now i have got sip-router processes up and running without any serious warnings and listening at correct ip addresses/ports, but when i send it a register request, nat_uac_test gets called and sip-route reports the following. any ideas? -- juha Jun 2 19:04:12 localhost /usr/sbin/sip-router[20726]: ERROR: nathelper [nhelpr_funcs.c:179]: message body has length zero Jun 2 19:04:12 localhost /usr/sbin/sip-router[20726]: ERROR: nathelper [nathelper.c:1429]: cannot extract body from msg! Jun 2 19:04:12 localhost /usr/sbin/sip-router[20728]: ERROR: nathelper [nhelpr_funcs.c:179]: message body has length zero Jun 2 19:04:12 localhost /usr/sbin/sip-router[20728]: ERROR: nathelper [nathelper.c:1429]: cannot extract body from msg!

14 years, 11 months

git:master: * Improved presence database handling.

by Juha Heinanen

Module: sip-router Branch: master Commit: 17bc823ded7489543686c1bae4253dadf96408d9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=17bc823… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 3 22:39:04 2009 +0300 * Improved presence database handling. --- modules/utils/utils.c | 110 +++++++++++++++++++++----------------------- modules/utils/utils.h | 4 +- modules/utils/xcap_auth.c | 14 +++--- 3 files changed, 62 insertions(+), 66 deletions(-) diff --git a/modules/utils/utils.c b/modules/utils/utils.c index 7088027..2366560 100644 --- a/modules/utils/utils.c +++ b/modules/utils/utils.c @@ -46,7 +46,7 @@ MODULE_VERSION -#define XCAP_TABLE_VERSION 3 +#define XCAP_TABLE_VERSION 3 /* Module parameter variables */ int http_query_timeout = 4; @@ -68,8 +68,8 @@ static struct mi_root* forward_fifo_filter(struct mi_root* cmd_tree, void* param static struct mi_root* forward_fifo_proxy(struct mi_root* cmd_tree, void* param); /* Database connection */ -db1_con_t *pxml_db = NULL; -db_func_t pxml_dbf; +db1_con_t *pres_dbh = NULL; +db_func_t pres_dbf; /* Module management function prototypes */ static int mod_init(void); @@ -164,6 +164,51 @@ static void destroy_shmlock(void) } +static void pres_db_close(void) { + if (pres_dbh) { + pres_dbf.close(pres_dbh); + pres_dbh = NULL; + } +} + +static int pres_db_init(void) { + if (!pres_db_url.s || !pres_db_url.len) { + LM_INFO("xcap_auth_status function is disabled\n"); + return 0; + } + if (db_bind_mod(&pres_db_url, &pres_dbf) < 0) { + LM_ERR("can't bind database module\n"); + return -1; + } + if ((pres_dbh = pres_dbf.init(&pres_db_url)) == NULL) { + LM_ERR("can't connect to database\n"); + return -1; + } + if (db_check_table_version(&pres_dbf, pres_dbh, &xcap_table, + XCAP_TABLE_VERSION) < 0) { + LM_ERR("during table version check\n"); + pres_db_close(); + return -1; + } + pres_db_close(); + return 0; +} + +static int pres_db_open(void) { + if (!pres_db_url.s || !pres_db_url.len) { + return 0; + } + if (pres_dbh) { + pres_dbf.close(pres_dbh); + } + if ((pres_dbh = pres_dbf.init(&pres_db_url)) == NULL) { + LM_ERR("can't connect to database\n"); + return -1; + } + return 0; +} + + /* Module initialization function */ static int mod_init(void) { @@ -224,38 +269,10 @@ static int mod_init(void) pres_db_url.s); xcap_table.len = xcap_table.s ? strlen(xcap_table.s) : 0; - if (pres_db_url.len == 0) { - LM_DBG("xcap_auth_status() function disabled\n"); - return 0; - } - - /* binding to mysql module */ - if (db_bind_mod(&pres_db_url, &pxml_dbf)) { - LM_ERR("Database module not found\n"); - return -1; - } - - if (!DB_CAPABILITY(pxml_dbf, DB_CAP_ALL)) { - LM_ERR("Database module does not implement all functions" - " needed by xcap_auth_status() function\n"); - return -1; - } - - pxml_db = pxml_dbf.init(&pres_db_url); - if (!pxml_db) { - LM_ERR("while connecting to database\n"); - return -1; - } - - if (db_check_table_version(&pxml_dbf, pxml_db, &xcap_table, - XCAP_TABLE_VERSION) < 0) { - LM_ERR("error during table version check.\n"); + if(pres_db_init() < 0) { return -1; } - pxml_dbf.close(pxml_db); - pxml_db = NULL; - return 0; } @@ -263,30 +280,8 @@ static int mod_init(void) /* Child initialization function */ static int child_init(int rank) { - if (pres_db_url.len == 0) - return 0; - - if (pxml_dbf.init==0) { - LM_CRIT("database not bound\n"); - return -1; - } - - pxml_db = pxml_dbf.init(&pres_db_url); - if (pxml_db == NULL) { - LM_ERR("while connecting database\n"); - return -1; - } - - if (pxml_dbf.use_table(pxml_db, &xcap_table) < 0) { - LM_ERR("in use_table SQL operation\n"); - return -1; - } - - LM_DBG("database connection opened successfully\n"); - - return 0; -} - + return pres_db_open(); +} static void destroy(void) { @@ -295,6 +290,8 @@ static void destroy(void) /* Cleanup forward */ conf_destroy(); destroy_shmlock(); + /* Close pres db */ + pres_db_close(); } @@ -319,7 +316,6 @@ static int fixup_http_query(void** param, int param_no) LM_ERR("result pvar is not writeble\n"); return -1; } - LM_INFO("leaving fixup_http_query\n"); return 0; } diff --git a/modules/utils/utils.h b/modules/utils/utils.h index 651de26..96d0286 100644 --- a/modules/utils/utils.h +++ b/modules/utils/utils.h @@ -30,7 +30,7 @@ extern int http_query_timeout; extern str xcap_table; -extern db1_con_t *pxml_db; -extern db_func_t pxml_dbf; +extern db1_con_t *pres_dbh; +extern db_func_t pres_dbf; #endif /* UTILS_H */ diff --git a/modules/utils/xcap_auth.c b/modules/utils/xcap_auth.c index e527a5f..be419a8 100644 --- a/modules/utils/xcap_auth.c +++ b/modules/utils/xcap_auth.c @@ -367,17 +367,17 @@ int get_rules_doc(str* user, str* domain, int type, str** rules_doc) result_cols[xcap_doc_col= n_result_cols++] = &tmp4; - if (pxml_dbf.use_table(pxml_db, &xcap_table) < 0) { + if (pres_dbf.use_table(pres_dbh, &xcap_table) < 0) { LM_ERR("in use_table-[table]= %.*s\n", xcap_table.len, xcap_table.s); return -1; } - if (pxml_dbf.query(pxml_db, query_cols, 0 , query_vals, result_cols, + if (pres_dbf.query(pres_dbh, query_cols, 0 , query_vals, result_cols, n_query_cols, 1, 0, &result) < 0) { LM_ERR("while querying table xcap for [user]=%.*s\t[domain]= %.*s\n", user->len, user->s, domain->len, domain->s); if (result) - pxml_dbf.free_result(pxml_db, result); + pres_dbf.free_result(pres_dbh, result); return -1; } @@ -388,7 +388,7 @@ int get_rules_doc(str* user, str* domain, int type, str** rules_doc) LM_DBG("No document found in db table for [user]=%.*s" "\t[domain]= %.*s\t[doc_type]= %d\n",user->len, user->s, domain->len, domain->s, type); - pxml_dbf.free_result(pxml_db, result); + pres_dbf.free_result(pres_dbh, result); return 0; } @@ -422,13 +422,13 @@ int get_rules_doc(str* user, str* domain, int type, str** rules_doc) *rules_doc= doc; if (result) - pxml_dbf.free_result(pxml_db, result); + pres_dbf.free_result(pres_dbh, result); return 0; error: if (result) - pxml_dbf.free_result(pxml_db, result); + pres_dbf.free_result(pres_dbh, result); return -1; @@ -449,7 +449,7 @@ int xcap_auth_status(struct sip_msg* _msg, char* _sp1, char* _sp2) subs_t subs; int res; - if (pxml_db == 0) { + if (pres_dbh == 0) { LM_ERR("function is disabled, to enable define pres_db_url\n"); return -1; }

14 years, 11 months

git:master: * Introduced new function xcap_auth_status that is a standalone version

by Juha Heinanen

Module: sip-router Branch: master Commit: b64b67df7d1fbac13646c47fd5a3f09498e3c799 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b64b67d… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Jun 3 18:54:03 2009 +0300 * Introduced new function xcap_auth_status that is a standalone version of modules_k/presence pres_auth_status function. This allows checking of presence authorization status from a sip proxy that does not include an integrated presence server. --- modules/utils/Makefile | 7 +- modules/utils/README | 272 +++++++++++++------ modules/utils/doc/utils.xml | 2 +- modules/utils/doc/utils_admin.xml | 89 ++++++- modules/utils/pidf.c | 195 ++++++++++++++ modules/utils/pidf.h | 53 ++++ modules/utils/utils.c | 93 ++++++- modules/utils/utils.h | 4 + modules/utils/xcap_auth.c | 527 +++++++++++++++++++++++++++++++++++++ modules/utils/xcap_auth.h | 38 +++ 10 files changed, 1177 insertions(+), 103 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b64…

14 years, 11 months

t_relay with param is unknown

by jh＠tutpro.com

this line if (!t_relay("0x01")) { gives error 0(6768) DEBUG: <core> [sr_module.c:515]: find_export_record: <t_relay> not found 0(6768) DEBUG: <core> [sr_module.c:515]: find_export_record: <t_relay> not found 0(6768) : <core> [cfg.y:2921]: parse error in config file, line 2884, column 21: unknown command, missing loadmodule? how can i achieve the same effect in sr, i.e., do not generate provisional response. also, how can the other flag values mapped? in case of failure, does t_relay always return -1 or are the other negative values as well? -- juha

14 years, 11 months

no line number given and why is $ru not writable?

by jh＠tutpro.com

if i remember correctly, k told the config file line number where an error occurred and also the name of the function that issued it. sr doesn't do so. see previous message about deprecated pv syntax warnings and now also this: Jun 1 20:24:49 localhost /usr/sbin/sip-router[14871]: ERROR: utils [utils.c:244]: result pvar is not writeble in general, how can i know where the problem occurred? in this particular case, i know where the error comes from: http_query("some_query", "$ru"); the same statement works fine in k. why is $ru not writeble? can i replace it with some other form of request-uri variable? -- juha

14 years, 11 months

another syntax error

by jh＠tutpro.com

this line gives me syntax error: if ($fU == null) { how should it be written? -- juha

14 years, 11 months

script callbacks

by Miklos Tirpak

Hi Andrei, could you please have a look at the tirpi/script_callbacks branch? There are some modules that need to initialize their variables before, or free/unlock/unref,... something after the script executions. This is supported only for request and onreply routes, but it is necessary also before/after failure routes in some cases. (For example db_ops needs to free the query result.) So I started to add support for pre- and post-script callbacks for failure routes. But instead of simply adding another list to the core I generalized the API a bit to support any kind of route blocks, and added hooks also for branch and onsend routes. Please let me know whether I can merge my branch to the master. Daniel: shall I add a hook around modules_k/htable/htable.c:187 for event_route? Thanks, Miklos

14 years, 11 months

git:master: pv: added new PV: $bs

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: b70650026f280a9d989cc4f6290d6d93a80df058 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b706500… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 3 14:00:34 2009 +0300 pv: added new PV: $bs - return body size computed from structure, not from Content Lenght - $cl stays shortcut to $hdr(Content-Lenght) for backward compatibility --- modules_k/pv/pv.c | 3 +++ modules_k/pv/pv_core.c | 17 +++++++++++++++++ modules_k/pv/pv_core.h | 3 +++ 3 files changed, 23 insertions(+), 0 deletions(-) diff --git a/modules_k/pv/pv.c b/modules_k/pv/pv.c index 596b618..f990a55 100644 --- a/modules_k/pv/pv.c +++ b/modules_k/pv/pv.c @@ -104,6 +104,9 @@ static pv_export_t mod_pvs[] = { {{"bR", (sizeof("bR")-1)}, /* */ PVT_CONTEXT, pv_get_branches, 0, 0, 0, 0, 0}, + {{"bs", (sizeof("bs")-1)}, /* */ + PVT_OTHER, pv_get_body_size, 0, + 0, 0, 0, 0}, {{"ci", (sizeof("ci")-1)}, /* */ PVT_OTHER, pv_get_callid, 0, 0, 0, 0, 0}, diff --git a/modules_k/pv/pv_core.c b/modules_k/pv/pv_core.c index 87b83fe..f8e527e 100644 --- a/modules_k/pv/pv_core.c +++ b/modules_k/pv/pv_core.c @@ -896,6 +896,7 @@ int pv_get_content_type(struct sip_msg *msg, pv_param_t *param, return pv_get_strval(msg, param, res, &msg->content_type->body); } + int pv_get_content_length(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { @@ -939,6 +940,22 @@ int pv_get_msg_body(struct sip_msg *msg, pv_param_t *param, } +int pv_get_body_size(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res) +{ + str s; + if(msg==NULL) + return -1; + + s.s = get_body( msg ); + + s.len = 0; + if (s.s != NULL) + s.len = msg->buf + msg->len - s.s; + return pv_get_sintval(msg, param, res, s.len); +} + + int pv_get_authattr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res) { diff --git a/modules_k/pv/pv_core.h b/modules_k/pv/pv_core.h index 18dc55a..f0e4e0e 100644 --- a/modules_k/pv/pv_core.h +++ b/modules_k/pv/pv_core.h @@ -165,6 +165,9 @@ int pv_get_content_length(struct sip_msg *msg, pv_param_t *param, int pv_get_msg_body(struct sip_msg *msg, pv_param_t *param, pv_value_t *res); +int pv_get_body_size(struct sip_msg *msg, pv_param_t *param, + pv_value_t *res); + int pv_get_authattr(struct sip_msg *msg, pv_param_t *param, pv_value_t *res);

14 years, 11 months

git:master: core: set 'fixed' shortcut to the value for fixup_uint...

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 235a9c07e8527efbe36e88363fca5399ff45ff21 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=235a9c0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 3 13:02:45 2009 +0300 core: set 'fixed' shortcut to the value for fixup_uint... - K module expect the uint value instead of pointer to it - reported by Juha Heinannen for nathelper module --- sr_module.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-) diff --git a/sr_module.c b/sr_module.c index 5220427..fc7671e 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1056,6 +1056,7 @@ int fix_param(int type, void** param) case FPARAM_STR: p->v.str.s = (char*)*param; p->v.str.len = strlen(p->v.str.s); + p->fixed = &p->v; break; case FPARAM_INT: s.s = (char*)*param; @@ -1068,11 +1069,12 @@ int fix_param(int type, void** param) pkg_free(p); return 1; } + p->fixed = (void*)(long)num; break; case FPARAM_REGEX: if ((p->v.regex = pkg_malloc(sizeof(regex_t))) == 0) { ERR("No memory left\n"); - goto error; + goto error; } if (regcomp(p->v.regex, *param, REG_EXTENDED|REG_ICASE|REG_NEWLINE)) { @@ -1081,6 +1083,7 @@ int fix_param(int type, void** param) ERR("Bad regular expression '%s'\n", (char*)*param); goto error; } + p->fixed = &p->v; break; case FPARAM_AVP: name.s = (char*)*param; @@ -1097,6 +1100,7 @@ int fix_param(int type, void** param) ERR("Error while parsing attribute name\n"); goto error; } + p->fixed = &p->v; break; case FPARAM_SELECT: name.s = (char*)*param; @@ -1111,6 +1115,7 @@ int fix_param(int type, void** param) ERR("Error while parsing select identifier\n"); goto error; } + p->fixed = &p->v; break; case FPARAM_SUBST: s.s = *param; @@ -1120,6 +1125,7 @@ int fix_param(int type, void** param) ERR("Error while parsing regex substitution\n"); goto error; } + p->fixed = &p->v; break; case FPARAM_PVS: name.s = (char*)*param; @@ -1151,12 +1157,11 @@ int fix_param(int type, void** param) ERR("bad PVE format: \"%.*s\"\n", name.len, name.s); goto error; } + p->fixed = &p->v; break; } p->type = type; - if(p->fixed==NULL) - p->fixed = &p->v; *param = (void*)p; return 0;

14 years, 11 months

git:master: core: added shortcut to fixed value in fparam_t

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d64c1c71e8c688b4e0e2f3c92702f143972ab806 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d64c1c7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Wed Jun 3 12:11:27 2009 +0300 core: added shortcut to fixed value in fparam_t - required for PVAR fixups in K modules --- mod_fix.c | 2 +- sr_module.c | 3 +++ sr_module.h | 7 ++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index ccd3744..a228e16 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -100,7 +100,7 @@ int fixup_regexpNL_none(void** param, int param_no); /* textops */ int ret; \ if ((ret=fixup_fp_##suffix (param, param_no))!=0) \ return ret; \ - *param=&((fparam_t*)*param)->v; \ + *param=((fparam_t*)*param)->fixed; \ return 0; \ } \ int fixup_free_##suffix (void** param, int param_no) \ diff --git a/sr_module.c b/sr_module.c index 81ef9b3..5220427 100644 --- a/sr_module.c +++ b/sr_module.c @@ -1142,6 +1142,7 @@ int fix_param(int type, void** param) p->v.pvs=0; goto error; } + p->fixed = p->v.pvs; break; case FPARAM_PVE: name.s = (char*)*param; @@ -1154,6 +1155,8 @@ int fix_param(int type, void** param) } p->type = type; + if(p->fixed==NULL) + p->fixed = &p->v; *param = (void*)p; return 0; diff --git a/sr_module.h b/sr_module.h index bdf64de..0b1d74b 100644 --- a/sr_module.h +++ b/sr_module.h @@ -252,9 +252,9 @@ enum { * Function parameter */ typedef struct fparam { - char* orig; /* The original value */ - int type; /* Type of parameter */ - union { + char* orig; /* The original value */ + int type; /* Type of parameter */ + union { char* asciiz; /* Zero terminated ASCII string */ struct _str str; /* pointer/len string */ int i; /* Integer value */ @@ -265,6 +265,7 @@ typedef struct fparam { pv_spec_t* pvs; /* kamailo pseudo-vars */ pv_elem_t* pve; /* kamailo pseudo-vars in a string */ } v; + void *fixed; } fparam_t;

14 years, 11 months

← Newer
1
...
21
22
23
24
25
26
27
28
29
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev June 2009