sr-dev January 2011

sr-dev@lists.kamailio.org

14 participants
226 discussions

git:master: modules_k/auth_diameter : if realm is NULL, do not crash but instead use uri.host (as it was intended)
by Marius Zbihlei 17 Jan '11

17 Jan '11

Module: sip-router Branch: master Commit: 6c31510e42369f1025f54c53c354b36faa737af0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6c31510… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 17 14:42:31 2011 +0200 modules_k/auth_diameter : if realm is NULL, do not crash but instead use uri.host (as it was intended) --- modules_k/auth_diameter/authorize.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/modules_k/auth_diameter/authorize.c b/modules_k/auth_diameter/authorize.c index dec3902..7b4f67c 100644 --- a/modules_k/auth_diameter/authorize.c +++ b/modules_k/auth_diameter/authorize.c @@ -151,6 +151,7 @@ auth_diam_result_t diam_pre_auth(struct sip_msg* _m, str* _realm, int _hftype, { int ret; struct sip_uri uri; + str realm; if ((_m->REQ_METHOD == METHOD_ACK) || (_m->REQ_METHOD == METHOD_CANCEL)) return AUTHORIZED; @@ -167,11 +168,12 @@ auth_diam_result_t diam_pre_auth(struct sip_msg* _m, str* _realm, int _hftype, } return ERROR; } - - *_realm = uri.host; + realm = uri.host; + } else { + realm = *_realm; } - ret = find_credentials(_m, _realm, _hftype, _h); + ret = find_credentials(_m, &realm, _hftype, _h); if (ret < 0) { LM_ERR("credentials not found\n");

1 0

git:master: core: switch.c Fixed dereference of null pointer
by Marius Zbihlei 17 Jan '11

17 Jan '11

Module: sip-router Branch: master Commit: ef82d90bec5d06ae53c202300a553ea7e09b0d27 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ef82d90… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Jan 14 19:10:08 2011 +0200 core: switch.c Fixed dereference of null pointer c->ct_rve is NULL in else branch, further deref. will cause chaos. --- switch.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/switch.c b/switch.c index 467e00c..b09d8ae 100644 --- a/switch.c +++ b/switch.c @@ -220,10 +220,7 @@ int fix_switch(struct action* t) n++; /* count only non-default cases */ }else{ if (default_found){ - LOG(L_ERR, "ERROR: fix_switch: more then one \"default\"" - " label found (%d, %d)\n", - c->ct_rve->fpos.s_line, - c->ct_rve->fpos.s_col); + LOG(L_ERR, "ERROR: fix_switch: more then one \"default\""); return E_UNSPEC; } default_found=1;

1 0

git:master: modules/auth Fixed a bug when realm is NULL in challenge method
by Marius Zbihlei 17 Jan '11

17 Jan '11

Module: sip-router Branch: master Commit: 1c9ccc12371b38f546ba874ab8b82d775ad112f3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c9ccc1… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Mon Jan 17 12:06:55 2011 +0200 modules/auth Fixed a bug when realm is NULL in challenge method --- modules/auth/challenge.c | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) diff --git a/modules/auth/challenge.c b/modules/auth/challenge.c index 9bd4ce0..decebf0 100644 --- a/modules/auth/challenge.c +++ b/modules/auth/challenge.c @@ -124,9 +124,13 @@ int get_challenge_hf(struct sip_msg* msg, int stale, str* realm, nonce_len = get_nonce_len(cfg, nc_enabled || otn_enabled); hf.len = hfn->len; - hf.len += DIGEST_REALM_LEN - + realm->len - + DIGEST_NONCE_LEN; + if (realm) { + hf.len += DIGEST_REALM_LEN + + realm->len; + } + + hf.len += DIGEST_NONCE_LEN; + if (nonce) { hf.len += nonce->len + 1; /* '"' */ @@ -156,10 +160,14 @@ int get_challenge_hf(struct sip_msg* msg, int stale, str* realm, ERR("auth: No memory left (%d bytes)\n", hf.len); return -1; } - + memcpy(p, hfn->s, hfn->len); p += hfn->len; - memcpy(p, DIGEST_REALM, DIGEST_REALM_LEN); p += DIGEST_REALM_LEN; - memcpy(p, realm->s, realm->len); p += realm->len; + + if(realm){ + memcpy(p, DIGEST_REALM, DIGEST_REALM_LEN); p += DIGEST_REALM_LEN; + memcpy(p, realm->s, realm->len); p += realm->len; + } + memcpy(p, DIGEST_NONCE, DIGEST_NONCE_LEN); p += DIGEST_NONCE_LEN; if (nonce) { memcpy(p, nonce->s, nonce->len); p += nonce->len;

1 0

git:master: db_postgres: check result status after query
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: 54d14270197a3585451675684ae10e961de0a48e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=54d1427… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 16 23:05:19 2011 +0100 db_postgres: check result status after query - connection might be broken and reported after the query operation - try to reset the connection in this case - reported by Javier Gallart --- modules/db_postgres/km_dbase.c | 27 +++++++++++++++++++-------- 1 files changed, 19 insertions(+), 8 deletions(-) diff --git a/modules/db_postgres/km_dbase.c b/modules/db_postgres/km_dbase.c index 649c945..1558e49 100644 --- a/modules/db_postgres/km_dbase.c +++ b/modules/db_postgres/km_dbase.c @@ -115,6 +115,7 @@ void db_postgres_close(db1_con_t* _h) static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) { int i; + ExecStatusType pqresult; if(! _con || !_s || !_s->s) { @@ -149,11 +150,17 @@ static int db_postgres_submit_query(const db1_con_t* _con, const str* _s) db_postgres_free_query(_con); /* exec the query */ if (PQsendQuery(CON_CONNECTION(_con), _s->s)) { - LM_DBG("sending query ok: %p - [%.*s]\n", - _con, _s->len, _s->s); - return 0; + pqresult = PQresultStatus(CON_RESULT(_con)); + if(pqresult!=PGRES_FATAL_ERROR) + { + LM_DBG("sending query ok: %p (%d) - [%.*s]\n", + _con, pqresult, _s->len, _s->s); + return 0; + } + LM_WARN("postgres result check failed with code %d (%s)\n", pqresult, + PQresStatus(pqresult)); } - LM_WARN("sending postgres command failed, connection status %d," + LM_WARN("postgres query command failed, connection status %d," " error [%s]\n", PQstatus(CON_CONNECTION(_con)), PQerrorMessage(CON_CONNECTION(_con))); if(PQstatus(CON_CONNECTION(_con))!=CONNECTION_OK) @@ -221,11 +228,13 @@ int db_postgres_fetch_result(const db1_con_t* _con, db1_res_t** _res, const int switch(pqresult) { case PGRES_COMMAND_OK: - /* Successful completion of a command returning no data (such as INSERT or UPDATE). */ + /* Successful completion of a command returning no data + * (such as INSERT or UPDATE). */ return 0; case PGRES_TUPLES_OK: - /* Successful completion of a command returning data (such as a SELECT or SHOW). */ + /* Successful completion of a command returning data + * (such as a SELECT or SHOW). */ if (db_postgres_get_columns(_con, *_res) < 0) { LM_ERR("failed to get column names\n"); return -2; @@ -234,8 +243,10 @@ int db_postgres_fetch_result(const db1_con_t* _con, db1_res_t** _res, const int case PGRES_FATAL_ERROR: LM_ERR("%p - invalid query, execution aborted\n", _con); - LM_ERR("%p - PQresultStatus(%s)\n", _con, PQresStatus(pqresult)); - LM_ERR("%p: %s\n", _con, PQresultErrorMessage(CON_RESULT(_con))); + LM_ERR("%p - PQresultStatus(%s)\n", _con, + PQresStatus(pqresult)); + LM_ERR("%p: %s\n", _con, + PQresultErrorMessage(CON_RESULT(_con))); if (*_res) db_free_result(*_res); *_res = 0;

1 0

git:master: app_lua: updated the docs
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: f3cc40a1e3007eff78a09cfdf767811839a018c0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f3cc40a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 16 22:44:32 2011 +0100 app_lua: updated the docs --- modules/app_lua/README | 1 + modules/app_lua/doc/app_lua_admin.xml | 6 ++++++ 2 files changed, 7 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/README b/modules/app_lua/README index 8b45ce2..d8dd8c7 100644 --- a/modules/app_lua/README +++ b/modules/app_lua/README @@ -139,6 +139,7 @@ modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") * sqlops - register functions from sqlops module under 'sr.sqlops'. * sl - register functions from sl module under 'sr.sl'. * tm - register functions from tm module under 'sr.tm'. + * xhttp - register functions from xhttp module under 'sr.xhttp'. Note that 'sr', 'sr.hdr' and 'sr.pv' modules are always registered to Lua. diff --git a/modules/app_lua/doc/app_lua_admin.xml b/modules/app_lua/doc/app_lua_admin.xml index 70d92bf..ae77ee7 100644 --- a/modules/app_lua/doc/app_lua_admin.xml +++ b/modules/app_lua/doc/app_lua_admin.xml @@ -163,6 +163,12 @@ modparam("app_lua", "load", "/usr/local/etc/kamailio/lua/myscript.lua") under 'sr.tm'. </para> </listitem> + <listitem> + <para> + <emphasis>xhttp</emphasis> - register functions from xhttp + module under 'sr.xhttp'. + </para> + </listitem> </itemizedlist> <para> Note that 'sr', 'sr.hdr' and 'sr.pv' modules are always registered

1 0

git:master: app_lua: include xhttp api headers
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: 2bcf11332135c3f23ce2cf0aa519ed57c4d2e4d7 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2bcf113… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 16 22:40:54 2011 +0100 app_lua: include xhttp api headers --- modules/app_lua/app_lua_exp.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index d8bc577..c998b7e 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -40,6 +40,7 @@ #include "../../modules_k/maxfwd/api.h" #include "../../modules_k/registrar/api.h" #include "../../modules_k/dispatcher/api.h" +#include "../../modules/xhttp/api.h" #include "app_lua_api.h" @@ -1249,7 +1250,7 @@ static int lua_sr_xhttp_reply(lua_State *L) LM_WARN("invalid parameters from Lua env\n"); return app_lua_return_error(L); } - rcode = (char*)lua_toint(L, -4); + rcode = lua_tointeger(L, -4); reason.s = (char*)lua_tostring(L, -3); ctype.s = (char*)lua_tostring(L, -2); mbody.s = (char*)lua_tostring(L, -1);

1 0

git:master: app_lua: exported xhttp API to Lua
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: b3d84f21011b023db95e0655c19c46f10d5b063c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b3d84f2… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Jan 16 22:32:28 2011 +0100 app_lua: exported xhttp API to Lua --- modules/app_lua/app_lua_exp.c | 74 +++++++++++++++++++++++++++++++++++++++++ 1 files changed, 74 insertions(+), 0 deletions(-) diff --git a/modules/app_lua/app_lua_exp.c b/modules/app_lua/app_lua_exp.c index a062221..d8bc577 100644 --- a/modules/app_lua/app_lua_exp.c +++ b/modules/app_lua/app_lua_exp.c @@ -52,6 +52,7 @@ #define SR_LUA_EXP_MOD_MAXFWD (1<<6) #define SR_LUA_EXP_MOD_REGISTRAR (1<<7) #define SR_LUA_EXP_MOD_DISPATCHER (1<<8) +#define SR_LUA_EXP_MOD_XHTTP (1<<9) /** * @@ -105,6 +106,11 @@ static tm_api_t _lua_tmb; static tm_xapi_t _lua_xtmb; /** + * xhttp + */ +static xhttp_api_t _lua_xhttpb; + +/** * */ static int lua_sr_sl_send_reply (lua_State *L) @@ -1217,6 +1223,59 @@ static int lua_sr_dispatcher_is_from(lua_State *L) return app_lua_return_int(L, ret); } + +/** + * + */ +static int lua_sr_xhttp_reply(lua_State *L) +{ + int rcode; + str reason; + str ctype; + str mbody; + int ret; + sr_lua_env_t *env_L; + + env_L = sr_lua_env_get(); + + if(!(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_XHTTP)) + { + LM_WARN("weird: xhttp function executed but module not registered\n"); + return app_lua_return_error(L); + } + + if(env_L->msg==NULL) + { + LM_WARN("invalid parameters from Lua env\n"); + return app_lua_return_error(L); + } + rcode = (char*)lua_toint(L, -4); + reason.s = (char*)lua_tostring(L, -3); + ctype.s = (char*)lua_tostring(L, -2); + mbody.s = (char*)lua_tostring(L, -1); + if(reason.s == NULL || ctype.s == NULL || mbody.s == NULL) + { + LM_WARN("invalid parameters from Lua\n"); + return app_lua_return_error(L); + } + reason.len = strlen(reason.s); + ctype.len = strlen(ctype.s); + mbody.len = strlen(mbody.s); + + ret = _lua_xhttpb.reply(env_L->msg, rcode, &reason, &ctype, &mbody); + return app_lua_return_int(L, ret); +} + + +/** + * + */ +static const luaL_reg _sr_xhttp_Map [] = { + {"reply", lua_sr_xhttp_reply}, + {NULL, NULL} +}; + + /** * */ @@ -1329,6 +1388,16 @@ int lua_sr_exp_init_mod(void) } LM_DBG("loaded dispatcher api\n"); } + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_XHTTP) + { + /* bind the XHTTP API */ + if (xhttp_load_api(&_lua_xhttpb) < 0) + { + LM_ERR("cannot bind to XHTTP API\n"); + return -1; + } + LM_DBG("loaded xhttp api\n"); + } return 0; } @@ -1369,6 +1438,9 @@ int lua_sr_exp_register_mod(char *mname) } else if(len==10 && strcmp(mname, "dispatcher")==0) { _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_DISPATCHER; return 0; + } else if(len==5 && strcmp(mname, "xhttp")==0) { + _sr_lua_exp_reg_mods |= SR_LUA_EXP_MOD_XHTTP; + return 0; } return -1; @@ -1397,5 +1469,7 @@ void lua_sr_exp_openlibs(lua_State *L) luaL_openlib(L, "sr.registrar", _sr_registrar_Map, 0); if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_DISPATCHER) luaL_openlib(L, "sr.dispatcher", _sr_dispatcher_Map, 0); + if(_sr_lua_exp_reg_mods&SR_LUA_EXP_MOD_XHTTP) + luaL_openlib(L, "sr.xhttp", _sr_xhttp_Map, 0); }

1 0

git:master: xhttp: exported xhttp reply via inter-module api
by Daniel-Constantin Mierla 16 Jan '11

16 Jan '11

Module: sip-router Branch: master Commit: efc3f1f5050ea2302952158098d61b457a7c8df1 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=efc3f1f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 15 16:29:02 2011 +0100 xhttp: exported xhttp reply via inter-module api --- modules/xhttp/api.h | 58 +++++++++++++++++++++++++++++++++++++++++++++ modules/xhttp/xhttp_mod.c | 17 +++++++++++++ 2 files changed, 75 insertions(+), 0 deletions(-) diff --git a/modules/xhttp/api.h b/modules/xhttp/api.h new file mode 100644 index 0000000..0fc7ee5 --- /dev/null +++ b/modules/xhttp/api.h @@ -0,0 +1,58 @@ +/** + * $Id$ + * + * Copyright (C) 2010 Daniel-Constantin Mierla (asipto.com) + * + * This file is part of kamailio, a free SIP server. + * + * kamailio is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version + * + * kamailio is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#ifndef _XHTTP_API_H_ +#define _XHTTP_API_H_ + +#include "../../sr_module.h" + +typedef int (*xhttp_reply_f)(sip_msg_t *msg, int code, str *reason, + str *ctype, str *body); + +typedef struct xhttp_api { + xhttp_reply_f reply; +} xhttp_api_t; + +typedef int (*bind_xhttp_f)(xhttp_api_t* api); +int bind_xhttp(xhttp_api_t* api); + +/** + * @brief Load the XHTTP API + */ +static inline int xhttp_load_api(xhttp_api_t *api) +{ + bind_xhttp_f bindxhttp; + + bindxhttp = (bind_xhttp_f)find_export("bind_xhttp", 0, 0); + if(bindxhttp == 0) { + LM_ERR("cannot find bind_xhttp\n"); + return -1; + } + if(bindxhttp(api)<0) + { + LM_ERR("cannot bind xhttp api\n"); + return -1; + } + return 0; +} + +#endif diff --git a/modules/xhttp/xhttp_mod.c b/modules/xhttp/xhttp_mod.c index 1c5ff7e..23ac3c4 100644 --- a/modules/xhttp/xhttp_mod.c +++ b/modules/xhttp/xhttp_mod.c @@ -44,6 +44,8 @@ #include "../../mod_fix.h" #include "../../pvar.h" +#include "api.h" + MODULE_VERSION static int xhttp_handler(sip_msg_t* msg); @@ -69,6 +71,8 @@ sl_api_t slb; static cmd_export_t cmds[] = { {"xhttp_reply", (cmd_function)w_xhttp_send_reply, 4, fixup_xhttp_reply, 0, REQUEST_ROUTE}, + {"bind_xhttp", (cmd_function)bind_xhttp, + 0, 0, 0, ANY_ROUTE}, {0, 0, 0, 0, 0} }; @@ -486,4 +490,17 @@ static int fixup_xhttp_reply(void** param, int param_no) return 0; } +/** + * + */ +int bind_xhttp(xhttp_api_t* api) +{ + if (!api) { + ERR("Invalid parameter value\n"); + return -1; + } + api->reply = xhttp_send_reply; + return 0; +} + /** @} */

1 0

git:3.1: mtree: don't safety check for db con in mod child
by Daniel-Constantin Mierla 15 Jan '11

15 Jan '11

Module: sip-router Branch: 3.1 Commit: 76a4dc1731034132b1651dc377bc34575b7ab057 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=76a4dc1… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 15 12:22:45 2011 +0100 mtree: don't safety check for db con in mod child - proper connection will be returned based on pid condition (cherry picked from commit 11b19d2f5f471bd151bfc47e82f716526118e834) --- modules/mtree/mtree_mod.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/mtree/mtree_mod.c b/modules/mtree/mtree_mod.c index 29ea12a..40ad09b 100644 --- a/modules/mtree/mtree_mod.c +++ b/modules/mtree/mtree_mod.c @@ -327,8 +327,6 @@ error1: */ static int mi_child_init(void) { - if(db_con!=NULL) - return 0; db_con = mt_dbf.init(&db_url); if(db_con==NULL) {

1 0

git:3.1: dispatcher(k): don't safety check db con in child init
by Daniel-Constantin Mierla 15 Jan '11

15 Jan '11

Module: sip-router Branch: 3.1 Commit: 26a3bb66c0f0f2c640a536df10f28df1a28a9ccb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=26a3bb6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sat Jan 15 12:34:11 2011 +0100 dispatcher(k): don't safety check db con in child init - proper db connection is returned based on pid condition (cherry picked from commit 0fa5e3acc651c7659fb0d55f03f0d23aade1dad1) --- modules_k/dispatcher/dispatch.c | 12 +++--------- 1 files changed, 3 insertions(+), 9 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 231b156..ba123bb 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -626,19 +626,13 @@ error: */ int ds_connect_db(void) { - if(!ds_db_url.s) + if(ds_db_url.s==NULL) return -1; - if (ds_db_handle) - { - LM_CRIT("BUG - db connection found already open\n"); + if((ds_db_handle = ds_dbf.init(&ds_db_url)) == 0) { + LM_ERR("cannot initialize db connection\n"); return -1; } - - if ((ds_db_handle = ds_dbf.init(&ds_db_url)) == 0){ - - return -1; - } return 0; }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
23
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev January 2011