sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

by Klaus Darilion

Hi! From Makefile: #excluded because they depend on external *.h files exclude_modules+= h350 Why is h350 handled different than the other modules with external dependencies? IMO it just should be added to "exclude_modules?=" # excluded because they do not compile (remove them only # after they are fixed) -- andrei exclude_modules+= avpops bdb dbtext iptrtpproxy pa rls This of course prevents also building of Kamailio's avpops and rls module. How can we distinguish between ser's rls module and K's rls module? thanks Klaus

15 years, 6 months

git:master: Forgot to update parameters of the send_rtpp_command() in the last

by Maxim Sobolev

Module: sip-router Branch: master Commit: e79dd5d9649f02909e6a87dadba952d44a81e04a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e79dd5d… Author: sobomax <sobomax(a)sippysoft.com> Committer: sobomax <sobomax(a)sippysoft.com> Date: Thu Jul 2 15:06:25 2009 -0700 Forgot to update parameters of the send_rtpp_command() in the last checkin. --- modules_s/nathelper/nathelper.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/nathelper/nathelper.c b/modules_s/nathelper/nathelper.c index d9c5fd9..889e4c8 100644 --- a/modules_s/nathelper/nathelper.c +++ b/modules_s/nathelper/nathelper.c @@ -2361,7 +2361,7 @@ force_rtp_proxy(struct sip_msg *msg, char *param1, char *param2, int offer) } else { v[3].iov_len = 0; } - cp = send_rtpp_command(node, v, (to_tag.len > 0) ? 16 : 12); + cp = send_rtpp_command(node, v, (to_tag.len > 0) ? 18 : 14); } while (cp == NULL); LOG(L_DBG, "force_rtp_proxy2: proxy reply: %s\n", cp); /* Parse proxy reply to <argc,argv> */

15 years, 6 months

git:master: FORCE_RTP_PROXY_ERET -> FORCE_RTP_PROXY_RET for clarity.

by Maxim Sobolev

Module: sip-router Branch: master Commit: b48a399e12719878a52a307154d22e048dfbcd5c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b48a399… Author: sobomax <sobomax(a)sippysoft.com> Committer: sobomax <sobomax(a)sippysoft.com> Date: Thu Jul 2 15:07:14 2009 -0700 FORCE_RTP_PROXY_ERET -> FORCE_RTP_PROXY_RET for clarity. --- modules_k/nathelper/nathelper.c | 78 +++++++++++++++++++------------------- 1 files changed, 39 insertions(+), 39 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=b48…

15 years, 6 months

git:master: Rework fix for the static buffer overflow with the content of the overly long payload types list . Instead of silently truncating the list, use dynamic buffer allocated on heap to keep that list growing it if necessary .

by Maxim Sobolev

Module: sip-router Branch: master Commit: 10250c1255a2c25f828726d01cfc64ad6a2906ef URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=10250c1… Author: sobomax <sobomax(a)sippysoft.com> Committer: sobomax <sobomax(a)sippysoft.com> Date: Thu Jul 2 15:02:44 2009 -0700 Rework fix for the static buffer overflow with the content of the overly long payload types list. Instead of silently truncating the list, use dynamic buffer allocated on heap to keep that list growing it if necessary. --- modules_s/nathelper/nathelper.c | 232 +++++++++++++++++++++++++++------------ 1 files changed, 162 insertions(+), 70 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=102…

15 years, 6 months

git:master: Rework fix for the static buffer overflow with the content of

by Maxim Sobolev

Module: sip-router Branch: master Commit: c5927189da3f7c4b7b736b24d8a9258c1a5ccaa3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c592718… Author: sobomax <sobomax(a)sippysoft.com> Committer: sobomax <sobomax(a)sippysoft.com> Date: Thu Jul 2 14:12:45 2009 -0700 Rework fix for the static buffer overflow with the content of the overly long payload types list. Instead of silently truncating the list, use dynamic buffer allocated on heap to keep that list growing it if necessary. --- modules_k/nathelper/nathelper.c | 253 ++++++++++++++++++++++++++------------ 1 files changed, 173 insertions(+), 80 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c59…

15 years, 6 months

git:rbetancor/drouting DELETED: * core

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting DELETED Commit: 1c5d19277a14e71167c81665d6de8173e61a2ccb URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1c5d192… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Fri Jun 19 16:40:24 2009 +0300 * core * Added fixup_igp_pvar and fixup_free_igp_pvar fixup functions. --- mod_fix.c | 1 + mod_fix.h | 3 +++ 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/mod_fix.c b/mod_fix.c index a228e16..90a4a4d 100644 --- a/mod_fix.c +++ b/mod_fix.c @@ -176,6 +176,7 @@ FIXUP_F2T(pvar_str_str, 1, 3, 1, FPARAM_PVS, FPARAM_STR) FIXUP_F2FP(igp_null, 1, 1, 1, FPARAM_INT|FPARAM_PVS, 0) FIXUP_F2FP(igp_igp, 1, 2, 2, FPARAM_INT|FPARAM_PVS, 0) +FIXUP_F2FP(igp_pvar, 1, 2, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) FIXUP_F2FP_T(igp_pvar_pvar, 1, 3, 1, FPARAM_INT|FPARAM_PVS, FPARAM_PVS) diff --git a/mod_fix.h b/mod_fix.h index 257d78c..37bccb6 100644 --- a/mod_fix.h +++ b/mod_fix.h @@ -109,6 +109,9 @@ int fixup_igp_igp(void** param, int param_no); int fixup_igp_null(void** param, int param_no); int fixup_get_ivalue(struct sip_msg* msg, gparam_p gp, int *val); +int fixup_igp_pvar(void** param, int param_no); +int fixup_free_igp_pvar(void** param, int param_no); + int fixup_igp_pvar_pvar(void** param, int param_no); int fixup_free_igp_pvar_pvar(void** param, int param_no);

15 years, 6 months

git:rbetancor/drouting: drouting: new module to support Dynamic Routing

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: 08e1be29be51ca720be5b796baa40ef4b786ef54 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=08e1be2… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Fri Jun 19 23:36:43 2009 +0100 drouting: new module to support Dynamic Routing -Adapted from OpenSips drouting module rev. #5770 --- modules_k/drouting/Makefile | 10 + modules_k/drouting/README | 771 ++++++++++++++++ modules_k/drouting/doc/Makefile | 4 + modules_k/drouting/doc/drouting.xml | 57 ++ modules_k/drouting/doc/drouting_admin.xml | 1364 +++++++++++++++++++++++++++++ modules_k/drouting/doc/drouting_devel.xml | 11 + modules_k/drouting/dr_bl.c | 207 +++++ modules_k/drouting/dr_bl.h | 56 ++ modules_k/drouting/dr_load.c | 581 ++++++++++++ modules_k/drouting/dr_load.h | 43 + modules_k/drouting/dr_time.c | 1168 ++++++++++++++++++++++++ modules_k/drouting/dr_time.h | 178 ++++ modules_k/drouting/drouting.c | 1077 +++++++++++++++++++++++ modules_k/drouting/parse.h | 47 + modules_k/drouting/prefix_tree.c | 324 +++++++ modules_k/drouting/prefix_tree.h | 183 ++++ modules_k/drouting/routing.c | 471 ++++++++++ modules_k/drouting/routing.h | 124 +++ 18 files changed, 6676 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=08e…

15 years, 6 months

git:rbetancor/drouting: drouting: Updated all Copyright notices

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: 0fbd2328d880d54cc2e4c68d09c7f5d52f4f6820 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0fbd232… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Sat Jun 20 00:49:23 2009 +0100 drouting: Updated all Copyright notices --- modules_k/drouting/dr_bl.c | 20 ++++++++------------ modules_k/drouting/dr_bl.h | 20 ++++++++------------ modules_k/drouting/dr_load.c | 20 ++++++++------------ modules_k/drouting/dr_load.h | 20 ++++++++------------ modules_k/drouting/dr_time.c | 20 ++++++++------------ modules_k/drouting/dr_time.h | 20 ++++++++------------ modules_k/drouting/drouting.c | 23 ++++++++++------------- modules_k/drouting/parse.h | 20 ++++++++------------ modules_k/drouting/prefix_tree.c | 20 ++++++++------------ modules_k/drouting/prefix_tree.h | 20 ++++++++------------ modules_k/drouting/routing.c | 20 ++++++++------------ modules_k/drouting/routing.h | 20 ++++++++------------ 12 files changed, 98 insertions(+), 145 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=0fb…

15 years, 6 months

git:rbetancor/drouting: drouting:

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: 4f3dbdd89505497b78ce7ce005f2e3a41923955e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4f3dbdd… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Thu Jul 2 15:53:08 2009 +0100 drouting: - changed db support to db1_k calls --- modules_k/drouting/dr_load.c | 36 ++++++++++++++++++------------------ modules_k/drouting/dr_load.h | 4 ++-- modules_k/drouting/drouting.c | 32 ++++++++++++++++++++++++++------ 3 files changed, 46 insertions(+), 26 deletions(-) diff --git a/modules_k/drouting/dr_load.c b/modules_k/drouting/dr_load.c index 80f7f43..3d833d9 100644 --- a/modules_k/drouting/dr_load.c +++ b/modules_k/drouting/dr_load.c @@ -34,7 +34,7 @@ #include "../../dprint.h" -#include "../../db/db.h" +//#include "../../db/db.h" #include "../../mem/shm_mem.h" #include "dr_load.h" @@ -276,14 +276,14 @@ error: } -rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db_con_t* db_hdl, +rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db1_con_t* db_hdl, str *drd_table, str *drl_table, str* drr_table ) { int int_vals[4]; char * str_vals[4]; str tmp; db_key_t columns[7]; - db_res_t* res; + db1_res_t* res; db_row_t* row; rt_info_t *ri; rt_data_t *rdata; @@ -341,22 +341,22 @@ rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db_con_t* db_hdl, for(i=0; i < RES_ROW_N(res); i++) { row = RES_ROWS(res) + i; /* DST_ID column */ - check_val( ROW_VALUES(row), DB_INT, 1, 0); + check_val( ROW_VALUES(row), DB1_INT, 1, 0); int_vals[0] = VAL_INT (ROW_VALUES(row)); /* ADDRESS column */ - check_val( ROW_VALUES(row)+1, DB_STRING, 1, 1); + check_val( ROW_VALUES(row)+1, DB1_STRING, 1, 1); str_vals[0] = (char*)VAL_STRING(ROW_VALUES(row)+1); /* STRIP column */ - check_val( ROW_VALUES(row)+2, DB_INT, 1, 0); + check_val( ROW_VALUES(row)+2, DB1_INT, 1, 0); int_vals[1] = VAL_INT (ROW_VALUES(row)+2); /* PREFIX column */ - check_val( ROW_VALUES(row)+3, DB_STRING, 0, 0); + check_val( ROW_VALUES(row)+3, DB1_STRING, 0, 0); str_vals[1] = (char*)VAL_STRING(ROW_VALUES(row)+3); /* TYPE column */ - check_val( ROW_VALUES(row)+4, DB_INT, 1, 0); + check_val( ROW_VALUES(row)+4, DB1_INT, 1, 0); int_vals[2] = VAL_INT(ROW_VALUES(row)+4); /* ATTRS column */ - check_val( ROW_VALUES(row)+5, DB_STRING, 0, 0); + check_val( ROW_VALUES(row)+5, DB1_STRING, 0, 0); str_vals[2] = (char*)VAL_STRING(ROW_VALUES(row)+5); /* add the destinaton definition in */ @@ -421,10 +421,10 @@ rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db_con_t* db_hdl, for(i=0; i < RES_ROW_N(res); i++) { row = RES_ROWS(res) + i; /* ID column */ - check_val( ROW_VALUES(row), DB_INT, 1, 0); + check_val( ROW_VALUES(row), DB1_INT, 1, 0); int_vals[0] = VAL_INT (ROW_VALUES(row)); /* GWLIST column */ - check_val( ROW_VALUES(row)+1, DB_STRING, 1, 1); + check_val( ROW_VALUES(row)+1, DB1_STRING, 1, 1); str_vals[0] = (char*)VAL_STRING(ROW_VALUES(row)+1); if (add_tmp_gw_list(int_vals[0], str_vals[0])!=0) { @@ -487,13 +487,13 @@ rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db_con_t* db_hdl, for(i=0; i < RES_ROW_N(res); i++) { row = RES_ROWS(res) + i; /* RULE_ID column */ - check_val( ROW_VALUES(row), DB_INT, 1, 0); + check_val( ROW_VALUES(row), DB1_INT, 1, 0); int_vals[0] = VAL_INT (ROW_VALUES(row)); /* GROUP column */ - check_val( ROW_VALUES(row)+1, DB_STRING, 1, 1); + check_val( ROW_VALUES(row)+1, DB1_STRING, 1, 1); str_vals[0] = (char*)VAL_STRING(ROW_VALUES(row)+1); /* PREFIX column - it may be null or empty */ - check_val( ROW_VALUES(row)+2, DB_STRING, 0, 0); + check_val( ROW_VALUES(row)+2, DB1_STRING, 0, 0); if ((ROW_VALUES(row)+2)->nul || VAL_STRING(ROW_VALUES(row)+2)==0){ tmp.s = NULL; tmp.len = 0; @@ -503,16 +503,16 @@ rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db_con_t* db_hdl, tmp.len = strlen(str_vals[1]); } /* TIME column */ - check_val( ROW_VALUES(row)+3, DB_STRING, 1, 1); + check_val( ROW_VALUES(row)+3, DB1_STRING, 1, 1); str_vals[2] = (char*)VAL_STRING(ROW_VALUES(row)+3); /* PRIORITY column */ - check_val( ROW_VALUES(row)+4, DB_INT, 1, 0); + check_val( ROW_VALUES(row)+4, DB1_INT, 1, 0); int_vals[2] = VAL_INT (ROW_VALUES(row)+4); /* ROUTE_ID column */ - check_val( ROW_VALUES(row)+5, DB_INT, 1, 0); + check_val( ROW_VALUES(row)+5, DB1_INT, 1, 0); int_vals[3] = VAL_INT (ROW_VALUES(row)+5); /* DSTLIST column */ - check_val( ROW_VALUES(row)+6, DB_STRING, 1, 1); + check_val( ROW_VALUES(row)+6, DB1_STRING, 1, 1); str_vals[3] = (char*)VAL_STRING(ROW_VALUES(row)+6); /* parse the time definition */ if ((time_rec=parse_time_def(str_vals[2]))==0) { diff --git a/modules_k/drouting/dr_load.h b/modules_k/drouting/dr_load.h index 5345d47..b0357f8 100644 --- a/modules_k/drouting/dr_load.h +++ b/modules_k/drouting/dr_load.h @@ -30,10 +30,10 @@ #define _DR_LOAD_ #include "../../str.h" -#include "../../db/db.h" +#include "../../lib/srdb1/db.h" #include "routing.h" -rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db_con_t* db_hdl, +rt_data_t* dr_load_routing_info( db_func_t *dr_dbf, db1_con_t* db_hdl, str *drd_table, str *drl_table, str* str_table); #endif diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index 3e69836..6c76f21 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -76,7 +76,7 @@ static str drg_user_col = str_init("username"); static str drg_domain_col = str_init("domain"); static str drg_grpid_col = str_init("groupid"); /* variables */ -static db_con_t *db_hdl=0; /* DB handler */ +static db1_con_t *db_hdl=0; /* DB handler */ static db_func_t dr_dbf; /* DB functions */ /* current dr data - pointer to a pointer in shm */ @@ -205,6 +205,26 @@ struct module_exports exports = { }; +/** + * Rewrite Request-URI + */ +static inline int rewrite_ruri(struct sip_msg* _m, char* _s) +{ + struct action act; + struct run_act_ctx ra_ctx; + + memset(&act, '\0', sizeof(act)); + act.type = SET_URI_T; + act.val[0].type = STRING_ST; + act.val[0].u.string = _s; + init_run_actions_ctx(&ra_ctx); + if (do_action(&ra_ctx, &act, _m) < 0) + { + LM_ERR("do_action failed\n"); + return -1; + } + return 0; +} static inline int dr_reload_data( void ) { @@ -478,20 +498,20 @@ static inline int get_group_id(struct sip_uri *uri) db_key_t keys_ret[1]; db_key_t keys_cmp[2]; db_val_t vals_cmp[2]; - db_res_t* res; + db1_res_t* res; int n; /* user */ keys_cmp[0] = &drg_user_col; - vals_cmp[0].type = DB_STR; + vals_cmp[0].type = DB1_STR; vals_cmp[0].nul = 0; vals_cmp[0].val.str_val = uri->user; n = 1; if (use_domain) { keys_cmp[1] = &drg_domain_col; - vals_cmp[1].type = DB_STR; + vals_cmp[1].type = DB1_STR; vals_cmp[1].nul = 0; vals_cmp[1].val.str_val = uri->host; n++; @@ -511,7 +531,7 @@ static inline int get_group_id(struct sip_uri *uri) uri->host.len, uri->host.s); goto error; } - if (res->rows[0].values[0].nul || res->rows[0].values[0].type!=DB_INT) { + if (res->rows[0].values[0].nul || res->rows[0].values[0].type!=DB1_INT) { LM_ERR("null or non-integer group_id\n"); goto error; } @@ -612,7 +632,7 @@ static int use_next_gw(struct sip_msg* msg) if (!avp) return -1; - if (set_ruri( msg, &val.s)==-1) { + if (rewrite_ruri(msg, &val.s.s)==-1) { LM_ERR("failed to rewite RURI\n"); return -1; }

15 years, 6 months

git:rbetancor/drouting: drouting:

by Raul Alexis Betancor Santana

Module: sip-router Branch: rbetancor/drouting Commit: 9b675c5a60ebb7c7a747312c0f3928eff9c2a966 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9b675c5… Author: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Committer: Raul Alexis Betancor Santana <rabs(a)dimension-virtual.com> Date: Thu Jul 2 17:45:43 2009 +0100 drouting: - fixed access to rlist --- modules_k/drouting/drouting.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/drouting.c b/modules_k/drouting/drouting.c index a5bb756..9c92a31 100644 --- a/modules_k/drouting/drouting.c +++ b/modules_k/drouting/drouting.c @@ -745,7 +745,7 @@ again: } if (rt_info->route_idx>0 && rt_info->route_idx<RT_NO) { - ret = run_top_route( rlist[rt_info->route_idx], msg ); + ret = run_top_route(main_rt.rlist[rt_info->route_idx], msg ); if (ret<1) { /* drop the action */ LM_DBG("script route %d drops routing "

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