sr-dev October 2011

sr-dev@lists.kamailio.org

37 participants
284 discussions

git:master: modules_k/presence_xml: The presentity activities check wasn' t quite right.
by Peter Dunkley 14 Oct '11

14 Oct '11

Module: sip-router Branch: master Commit: e34040497b405f3f5c104cb9ba7a1e23e81871bf URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=e340404… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Oct 14 14:03:52 2011 +0100 modules_k/presence_xml: The presentity activities check wasn't quite right. --- modules_k/presence_xml/pres_check.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 … [View More]

1 0

git:master: modules_k/dispatcher: Fixes to handling of empty DB and hostnames that cannot be resolved
by Peter Dunkley 14 Oct '11

14 Oct '11

Module: sip-router Branch: master Commit: 92da08fde8ee3273cb7b181f3320fd0f613aeb17 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=92da08f… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Oct 14 14:00:36 2011 +0100 modules_k/dispatcher: Fixes to handling of empty DB and hostnames that cannot be resolved - Dispatcher handles an empty DB on start-up, but it doesn't do so well on a reload - … [View More]especially when the DB is now empty, but previously contained records. This commit fixes these issues. - Dispatcher also doesn't cope well when a hostname cannot be resolved to an address. This means a mis-typed DB entry can stop Kamailio from starting up properly. Also fixed in this commit. --- modules_k/dispatcher/dispatch.c | 29 ++++++++++++++++++++--------- 1 files changed, 20 insertions(+), 9 deletions(-) diff --git a/modules_k/dispatcher/dispatch.c b/modules_k/dispatcher/dispatch.c index 2c28fb6..9bb942a 100644 --- a/modules_k/dispatcher/dispatch.c +++ b/modules_k/dispatcher/dispatch.c @@ -252,6 +252,8 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, static char hn[256]; struct hostent* he; struct sip_uri puri; + int orig_id = 0, orig_nr = 0; + ds_set_t *orig_ds_lists = ds_lists[list_idx]; /* check uri */ if(parse_uri(uri.s, uri.len, &puri)!=0 || puri.host.len>254) @@ -283,6 +285,8 @@ int add_dest2list(int id, str uri, int flags, int priority, str *attrs, ds_lists[list_idx] = sp; *setn = *setn+1; } + orig_id = sp->id; + orig_nr = sp->nr; sp->id = id; sp->nr++; @@ -365,6 +369,18 @@ err: shm_free(dp->uri.s); shm_free(dp); } + + if (sp != NULL) + { + sp->id = orig_id; + sp->nr = orig_nr; + if (sp->nr == 0) + { + shm_free(sp); + ds_lists[list_idx] = orig_ds_lists; + } + } + return -1; } @@ -566,9 +582,8 @@ int ds_load_list(char *lfile) add_destination: if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) != 0) - goto error; - - + LM_WARN("unable to add destination %.*s to set %d -- skipping\n", + uri.len, uri.s, id); next_line: p = fgets(line, 256, f); } @@ -720,11 +735,7 @@ int ds_load_db(void) nr_rows = RES_ROW_N(res); rows = RES_ROWS(res); if(nr_rows == 0) - { LM_WARN("no dispatching data in the db -- empty destination set\n"); - ds_dbf.free_result(ds_db_handle, res); - return 0; - } setn = 0; *next_idx = (*crt_idx + 1)%2; @@ -752,8 +763,8 @@ int ds_load_db(void) } if(add_dest2list(id, uri, flags, priority, &attrs, *next_idx, &setn) != 0) - goto err2; - + LM_WARN("unable to add destination %.*s to set %d -- skipping\n", + uri.len, uri.s, id); } ds_dbf.free_result(ds_db_handle, res); [View Less]

1 0

git:master: modules/app_lua: Fix to lua_sr_pv_is_null()
by Peter Dunkley 14 Oct '11

14 Oct '11

Module: sip-router Branch: master Commit: 4e4069330fd44e454c7db19b5d944dbe4ca46a39 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e40693… Author: pd <peter.dunkley(a)crocodile-rcs.com> Committer: pd <peter.dunkley(a)crocodile-rcs.com> Date: Fri Oct 14 13:55:24 2011 +0100 modules/app_lua: Fix to lua_sr_pv_is_null() - Previously this function returned an error when it could not retrieve the pv (for example if it did not exist). As Lua is not a … [View More]

1 0

git:master: dialog(k): new dialogs can be created only by INVITE
by Daniel-Constantin Mierla 14 Oct '11

14 Oct '11

Module: sip-router Branch: master Commit: f4b7f30172ae9c790d21493f26a77fb515b7953f URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=f4b7f30… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Sun Oct 9 12:01:22 2011 +0200 dialog(k): new dialogs can be created only by INVITE - remove unnecessary reset of current dialog pointer added previously, spotted by Timo Reimann --- … [View More]modules_k/dialog/dlg_handlers.c | 2 +- modules_k/dialog/dlg_hash.c | 6 +----- modules_k/dialog/dlg_hash.h | 4 ++-- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/modules_k/dialog/dlg_handlers.c b/modules_k/dialog/dlg_handlers.c index 7bfdbab..ccc95f1 100644 --- a/modules_k/dialog/dlg_handlers.c +++ b/modules_k/dialog/dlg_handlers.c @@ -750,7 +750,7 @@ int dlg_new_dialog(struct sip_msg *req, struct cell *t, const int run_initial_cb if(current_dlg_pointer != NULL) return -1; - if(req->first_line.u.request.method_value == METHOD_CANCEL) + if(req->first_line.u.request.method_value != METHOD_INVITE) return -1; if(pre_match_parse( req, &callid, &ftag, &ttag, 0)<0) { diff --git a/modules_k/dialog/dlg_hash.c b/modules_k/dialog/dlg_hash.c index aa94b7e..a09e78f 100644 --- a/modules_k/dialog/dlg_hash.c +++ b/modules_k/dialog/dlg_hash.c @@ -178,7 +178,7 @@ inline void destroy_dlg(struct dlg_cell *dlg) int ret = 0; struct dlg_var *var; - LM_DBG("destroying dialog %p\n",dlg); + LM_DBG("destroying dialog %p (ref %d)\n", dlg, dlg->ref); ret = remove_dialog_timer(&dlg->tl); if (ret < 0) { @@ -200,10 +200,6 @@ inline void destroy_dlg(struct dlg_cell *dlg) run_dlg_callbacks( DLGCB_DESTROY , dlg, NULL, NULL, DLG_DIR_NONE, 0); - /* reset the global shortcut, if it is the case */ - if(current_dlg_pointer == dlg) - current_dlg_pointer = NULL; - /* delete the dialog from DB*/ if (dlg_db_mode) remove_dialog_from_db(dlg); diff --git a/modules_k/dialog/dlg_hash.h b/modules_k/dialog/dlg_hash.h index ed90d23..ecb6526 100644 --- a/modules_k/dialog/dlg_hash.h +++ b/modules_k/dialog/dlg_hash.h @@ -88,7 +88,7 @@ /*! entries in the dialog list */ -struct dlg_cell +typedef struct dlg_cell { volatile int ref; /*!< reference counter */ struct dlg_cell *next; /*!< next entry in the list */ @@ -116,7 +116,7 @@ struct dlg_cell struct dlg_head_cbl cbs; /*!< dialog callbacks */ struct dlg_profile_link *profile_links; /*!< dialog profiles */ struct dlg_var *vars; /*!< dialog variables */ -}; +} dlg_cell_t; /*! entries in the main dialog table */ [View Less]

2 4

[tracker] Task closed: $hdr(SomeHeader)[$var(i)] fails when $var(i) is 0
by sip-router 14 Oct '11

14 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#167 - $hdr(SomeHeader)[$var(i)] fails when $var(i) is 0 User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Not a bug Additional comments about closing: Invalid for our project. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=167 You are receiving this message because you have requested it from the Flyspray bugtracking … [View More]

1 0

[tracker] Comment added: $hdr(SomeHeader)[$var(i)] fails when $var(i) is 0
by sip-router 14 Oct '11

14 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#167 - $hdr(SomeHeader)[$var(i)] fails when $var(i) is 0 User who did this - Daniel-Constantin Mierla (miconda) ---------- I tested and it works fine with master branch. Very likely the bug does not affect our project, it was quite a lot of refactoring to pseudo-variables in kamailio since v1.4.x, which I guess it is the core still in place for the other project that forked at that time. I am closing … [View More]

1 0

[tracker] User took ownership: $hdr(SomeHeader)[$var(i)] fails when $var(i) is 0
by sip-router 14 Oct '11

14 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. Daniel-Constantin Mierla has taken ownership of the following task: FS#167 - $hdr(SomeHeader)[$var(i)] fails when $var(i) is 0 More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=167 You are receiving this message because you have requested it from the Flyspray bugtracking system. If you did not expect this message or don't want to receive mails in future, you can change your … [View More]

1 0

[tracker] Task opened: $hdr(SomeHeader)[$var(i)] fails when $var(i) is 0 (Attachment added)
by sip-router 14 Oct '11

14 Oct '11

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Walter Doekes (wdoekes) Attached to Project - sip-router Summary - $hdr(SomeHeader)[$var(i)] fails when $var(i) is 0 Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - All Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - Hi, when using $hdr(SomeHeader)[0]… [View More]

1 0

git:master: modules:sipcapture: fixed uint types and IPPROTO_IPIP on Solaris.
by Alexandr Dubovikov 14 Oct '11

14 Oct '11

Module: sip-router Branch: master Commit: 1ced096557f951b437c1fa5970ac0fa16357d8f0 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=1ced096… Author: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Committer: Alexandr Dubovikov <alexandr.dubovikov(a)gmail.com> Date: Fri Oct 14 11:06:25 2011 +0200 modules:sipcapture: fixed uint types and IPPROTO_IPIP on Solaris. Thanks to Jason Penton <jason.penton(a)gmail.com> for the bug report and testing.… [View More]

1 0

git:master: core: added parameter to enable/ disable automatic binding of ipv6 interfaces
by Marius Zbihlei 14 Oct '11

14 Oct '11

Module: sip-router Branch: master Commit: bd3d3546af5e52263ed803000f8b490b96108504 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=bd3d354… Author: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Committer: Marius Zbihlei <marius.zbihlei(a)1and1.ro> Date: Tue Oct 11 11:35:56 2011 +0300 core: added parameter to enable/disable automatic binding of ipv6 interfaces TODO: documentation --- cfg.lex | 4 ++++ cfg.y | 11 +++++++++++ cfg_core.… [View More]c | 8 ++++++++ cfg_core.h | 5 +++++ socket_info.c | 18 +++++++++--------- 5 files changed, 37 insertions(+), 9 deletions(-) diff --git a/cfg.lex b/cfg.lex index ff35a8a..4a19fe1 100644 --- a/cfg.lex +++ b/cfg.lex @@ -370,6 +370,8 @@ DNS_CACHE_MAX_TTL dns_cache_max_ttl DNS_CACHE_MEM dns_cache_mem DNS_CACHE_GC_INT dns_cache_gc_interval DNS_CACHE_DEL_NONEXP dns_cache_del_nonexp|dns_cache_delete_nonexpired +/* ipv6 auto bind */ +AUTO_BIND_IPV6 auto_bind_ipv6 /* blacklist */ DST_BLST_INIT dst_blacklist_init USE_DST_BLST use_dst_blacklist @@ -751,6 +753,8 @@ IMPORTFILE "import_file" return DNS_CACHE_GC_INT; } <INITIAL>{DNS_CACHE_DEL_NONEXP} { count(); yylval.strval=yytext; return DNS_CACHE_DEL_NONEXP; } +<INITIAL>{AUTO_BIND_IPV6} { count(); yylval.strval=yytext; + return AUTO_BIND_IPV6; } <INITIAL>{DST_BLST_INIT} { count(); yylval.strval=yytext; return DST_BLST_INIT; } <INITIAL>{USE_DST_BLST} { count(); yylval.strval=yytext; diff --git a/cfg.y b/cfg.y index 4290e41..ab9b126 100644 --- a/cfg.y +++ b/cfg.y @@ -164,6 +164,11 @@ if (rt!=ONSEND_ROUTE) yyerror( s " allowed only in onsend_routes");\ }while(0) +#ifdef USE_IPV6 + #define IF_AUTO_BIND_IPV6(x) x +#else + #define IF_AUTO_BIND_IPV6(x) warn("IPV6 support not compiled"); +#endif #ifdef USE_DNS_CACHE #define IF_DNS_CACHE(x) x @@ -419,6 +424,10 @@ extern char *finame; %token DNS_CACHE_MEM %token DNS_CACHE_GC_INT %token DNS_CACHE_DEL_NONEXP + +/* ipv6 auto bind */ +%token AUTO_BIND_IPV6 + /*blacklist*/ %token DST_BLST_INIT %token USE_DST_BLST @@ -877,6 +886,8 @@ 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 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"); } | USE_DST_BLST EQUAL NUMBER { diff --git a/cfg_core.c b/cfg_core.c index 27a55b3..bd5a00d 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -105,6 +105,9 @@ 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 @@ -272,6 +275,11 @@ 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 25f69ae..ada5b89 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -93,6 +93,11 @@ 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/socket_info.c b/socket_info.c index 73a5cf3..4e7d27e 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 - && (add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_UDP, &ai_lst) == 0) + && (!(cfg_get(core, core_cfg, auto_bind_ipv6)) || add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_UDP, &ai_lst) == 0) #else - && (add_interfaces(0, AF_INET6, 0, PROTO_UDP, &ai_lst)==0) /* add_interface does not work for IPv6 on Linux */ + && ( !(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 */ #endif /* __OS_linux */ #endif /* USE_IPV6 */ ) && (addr_info_to_si_lst(ai_lst, 0, PROTO_UDP, 0, &udp_listen)==0)){ @@ -1726,12 +1726,12 @@ int fix_all_socket_lists() if ( ((add_interfaces(0, AF_INET, 0, PROTO_TCP, &ai_lst)!=0) #ifdef USE_IPV6 #ifdef __OS_linux - || (add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TCP, &ai_lst) != 0) + || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TCP, &ai_lst) != 0) #else - || (add_interfaces(0, AF_INET6, 0, PROTO_TCP, &ai_lst)!=0) + || (cfg_get(core, core_cfg, 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, + ) || (addr_info_to_si_lst(ai_lst, 0, PROTO_TCP, 0, &tcp_listen)!=0)) goto error; free_addr_info_lst(&ai_lst); @@ -1742,9 +1742,9 @@ int fix_all_socket_lists() &ai_lst)!=0) #ifdef USE_IPV6 #ifdef __OS_linux - || (add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TLS, &ai_lst) != 0) + || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_TLS, &ai_lst) != 0) #else - || (add_interfaces(0, AF_INET6, 0, PROTO_TLS, &ai_lst)!=0) + || (cfg_get(core, core_cfg, 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 - || (add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) + || (cfg_get(core, core_cfg, auto_bind_ipv6) && add_interfaces_via_netlink(0, AF_INET6, 0, PROTO_SCTP, &ai_lst) != 0) #else - || (add_interfaces(0, AF_INET6, 0, PROTO_SCTP, &ai_lst)!=0) + || (cfg_get(core, core_cfg, 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, [View Less]

2 2

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev October 2011