sr-dev

sr-dev@lists.kamailio.org

44307 discussions

git:master: Merge remote branch 'origin/andrei/raw_sock'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 88b1fb440e9a379bbcd64292a8bb1d8e29a8b427 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=88b1fb4… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 22:49:04 2010 +0200 Merge remote branch 'origin/andrei/raw_sock' Raw socket support for sending UDP IPv4 packets (major performance increase on multi-cpu machines running linux: 40-50% faster at least in stateless mode). * origin/andrei/raw_sock: NEWS: notes about the new udp4_raw mode raw sockets: added info rpc core: compile raw socket support by default on freebsd raw sockets: freebsd support cfg: delay cfg_shmize to just before forking core: always compile the raw sockets code on linux raw sockets: ttl can be set from the config file raw sockets: ttl can be set or auto-detected core: include raw socket support in version info raw sockets: use BSD ip & udp structure versions raw sockets: config file support raw sockets: udp send will use now raw sockets if enabled raw sockets: runtime config support raw sockets: build ip header & fragmentation support raw socket: compilation fixes raw sockets: get dst. ip from the ip header core: basic support for receiving udp sip packets on raw sockets core: basic raw socket support functions ---

14 years, 6 months

git:master: debugger: update the module functions types

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 690a19f54924cf5fef642b3542b3d86e41170508 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=690a19f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 22:24:46 2010 +0200 debugger: update the module functions types Updated to the current module function types (MODULE*_T), after the rve_f_params merge. Removed MODULE_T and added MODULE0_T, MODULE1_T, MODULE2_T, MODULE1_RVE_T, MODULE2_RVE_T, MODULE3_RVE_T, MODULE4_RVE_T, MODULE5_RVE_T, MODULE6_RVE_T, MODULEX_RVE_T. --- modules/debugger/debugger_act.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/modules/debugger/debugger_act.c b/modules/debugger/debugger_act.c index f99d63a..e9372fa 100644 --- a/modules/debugger/debugger_act.c +++ b/modules/debugger/debugger_act.c @@ -117,12 +117,21 @@ str* dbg_get_action_name(struct action *a) if(a->val[1].u.number&RETURN_R_F) return &_dbg_action_special[3]; return &_dbg_action_special[1]; - case MODULE_T: + case MODULE0_T: + case MODULE1_T: + case MODULE2_T: case MODULE3_T: case MODULE4_T: case MODULE5_T: case MODULE6_T: case MODULEX_T: + case MODULE1_RVE_T: + case MODULE2_RVE_T: + case MODULE3_RVE_T: + case MODULE4_RVE_T: + case MODULE5_RVE_T: + case MODULE6_RVE_T: + case MODULEX_RVE_T: cmd = (cmd_export_common_t*)(a->val[0].u.data); aname.s = cmd->name; aname.len = strlen(aname.s);

14 years, 6 months

git:master: app_lua: updated to the sr31 export records

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: d3796af0614b59b58633243c7d5adb2eaba6276a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d3796af… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 22:27:53 2010 +0200 app_lua: updated to the sr31 export records - use the new unified sr31_cmd_export_t (removed checks for v0 or v1 modules). - set the correct module function type in the created action (in function of the function export record number of parameters one of the MODULE[0-5]_T or MODULEX_T). --- modules/app_lua/app_lua_sr.c | 47 ++++++++++++++++++++++++++++++++++------- 1 files changed, 39 insertions(+), 8 deletions(-) diff --git a/modules/app_lua/app_lua_sr.c b/modules/app_lua/app_lua_sr.c index 0900bd4..bd1510a 100644 --- a/modules/app_lua/app_lua_sr.c +++ b/modules/app_lua/app_lua_sr.c @@ -109,10 +109,11 @@ static int lua_sr_modf (lua_State *L) char *argv[MAX_ACTIONS]; int argc; int i; + int mod_type; struct run_act_ctx ra_ctx; unsigned modver; struct action *act; - union cmd_export_u* expf; + sr31_cmd_export_t* expf; sr_lua_env_t *env_L; ret = 1; @@ -169,12 +170,42 @@ static int lua_sr_modf (lua_State *L) goto error; } /* check fixups */ - if (expf->v1.fixup!=NULL && (modver!=1 || expf->v1.free_fixup==NULL)) { + if (expf->fixup!=NULL && expf->free_fixup==NULL) { LM_ERR("function '%s' has fixup - cannot be used\n", luav[0]); goto error; } + switch(expf->param_no) { + case 0: + mod_type = MODULE0_T; + break; + case 1: + mod_type = MODULE1_T; + break; + case 2: + mod_type = MODULE2_T; + break; + case 3: + mod_type = MODULE3_T; + break; + case 4: + mod_type = MODULE4_T; + break; + case 5: + mod_type = MODULE5_T; + break; + case 6: + mod_type = MODULE6_T; + break; + case VAR_PARAM_NO: + mod_type = MODULEX_T; + break; + default: + LM_ERR("unknown/bad definition for function '%s' (%d params)\n", + luav[0], expf->param_no); + goto error; + } - act = mk_action(MODULE_T, argc+1 /* number of (type, value) pairs */, + act = mk_action(mod_type, argc+1 /* number of (type, value) pairs */, MODEXP_ST, expf, /* function */ NUMBER_ST, argc-1, /* parameter number */ STRING_ST, argv[1], /* param. 1 */ @@ -191,10 +222,10 @@ static int lua_sr_modf (lua_State *L) } /* handle fixups */ - if (expf->v1.fixup) { + if (expf->fixup) { if(argc==1) { /* no parameters */ - if(expf->v1.fixup(0, 0)<0) + if(expf->fixup(0, 0)<0) { LM_ERR("Error in fixup (0) for '%s'\n", luav[0]); goto error; @@ -202,7 +233,7 @@ static int lua_sr_modf (lua_State *L) } else { for(i=1; i<=argc; i++) { - if(expf->v1.fixup(&(act->val[i+1].u.data), i)<0) + if(expf->fixup(&(act->val[i+1].u.data), i)<0) { LM_ERR("Error in fixup (%d) for '%s'\n", i, luav[0]); goto error; @@ -215,12 +246,12 @@ static int lua_sr_modf (lua_State *L) ret = do_action(&ra_ctx, act, env_L->msg); /* free fixups */ - if (expf->v1.fixup) { + if (expf->fixup) { for(i=1; i<=argc; i++) { if ((act->val[i+1].type == MODFIXUP_ST) && (act->val[i+1].u.data)) { - expf->v1.free_fixup(&(act->val[i+1].u.data), i); + expf->free_fixup(&(act->val[i+1].u.data), i); } } }

14 years, 6 months

git:master: Merge remote branch 'origin/andrei/rve_f_params'

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 99cff51099aad0613ed7a7a19c3042045a52917a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=99cff51… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 22:18:06 2010 +0200 Merge remote branch 'origin/andrei/rve_f_params' Automatic support for expressions or variables in lots of module functions. It applies to all the module functions declared without a fixup, with a fixup and the corresponding free_fixup function or with a compatible ser or kamailio style standard fixup (declared in sr_module.h or mod_fix.h). E.g.: f($a, "b = " + $b); t_set_fr($v + 2 + $x). t_set_fr($foo) (equivalent now with t_set_fr("$foo")). If the expression is constant, then there is no restriction, all the module functions can take it as parameter. E.g.: f("7 *" +" 6 = " + 7 * 6) # equivalent to f("7 * 6 = 42") * origin/andrei/rve_f_params: (21 commits) NEWS: notes about expressions in function parameters core: enable RVE fixup support when fixup_free is present core: automatically fill known fixup_free functions core: functions to get a fixup corresp. fixup_free function core: k style fixup_free fixes core: added generic fparam fixup_free functions core: pvapi: added pv_spec_free_contents() core: fix "unsigned" bug in sint2str*() core: fix auto-deref. for vars in fparam fixups perl(k): use sr31_cmd_export_t app_python: use sr31_cmd_export_t core: internal module interface changes print(s): fparam fixup example core: support for RVEs in fparam fixups core: rval - don't use static buffer for int conversions core: ut.* - BSD licence core: ut.h: added sint2strbuf() perl(k): update api calls: s/MODULE_T/MODULE2_T/ app_python: update api calls: s/MODULE_T/MODULE2_T print(s): more module function examples core: support for expressions/variables in function parameters Conflicts: NEWS action.c modules/app_python/python_msgobj.c modules_k/perl/openserxs.xs pkg/kamailio/debian-lenny pvapi.c route.c route_struct.h sr_module.c ---

14 years, 6 months

3.0.2 Makefile issues continued - FreeBSD 6

by Olle E. Johansson

Installing on Linux went like a charm, no issues. However, there are some issues when building on FreeBSD. Some comments: - The xmlrpc module links to -lresolv, something that doesn't exist on FreeBSD and can be removed. - Libraries in /usr/local/lib was not found, but it seems like include files in /usr/local/include was found by some modules, but not all. Setting CPATH solved issues here. - There's no point in even trying to compile iptrtpproxy on systems that are not Linux, right? - There are many compiler warnings that should be looked at - In order to get INADDR_LOOPBACK, that is used in presence_dialoginfo and other modules I ended up copying the definition of INADDR_LOOPBACK into ip_addr.h... It's in netinet/in.h but must be disabled for some reason. Also getting this at make install (but not make modules), guessing it belongs to kamctl installation: MYSQLON=yes make -C ../../utils/kamctl/ install-modules "../../Makefile.defs", line 88: Missing dependency operator Error expanding embedded variable. gmake[1]: *** [install-mysql-scripts] Error 2 gmake[1]: Leaving directory `/s/usr-local/src/kamailio-3.0.2/modules/db_mysql' gmake: *** [install-modules] Error 1 I had to exclude all db modules in order to get around this. I guess someone with some more experience of the build system needs to look at this :-) Cheers, /O

14 years, 6 months

git:master: kamctl: fix make use and make install

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 91ce090529ac1a1c6285f387e57013cad5598def URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91ce090… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 19:49:09 2010 +0200 kamctl: fix make use and make install - use $(MAKE) instead of directly using make. - added targets for the install dirs (create bin_dir, cfg_dir and man_dirs if missing). This fixes make -C utils/kamctl install (allows installing only kamctl). --- utils/kamctl/Makefile | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/utils/kamctl/Makefile b/utils/kamctl/Makefile index 57677a0..0f2643b 100644 --- a/utils/kamctl/Makefile +++ b/utils/kamctl/Makefile @@ -191,7 +191,7 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/oracle/admin/`basename "$$FILE"` ; \ fi ;\ done ; \ - make -C ../db_oracle/ ; \ + $(MAKE) -C ../db_oracle/ ; \ $(INSTALL_BIN) ../db_oracle/kamailio_orasel $(bin_prefix)/$(bin_dir) ; \ fi # install Berkeley database stuff @@ -216,7 +216,7 @@ install-modules: $(bin_prefix)/$(bin_dir) $(data_prefix)/$(data_dir)/db_berkeley/kamailio/`basename "$$FILE"` ; \ fi ;\ done ; \ - make -C ../db_berkeley/ ; \ + $(MAKE) -C ../db_berkeley/ ; \ $(INSTALL_BIN) ../db_berkeley/kambdb_recover $(bin_prefix)/$(bin_dir) ; \ fi # install dbtext stuff @@ -246,3 +246,15 @@ install-modules: $(bin_prefix)/$(bin_dir) done ;\ fi + +$(cfg_prefix)/$(cfg_dir): + mkdir -p $(cfg_prefix)/$(cfg_dir) + +$(bin_prefix)/$(bin_dir): + mkdir -p $(bin_prefix)/$(bin_dir) + +$(man_prefix)/$(man_dir)/man8: + mkdir -p $(man_prefix)/$(man_dir)/man8 + +$(man_prefix)/$(man_dir)/man5: + mkdir -p $(man_prefix)/$(man_dir)/man5

14 years, 6 months

git:master: presence_dialoginfo(k): fix bsd compilation

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 850a7b31de86056fc9223d809dfae54b0e490c5f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=850a7b3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 19:31:14 2010 +0200 presence_dialoginfo(k): fix bsd compilation On FreeBSD don't define _XOPEN_SOURCE (define it only on linux). It's not needed for strptime() and worse will cause some other defines to be missing, like INADDR_LOOPBACK ( if_XOPEN_SOURCE is defined, __BSD_VISIBLE will be undefined => lots of missing defines). Reported-by: Reported-by: Olle E. Johansson oej edvina net --- modules_k/presence_dialoginfo/pidf.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/presence_dialoginfo/pidf.c b/modules_k/presence_dialoginfo/pidf.c index 9285d2b..d90de4c 100644 --- a/modules_k/presence_dialoginfo/pidf.c +++ b/modules_k/presence_dialoginfo/pidf.c @@ -36,12 +36,12 @@ * use 600 for 'Single UNIX Specification, Version 3' * _XOPEN_SOURCE creates conflict in header definitions in Solaris */ -#ifndef __OS_solaris - #define _XOPEN_SOURCE 600 /* glibc2 on linux, bsd */ +#ifdef __OS_linux + #define _XOPEN_SOURCE 600 /* glibc2 on linux */ #define _BSD_SOURCE 1 /* needed on linux to "fix" the effect of the above define on features.h/unistd.h syscall() */ -#else +#elif defined __OS_solaris #define _XOPEN_SOURCE_EXTENDED 1 /* solaris */ #endif

14 years, 6 months

git:master: xmlrpc: fix includes and libs

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: ecc9fcf9fe61cb355864bf8142e65b8dd9d8658b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ecc9fcf… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 18:56:57 2010 +0200 xmlrpc: fix includes and libs Reported-by: Olle E. Johansson oej edvina net --- modules/xmlrpc/Makefile | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/xmlrpc/Makefile b/modules/xmlrpc/Makefile index efcbf38..485d12a 100644 --- a/modules/xmlrpc/Makefile +++ b/modules/xmlrpc/Makefile @@ -6,8 +6,9 @@ include ../../Makefile.defs auto_gen= NAME=xmlrpc.so -DEFS += -I/usr/include/libxml2 -I/usr/local/include/libxml2 -I/usr/local/include -LIBS +=-lxml2 +INCLUDES += -I/usr/include/libxml2 -I$(LOCALBASE)/include/libxml2 \ + -I$(LOCALBASE)/include +LIBS += -L$(LOCALBASE)/lib -L/usr/pkg/lib -lxml2 DEFS+=-DSER_MOD_INTERFACE

14 years, 6 months

git:master: sercmd: fix LIBS - don't link -lresolv if not needed

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: e5978c182e4bd5d5c1d723d00e9f54ea958816c8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e5978c1… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 18:51:09 2010 +0200 sercmd: fix LIBS - don't link -lresolv if not needed - link with libresolv only on linux, solaris and darwin - on solaris link also witl -lxnet and -lnsl (bugs introduced in b0f00c3348b9) --- utils/sercmd/Makefile | 23 +++++++++++++++++++---- 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/utils/sercmd/Makefile b/utils/sercmd/Makefile index 7072a7d..bc03b74 100644 --- a/utils/sercmd/Makefile +++ b/utils/sercmd/Makefile @@ -29,14 +29,29 @@ DEFS:= -DNAME='"$(NAME)"' -DVERSION='"$(RELEASE)"' \ # from a module Makefile) #LIBS:=$(filter-out -lfl -ldl -lpthread -lssl -lcrypto, $(LIBS)) +ifeq ($(OS), linux) + LIBS:= -lresolv +endif +ifeq ($(OS), solaris) + LIBS:= -lresolv -L$(LOCALBASE)/lib -lxnet -lnsl +endif +ifeq ($(OS), freebsd) + LIBS:= +endif ifeq ($(OS), dragonfly) LIBS:= -L$(LOCALBASE)/lib -else +endif +ifeq ($(OS), openbsd) + LIBS:= +endif +ifeq ($(OS), netbsd) + LIBS:= +endif +ifeq ($(OS), darwin) LIBS:= -lresolv endif - -ifeq ($(OS), solaris) - LIBS+= -L$(LOCALBASE)/lib -lxnet -lnsl +ifneq (,$(findstring cygwin, $(OS))) + LIBS:= -lresolv endif ifeq ($(use_readline),)

14 years, 6 months

git:andrei/rve_f_params: NEWS: notes about expressions in function parameters

by Andrei Pelinescu-Onciul

Module: sip-router Branch: andrei/rve_f_params Commit: c06ba275405db446df6a3fd1f19f66c7bcd263dc URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c06ba27… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Wed Aug 11 16:16:54 2010 +0200 NEWS: notes about expressions in function parameters --- NEWS | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/NEWS b/NEWS index 5f193c4..7e2e8d3 100644 --- a/NEWS +++ b/NEWS @@ -6,6 +6,15 @@ $Id$ sip-router 3.1 chages core: + - lots of module functions automatically support now expressions or + variables in function parameters. This applies to all the module + functions declared without a fixup, with a fixup and the corresponding + free_fixup function or with a compatible ser or kamailio style standard + fixup (declared in sr_module.h or mod_fix.h). + E.g.: f($a, "b = " + $b); t_set_fr($v + 2 + $x). + t_set_fr($foo) (equivalent now with t_set_fr("$foo")). + - all the module functions can now be called with any constant expression + as parameters. E.g.: f("7 *" +" 6 = " + 7 * 6); - onreply_route {...} is now equivalent with onreply_route[0] {...} - global, per protocol blacklist ignore masks (via extended send_flags). See dst_blacklist_udp_imask a.s.o (dst_blacklist_*_imask).

14 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