sr-dev September 2009

sr-dev@lists.kamailio.org

32 participants
207 discussions

git:master: avp(s): tm: gcc-2.9x warning fixes (%zd)
by Andrei Pelinescu-Onciul 30 Sep '09

30 Sep '09

Module: sip-router Branch: master Commit: 91eadbeda403afefdb26ab94d79ed58ea78779d2 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=91eadbe… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 01:13:57 2009 +0200 avp(s): tm: gcc-2.9x warning fixes (%zd) - %zd is not supported in the format string for gcc < 3.0 --- modules_s/avp/avp.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_s/avp/avp.c b/modules_s/avp/avp.c index 0951b4a..cf6e4bd 100644 --- a/modules_s/avp/avp.c +++ b/modules_s/avp/avp.c @@ -1603,7 +1603,7 @@ static int select_attr_fixup(str* res, select_t* s, struct sip_msg* msg) DEBUG("fix up for attribute '%.*s'\n", STR_FMT(&attr_name)); if (! (avp_ident = pkg_malloc(sizeof(avp_ident_t)))) { - ERR("out of mem; requested: %zd.\n", sizeof(avp_ident_t)); + ERR("out of mem; requested: %d.\n", (int)sizeof(avp_ident_t)); return -1; } memset(avp_ident, 0, sizeof(avp_ident_t));

1 0

git:master: makefile: -m32/-m64 fixes
by Andrei Pelinescu-Onciul 30 Sep '09

30 Sep '09

Module: sip-router Branch: master Commit: c69ee0ff5ea74d3f8d028635ae03dc33f2d72c3c URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c69ee0f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 00:54:32 2009 +0200 makefile: -m32/-m64 fixes - gcc supports -m32/-m64 only from version 3.2 on x86/x86_64 and from version 3.0 on sparc/sparc64. --- Makefile.defs | 54 ++++++++++++++++++++++++++++++++---------------------- 1 files changed, 32 insertions(+), 22 deletions(-) diff --git a/Makefile.defs b/Makefile.defs index eb659be..aa38af0 100644 --- a/Makefile.defs +++ b/Makefile.defs @@ -415,7 +415,7 @@ endif # predefined macros tests (x86_macros, ...) endif # gcc ifdef CC_ARCH -$(info "target architecture <$(CC_ARCH)>, host architecture <$(HOST_ARCH)>") +$(info target architecture <$(CC_ARCH)>, host architecture <$(HOST_ARCH)>) ARCH:=$(CC_ARCH) else ARCH:=$(HOST_ARCH) @@ -751,38 +751,41 @@ ifeq ($(ARCH), i386) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-m32 -g -O9 -funroll-loops -Wcast-align $(PROFILE) - LDFLAGS+=-m32 + CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) CPU ?= athlon64 - CFLAGS+=-minline-all-stringops \ + CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ -fno-strict-overflow \ -mtune=$(CPU) + LDFLAGS+=-m32 else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CPU ?= athlon64 - CFLAGS+=-minline-all-stringops \ + CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ -mtune=$(CPU) + LDFLAGS+=-m32 else #if gcc 3.4+ ifeq ($(CC_SHORTVER), 3.4) CPU ?= athlon - CFLAGS+=-minline-all-stringops \ + CFLAGS+=-m32 -minline-all-stringops \ -falign-loops \ -mtune=$(CPU) + LDFLAGS+=-m32 else #if gcc 3.0+ ifeq ($(CC_SHORTVER), 3.0) CPU ?= athlon CFLAGS+=-minline-all-stringops \ -falign-loops \ - -mcpu=$(CPU) + -mcpu=$(CPU) + # -m32 supported since gcc 3.2 else ifeq ($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5]) $(warning Old gcc detected ($(CC_SHORTVER)), use gcc >= 3.1 \ @@ -823,30 +826,32 @@ ifeq ($(ARCH), x86_64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM #common stuff - CFLAGS=-m64 -g -O9 -funroll-loops -Wcast-align $(PROFILE) - LDFLAGS+=-m64 + CFLAGS=-g -O9 -funroll-loops -Wcast-align $(PROFILE) #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) CPU ?= opteron - CFLAGS+=-minline-all-stringops \ + CFLAGS+=-m64 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ -fno-strict-overflow \ -mtune=$(CPU) + LDFLAGS+=-m64 else #if gcc 4.0+ ifeq ($(CC_SHORTVER), 4.x) CPU ?= opteron - CFLAGS+=-minline-all-stringops \ + CFLAGS+=-m64 -minline-all-stringops \ -falign-loops \ -ftree-vectorize \ -mtune=$(CPU) + LDFLAGS+=-m64 else #if gcc 3.4 ifeq ($(CC_SHORTVER), 3.4) CPU ?= athlon64 - CFLAGS+=-minline-all-stringops \ + CFLAGS+=-m64 -minline-all-stringops \ -falign-loops + LDFLAGS+=-m64 else #if gcc 3.0 ifeq ($(CC_SHORTVER), 3.0) @@ -855,6 +860,7 @@ ifeq ($(CC_SHORTVER), 3.0) -falign-loops #-mcpu=$(CPU) \ # not working on all x86_64 gccs #-mcpu=athlon + #-m64 on x86_64/x86 works starting with gcc 3.2 else ifeq ($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5]) $(warning Old gcc detected ($(CC_SHORTVER)), use gcc >= 3.1 \ @@ -895,46 +901,49 @@ ifeq ($(ARCH), sparc64) ifeq ($(CC_NAME), gcc) C_DEFS+=-DCC_GCC_LIKE_ASM -DSPARC64_MODE #common stuff - CFLAGS=-m64 -g -O9 -funroll-loops $(PROFILE) \ + CFLAGS=-g -O9 -funroll-loops $(PROFILE) \ #-Wcast-align \ #-Wmissing-prototypes - # use -m64 to force 64 bit (but add it also to LDFLAGS and - # don't forget to define SPARC64_MODE) - # -m32 for 32 bit (default on solaris), - # nothing for arch. default - LDFLAGS+=-m64 #if gcc 4.2+ ifeq ($(CC_SHORTVER), 4.2+) CPU ?= ultrasparc #use 32bit for now - CFLAGS+=-mcpu=ultrasparc \ + CFLAGS+=-m64 -mcpu=ultrasparc \ -mtune=$(CPU) \ -fno-strict-overflow \ -ftree-vectorize + # use -m64 to force 64 bit (but add it also to LDFLAGS and + # don't forget to define SPARC64_MODE) + # -m32 for 32 bit (default on solaris), + # nothing for arch. default + LDFLAGS+=-m64 else #if gcc 4.x ifeq ($(CC_SHORTVER), 4.x) CPU ?= ultrasparc #use 32bit for now - CFLAGS+=-mcpu=ultrasparc \ + CFLAGS+=-m64 -mcpu=ultrasparc \ -mtune=$(CPU) \ -ftree-vectorize + LDFLAGS+=-m64 else #if gcc 3.4 ifeq ($(CC_SHORTVER), 3.4) CPU ?= ultrasparc #use 32bit for now - CFLAGS+= -mcpu=ultrasparc -mtune=$(CPU) + CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPU) + LDFLAGS+=-m64 else #if gcc 3.0 ifeq ($(CC_SHORTVER), 3.0) CPU ?= ultrasparc #use 32bit for now - CFLAGS+= -mcpu=ultrasparc -mtune=$(CPU) \ + CFLAGS+=-m64 -mcpu=ultrasparc -mtune=$(CPU) \ # -mcpu=v9 or ultrasparc? # -mtune implied by -mcpu #-mno-epilogue #try to inline function exit code #-mflat # omit save/restore #-,faster-structs #faster non Sparc ABI structure copy ops + LDFLAGS+=-m64 else # CC_SHORTVER, 3.0 ifeq ($(CC_SHORTVER), 2.9x) #older gcc version (2.9[1-5]) $(warning Old gcc detected ($(CC_SHORTVER)), use gcc >= 3.1 \ @@ -943,6 +952,7 @@ ifneq ($(OS), netbsd) # on netbsd/sparc64, gcc 2.95.3 does not compile # ser with -mv8 CFLAGS+= -mv9 + # -m64/-m32 on sparc works starting with gcc 3.0 endif ifeq ($(ASTYPE), solaris) CFLAGS+= -Wa,-xarch=v8plus

1 0

git:master: core: fix gcc 2.9x #ifdef in macro args
by Andrei Pelinescu-Onciul 30 Sep '09

30 Sep '09

Module: sip-router Branch: master Commit: b0c1c3fb3bd53b65022fd1e2d6d34023db9043c6 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b0c1c3f… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Thu Oct 1 01:06:03 2009 +0200 core: fix gcc 2.9x #ifdef in macro args gcc version < 3.0 do not support compile directives in macro arguments. --- rpc_lookup.c | 8 ++++++-- tcp_main.c | 17 +++++++++-------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/rpc_lookup.c b/rpc_lookup.c index 2bc286f..1b03dae 100644 --- a/rpc_lookup.c +++ b/rpc_lookup.c @@ -94,13 +94,17 @@ static int rpc_hash_add(struct rpc_export* rpc) doc0_len=rpc->doc_str[0]?strlen(rpc->doc_str[0]):0; doc1_len=rpc->doc_str[1]?strlen(rpc->doc_str[1]):0; /* alloc everything into one block */ - e=pkg_malloc(ROUND_POINTER(sizeof(struct str_hash_entry)) + #ifdef RPC_COPY_EXPORT + e=pkg_malloc(ROUND_POINTER(sizeof(struct str_hash_entry)) +ROUND_POINTER(sizeof(*rpc))+2*sizeof(char*)+ +name_len+1+doc0_len+(rpc->doc_str[0]!=0) +doc1_len+(rpc->doc_str[1]!=0) -#endif /* RPC_COPY_EXPORT */ ); +#else /* RPC_COPY_EXPORT */ + e=pkg_malloc(ROUND_POINTER(sizeof(struct str_hash_entry))); +#endif /* RPC_COPY_EXPORT */ + if (e==0){ ERR("out of memory\n"); goto error; diff --git a/tcp_main.c b/tcp_main.c index 0164d22..77ecdf5 100644 --- a/tcp_main.c +++ b/tcp_main.c @@ -1983,19 +1983,20 @@ int tcp_send(struct dest_info* dst, union sockaddr_union* from, /* get_fd: */ #ifdef TCP_ASYNC /* if data is already queued, we don't need the fd any more */ - if (unlikely(cfg_get(tcp, tcp_cfg, async) && - (_wbufq_non_empty(c) #ifdef TCP_CONNECT_WAIT - || (c->flags&F_CONN_PENDING) + if (unlikely(cfg_get(tcp, tcp_cfg, async) && + (_wbufq_non_empty(c) || (c->flags&F_CONN_PENDING)) )) +#else /* ! TCP_CONNECT_WAIT */ + if (unlikely(cfg_get(tcp, tcp_cfg, async) && (_wbufq_non_empty(c)) )) #endif /* TCP_CONNECT_WAIT */ - ) )){ + { lock_get(&c->write_lock); - if (likely(_wbufq_non_empty(c) #ifdef TCP_CONNECT_WAIT - || (c->flags&F_CONN_PENDING) + if (likely(_wbufq_non_empty(c) || (c->flags&F_CONN_PENDING))) +#else /* ! TCP_CONNECT_WAIT */ + if (likely(_wbufq_non_empty(c))) #endif /* TCP_CONNECT_WAIT */ - - )){ + { do_close_fd=0; if (unlikely(_wbufq_add(c, buf, len)<0)){ lock_release(&c->write_lock);

1 0

git:master: * Fixed to_any_gw() example.
by Juha Heinanen 30 Sep '09

30 Sep '09

Module: sip-router Branch: master Commit: 873d03503afa2059f4b1d6ca3903b1a2a6428d1f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=873d035… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Sat Sep 26 11:50:10 2009 +0300 * Fixed to_any_gw() example. --- modules/lcr/README | 2 +- modules/lcr/doc/lcr_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/lcr/README b/modules/lcr/README index 2454a28..f0bcf07 100644 --- a/modules/lcr/README +++ b/modules/lcr/README @@ -792,7 +792,7 @@ if (to_gw("1")) { Example 1.36. to_gw usage ... -if (to_gw("1")) { +if (to_any_gw()) { ... exit; }; diff --git a/modules/lcr/doc/lcr_admin.xml b/modules/lcr/doc/lcr_admin.xml index 3a74061..fc76be3 100644 --- a/modules/lcr/doc/lcr_admin.xml +++ b/modules/lcr/doc/lcr_admin.xml @@ -987,7 +987,7 @@ if (to_gw("1")) { <title><function>to_gw</function> usage</title> <programlisting format = "linespecific"> ... -if (to_gw("1")) { +if (to_any_gw()) { ... exit; };

1 0

git:master: * modules/lcr: gw table db schema fixes
by Juha Heinanen 30 Sep '09

30 Sep '09

Module: sip-router Branch: master Commit: 00634dc0869c2e65a6626b8ad2408cd9a2b3598a URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=00634dc… Author: Juha Heinanen <jh(a)tutpro.com> Committer: Juha Heinanen <jh(a)tutpro.com> Date: Wed Sep 30 16:33:05 2009 +0300 * modules/lcr: gw table db schema fixes - Added missing defunct column. - Replaced index lcr_id_idx with index lcr_id_gw_name_idx. --- lib/srdb1/schema/gw.xml | 12 +++++++++++- 1 files changed, 11 insertions(+), 1 deletions(-) diff --git a/lib/srdb1/schema/gw.xml b/lib/srdb1/schema/gw.xml index e73d61b..842c9c8 100644 --- a/lib/srdb1/schema/gw.xml +++ b/lib/srdb1/schema/gw.xml @@ -113,9 +113,19 @@ <description>Gateway specific flags</description> </column> + <column> + <name>defunct</name> + <type>unsigned int</type> + <null/> + <default><null/></default> + <description>If not null, contains unix timestamp telling when gw becomes operational.</description> + </column> + <index> - <name>lcr_id_idx</name> + <name>lcr_id_gw_name_idx</name> <colref linkend="lcr_id"/> + <colref linkend="gw_name"/> + <unique/> </index> </table>

1 0

Crash dump. openser 1.3.2
by Andrew O. Zhukov 30 Sep '09

30 Sep '09

Ready to provide additional info. BTW, Is it some sense upgrade to 1.3.4 ? Core was generated by `openser -P /var/run/openser/openser.pid -m 32 -u openser -g openser -w /var/run'. Program terminated with signal 6, Aborted. #0 0x0000003840430ec5 in raise () from /lib64/libc.so.6 (gdb) backtrace #0 0x0000003840430ec5 in raise () from /lib64/libc.so.6 #1 0x0000003840432970 in abort () from /lib64/libc.so.6 #2 0x00000000004906a4 in qm_debug_frag (qm=0x73c9e0, f=0x7cc040) at mem/q_malloc.c:155 #3 0x0000000000490d9b in qm_free (qm=0x73c9e0, p=0x7cc070, file=0x4f8332 "parser/digest/digest.c", func=0x4f8430 "free_credentials", line=95) at mem/q_malloc.c:438 #4 0x00000000004b3929 in free_credentials (_b=0x2aaaae7dc8e0) at parser/digest/digest.c:95 #5 0x000000000049269f in clean_hdr_field (hf=0x2aaaae7dc8b0) at parser/hf.c:111 #6 0x00002aaaab1191a6 in run_trans_callbacks (type=<value optimized out>, trans=<value optimized out>, req=0x2aaaae7db8b0, rpl=0x7f09e8, code=<value optimized out>) at sip_msg.h:49 #7 0x00002aaaab122902 in t_reply_matching (p_msg=0x7f09e8, p_branch=<value optimized out>) at t_lookup.c:840 #8 0x00002aaaab122d20 in t_check (p_msg=0x7f09e8, param_branch=0x7fff7a2c191c) at t_lookup.c:911 #9 0x00002aaaab132993 in reply_received (p_msg=0x3e27) at t_reply.c:1285 #10 0x000000000041d90c in forward_reply (msg=0x7f09e8) at forward.c:499 #11 0x000000000044d85c in receive_msg ( buf=0x72b960 "SIP/2.0 200 OK\r\nVia: SIP/2.0/UDP 193.28.184.13;branch=z9hG4bKd61b.a988a001.0;received=193.28.184.13\r\nVia: SIP/2.0/UDP 192.168.1.239:5060;received=212.82.211.35;branch=z9hG4bK14b072a5;rport=57642\r\nReco"..., len=620, rcv_info=0x7fff7a2c1a00) at receive.c:194 #12 0x000000000048ab8e in udp_rcv_loop () at udp_server.c:438 #13 0x0000000000425d63 in main (argc=11, argv=0x7fff7a2c1c18) at main.c:834 (gdb) quit [root@ipshka sbin]# ./openser -V version: openser 1.3.2-notls (x86_64/linux) flags: STATS: Off, USE_IPV6, USE_TCP, DISABLE_NAGLE, USE_MCAST, SHM_MEM, SHM_MMAP, PKG_MALLOC, DBG_QM_MALLOC, FAST_LOCK-ADAPTIVE_WAIT ADAPTIVE_WAIT_LOOPS=1024, MAX_RECV_BUFFER_SIZE 262144, MAX_LISTEN 16, MAX_URI_SIZE 1024, BUF_SIZE 65535 poll method support: poll, epoll_lt, epoll_et, sigio_rt, select. svnrevision: unknown @(#) $Id: main.c 3590 2008-01-28 17:46:56Z bogdan_iancu $ main.c compiled on 23:22:34 Aug 24 2009 with gcc 4.1.2

2 1

git:master: core: use current config for the attendant process
by Miklos Tirpak 30 Sep '09

30 Sep '09

Module: sip-router Branch: master Commit: 7362f8245bf66205c4720f65cf07c0db8039f191 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=7362f82… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 29 17:22:01 2009 +0200 core: use current config for the attendant process Changes in relevant config variables at runtime are now visible in the attendant process (e.g. debug, memlog, mem_summary). Signed-off-by: Miklos Tirpak <miklos(a)iptel.org> --- main.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/main.c b/main.c index 04d34b0..47d8ccc 100644 --- a/main.c +++ b/main.c @@ -510,6 +510,10 @@ void cleanup(show_status) /* restore the original core configuration before the * config block is freed, otherwise even logging is unusable, * it can case segfault */ + cfg_update(); + /* copy current config into default_core_cfg */ + if (core_cfg) + default_core_cfg=*((struct cfg_group_core*)core_cfg); core_cfg = &default_core_cfg; cfg_destroy(); #ifdef USE_TCP @@ -775,6 +779,7 @@ void sig_usr(int signo) LOG(L_INFO, "INFO: signal %d received\n", signo); /* print memory stats for non-main too */ #ifdef PKG_MALLOC + cfg_update(); /* make sure we have current values */ memlog=cfg_get(core, core_cfg, memlog); if (memlog <= cfg_get(core, core_cfg, debug)){ if (cfg_get(core, core_cfg, mem_summary) & 1) { @@ -1529,6 +1534,8 @@ int main_loop() unix_tcp_sock=-1; } #endif + /* init cfg, but without per child callbacks support */ + cfg_child_no_cb_init(); #ifdef EXTRA_DEBUG for (r=0; r<*process_count; r++){ @@ -1540,6 +1547,7 @@ int main_loop() for(;;){ handle_sigs(); pause(); + cfg_update(); } }

1 0

git:master: cfg framework: support for no per-child callbacks procs
by Miklos Tirpak 30 Sep '09

30 Sep '09

Module: sip-router Branch: master Commit: 4a9a969de84eef3aac616d49ec02c25aceff2a68 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4a9a969… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Sep 29 17:18:37 2009 +0200 cfg framework: support for no per-child callbacks procs Support for using the config framework from processes that cannot or do not need to execute cfg per-child callbacks. For example a process that only monitors some cfg values that do not involve per-child callbacks, does not ever need to execute one. Signed-off-by: Miklos Tirpak <miklos(a)iptel.org> --- cfg/cfg_struct.c | 18 +++++++++++++++++- cfg/cfg_struct.h | 16 ++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletions(-) diff --git a/cfg/cfg_struct.c b/cfg/cfg_struct.c index ad613ee..c204573 100644 --- a/cfg/cfg_struct.c +++ b/cfg/cfg_struct.c @@ -418,6 +418,22 @@ int cfg_late_child_init(void) return 0; } + +/* per-child init function for non-cb executing processes. + * Mark this process as not wanting to execute any per-child config + * callback (it will have only limited config functionality, but is useful + * when a process needs only to watch some non-callback cfg. values, + * e.g. the main attendant process, debug and memlog). + * It needs to be called from the forked process. + * cfg_register_child must _not_ be called. + */ +int cfg_child_no_cb_init(void) +{ + /* set the callback list pointer to the beginning of the list */ + cfg_child_cb = CFG_NO_CHILD_CBS; + return 0; +} + /* per-child process destroy function * Should be called only when the child process exits, * but SER continues running @@ -436,7 +452,7 @@ void cfg_child_destroy(void) cfg_local = NULL; } - if (!cfg_child_cb) return; + if (!cfg_child_cb || cfg_child_cb==CFG_NO_CHILD_CBS) return; /* The lock must be held to make sure that the global config is not replaced meantime, and the other child processes do not diff --git a/cfg/cfg_struct.h b/cfg/cfg_struct.h index e7ac4e3..0eafc51 100644 --- a/cfg/cfg_struct.h +++ b/cfg/cfg_struct.h @@ -120,6 +120,10 @@ extern cfg_child_cb_t **cfg_child_cb_first; extern cfg_child_cb_t **cfg_child_cb_last; extern cfg_child_cb_t *cfg_child_cb; +/* magic value for cfg_child_cb for processes that do not want to + execute per-child callbacks */ +#define CFG_NO_CHILD_CBS ((void*)(long)(-1)) + /* macros for easier variable access */ #define CFG_VAR_TYPE(var) CFG_VAR_MASK((var)->def->type) #define CFG_INPUT_TYPE(var) CFG_INPUT_MASK((var)->def->type) @@ -149,6 +153,16 @@ int cfg_child_init(void); */ int cfg_late_child_init(void); +/* per-child init function for non-cb executing processes. + * Mark this process as not wanting to execute any per-child config + * callback (it will have only limited config functionality, but is useful + * when a process needs only to watch some non-callback cfg. values, + * e.g. the main attendant process, debug and memlog). + * It needs to be called from the forked process. + * cfg_register_child must _not_ be called. + */ +int cfg_child_no_cb_init(void); + /* per-child process destroy function * Should be called only when the child process exits, * but SER continues running. @@ -233,6 +247,8 @@ static inline void cfg_update_local(void) ) *(group->handle) = cfg_local->vars + group->offset; + if (unlikely(cfg_child_cb==CFG_NO_CHILD_CBS)) + return; /* call the per-process callbacks */ while (cfg_child_cb != last_cb) { prev_cb = cfg_child_cb;

1 0

git:master: registrar(k): missing include
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: f2e2f898112ed402147cd2072a4bfae3d864a925 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f2e2f89… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:06:06 2009 +0200 registrar(k): missing include --- modules_k/registrar/lookup.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/modules_k/registrar/lookup.c b/modules_k/registrar/lookup.c index 1e74594..5a0f19e 100644 --- a/modules_k/registrar/lookup.c +++ b/modules_k/registrar/lookup.c @@ -40,6 +40,7 @@ #include "../../action.h" #include "../../parser/parse_rr.h" #include "../usrloc/usrloc.h" +#include "../../lib/kcore/parser_helpers.h" #include "common.h" #include "regtime.h" #include "reg_mod.h"

1 0

git:master: dispatcher(k): append_branch() api changes
by Andrei Pelinescu-Onciul 29 Sep '09

29 Sep '09

Module: sip-router Branch: master Commit: 94ec0ae08c85a1d84e05a5689c8bfcd13652d5a4 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=94ec0ae… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:04:02 2009 +0200 dispatcher(k): append_branch() api changes --- modules_k/dispatcher/dispatch.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index ff260f9..d1fa863 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -1061,8 +1061,7 @@ static inline int ds_update_dst(struct sip_msg *msg, str *uri, int mode) } if(ds_append_branch!=0 && route_type==FAILURE_ROUTE) { - if (append_branch(msg, 0, 0, (duri)?duri->s:0, (duri)?duri->len:0, - Q_UNSPECIFIED, 0)!=1 ) + if (append_branch(msg, 0, duri, 0, Q_UNSPECIFIED, 0, 0)!=1 ) { LM_ERR("append_branch action failed\n"); return -1;

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev September 2009