sr-dev

sr-dev@lists.kamailio.org

15 participants
44228 discussions

git:master: * modules/lcr: gw table db schema fixes

by Juha Heinanen

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>

15 years, 3 months

git:master: * Fixed to_any_gw() example.

by Juha Heinanen

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; };

15 years, 3 months

Crash dump. openser 1.3.2

by Andrew O. Zhukov

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

15 years, 3 months

git:master: cfg framework: support for no per-child callbacks procs

by Miklos Tirpak

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;

15 years, 3 months

git:master: core: use current config for the attendant process

by Miklos Tirpak

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(); } }

15 years, 3 months

git:master: alias_db(k): append_branch() api changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: b23a7ab13046347a70ffb1be19a9896d0ff3fc61 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=b23a7ab… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:02:09 2009 +0200 alias_db(k): append_branch() api changes --- modules_k/alias_db/alookup.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/alias_db/alookup.c b/modules_k/alias_db/alookup.c index 48909e9..33bb65a 100644 --- a/modules_k/alias_db/alookup.c +++ b/modules_k/alias_db/alookup.c @@ -207,7 +207,7 @@ int alias_db_lookup(struct sip_msg* _msg, char* _table, char* _str2) break; } else { user_s.s = useruri_buf; - if (append_branch(_msg, useruri_buf, 0, 0, MIN_Q, 0, 0) == -1) + if (append_branch(_msg, &user_s, 0, 0, MIN_Q, 0, 0) == -1) { LM_ERR("error while appending branches\n"); goto err_server;

15 years, 3 months

git:master: drouting(k): typo fix

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 140d0a351d8dd0779610f53ec97809b1edacfb52 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=140d0a3… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:04:32 2009 +0200 drouting(k): typo fix --- modules_k/drouting/routing.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/drouting/routing.c b/modules_k/drouting/routing.c index 618f413..1ff7629 100644 --- a/modules_k/drouting/routing.c +++ b/modules_k/drouting/routing.c @@ -351,7 +351,7 @@ add_dst( } /* note we discard the port discovered by the resolve function - we are interested only in the port that was actually configured. */ - if ( (he=sip_resolvehost( &uri.host, NULL, (char*)(void*)&uri.proto)==0 )) { + if ((he=sip_resolvehost( &uri.host, NULL, (char*)(void*)&uri.proto))==0 ) { if(dr_force_dns) { LM_ERR("cannot resolve <%.*s>\n",

15 years, 3 months

git:master: exec(k): append_branch() api changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 820c58ec91c147548bcfcaca1a2786f46a1e7456 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=820c58e… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:05:24 2009 +0200 exec(k): append_branch() api changes --- modules_k/exec/exec.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/modules_k/exec/exec.c b/modules_k/exec/exec.c index fd7ce02..2ce7895 100644 --- a/modules_k/exec/exec.c +++ b/modules_k/exec/exec.c @@ -167,7 +167,7 @@ int exec_str(struct sip_msg *msg, char *cmd, char *param, int param_len) { goto error02; } } else { - if (append_branch(msg, uri.s, uri.len, 0, 0, Q_UNSPECIFIED, 0)==-1) { + if (append_branch(msg, &uri, 0, 0, Q_UNSPECIFIED, 0, 0)==-1) { LM_ERR("append_branch failed; too many or too long URIs?\n"); goto error02; }

15 years, 3 months

git:master: cpl-c(k): append_branch() api changes

by Andrei Pelinescu-Onciul

Module: sip-router Branch: master Commit: 2a791567ae8697c171a9584c2a10e7d6a16253c5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2a79156… Author: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Committer: Andrei Pelinescu-Onciul <andrei(a)iptel.org> Date: Tue Sep 29 20:03:35 2009 +0200 cpl-c(k): append_branch() api changes --- modules_k/cpl-c/cpl_sig.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/modules_k/cpl-c/cpl_sig.c b/modules_k/cpl-c/cpl_sig.c index d77c1fc..8f84e77 100644 --- a/modules_k/cpl-c/cpl_sig.c +++ b/modules_k/cpl-c/cpl_sig.c @@ -87,9 +87,8 @@ int cpl_proxy_to_loc_set( struct sip_msg *msg, struct location **locs, bflags = ((*locs)->flags&CPL_LOC_NATED) ? cpl_fct.ulb.nat_flag : 0 ; LM_DBG("appending branch <%.*s>, flags %d\n", (*locs)->addr.uri.len, (*locs)->addr.uri.s, bflags); - if(append_branch(msg, (*locs)->addr.uri.s, (*locs)->addr.uri.len, - (*locs)->addr.received.s, (*locs)->addr.received.len, - Q_UNSPECIFIED, 0)==-1){ + if(append_branch(msg, &(*locs)->addr.uri, &(*locs)->addr.received, 0, + Q_UNSPECIFIED, bflags, 0)==-1){ LM_ERR("failed when appending branch <%s>\n",(*locs)->addr.uri.s); goto error; }

15 years, 3 months

git:master: dispatcher(k): append_branch() api changes

by Andrei Pelinescu-Onciul

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;

15 years, 3 months

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev