sr-dev

sr-dev@lists.kamailio.org

13 participants
44200 discussions

git:master: Merge commit 'origin/janakj/kcore'

by Jan Janak

Module: sip-router Branch: master Commit: 93c2f8aedc4b9fa97af3eb1caa77215a4cbb049e URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=93c2f8a… Author: Jan Janak <jan(a)iptel.org> Committer: Jan Janak <jan(a)iptel.org> Date: Wed Apr 15 13:35:47 2009 +0200 Merge commit 'origin/janakj/kcore' * commit 'origin/janakj/kcore': (32 commits) Make the parser work with the sr core Update header field paths, we moved the parser to libkcore Adding the supported parser from kamailio core Adding the sst parser from kamailio core Function to retrieve the first URI from Path headers. Moving socket related code from snmpstats module into libkcore Added privacy header parser from kamailio to kcore lib Use next_sibling_hdr to obtain next header with same type Kamailio compatiblity: export last_retcode via a global variable Fix paths to header files in the sr core. Adding files regexp.[ch] from kamailio core Fix path to msg_parser.h Fixing the path to headers in the sip-router core. Adding P-Preferred-Identity header parser from kamailio core Fix paths to headers in the sip-router core. P-Asserted-Identity parser from kamailio core Update header paths Adding core_stats.[ch] from kamailio Copy statistics files from kamailio into libkcore Adding faked_msg.[ch] from kamailio core ... ---

15 years, 9 months

Patch: fix nathelper module loading

by Henning Westerholt

Hi, this patch fixes the module loading for the nathelper module. The module registers the additional processes only (for ping timers) only when natping_interval > 0. Thus we need to check for this variable in the child_init(..) function as well. Cheers, Henning diff --git a/modules/nathelper/nathelper.c b/modules/nathelper/nathelper.c index e9666bf..4118bf2 100644 --- a/modules/nathelper/nathelper.c +++ b/modules/nathelper/nathelper.c @@ -1166,7 +1166,7 @@ child_init(int rank) struct rtpp_set *rtpp_list; struct rtpp_node *pnode; - if (rank==PROC_MAIN) { + if (rank==PROC_MAIN && natping_interval > 0) { for( i=0 ; i<natping_processes ; i++ ) { if(fork_dummy_timer(PROC_TIMER, "TIMER NH", 1 /*socks flag*/, nh_timer, (void*)(unsigned long)i,

15 years, 9 months

Module migration to git starts now

by Jan Janak

Folks, I am about to start migrating SER modules and Kamailio modules to the git repository at git://git.sip-router.org/sip-router. I suppose it will take most of the day, I will send another announcement when it is done. Unless you have something very urgent to commit, please wait with commits to the svn trunk and cvs head. This applies only to cvs head and svn trunk, feel free to commit to other branches. If you have something that you need to commit urgently to svn trunk or cvs head, please do so and let me know by email. Thanks for your cooperation. Jan.

15 years, 9 months

path parser support in sr

by Henning Westerholt

Hi, one module that is still not works with sr is the registrar module. In order to compile path support (RFC 3327) is necessary. The path module already compiles, but some necessary functions in the parser are missing. I've digged a bit in the archives, a few years ago there were some proposals about path support in SER, but i was not able to found this in the current tree. I found something in the roadmap for SER 2.1. How should i progress in this regards? Just try to porting the missing parser parts from kamailio, or is there perhaps a own implementation in SER somehow? Henning

15 years, 9 months

Migration to Git

by Jan Janak

Folks, Most of you probably know that we have been working on integration of SER and Kamailio projects. We aim at having one common source tree long term, hoping that this would allow us share share the workload. The integration work has been going on in git repositories at http://git.sip-router.org and on the sr-dev (http://lists.sip-router.org) mailing list. As of today we have a common core that contains most features available in both projects, we can compile all SER modules with the new core and most Kamailio modules. Tomorrow we will migrate both projects to the shared git repository and further development will continue there. The URL of the shared repository will be git://git.sip-router.org/sip-router for read-only access and ssh://<username>@git.sip-router.org/sip-router for read write access. The repository is also available via HTTP(S) for read-only access. You can also browse the contents of the repository through the WWW interface at http://git.sip-router.org Repository Layout ----------------- The most important branch in the repository is the branch named 'master'. This is the equivalent of CVS HEAD and SVN trunk branches. The most up-to-date code can be found there. This is the branch you need to look at if you want to get a glimpse of the most recent code. You will also see a number of personal branches of individual developers, these branches typically contain work in progress and haven't been merged into the master branch yet. The biggest difference in the repository layout is that there will be three directories containing modules. The subdirectory 'modules' will contain modules that are shared between SER and Kamailio. Initially, this directory will contain modules that only exist in one of the projects (i.e. there is no module with conflicting name in the other project), or modules that have already been merged and provide functionality needed by both project. That includes modules like carrierroute, tls, tm, db_mysql, db_flatstore, db_berkeley, db_mysql, and so on. Directory modules_s will contain original SER modules from the CVS repository, updated to make tham work with the sip-router core. Directory modules_k will contain original Kamailio modules from the SVN repository, modules in this directory will be updated with patches that we have been keeping in kamailio-3.0 temporary repository now. This temporary repository will be deleted after the migration. Write Access ------------ All developers in the table below have write access to branch master. In addition to that developers have write access to their personal branches. Personal branches are the branches that start with the username of the developer followed by a slash and the name of the branch, for example janakj/kcore. Only user with username janakj has write access to that branch. Write access to other branches is not permitted by default. This is to make sure that people do not modify the work in progress of other developers by mistake. I often create a number of topic branches in my local repository and synchronize them with the master repository at git.sip-router.org. The write restriction makes me to put all such branches under janakj/, this make it clear who owns them. You are free to create as many topic branches as you wish. Branches are cheap and it is the preferred way of doing non-trivial changes. All developers will have write access to newly created release branches, of course. Here is a list of people who currently have write access to the git repository: Name | Username | Commitlog Email -------------------------+------------+---------------------------- Jan Janak | janakj | jan(a)iptel.org Martin Hoffmann | martinh | hn(a)nvnc.de Andrei Pelinescu-Onciul | andrei | andrei(a)iptel.org Pavel Kasparek | pavel | pavel(a)iptel.org Greger V. Teigre | greger | greger(a)teigre.com Alfred E. Heggestad | alfredh | aeh(a)db.org Gonzalo Javier Sambucaro | sambucaro | gonzalo(a)mslc.com.ar Ondrej Martinek | ondra | ondra(a)iptel.org Bogdan Pintea | bpintea | bogdan(a)iptego.com Libor Chocholaty | liborc | libor(a)iptel.org Vladimir Marek | vlada | vlada(a)iptel.org Di-Shi Sun | di-shi | di-shi(a)transnexus.com Hendrik Scholz | hscholz | hscholz(a)raisdorf.net Raphael Coeffic | rco | rco(a)iptel.org Maxim Sobolev | sobomax | sobomax(a)sippysoft.com Jiri Kuthan | jiri | jiri(a)iptel.org Miklos Tirpak | tirpi | miklos(a)iptel.org Michal Matyska | mma | michal.matyska(a)iptel.org Nils Ohlmeier | calrissian | nils(a)iptel.org Karel Kozlik | kozlik | karel(a)iptel.org Dmitry Semyonov | dsemyonov | dsemyonov(a)dins.ru Vaclav Kubart | kubartv | vaclav.kubart(a)iptel.org Tomas Mandys | tma0 | tomas.mandys(a)iptel.org Dmitry Isakbayev | isakdim | isakdim(a)gmail.com Daniel-Constantin Mierla | daniel | miconda(a)gmail.com Henning Westerholt | henning | henning.westerholt(a)1und1.de -------------------------+------------+---------------------------- If you had write access to either SER or Kamailio repository and you are not on the list then, please, send us your public ssh key and desired username and we will give you write access. You can send the key to jan(a)iptel.org, andrei(a)iptel.org, or miconda(a)gmail.com. To try whether your write access works, you can clone the repository over ssh: $ git clone ssh://<username>@git.sip-router.org/sip-router If it worked then your ssh key is installed and you should be able to modify the repository. Jan.

15 years, 9 months

Patch: pdb loading fix

by Henning Westerholt

against kamailio-3.0, include libkmi library to enable to load the pdt module diff --git a/modules/pdt/Makefile b/modules/pdt/Makefile index 4756d05..9bc93c8 100644 --- a/modules/pdt/Makefile +++ b/modules/pdt/Makefile @@ -14,4 +14,5 @@ DEFS+=-DOPENSER_MOD_INTERFACE SERLIBPATH=../../lib SER_LIBS+=$(SERLIBPATH)/srdb1/srdb1 +SER_LIBS+=$(SERLIBPATH)/kmi/kmi include ../../Makefile.modules

15 years, 9 months

git:master: core: start with a complete module search path

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: c82fe029711cf9eda4f49522d446285e97bc5ce2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c82fe02… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 18:30:30 2009 +0200 core: start with a complete module search path - set the default module search path in function of the selected modules_dirs. --- Makefile | 8 ++++++++ Makefile.defs | 5 +++-- main.c | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index fe0c6b3..5ed6935 100644 --- a/Makefile +++ b/Makefile @@ -359,6 +359,14 @@ lex.yy.c: cfg.lex cfg.tab.h $(ALLDEP) cfg.tab.c cfg.tab.h: cfg.y $(ALLDEP) $(YACC) $(YACC_FLAGS) $< +nullstring= +space=$(nullstring) $(nullstring) + +modules_search_path=$(subst $(space),:,$(strip\ + $(addprefix $(modules_target),$(modules_dirs)))) + +main.o: DEFS+=-DMODS_DIR='"$(modules_search_path)"' + include Makefile.shared ifeq ($(config_mak),1) diff --git a/Makefile.defs b/Makefile.defs index e7794ad..2687d0a 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -239,6 +239,7 @@ lib_target = $(prefix)/$(lib_dir) doc_target = $(prefix)/$(doc_dir) + ifeq ($(OS), solaris) #use GNU versions INSTALL ?= ginstall @@ -466,10 +467,10 @@ endif C_DEFS= $(extra_defs) \ -DNAME='"$(MAIN_NAME)"' -DVERSION='"$(RELEASE)"' -DARCH='"$(ARCH)"' \ - -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"' -D__CPU_$(ARCH) -D__OS_$(OS) \ + -DOS='$(OS)_' -DOS_QUOTED='"$(OS)"' -DCOMPILER='"$(CC_VER)"'\ + -D__CPU_$(ARCH) -D__OS_$(OS) \ -DSER_VER=$(SER_VER) \ -DCFG_DIR='"$(cfg_target)"'\ - -DMODS_DIR='"$(modules_target)"'\ -DPKG_MALLOC \ -DSHM_MEM -DSHM_MMAP \ -DDNS_IP_HACK \ diff --git a/main.c b/main.c index 868572f..228e6f3 100644 --- a/main.c +++ b/main.c @@ -194,7 +194,7 @@ static char help_msg[]= "\ Usage: " NAME " [options]\n\ Options:\n\ -f file Configuration file (default: " CFG_FILE ")\n\ - -L dir Modules directory (default: " MODS_DIR ")\n\ + -L path Modules search path (default: " MODS_DIR ")\n\ -c Check configuration file for errors\n\ -l address Listen on the specified address/interface (multiple -l\n\ mean listening on more addresses). The address format is\n\ @@ -283,7 +283,7 @@ void receive_stdin_loop() int own_pgid = 0; /* whether or not we have our own pgid (and it's ok to use kill(0, sig) */ -char* mods_dir = MODS_DIR; /* directory with dyn. loadable modules */ +char* mods_dir = MODS_DIR; /* search path for dyn. loadable modules */ char* cfg_file = 0; unsigned int maxbuffer = MAX_RECV_BUFFER_SIZE; /* maximum buffer size we do

15 years, 9 months

git:master: Merge branch 'master' of ssh://git.sip-router.org/sip-router

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: cf481d5d5412ef930f120bcb0f8be729a2bfa4bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=cf481d5… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 16:32:24 2009 +0200 Merge branch 'master' of ssh://git.sip-router.org/sip-router * 'master' of ssh://git.sip-router.org/sip-router: build system: support for multiple modules dirs ---

15 years, 9 months

git:master: core: loadpath can now use a list of directories

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: fdbb341c72c140516578e80e9e0823779e03d409 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=fdbb341… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Apr 3 17:31:01 2009 +0200 core: loadpath can now use a list of directories - loadpath can use a list of directories separated by ':', e.g.: loadpath "modules:modules_s:modules_k". First match wins (e.g. for loadmodule "textops" if modules/textops.so or modules/textops/textops.so exists, it will be loaded and the search will stop). --- NEWS | 6 ++++ sr_module.c | 90 ++++++++++++++++++++++++++++++++++++---------------------- 2 files changed, 62 insertions(+), 34 deletions(-) diff --git a/NEWS b/NEWS index d3d6418..ba832bf 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,10 @@ $Id$ sip-router changes core: + - module search path support: loadpath takes now a list of directories + separated by ':'. The list is searched in-order. For each directory d + $d/${module_name}.so and $d/${module_name}/${module_name}.so are tried. + - dns TXT, EBL and PTR support (both cache and non-cached resolver) - support for dual module interfaces: ser and kamailio config script changes: - script mode can be switched between ser compatible, kamailio compatible @@ -21,6 +25,8 @@ config script changes: - while() - max_while_loops - maximum iterations allowed for a while, can be changed at runtime. Default 100. +build system: + - multiple modules directories are now supported (defined in Makefile.dirs) diff --git a/sr_module.c b/sr_module.c index 24c1445..3ff127f 100644 --- a/sr_module.c +++ b/sr_module.c @@ -238,7 +238,7 @@ static inline int version_control(void *handle, char *path) * @param modname - path or module name * @return 0 on success , <0 on error */ -int load_module(char* path) +int load_module(char* mod_path) { void* handle; char* error; @@ -248,6 +248,10 @@ int load_module(char* path) struct sr_module* t; struct stat stat_buf; char* modname; + char* mdir; + char* nxt_mdir; + char* path; + int mdir_len; int len; int dlflags; int new_dlflags; @@ -257,49 +261,64 @@ int load_module(char* path) /* for openbsd */ #define RTLD_NOW DL_LAZY #endif - + path=mod_path; if (!strchr(path, '/') && !strchr(path, '.')) { /* module name was given, we try to construct the path */ modname = path; - - /* try path <MODS_DIR>/<modname>.so */ - path = (char*)pkg_malloc( - strlen(mods_dir) + 1 /* "/" */ + - strlen(modname) + 3 /* ".so" */ + 1); - strcpy(path, mods_dir); - len = strlen(path); - if (len != 0 && path[len - 1] != '/') { - strcat(path, "/"); - } - strcat(path, modname); - strcat(path, ".so"); - - if (stat(path, &stat_buf) == -1) { - DBG("load_module: module file not found <%s>\n", path); - pkg_free(path); - - /* try path <MODS_DIR>/<modname>/<modname>.so */ - path = (char*)pkg_malloc( - strlen(mods_dir) + 1 /* "/" */ + - strlen(modname) + 1 /* "/" */ + - strlen(modname) + 3 /* ".so" */ + 1); - strcpy(path, mods_dir); - len = strlen(path); - if (len != 0 && path[len - 1] != '/') { - strcat(path, "/"); + mdir=mods_dir; /* search path */ + do{ + nxt_mdir=strchr(mdir, ':'); + if (nxt_mdir) mdir_len=(int)(nxt_mdir-mdir); + else mdir_len=strlen(mdir); + + /* try path <MODS_DIR>/<modname>.so */ + path = (char*)pkg_malloc(mdir_len + 1 /* "/" */ + + strlen(modname) + 3 /* ".so" */ + 1); + if (path==0) goto error; + memcpy(path, mdir, mdir_len); + len = mdir_len; + if (len != 0 && path[len - 1] != '/'){ + path[len]='/'; + len++; } - strcat(path, modname); - strcat(path, "/"); + path[len]=0; strcat(path, modname); strcat(path, ".so"); if (stat(path, &stat_buf) == -1) { DBG("load_module: module file not found <%s>\n", path); pkg_free(path); - LOG(L_ERR, "ERROR: load_module: could not find module <%s>\n", - modname); - goto error; + + /* try path <MODS_DIR>/<modname>/<modname>.so */ + path = (char*)pkg_malloc( + mdir_len + 1 /* "/" */ + + strlen(modname) + 1 /* "/" */ + + strlen(modname) + 3 /* ".so" */ + 1); + if (path==0) goto error; + memcpy(path, mdir, mdir_len); + len = mdir_len; + if (len != 0 && path[len - 1] != '/') { + path[len]='/'; + len++; + } + path[len]=0; + strcat(path, modname); + strcat(path, "/"); + strcat(path, modname); + strcat(path, ".so"); + + if (stat(path, &stat_buf) == -1) { + DBG("load_module: module file not found <%s>\n", path); + pkg_free(path); + path=0; + } } + mdir=nxt_mdir?nxt_mdir+1:0; + }while(path==0 && mdir); + if (path==0){ + LOG(L_ERR, "ERROR: load_module: could not find module <%s> in" + " <%s>\n", modname, mods_dir); + goto error; } } retries=2; @@ -373,18 +392,21 @@ reload: } } if (register_module(*mod_if_ver, exp, path, handle)<0) goto error1; + if (path && path!=mod_path) + pkg_free(path); return 0; error1: dlclose(handle); error: skip: + if (path && path!=mod_path) + pkg_free(path); return -1; } - /* searches the module list for function name in module mod and returns * a pointer to the "name" function record union or 0 if not found * sets also *mod_if_ver to the module interface version (needed to know

15 years, 9 months

git:master: build system: support for multiple modules dirs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 27cdfd2c39e28b846c81640c84f00f1e282ab91c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=27cdfd2… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Fri Mar 27 20:44:36 2009 +0100 build system: support for multiple modules dirs Multiple modules directories are now supported. The list of the modules directories is in Makefile.dirs in $(modules_dirs). Name restrictions: the names must not match any makefile variable name and they shouldn't contain any '-' char. The modules and modules doc/READMEs will be installed in separate dirs (e.g. for modules_dirs="modules modules_s modules_k" , the modules will be installed in .../lib/ser/modules , ...lib/ser/modules_s and ...lib/ser/modules_k). The module man pages will all be installed in the same man dir (but so far only some ser modules have man pages so we should be safe). New make targets: every-module - make all the modules in all the module dirs install-every-module - like above, but install install-every-module-doc install-every-module-man Targets dependent on $(modules_dirs) content: $(m), $(m)-doc, $(m)-readme, $(m)-man, install-$(m), install-$(m)-doc, install-$(m)-man. E.g.: for modules_dirs=modules modules_k modules_s make modules - make all modules in the directory "modules". make modules_k - make all the modules in the directory modules_k. make every-module - make all the modules in the directories modules, modules_k and modules_s. make install-modules_s - install all the modules in the directory modules_s. --- Makefile | 315 +++++++++++++++++++++++++++++++++--------------------- Makefile.defs | 3 +- Makefile.dirs | 23 ++++ Makefile.modules | 16 ++-- Makefile.rules | 12 +- Makefile.sources | 2 +- Makefile.targets | 22 +++-- 7 files changed, 251 insertions(+), 142 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=27c…

15 years, 9 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev