sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
283 discussions

git:master: core: auto_bind_ipv6 : changed param from cfg framework to normal global parameter as setting it at run time doesn 't change anything

by Marius Zbihlei

Module: sip-router Branch: master Commit: 3e154160f4b94dcb55eb3057dc9c3d346ec25ac8 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3e15416… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Fri Oct 14 11:37:20 2011 +0300 core: auto_bind_ipv6 : changed param from cfg framework to normal global parameter as setting it at run time doesn't change anything --- cfg.y | 2 +- cfg_core.c | 8 -------- cfg_core.h | 5 ----- globals.h | 4 ++++ main.c | 4 ++++ socket_info.c | 16 ++++++++-------- 6 files changed, 17 insertions(+), 22 deletions(-) diff --git a/cfg.y b/cfg.y index ab9b126..9317541 100644 --- a/cfg.y +++ b/cfg.y @@ -886,7 +886,7 @@ assign_stm: | DNS_CACHE_GC_INT error { yyerror("boolean value expected"); } | DNS_CACHE_DEL_NONEXP EQUAL NUMBER { IF_DNS_CACHE(default_core_cfg.dns_cache_del_nonexp=$3); } | DNS_CACHE_DEL_NONEXP error { yyerror("boolean value expected"); } - | AUTO_BIND_IPV6 EQUAL NUMBER {IF_AUTO_BIND_IPV6(default_core_cfg.auto_bind_ipv6 = $3);} + | AUTO_BIND_IPV6 EQUAL NUMBER {IF_AUTO_BIND_IPV6(auto_bind_ipv6 = $3);} | AUTO_BIND_IPV6 error { yyerror("boolean value expected"); } | DST_BLST_INIT EQUAL NUMBER { IF_DST_BLACKLIST(dst_blacklist_init=$3); } | DST_BLST_INIT error { yyerror("boolean value expected"); } diff --git a/cfg_core.c b/cfg_core.c index bd5a00d..27a55b3 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -105,9 +105,6 @@ struct cfg_group_core default_core_cfg = { 0, /*!< dns_cache_del_nonexp -- delete only expired entries by default */ 0, /*!< dns_cache_rec_pref -- 0 by default, do not check the existing entries. */ #endif -#ifdef USE_IPV6 - 0, /*!< auto_bind_ipv6 -- off by default */ -#endif #ifdef PKG_MALLOC 0, /*!< mem_dump_pkg */ #endif @@ -275,11 +272,6 @@ cfg_def_t core_cfg_def[] = { " 2 - prefer new records" " 3 - prefer records with longer lifetime"}, #endif -#ifdef USE_IPV6 - {"auto_bind_ipv6", CFG_VAR_INT, 0, 1, 0, 0, 0, - "enable/disable auto binding of proxy to IPV6 interfaces." - "default is disabled 0"}, -#endif #ifdef PKG_MALLOC {"mem_dump_pkg", CFG_VAR_INT, 0, 0, 0, mem_dump_pkg_cb, "dump process memory status, parameter: pid_number"}, diff --git a/cfg_core.h b/cfg_core.h index ada5b89..25f69ae 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -93,11 +93,6 @@ struct cfg_group_core { int dns_cache_del_nonexp; int dns_cache_rec_pref; #endif - -#ifdef USE_IPV6 - int auto_bind_ipv6; -#endif - #ifdef PKG_MALLOC int mem_dump_pkg; #endif diff --git a/globals.h b/globals.h index 06c493d..0b7184a 100644 --- a/globals.h +++ b/globals.h @@ -137,6 +137,10 @@ extern int stun_allow_stun; extern int stun_allow_fp; #endif +#ifdef USE_IPV6 +extern int auto_bind_ipv6; +#endif + extern int tos; extern int pmtu_discovery; diff --git a/main.c b/main.c index f80f88c..5e4defa 100644 --- a/main.c +++ b/main.c @@ -421,6 +421,10 @@ int mcast_ttl = -1; /* if -1, don't touch it, use the default (usually 1) */ int tos = IPTOS_LOWDELAY; int pmtu_discovery = 0; +#ifdef USE_IPV6 +int auto_bind_ipv6 = 0; +#endif + #if 0 char* names[MAX_LISTEN]; /* our names */ int names_len[MAX_LISTEN]; /* lengths of the names*/ diff --git a/socket_info.c b/socket_info.c index 4e7d27e..09aba4d 100644 --- a/socket_info.c +++ b/socket_info.c @@ -1712,9 +1712,9 @@ int fix_all_socket_lists() if ( ( (add_interfaces(0, AF_INET, 0, PROTO_UDP, &ai_lst)==0) #ifdef USE_IPV6 #ifdef __OS_linux - && (!(cfg_get(core, core_cfg, auto_bind_ipv6)) || add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_UDP, &ai_lst) == 0) + && (!auto_bind_ipv6 || add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_UDP, &ai_lst) == 0) #else - && ( !(cfg_get(core, core_cfg, auto_bind_ipv6)) || add_interfaces(0, AF_INET6, 0, PROTO_UDP, &ai_lst) !=0 ) /* add_interface does not work for IPv6 on Linux */ + && ( !auto_bind_ipv6 || add_interfaces(0, AF_INET6, 0, PROTO_UDP, &ai_lst) !=0 ) /* add_interface does not work for IPv6 on Linux */ #endif /* __OS_linux */ #endif /* USE_IPV6 */ ) && (addr_info_to_si_lst(ai_lst, 0, PROTO_UDP, 0, &udp_listen)==0)){ @@ -1726,9 +1726,9 @@ int fix_all_socket_lists() if ( ((add_interfaces(0, AF_INET, 0, PROTO_TCP, &ai_lst)!=0) #ifdef USE_IPV6 #ifdef __OS_linux - || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TCP, &ai_lst) != 0) + || (auto_bind_ipv6 && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TCP, &ai_lst) != 0) #else - || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces(0, AF_INET6, 0, PROTO_TCP, &ai_lst) !=0 ) + || (auto_bind_ipv6 && add_interfaces(0, AF_INET6, 0, PROTO_TCP, &ai_lst) !=0 ) #endif /* __OS_linux */ #endif /* USE_IPV6 */ ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TCP, 0, @@ -1742,9 +1742,9 @@ int fix_all_socket_lists() &ai_lst)!=0) #ifdef USE_IPV6 #ifdef __OS_linux - || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TLS, &ai_lst) != 0) + || (auto_bind_ipv6 && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TLS, &ai_lst) != 0) #else - || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces(0, AF_INET6, 0, PROTO_TLS, &ai_lst)!=0) + || (auto_bind_ipv6 && add_interfaces(0, AF_INET6, 0, PROTO_TLS, &ai_lst)!=0) #endif /* __OS_linux */ #endif /* USE_IPV6 */ ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TLS, 0, @@ -1761,9 +1761,9 @@ int fix_all_socket_lists() if (((add_interfaces(0, AF_INET, 0, PROTO_SCTP, &ai_lst)!=0) #ifdef USE_IPV6 #ifdef __OS_linux - || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) + || (auto_bind_ipv6 && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) #else - || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) + || (auto_bind_ipv6 && add_interfaces(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) #endif /* __OS_linux */ #endif /* USE_IPV6 */ ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_SCTP, 0,

13 years, 1 month

git:master: message shooter module added

by Miklos Tirpak

Module: sip-router Branch: master Commit: 9c9609dd2ec1f57f0a7f803728f57e7390a27898 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=9c9609d… Author: Miklos Tirpak <miklos(a)iptel.org> Committer: Miklos Tirpak <miklos(a)iptel.org> Date: Tue Oct 11 17:18:17 2011 +0200 message shooter module added This is a small module for sending out SIP messages outside of the current transaction. The ruri, from, to, additional headers, and optionally the body can be specified which make up the SIP message that is sent out. --- modules/msg_shooter/Makefile | 16 ++ modules/msg_shooter/README | 125 ++++++++++++++ modules/msg_shooter/msg_shooter.c | 303 +++++++++++++++++++++++++++++++++ modules/msg_shooter/msg_shooter.h | 42 +++++ modules/msg_shooter/msg_shooter_mod.c | 124 ++++++++++++++ modules/msg_shooter/msg_shooter_mod.h | 26 +++ modules/msg_shooter/smsg_routes.c | 54 ++++++ modules/msg_shooter/smsg_routes.h | 26 +++ 8 files changed, 716 insertions(+), 0 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=9c9…

13 years, 1 month

Re: [sr-dev] git:master: message shooter module added

by Miklos Tirpak

Hi Henning, sorry, I completely forgot this when I was in a rush. I see that you have already reverted the commit, thanks a lot! I will add it in a new branch. Thanks, Miklos On 10/12/2011 12:08 PM, Henning Westerholt wrote: > On Wednesday 12 October 2011, Miklos Tirpak wrote: >> Module: sip-router >> Branch: master >> [...] >> message shooter module added > > Hi Miklos, > > did you planned to add this to the master branch? IMHO we're still in the > feature freeze for 3.2 and want to release soon. Maybe you can add this to a > branch for now? > > Best regards, > > Henning

13 years, 1 month

git:master: core: socket_info Added automatic discovery of IPv6 interfaces on Linux using RT_NETLINK socks

by Marius Zbihlei

Module: sip-router Branch: master Commit: c6b62bf87238be251845f33fc306bb4522ca5915 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=c6b62bf… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Wed Sep 28 13:39:39 2011 +0300 core:socket_info Added automatic discovery of IPv6 interfaces on Linux using RT_NETLINK socks The behavior now is identical for IPv4 or IPv6 interfaces : if no listen directives are given, either via command line or config file, Kamailio will automatically detect IPv4/IPv6 interfaces and bind to them (well, it will not bind to link-local prefixes) --- socket_info.c | 415 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 403 insertions(+), 12 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=c6b…

13 years, 1 month

git:3.1: dialog(k): Fix typos.

by Timo Reimann

Module: sip-router Branch: 3.1 Commit: 48a6472a86109c7f1335d1e430f2cfc5f3c722ae URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=48a6472… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Oct 13 02:23:29 2011 +0200 dialog(k): Fix typos. (cherry picked from commit e32982644f0da3b9f8240237fdf33dfcabd80af0) --- modules_k/dialog/dialog.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 38a30b5..4bf700c 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -528,19 +528,19 @@ static int mod_init(void) } if (register_script_cb( profile_cleanup, POST_SCRIPT_CB|REQUEST_CB,0)<0) { - LM_ERR("cannot regsiter script callback"); + LM_ERR("cannot register script callback"); return -1; } if (register_script_cb(dlg_cfg_cb, PRE_SCRIPT_CB|REQUEST_CB,0)<0) { - LM_ERR("cannot regsiter pre-script ctx callback\n"); + LM_ERR("cannot register pre-script ctx callback\n"); return -1; } if (register_script_cb(dlg_cfg_cb, POST_SCRIPT_CB|REQUEST_CB,0)<0) { - LM_ERR("cannot regsiter post-script ctx callback\n"); + LM_ERR("cannot register post-script ctx callback\n"); return -1; }

13 years, 1 month

git:master: dialog(k): Fix typos.

by Timo Reimann

Module: sip-router Branch: master Commit: e32982644f0da3b9f8240237fdf33dfcabd80af0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e329826… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Oct 13 02:23:29 2011 +0200 dialog(k): Fix typos. --- modules_k/dialog/dialog.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules_k/dialog/dialog.c b/modules_k/dialog/dialog.c index 27bc7dd..7d8f239 100644 --- a/modules_k/dialog/dialog.c +++ b/modules_k/dialog/dialog.c @@ -567,19 +567,19 @@ static int mod_init(void) } if (register_script_cb( profile_cleanup, POST_SCRIPT_CB|REQUEST_CB,0)<0) { - LM_ERR("cannot regsiter script callback"); + LM_ERR("cannot register script callback"); return -1; } if (register_script_cb(dlg_cfg_cb, PRE_SCRIPT_CB|REQUEST_CB,0)<0) { - LM_ERR("cannot regsiter pre-script ctx callback\n"); + LM_ERR("cannot register pre-script ctx callback\n"); return -1; } if (register_script_cb(dlg_cfg_cb, POST_SCRIPT_CB|REQUEST_CB,0)<0) { - LM_ERR("cannot regsiter post-script ctx callback\n"); + LM_ERR("cannot register post-script ctx callback\n"); return -1; }

13 years, 1 month

git:treimann/tm-extend-pend-cbs-on-reqin: tm: Consider callbacks registered during execution of a TMCB_REQUEST_IN

by Timo Reimann

Module: sip-router Branch: treimann/tm-extend-pend-cbs-on-reqin Commit: bc17e80a81e1d791ddb20a8b1e8fb0bb3adffc66 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bc17e80… Author: Timo Reimann <timo.reimann(a)1und1.de> Committer: Timo Reimann <timo.reimann(a)1und1.de> Date: Thu Oct 13 01:17:58 2011 +0200 tm: Consider callbacks registered during execution of a TMCB_REQUEST_IN callback. --- modules/tm/h_table.c | 5 +++++ modules/tm/t_hooks.c | 21 +++++++++++++++++++++ modules/tm/t_hooks.h | 2 ++ 3 files changed, 28 insertions(+), 0 deletions(-) diff --git a/modules/tm/h_table.c b/modules/tm/h_table.c index 18b0857..e6927f5 100644 --- a/modules/tm/h_table.c +++ b/modules/tm/h_table.c @@ -366,6 +366,11 @@ struct cell* build_cell( struct sip_msg* p_msg ) set_early_tmcb_list(p_msg, new_cell); if(has_reqin_tmcbs()) run_reqin_callbacks( new_cell, p_msg, p_msg->REQ_METHOD); + + /* if new pending callbacks were issued by any TMCB_REQUEST_IN + * callback, move them to the transaction as well (possibly + * extending the existing list of callbacks) */ + extend_early_cbs(p_msg->id, new_cell); } if (p_msg) { diff --git a/modules/tm/t_hooks.c b/modules/tm/t_hooks.c index 8dc77b1..88b862d 100644 --- a/modules/tm/t_hooks.c +++ b/modules/tm/t_hooks.c @@ -88,6 +88,27 @@ void set_early_tmcb_list(struct sip_msg *msg, struct cell *t) } } +static void extend_cb_list(struct tmcb_head_list *existing, struct tmcb_head_list *new) +{ + struct tm_callback *cbp; + + if (existing->first == 0) + *existing = *new; + else { + for (cbp = (struct tm_callback*)new->first; cbp->next != NULL; cbp = cbp->next) ; + cbp->next = (struct tm_callback*)existing->first; + existing->first = new->first; + existing->reg_types |= new->reg_types; + } +} + +void extend_early_cbs(int msgid, struct cell *new_cell) { + if (tmcb_early_hl.cb_list.first!=0 && msgid==tmcb_early_hl.msgid) { + extend_cb_list(&new_cell->tmcb_hl, &tmcb_early_hl.cb_list); + tmcb_early_hl.cb_list.first = 0; + } +} + int init_tmcb_lists() { req_in_tmcb_hl = (struct tmcb_head_list*)shm_malloc diff --git a/modules/tm/t_hooks.h b/modules/tm/t_hooks.h index 38ba5d4..b7d763e 100644 --- a/modules/tm/t_hooks.h +++ b/modules/tm/t_hooks.h @@ -423,6 +423,8 @@ extern struct tmcb_head_list* local_req_in_tmcb_hl; void set_early_tmcb_list(struct sip_msg *msg, struct cell *t); +void extend_early_cbs(int msgid, struct cell *new_cell); + #define has_tran_tmcbs(_T_, _types_) \ ( ((_T_)->tmcb_hl.reg_types)&(_types_) ) #define has_reqin_tmcbs() \

13 years, 1 month

git:master: Revert "message shooter module added"

by Henning Westerholt

Module: sip-router Branch: master Commit: 78078ec214827852ca884d1e019b356b95b9de13 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=78078ec… Author: Henning Westerholt <hw(a)kamailio.org> Committer: Henning Westerholt <hw(a)kamailio.org> Date: Thu Oct 13 00:02:04 2011 +0200 Revert "message shooter module added" This reverts commit 9c9609dd2ec1f57f0a7f803728f57e7390a27898. As announced in the following mail: > [sr-dev] Development branch frozen for v3.2.0 > Daniel-Constantin Mierla miconda at gmail.com > Tue Aug 23 14:56:02 CEST 2011 > [..]the development of new features in master > branch has been frozen, to allow proper testing for release of version > 3.2.0. That means no new features should be committed to GIT master > branch. The master branch is currently closed for new features. Please re-introduce this code again when 3.2.0 has been released and the master branch is open again. --- modules/msg_shooter/Makefile | 16 -- modules/msg_shooter/README | 125 -------------- modules/msg_shooter/msg_shooter.c | 303 --------------------------------- modules/msg_shooter/msg_shooter.h | 42 ----- modules/msg_shooter/msg_shooter_mod.c | 124 -------------- modules/msg_shooter/msg_shooter_mod.h | 26 --- modules/msg_shooter/smsg_routes.c | 54 ------ modules/msg_shooter/smsg_routes.h | 26 --- 8 files changed, 0 insertions(+), 716 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=780…

13 years, 1 month

Kamailio Developer Seminar, Oct 24-24, San Francisco

by Daniel-Constantin Mierla

Hello, the place and date for Kamailio/SER Developer Seminar have been set: San Mateo (just south of San Francisco, CA, in the nearby of international airport), for one day and a half, Oct 24-25, 2011. I posted more details, including about content and registration, at: * http://www.kamailio.org/w/2011/10/kamailio-developer-seminar-san-francisco-… Participating fee is 250USD. Selection of attendees is done by the rule of first come first served. The number of seats is limited, don't wait too long if you want to attend. Looking forward to meeting many of you there. Cheers, Daniel -- Daniel-Constantin Mierla -- http://www.asipto.com Kamailio Advanced Training, Dec 5-8, Berlin: http://asipto.com/u/kat http://linkedin.com/in/miconda -- http://twitter.com/miconda

13 years, 1 month

please remove msg_shooter module from master

by Juha Heinanen

see subject, -- juha

13 years, 1 month

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

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011