sr-dev May 2009

sr-dev@lists.kamailio.org

26 participants
263 discussions

git:master: * Fixed bug in computing expires value for subscription dialogs .
by Juha Heinanen 11 May '09

11 May '09

Module: sip-router Branch: master Commit: ae4856f3db1f4a82a23eaa9c9f305d8f6924bb48 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=ae4856f… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Mon May 11 14:15:12 2009 +0300 * Fixed bug in computing expires value for subscription dialogs. Credits to Anca Vamanu. --- modules_k/presence/notify.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/modules_k/presence/notify.c b/modules_k/presence/notify.c index 87e728e..93dddf0 100644 --- a/modules_k/presence/notify.c +++ b/modules_k/presence/notify.c @@ -1096,14 +1096,14 @@ int get_subs_db(str* pres_uri, pres_ev_t* event, str* sender, row = &result->rows[i]; row_vals = ROW_VALUES(row); - // if(row_vals[expires_col].val.int_val< (int)time(NULL)) - // continue; - - if(row_vals[reason_col].val.string_val) - { - if(strlen(row_vals[reason_col].val.string_val) != 0) - continue; - } + // if(row_vals[expires_col].val.int_val< (int)time(NULL)) + // continue; + + if(row_vals[reason_col].val.string_val) { + if(strlen(row_vals[reason_col].val.string_val) != 0) + continue; + } + // s.reason.len= strlen(s.reason.s); memset(&s, 0, sizeof(subs_t)); @@ -1148,7 +1148,11 @@ int get_subs_db(str* pres_uri, pres_ev_t* event, str* sender, s.event= event; s.local_cseq = row_vals[cseq_col].val.int_val; - s.expires = row_vals[expires_col].val.int_val -(int)time(NULL); + if(row_vals[expires_col].val.int_val < (int)time(NULL)) + s.expires = 0; + else + s.expires = row_vals[expires_col].val.int_val - + (int)time(NULL); s.version = row_vals[version_col].val.int_val; s_new= mem_copy_subs(&s, PKG_MEM_TYPE);

1 0

git:master: * Moved lcr module from modules_k to modules and removed it from modules_s .
by Juha Heinanen 11 May '09

11 May '09

Module: sip-router Branch: master Commit: a3f16850cd2a897710cb0a56174e9f64dcc77653 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a3f1685… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat May 9 19:14:18 2009 +0300 * Moved lcr module from modules_k to modules and removed it from modules_s. --- {modules_k => modules}/lcr/Makefile | 0 {modules_k => modules}/lcr/README | 0 {modules_k => modules}/lcr/doc/Makefile | 0 {modules_k => modules}/lcr/doc/lcr.xml | 0 {modules_k => modules}/lcr/doc/lcr_admin.xml | 0 {modules_k => modules}/lcr/hash.c | 0 {modules_k => modules}/lcr/hash.h | 0 {modules_k => modules}/lcr/lcr_mod.c | 0 {modules_k => modules}/lcr/lcr_mod.h | 0 {modules_k => modules}/lcr/mi.c | 0 {modules_k => modules}/lcr/mi.h | 0 modules_s/lcr/Makefile | 17 - modules_s/lcr/README | 259 ------ modules_s/lcr/doc/Makefile | 4 - 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, 0 insertions(+), 1990 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=a3f…

6 24

git:master: doc: rpc makefile migrated to the new doc make system
by Andrei Pelinescu-Onciul 11 May '09

11 May '09

Module: sip-router Branch: master Commit: 83d732f025fb4db086449e095b1c91e8fefaa754 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=83d732f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sun May 10 10:56:45 2009 +0200 doc: rpc makefile migrated to the new doc make system --- doc/rpc/Makefile | 27 +++------------------------ 1 files changed, 3 insertions(+), 24 deletions(-) diff --git a/doc/rpc/Makefile b/doc/rpc/Makefile index 5d2867c..8f32f6a 100644 --- a/doc/rpc/Makefile +++ b/doc/rpc/Makefile @@ -1,29 +1,8 @@ # # The list of documents to build (without extensions) # -DOCUMENTS = ser_rpc -# -# The root directory containing Makefile.doc -# -ROOT_DIR=../.. - -# -# Validate docbook documents before generating output -# (may be slow) -# -#VALIDATE=1 - -# -# You can override the stylesheet used to generate -# xhtml documents here -# -#XHTML_XSL=$(ROOT_DIR)/doc/stylesheets/xhtml.xsl - -# -# You can override the stylesheet used to generate -# plain text documents here -# -#TXT_XSL=$(XHTML_XSL) +docs = ser_rpc.xml +docbook_dir = ../../docbook -include $(ROOT_DIR)/Makefile.doc +include $(docbook_dir)/Makefile

1 0

git:master: * Moved lcr module from modules_k to modules and removed it from modules_s .
by Andrei Pelinescu-Onciul 11 May '09

11 May '09

Module: sip-router Branch: master Commit: 4fdd0730d17b5770995817a50750897f1e0ab108 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4fdd073… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Sat May 9 19:14:18 2009 +0300 * Moved lcr module from modules_k to modules and removed it from modules_s. --- {modules_k => modules}/lcr/Makefile | 0 {modules_k => modules}/lcr/README | 0 {modules_k => modules}/lcr/doc/Makefile | 0 {modules_k => modules}/lcr/doc/lcr.xml | 0 {modules_k => modules}/lcr/doc/lcr_admin.xml | 0 {modules_k => modules}/lcr/hash.c | 0 {modules_k => modules}/lcr/hash.h | 0 {modules_k => modules}/lcr/lcr_mod.c | 0 {modules_k => modules}/lcr/lcr_mod.h | 0 {modules_k => modules}/lcr/mi.c | 0 {modules_k => modules}/lcr/mi.h | 0 modules_s/lcr/Makefile | 17 - modules_s/lcr/README | 259 ------ modules_s/lcr/doc/Makefile | 4 - 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, 0 insertions(+), 1990 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=4fd…

1 0

git:master: mi_fifo: fork process using PROC_NOCHLDINIT instead of 100
by Daniel-Constantin Mierla 11 May '09

11 May '09

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){

1 0

git:master: mi_datagram: use PROC_NOCHLDINIT to fork process instead of 100
by Daniel-Constantin Mierla 11 May '09

11 May '09

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) {

1 0

git:master: mi_xmlrpc: use PROC_NOCHLDINIT to fork process instead of 100
by Daniel-Constantin Mierla 11 May '09

11 May '09

Module: sip-router Branch: master Commit: d7d561c3c485699d34143b285801b73a98419051 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=d7d561c… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon May 11 11:29:56 2009 +0300 mi_xmlrpc: 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_xmlrpc/mi_xmlrpc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/mi_xmlrpc/mi_xmlrpc.c b/modules_k/mi_xmlrpc/mi_xmlrpc.c index 2b0e59d..d29cf04 100644 --- a/modules_k/mi_xmlrpc/mi_xmlrpc.c +++ b/modules_k/mi_xmlrpc/mi_xmlrpc.c @@ -141,7 +141,7 @@ static int child_init(int rank) { int pid; if (rank==PROC_MAIN) { - pid=fork_process(100, "MI XMLRPC", 1); + pid=fork_process(PROC_NOCHLDINIT, "MI XMLRPC", 1); if (pid<0) return -1; /* error */ if(pid==0){

1 0

Re: [SR-Dev] a couple of make errors
by Andrei Pelinescu-Onciul 10 May '09

10 May '09

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

2 1

git:master: Revert " * Moved lcr module from modules_k to modules and removed it from modules_s. "
by Juha Heinanen 10 May '09

10 May '09

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…

1 0

a couple of make errors
by jh＠tutpro.com 10 May '09

10 May '09

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)

2 3

← Newer
1
...
15
16
17
18
19
20
21
...
27
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev May 2009