sr-dev

sr-dev@lists.kamailio.org

12 participants
44197 discussions

git:master: mi_datagram: use PROC_NOCHLDINIT to fork process instead of 100

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: d8c11d48aa6f3e36b2ae7b5b8f802961a8cc08d3 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d8c11d4… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 11 11:28:39 2009 +0300 mi_datagram: use PROC_NOCHLDINIT to fork process instead of 100 - do not run modules' child init, MI commands register own proc init funtion --- modules_k/mi_datagram/mi_datagram.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/mi_datagram/mi_datagram.c b/modules_k/mi_datagram/mi_datagram.c index e68a99a..e45cee2 100644 --- a/modules_k/mi_datagram/mi_datagram.c +++ b/modules_k/mi_datagram/mi_datagram.c @@ -277,7 +277,7 @@ static int mi_child_init(int rank) } for(i=0; i<mi_procs[0].no; i++) { - pid=fork_process(100, "MI DATAGRAM", 1); + pid=fork_process(PROC_NOCHLDINIT, "MI DATAGRAM", 1); if (pid<0) return -1; /* error */ if(pid==0) {

15 years, 8 months

git:master: mi_fifo: fork process using PROC_NOCHLDINIT instead of 100

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a0da9a80aa1aa99c03c2f8e910f5403d1f65d8d0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a0da9a8… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 11 11:26:43 2009 +0300 mi_fifo: fork process using PROC_NOCHLDINIT instead of 100 - do not call modules' child init, MI commands register own proc init function --- modules_k/mi_fifo/mi_fifo.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/mi_fifo/mi_fifo.c b/modules_k/mi_fifo/mi_fifo.c index b1425ce..17a72b8 100644 --- a/modules_k/mi_fifo/mi_fifo.c +++ b/modules_k/mi_fifo/mi_fifo.c @@ -191,7 +191,7 @@ static int mi_child_init(int rank) } if (rank==PROC_MAIN) { - pid=fork_process(100, "MI FIFO", 1); + pid=fork_process(PROC_NOCHLDINIT, "MI FIFO", 1); if (pid<0) return -1; /* error */ if(pid==0){

15 years, 8 months

Re: [SR-Dev] a couple of make errors

by Andrei Pelinescu-Onciul

On May 10, 2009 at 12:24, Juha Heinanen <jh(a)tutpro.com> wrote: Content-Description: message body text > Andrei Pelinescu-Onciul writes: > > > Could you please send me also the output of: > > > > cd modules_k/tmx > > make -wn > > jh@taimen:/usr/src/orig/sip-router/modules_k/tmx$ make -wn > config.mak included > make: Entering directory `/usr/src/orig/sip-router/modules_k/tmx' > make -wC ../../lib/kmi/ compile_for_install= \ > NOREBUILD_DEFS=" " \ > NOREBUILD_INCLUDES=" " > Makefile.defs defs skipped > make[1]: Entering directory `/usr/src/orig/sip-router/lib/kmi' > make[1]: `libkmi.so.1.0' is up to date. > make[1]: Leaving directory `/usr/src/orig/sip-router/lib/kmi' > make -wC ../../lib/kcore/ compile_for_install= \ > NOREBUILD_DEFS=" " \ > NOREBUILD_INCLUDES=" " > Makefile.defs defs skipped > make: *** [../../lib/kcore/libkcore.so] Error 2 > make: Leaving directory `/usr/src/orig/sip-router/modules_k/tmx' > > > and > > > > make -wd # warning: lots of output > It looks like you have a stale statistic.d file in lib/kcore/ which adds a dependency on core_stats.h which does not exist anymore. Try make proper or cd lib/kcore ; make proper (if you don't want to recompile everything), or rm lib/kcore/statistics.d. After any of the above commands it should work. We could add this to some docs somewhere: when files are removed make might fail. If make fails after an update (e.g. git pull or git checkout), run make proper and then retry. Andrei

15 years, 8 months

git:master: Revert " * Moved lcr module from modules_k to modules and removed it from modules_s. "

by Juha Heinanen

Module: sip-router Branch: master Commit: 32076aefe5c4e58c75d44ea97bfd0a70f92f5573 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=32076ae… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun May 10 12:40:06 2009 +0300 Revert "* Moved lcr module from modules_k to modules and removed it from modules_s." This reverts commit a3f16850cd2a897710cb0a56174e9f64dcc77653. --- {modules => modules_k}/lcr/Makefile | 0 {modules => modules_k}/lcr/README | 0 {modules => modules_k}/lcr/doc/Makefile | 0 {modules => modules_k}/lcr/doc/lcr.xml | 0 {modules => modules_k}/lcr/doc/lcr_admin.xml | 0 {modules => modules_k}/lcr/hash.c | 0 {modules => modules_k}/lcr/hash.h | 0 {modules => modules_k}/lcr/lcr_mod.c | 0 {modules => modules_k}/lcr/lcr_mod.h | 0 {modules => modules_k}/lcr/mi.c | 0 {modules => modules_k}/lcr/mi.h | 0 modules_s/lcr/Makefile | 17 + modules_s/lcr/README | 259 ++++++ {modules => modules_s}/lcr/doc/Makefile | 2 +- modules_s/lcr/doc/functions.xml | 17 + modules_s/lcr/doc/lcr.xml | 121 +++ modules_s/lcr/doc/params.xml | 235 ++++++ modules_s/lcr/lcr_mod.c | 1113 ++++++++++++++++++++++++++ modules_s/lcr/lcr_mod.h | 61 ++ modules_s/lcr/lcr_rpc.c | 104 +++ modules_s/lcr/lcr_rpc.h | 35 + modules_s/lcr/ser-lcr.cfg | 24 + 22 files changed, 1987 insertions(+), 1 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=320…

15 years, 8 months

a couple of make errors

by jh＠tutpro.com

when working with msilo patches, i noticed the following errors during makes. any idea how to get rid of them? -- juha first error occurred when i compiled the module: jh@taimen:/usr/src/orig/sip-router$ make modules=modules_k/msilo modules config.mak loaded Makefile.defs defs skipped Makefile:365: "make TLS option is obsoleted, try TLS_HOOKS or CORE_TLS" config.mak included make[1]: Entering directory `/usr/src/orig/sip-router/modules_k/msilo' make[1]: Leaving directory `/usr/src/orig/sip-router/modules_k/msilo' config.mak included make[1]: Entering directory `/usr/src/orig/sip-router/modules_k/msilo' gcc -fPIC -DPIC -g -O9 -funroll-loops -Wcast-align -minline-all-stringops -falign-loops -ftree-vectorize -mtune=athlon64 -Wall -DNAME='"ser"' -DVERSION='"2.1.0-dev23-make"' -DARCH='"i386"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.3.2"' -D__CPU_i386 -D__OS_linux -DSER_VER=2001000 -DCFG_DIR='"/usr/local/etc/ser/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DDBG_QM_MALLOC -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DUSE_SCTP -DOPENSER_MOD_INTERFACE -DMOD_NAME='"msilo"' -c msfuncs.c -o msfuncs.o gcc -fPIC -DPIC -g -O9 -funroll-loops -Wcast-align -minline-all-stringops -falign-loops -ftree-vectorize -mtune=athlon64 -Wall -DNAME='"ser"' -DVERSION='"2.1.0-dev23-make"' -DARCH='"i386"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.3.2"' -D__CPU_i386 -D__OS_linux -DSER_VER=2001000 -DCFG_DIR='"/usr/local/etc/ser/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DDBG_QM_MALLOC -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DUSE_SCTP -DOPENSER_MOD_INTERFACE -DMOD_NAME='"msilo"' -c msilo.c -o msilo.o gcc -fPIC -DPIC -g -O9 -funroll-loops -Wcast-align -minline-all-stringops -falign-loops -ftree-vectorize -mtune=athlon64 -Wall -DNAME='"ser"' -DVERSION='"2.1.0-dev23-make"' -DARCH='"i386"' -DOS='linux_' -DOS_QUOTED='"linux"' -DCOMPILER='"gcc 4.3.2"' -D__CPU_i386 -D__OS_linux -DSER_VER=2001000 -DCFG_DIR='"/usr/local/etc/ser/"' -DPKG_MALLOC -DSHM_MEM -DSHM_MMAP -DDNS_IP_HACK -DUSE_IPV6 -DUSE_MCAST -DUSE_TCP -DDISABLE_NAGLE -DHAVE_RESOLV_RES -DUSE_DNS_CACHE -DUSE_DNS_FAILOVER -DUSE_DST_BLACKLIST -DUSE_NAPTR -DDBG_QM_MALLOC -DUSE_TLS -DTLS_HOOKS -DFAST_LOCK -DADAPTIVE_WAIT -DADAPTIVE_WAIT_LOOPS=1024 -DCC_GCC_LIKE_ASM -DHAVE_GETHOSTBYNAME2 -DHAVE_UNION_SEMUN -DHAVE_SCHED_YIELD -DHAVE_MSG_NOSIGNAL -DHAVE_MSGHDR_MSG_CONTROL -DHAVE_ALLOCA_H -DHAVE_TIMEGM -DHAVE_SCHED_SETSCHEDULER -DHAVE_EPOLL -DHAVE_SIGIO_RT -DSIGINFO64_WORKARROUND -DUSE_FUTEX -DHAVE_SELECT -DUSE_SCTP -DOPENSER_MOD_INTERFACE -DMOD_NAME='"msilo"' -c ms_msg_list.c -o ms_msg_list.o Makefile.defs defs skipped make[2]: Entering directory `/usr/src/orig/sip-router/lib/srdb1' make[2]: `libsrdb1.so.1.0' is up to date. make[2]: Leaving directory `/usr/src/orig/sip-router/lib/srdb1' Makefile.defs defs skipped make[1]: *** [../../lib/kcore/libkcore.so] Error 2 make[1]: Leaving directory `/usr/src/orig/sip-router/modules_k/msilo' make: *** [modules] Error 1 second error occurred when i made readme: jh@taimen:/usr/src/orig/sip-router$ make modules=modules_k/msilo README config.mak loaded Makefile.defs defs skipped Makefile:365: "make TLS option is obsoleted, try TLS_HOOKS or CORE_TLS" config.mak included make[1]: Entering directory `/usr/src/orig/sip-router/modules_k/msilo' make -C doc msilo.txt make[2]: Entering directory `/usr/src/orig/sip-router/modules_k/msilo/doc' ../../../docbook/Makefile:191: msilo.d: No such file or directory ../../../docbook/Makefile:191: msilo.d: No such file or directory ../../../docbook/Makefile:191: msilo.d: No such file or directory xsltproc --novalid \ --nonet \ --novalid \ --stringparam output "msilo.d" \ ../../../docbook/dep.xsl msilo.xml make[2]: Leaving directory `/usr/src/orig/sip-router/modules_k/msilo/doc' make[2]: Entering directory `/usr/src/orig/sip-router/modules_k/msilo/doc' XML_CATALOG_FILES=../../../docbook/catalog.xml xsltproc --novalid \ --xinclude \ ../../../docbook/txt.xsl msilo.xml | lynx -nolist -stdin -dump > msilo.txt make[2]: Leaving directory `/usr/src/orig/sip-router/modules_k/msilo/doc' mv doc/msilo.txt README make[1]: Leaving directory `/usr/src/orig/sip-router/modules_k/msilo' make: *** acc: No such file or directory. Stop. make: [modules_k-readme] Error 1 (ignored)

15 years, 8 months

git:master: * Added note on how to generate README of a module.

by Juha Heinanen

Module: sip-router Branch: master Commit: bcc002cb9cb1fef569357695ee073d7f531af3c9 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bcc002c… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sun May 10 11:37:40 2009 +0300 * Added note on how to generate README of a module. --- INSTALL | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/INSTALL b/INSTALL index 4d659b0..e157b9a 100644 --- a/INSTALL +++ b/INSTALL @@ -411,6 +411,10 @@ make man Generates a manpage for all the modules that support it (.xml file in the module directory). +make modules=modules_k/foo modules-readme + +Generates README file for modules_k/foo. + Install: make prefix=/usr/local install

15 years, 8 months

git:master: * Added support for adding extra headers into MESSAGEs sent out from

by Juha Heinanen

Module: sip-router Branch: master Commit: 4c8c5a7c091ea7213819d24b762affef69f4a0f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4c8c5a7… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat May 9 19:03:52 2009 +0300 * Added support for adding extra headers into MESSAGEs sent out from silo by m_dump(). --- modules_k/msilo/README | 602 +++++++++++++++++++++-------------- modules_k/msilo/doc/msilo.xml | 14 + modules_k/msilo/doc/msilo_admin.xml | 21 ++ modules_k/msilo/msfuncs.c | 11 +- modules_k/msilo/msfuncs.h | 2 +- modules_k/msilo/msilo.c | 42 +++- 6 files changed, 436 insertions(+), 256 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4c8…

15 years, 8 months

git:master: rtimer: update to use the new sr core routes list

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: ac41ee015d26335986596eec1c8b28d8719f776a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ac41ee0… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 8 18:31:35 2009 +0200 rtimer: update to use the new sr core routes list --- modules_k/rtimer/rtimer_mod.c | 13 +++++++++---- 1 files changed, 9 insertions(+), 4 deletions(-) diff --git a/modules_k/rtimer/rtimer_mod.c b/modules_k/rtimer/rtimer_mod.c index d54124e..4313330 100644 --- a/modules_k/rtimer/rtimer_mod.c +++ b/modules_k/rtimer/rtimer_mod.c @@ -274,6 +274,7 @@ int stm_e_param(modparam_t type, void *val) stm_route_t *rt; stm_timer_t *nt; str s; + char c; if(val==NULL) return -1; @@ -291,7 +292,7 @@ int stm_e_param(modparam_t type, void *val) tmp.timer = pit->body; } else if(pit->name.len==5 && strncasecmp(pit->name.s, "route", 5)==0) { - str2int(&pit->body, &tmp.route); + s = pit->body; } } if(tmp.timer.s==NULL) @@ -315,10 +316,14 @@ int stm_e_param(modparam_t type, void *val) free_params(params_list); return -1; } - if(tmp.route>=RT_NO) + c = s.s[s.len]; + s.s[s.len] = '\0'; + tmp.route = route_get(&main_rt, s.s); + s.s[s.len] = c; + if(tmp.route == -1) { - LM_ERR("invalid route number: %u\n", - tmp.route); + LM_ERR("invalid route: %.*s\n", + s.len, s.s); free_params(params_list); return -1; }

15 years, 8 months

git:master: core: removed fixup_pvar(param) prototype

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: e6949b5adb486ea2f14ab44c2af4c1ea9f4d127b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e6949b5… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 8 08:12:18 2009 +0200 core: removed fixup_pvar(param) prototype - no longer implemented as standalone function - use fixup_pvar_null(param, 1) instead --- mod_fix.h | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/mod_fix.h b/mod_fix.h index 613e11f..257d78c 100644 --- a/mod_fix.h +++ b/mod_fix.h @@ -117,7 +117,4 @@ int fixup_spve_null(void** param, int param_no); int fixup_spve_uint(void** param, int param_no); int fixup_spve_str(void** param, int param_no); - -int fixup_pvar(void **param); - #endif

15 years, 8 months

git:master: statistics: use fixup_pvar_null()

by Daniel-Constantin Mierla

Module: sip-router Branch: master Commit: a8e660b62bf6b6ca10d63078d6574ebdffc61fe2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a8e660b… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Fri May 8 08:15:12 2009 +0200 statistics: use fixup_pvar_null() - fixup_pvar() replaced by fixup_pvar_null() --- modules_k/statistics/statistics.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/statistics/statistics.c b/modules_k/statistics/statistics.c index 45d0baf..ee6e61b 100644 --- a/modules_k/statistics/statistics.c +++ b/modules_k/statistics/statistics.c @@ -122,7 +122,7 @@ static int fixup_stat(void** param, int param_no) memset( sopv, 0 , sizeof(struct stat_or_pv) ); /* is it pv? */ if (s.s[0]=='$') { - if (fixup_pvar(param)!=0) { + if (fixup_pvar_null(param, 1)!=0) { LM_ERR("invalid pv %.s as parameter\n",s.s); return E_CFG; }

15 years, 8 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev