sr-dev April 2009

sr-dev@lists.kamailio.org

13 participants
230 discussions

git:master: fix crash in carrierroute related to failed config file loading

by Henning Westerholt

Module: sip-router Branch: master Commit: 6fc84149d62956192257c0fe9af728121f5d71e9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6fc8414… Author: Henning Westerholt <henning.westerholt(a)1und1.de> Committer: Henning Westerholt <henning.westerholt(a)1und1.de> Date: Tue Apr 21 18:23:51 2009 +0200 fix crash in carrierroute related to failed config file loading --- modules/carrierroute/cr_config.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/modules/carrierroute/cr_config.c b/modules/carrierroute/cr_config.c index 642f911..87969fa 100644 --- a/modules/carrierroute/cr_config.c +++ b/modules/carrierroute/cr_config.c @@ -104,6 +104,10 @@ static cfg_t * parse_config(void) { }; cfg = cfg_init(opts, CFGF_NONE); + if (cfg == NULL) { + LM_ERR("could not initialize configuration\n"); + return NULL; + } cfg_set_error_function(cfg, conf_error);

15 years, 8 months

another git and make question

by jh＠tutpro.com

if i delete a file and then do 'git pull', git claims that my repo is up to date, which is not true: jh@taimen:/usr/src/orig/sip-router$ rm modules.lst jh@taimen:/usr/src/orig/sip-router$ git pull jh(a)git.sip-router.org's password: Already up-to-date. in svn if i do 'svn update', it fetches for me the missing file. if i try explicitly pull the missing file, i get this: jh@taimen:/usr/src/orig/sip-router$ git pull modules.lst fatal: 'modules.lst': unable to chdir or not a git archive fatal: The remote end hung up unexpectedly does anyone know how to get my repo up to date if files are missing? -- juha

15 years, 8 months

what to do if function names differ?

by jh＠tutpro.com

how should merge be done, when function names differ? should we support both names or choose one? for example, max_forwards module: s: maxfwd_process(max_value) maxfwd_at_least(min_value) k: mf_process_maxfwd_header(max_value) is_maxfwd_lt(max_value) my vote is to take one that has better documentation. -- juha

15 years, 8 months

New commits on branch master

by Daniel-Constantin Mierla

URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=0f22959… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 14:40:34 2009 +0200 dialplan: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e772f6a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 14:40:19 2009 +0200 db_flatstore: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=aa9c7d3… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 14:39:58 2009 +0200 db_flatstore: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=04f66b6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 14:39:09 2009 +0200 carrierroute: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fe64f7f… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:46:05 2009 +0200 utils: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f9fe106… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:45:21 2009 +0200 xcap_client: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=212e75b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:45:05 2009 +0200 usrloc: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=571bc6e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:44:52 2009 +0200 userblacklist: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e8b35ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:44:37 2009 +0200 siptrace: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b821393… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:44:11 2009 +0200 regexp: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=74e3087… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:43:03 2009 +0200 ratelimit: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ba94f02… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:42:46 2009 +0200 pv: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=adf4a91… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:42:24 2009 +0200 pua_mi: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9d5361e… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:41:59 2009 +0200 presence_xml: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6b55446… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:41:45 2009 +0200 presence: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=6635cb9… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:41:34 2009 +0200 pike: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00c0a17… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:41:15 2009 +0200 permissions: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=16310fd… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:40:56 2009 +0200 perl: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b30d226… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:40:42 2009 +0200 pdt: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=120e032… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:40:20 2009 +0200 nathelper: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=60b34eb… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:40:01 2009 +0200 lcr: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=700e6f7… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:39:45 2009 +0200 imc: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=8e47fc6… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:39:26 2009 +0200 htable: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fa12669… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:39:04 2009 +0200 domain: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f07cb98… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:38:35 2009 +0200 cpl-c: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9f8d47c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:38:00 2009 +0200 dialog: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2633b5a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:37:22 2009 +0200 cfgutils: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cdcc7ce… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 13:36:37 2009 +0200 benchmark: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...)

15 years, 8 months

git:master: dispatcher: export MI commands

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 9bdaf1a820719b9431382cfa79cc0af36f0d9a3b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9bdaf1a… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Apr 21 12:46:44 2009 +0200 dispatcher: export MI commands - MI commands exported from mod_init - MI API is now a library (lib/kmi), SR core does not call anymore register_mi_mod(...) --- modules_k/dispatcher/dispatcher.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/modules_k/dispatcher/dispatcher.c b/modules_k/dispatcher/dispatcher.c index 93799ba..fdd73ca 100644 --- a/modules_k/dispatcher/dispatcher.c +++ b/modules_k/dispatcher/dispatcher.c @@ -204,6 +204,12 @@ static int mod_init(void) { pv_spec_t avp_spec; + if(register_mi_mod(exports.name, mi_cmds)!=0) + { + LM_ERR("failed to register MI commands\n"); + return -1; + } + if (dst_avp_param.s) dst_avp_param.len = strlen(dst_avp_param.s); if (grp_avp_param.s)

15 years, 8 months

moving modules

by Andrei Pelinescu-Onciul

Hi *, Before moving more modules consider the following problem cases: - same module in k uses mi and in ser rpc => for the near future we cannot choose one over the other, because some functionality will be lost (e.g. choosing the k module will leave someone wanting a ser like config having to use mi for one module). - a module includes stuff from other modules (e.g. auth_* & auth) => it's probably not safe to replace it with only one version, until the modules they depend on are merged. - even if the module exists only in ser or in k, it might be unmaintained or obsolete (in which case we better make another dir, something like modules_obsolete or unmaintained and move them there until somebody volunteers to take over). Part of the problem is if we merge everything now or latter. I think latter is better, unless you want a larger delay (there are just too many modules/interfaces to merge and too few people knowing enough about both projects to do it). There are other points we haven't even discussed yet (like rpc & mi, it doesn't make sense to have 2 management interfaces in the long run). Andrei

15 years, 8 months

compile only a given list of modules

by jh＠tutpro.com

is there a way to tell that i want to compile only a given list of modules? i don't like to list excluded modules, because if i use that, i need to keep on adding stuff to the list all the time. -- juha

15 years, 8 months

what is git equivalent of 'svn revert'

by jh＠tutpro.com

i did some adds/commits, but did not push them yet. now i want to get my repo to clean stage it was before all this. in svn world i would give command 'svn revert', but with git i haven't found anything simple (nor working complicated) way to accomplish it. is there any? -- juha

15 years, 8 months

git:master: dialog: fix dlg flags and profile issues

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: 5d131fe7d5ca78526372bab26af27c7501326f57 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=5d131fe… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Apr 20 12:23:06 2009 +0200 dialog: fix dlg flags and profile issues - reported by Alex Balasov and Inaki Baz Castillo - flags operations were not taken in account - profiles without name were buggy --- modules_k/dialog/dialog.c | 35 +++++++++++++++++++++++------------ modules_k/dialog/dlg_db_handler.c | 6 ++++-- modules_k/dialog/dlg_handlers.c | 2 +- modules_k/dialog/dlg_var.c | 4 ++++ modules_k/dialog/dlg_var.h | 2 ++ 5 files changed, 34 insertions(+), 15 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index bbb8565..d97bd52 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -682,9 +682,14 @@ static int w_get_profile_size(struct sip_msg *msg, char *profile, unsigned int size; pv_value_t val; - pve = (pv_elem_t *)value; - sp_dest = (pv_spec_t *)result; - + if(result!=NULL) + { + pve = (pv_elem_t *)value; + sp_dest = (pv_spec_t *)result; + } else { + pve = NULL; + sp_dest = (pv_spec_t *)value; + } if ( pve!=NULL && ((struct dlg_profile_table*)profile)->has_value) { if ( pv_printf_s(msg, pve, &val_s)!=0 || val_s.len == 0 || val_s.s == NULL) { @@ -711,7 +716,7 @@ static int w_get_profile_size(struct sip_msg *msg, char *profile, static int w_dlg_setflag(struct sip_msg *msg, char *flag, char *s2) { - struct dlg_cell *dlg; + dlg_ctx_t *dctx; int val; if(fixup_get_ivalue(msg, (gparam_p)flag, &val)!=0) @@ -721,17 +726,19 @@ static int w_dlg_setflag(struct sip_msg *msg, char *flag, char *s2) } if(val<0 || val>31) return -1; - if ( (dlg=dlg_get_ctx_dialog())==NULL ) + if ( (dctx=dlg_get_dlg_ctx())==NULL ) return -1; - dlg->sflags |= 1<<val; + dctx->flags |= 1<<val; + if(dctx->dlg) + dctx->dlg->sflags |= 1<<val; return 1; } static int w_dlg_resetflag(struct sip_msg *msg, char *flag, str *s2) { - struct dlg_cell *dlg; + dlg_ctx_t *dctx; int val; if(fixup_get_ivalue(msg, (gparam_p)flag, &val)!=0) @@ -742,17 +749,19 @@ static int w_dlg_resetflag(struct sip_msg *msg, char *flag, str *s2) if(val<0 || val>31) return -1; - if ( (dlg=dlg_get_ctx_dialog())==NULL ) + if ( (dctx=dlg_get_dlg_ctx())==NULL ) return -1; - dlg->sflags &= ~(1<<val); + dctx->flags &= ~(1<<val); + if(dctx->dlg) + dctx->dlg->sflags &= ~(1<<val); return 1; } static int w_dlg_isflagset(struct sip_msg *msg, char *flag, str *s2) { - struct dlg_cell *dlg; + dlg_ctx_t *dctx; int val; if(fixup_get_ivalue(msg, (gparam_p)flag, &val)!=0) @@ -763,10 +772,12 @@ static int w_dlg_isflagset(struct sip_msg *msg, char *flag, str *s2) if(val<0 || val>31) return -1; - if ( (dlg=dlg_get_ctx_dialog())==NULL ) + if ( (dctx=dlg_get_dlg_ctx())==NULL ) return -1; - return (dlg->sflags&(1<<val))?1:-1; + if(dctx->dlg) + return (dctx->dlg->sflags&(1<<val))?1:-1; + return (dctx->flags&(1<<val))?1:-1; } static int w_dlg_manage(struct sip_msg *msg, char *s1, char *s2) diff --git a/modules_k/dialog/dlg_db_handler.c b/modules_k/dialog/dlg_db_handler.c index 61b99e9..1d39d08 100644 --- a/modules_k/dialog/dlg_db_handler.c +++ b/modules_k/dialog/dlg_db_handler.c @@ -509,8 +509,10 @@ int update_dialog_dbinfo(struct dlg_cell * cell) SET_PROPER_NULL_FLAG(cell->contact[DLG_CALLER_LEG], values, 16); SET_PROPER_NULL_FLAG(cell->contact[DLG_CALLEE_LEG], values, 17); - VAL_INT(values+18) = cell->sflags; - VAL_INT(values+19) = cell->toroute; + VAL_NULL(values+18) = 0; + VAL_INT(values+18) = cell->sflags; + VAL_NULL(values+19) = 0; + VAL_INT(values+19) = cell->toroute; if((dialog_dbf.insert(dialog_db_handle, insert_keys, values, DIALOG_TABLE_COL_NO)) !=0){ diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index fb53bd4..082e835 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -485,7 +485,7 @@ int dlg_new_dialog(struct sip_msg *msg, struct cell *t) return -1; } - current_dlg_pointer = dlg; + set_current_dialog(msg, dlg); _dlg_ctx.dlg = dlg; link_dlg(dlg, 2/* extra ref for the callback and current dlg hook */); diff --git a/modules_k/dialog/dlg_var.c b/modules_k/dialog/dlg_var.c index 482ca1f..588e231 100644 --- a/modules_k/dialog/dlg_var.c +++ b/modules_k/dialog/dlg_var.c @@ -372,3 +372,7 @@ struct dlg_cell* dlg_get_ctx_dialog(void) return _dlg_ctx.dlg; } +dlg_ctx_t* dlg_get_dlg_ctx(void) +{ + return &_dlg_ctx; +} diff --git a/modules_k/dialog/dlg_var.h b/modules_k/dialog/dlg_var.h index 27f5305..a1813f8 100644 --- a/modules_k/dialog/dlg_var.h +++ b/modules_k/dialog/dlg_var.h @@ -54,4 +54,6 @@ int dlg_cfg_cb(struct sip_msg *foo, void *bar); void dlg_set_ctx_dialog(struct dlg_cell *dlg); struct dlg_cell* dlg_get_ctx_dialog(void); +dlg_ctx_t* dlg_get_dlg_ctx(void); + #endif

15 years, 8 months

git:master: presence_xml(k): futex warning fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c14314a41793c03c0e9b348845b403c27875e85a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c14314a… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Mon Apr 20 10:56:11 2009 +0200 presence_xml(k): futex warning fix - added _BSD_SOURCE define if _XOPEN_SOURCE is manually defined (the _XOPEN_SOURCE define in pidf.c caused _BSD_SOURCE to be no longer defined in features.h => _USE_MISC not defined => syscall() not declared in unistd.h.) --- modules_k/presence_xml/pidf.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/modules_k/presence_xml/pidf.c b/modules_k/presence_xml/pidf.c index d83fd6d..36eb2a5 100644 --- a/modules_k/presence_xml/pidf.c +++ b/modules_k/presence_xml/pidf.c @@ -38,6 +38,9 @@ */ #ifndef __OS_solaris #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ + #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect + of the above define on + features.h/unistd.h syscall() */ #else #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif

15 years, 8 months

← Newer
1
...
11
12
13
14
15
16
17
...
23
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev April 2009