sr-dev November 2013

sr-dev@lists.kamailio.org

29 participants
220 discussions

[tracker] Task closed: Crash in cancel_branch on Kamailio 4.0.3
by sip-router 12 Nov '13

12 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task is now closed: FS#367 - Crash in cancel_branch on Kamailio 4.0.3 User who did this - Daniel-Constantin Mierla (miconda) Reason for closing: Fixed More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=367 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 notification settings at the URL shown above.

1 0

[tracker] Comment added: Crash in cancel_branch on Kamailio 4.0.3
by sip-router 12 Nov '13

12 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#367 - Crash in cancel_branch on Kamailio 4.0.3 User who did this - Daniel-Constantin Mierla (miconda) ---------- This should be already fixed by commit 49e566ab80a8458ba229c77149a6011ea5d0df28 in branch 4.0 - it matches the line and the likelihood. For now, you should install the latest version from branch 4.0. Soon we will probably release v4.0.5 that will include this fix as well. I am going to close this item, if after using latest branch 4.0 is still an issue, reopen here. A tutorial about how to install Kamailio from branch 4.0 is available at kamailio.org/wiki/. ---------- More information can be found at the following URL: https://sip-router.org/tracker/index.php?do=details&task_id=367#comment1161 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 notification settings at the URL shown above.

1 0

[tracker] Task opened: Crash in cancel_branch on Kamailio 4.0.3
by sip-router 12 Nov '13

12 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - avangard solutions (avangardsolutions) Attached to Project - sip-router Summary - Crash in cancel_branch on Kamailio 4.0.3 Task Type - Bug Report Category - Core Status - Unconfirmed Assigned To - Operating System - Linux Severity - Low Priority - Normal Reported Version - Development Due in Version - Undecided Due Date - Undecided Details - We experience couple of kamailio randomly crashes. on linux CentOS release 6.3 (Final) kamailio-4.0.3-1.1.x86_64 core dump: Program terminated with signal 11, Segmentation fault. #0 0x00007f3cf4a0f7b2 in cancel_branch (t=0x7f3cd2d39220, branch=0, reason=<value optimized out>, flags=4) at t_cancel.c:284 284 if (cfg_get(tm, tm_cfg, reparse_invite) || #0 0x00007f3cf4a0f7b2 in cancel_branch (t=0x7f3cd2d39220, branch=0, reason=<value optimized out>, flags=4) at t_cancel.c:284 284 if (cfg_get(tm, tm_cfg, reparse_invite) || (gdb) bt full #0 0x00007f3cf4a0f7b2 in cancel_branch (t=0x7f3cd2d39220, branch=0, reason=<value optimized out>, flags=4) at t_cancel.c:284 cancel = <value optimized out> len = <value optimized out> crb = 0x7f3cd2d39418 irb = 0x7f3cd2d39390 ret = 1 tmp_cd = {cancel_bitmap = 0, reason = {cause = 0, u = {text = {s = 0x0, len = 0}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = 0}}}} pcbuf = <value optimized out> __FUNCTION__ = "cancel_branch" 0000001 0x00007f3cf4a4b19b in reply_received (p_msg=0x7f3cf5968270) at t_reply.c:2194 msg_status = <value optimized out> last_uac_status = 408 ack = 0x7f3cd2d39220 "`\347\306\322<\177" ack_len = <value optimized out> branch = 0 reply_status = <value optimized out> onreply_route = <value optimized out> cancel_data = {cancel_bitmap = 0, reason = {cause = 408, u = {text = {s = 0x0, len = -174615312}, e2e_cancel = 0x0, packed_hdrs = {s = 0x0, len = -174615312}}}} uac = <value optimized out> t = 0x7f3cd2d39220 lack_dst = {send_sock = 0x0, to = {s = {sa_family = 37824, sa_data = "\227\365<\177\000\000p\202\226\365<\177\000"}, sin = {sin_family = 37824, sin_port = 62871, sin_addr = {s_addr = 32572}, sin_zero = "p\202\226\365<\177\000"}, sin6 = {sin6_family = 37824, sin6_port = 62871, sin6_flowinfo = 32572, sin6_addr = {__in6_u = {__u6_addr8 = "p\202\226\365<\177\000\000\300\223\227\365<\177\000", __u6_addr16 = {33392, 62870, 32572, 0, 37824, 62871, 32572, 0}, __u6_addr32 = {4120281712, 32572, 4120351680, 32572}}}, sin6_scope_id = 4120281712}}, id = 32572, proto = -2 '\376', send_flags = {f = 137 '\211', blst_imask = 141 '\215'}} backup_user_from = <value optimized out> backup_user_to = <value optimized out> backup_domain_from = <value optimized out> backup_domain_to = <value optimized out> backup_uri_from = <value optimized out> backup_uri_to = <value optimized out> backup_xavps = <value optimized out> replies_locked = 0 branch_ret = <value optimized out> ---Type <return> to continue, or q <return> to quit--- prev_branch = <value optimized out> blst_503_timeout = <value optimized out> hf = <value optimized out> onsend_params = {req = 0x8d8a00, rpl = 0x541db4, param = 0x7f3cf59796f8, code = 4482677, flags = 0, branch = 0, t_rbuf = 0x7f3cf595ce10, dst = 0x7f3cf533397d, send_buf = {s = 0x7f3cf594c010 "", len = 5500024}} ctx = {rec_lev = -174592224, run_flags = 32572, last_retcode = 5674140, jmp_env = {{__jmpbuf = {139899795117744, 5628326, 4, 140735819000640, 9276147, 139899795050944, 139899795136192, 139899807274645}, __mask_was_saved = 0, __saved_mask = {__val = {139899795059392, 0, 139899795073285, 345, 140733193388048, 6185803, 9275883, 4120351984, 9275666, 72839828720, 5510132, 139899795136192, 9275609, 139899795117296, 9275904, 139899795140384}}}}} __FUNCTION__ = "reply_received" 0000002 0x0000000000456444 in do_forward_reply (msg=0x7f3cf5968270, mode=<value optimized out>) at forward.c:799 new_buf = 0x0 dst = {send_sock = 0x0, to = {s = {sa_family = 0, sa_data = '\000' <repeats 13 times>}, sin = {sin_family = 0, sin_port = 0, sin_addr = {s_addr = 0}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 0, sin6_port = 0, sin6_flowinfo = 0, sin6_addr = {__in6_u = { __u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, id = 0, proto = 0 '\000', send_flags = {f = 0 '\000', blst_imask = 0 '\000'}} new_len = <value optimized out> r = <value optimized out> s = <value optimized out> len = <value optimized out> __FUNCTION__ = "do_forward_reply" 0000003 0x000000000049e15e in receive_msg (buf=<value optimized out>, len=320, rcv_info=0x7fff9c7fade0) at receive.c:270 msg = 0x7f3cf5968270 ctx = {rec_lev = 0, run_flags = 0, last_retcode = -758143620, jmp_env = {{__jmpbuf = {1, 1, 139899799175928, 139899809382400, 140735819001552, 4294967295, 0, 1}, __mask_was_saved = 8576424, __saved_mask = {__val = {0, 28, 16, 0, 139899807248336, 1, 0, 1, 139899799175928, 1, 139899795166208, 139899809380008, 139899795166216, 140735819001448, 139899807274645, 140735819001320}}}}} ret = <value optimized out> inb = { s = 0x8d88c0 "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 124.248.203.51;branch=z9hG4bKe4ab.d39089f4.0;received=124.248.203.51\r\nFrom: sip:dispatcher@localhost;tag=cb55100cf2f7b8ecef9f1913b54cc8ee-b977\r\nTo: sip:124.248.203"..., len = 320} __FUNCTION__ = "receive_msg" 0000004 0x0000000000530e46 in udp_rcv_loop () at udp_server.c:557 len = 320 buf = "SIP/2.0 100 Trying\r\nVia: SIP/2.0/UDP 124.248.203.51;branch=z9hG4bKe4ab.d39089f4.0;received=124.248.203.51\r\nFrom: sip:dispatcher@localhost;tag=cb55100cf2f7b8ecef9f1913b54cc8ee-b977\r\nTo: sip:124.248.203"... ---Type <return> to continue, or q <return> to quit--- from = 0x7f3cf5985400 fromlen = 16 ri = {src_ip = {af = 2, len = 4, u = {addrl = {869005436, 0}, addr32 = {869005436, 0, 0, 0}, addr16 = {63612, 13259, 0, 0, 0, 0, 0, 0}, addr = "|\370\313\063", '\000' <repeats 11 times>}}, dst_ip = {af = 2, len = 4, u = {addrl = {869005436, 0}, addr32 = {869005436, 0, 0, 0}, addr16 = { 63612, 13259, 0, 0, 0, 0, 0, 0}, addr = "|\370\313\063", '\000' <repeats 11 times>}}, src_port = 5090, dst_port = 5060, proto_reserved1 = 0, proto_reserved2 = 0, src_su = {s = {sa_family = 2, sa_data = "\023\342|\370\313\063\000\000\000\000\000\000\000"}, sin = {sin_family = 2, sin_port = 57875, sin_addr = {s_addr = 869005436}, sin_zero = "\000\000\000\000\000\000\000"}, sin6 = {sin6_family = 2, sin6_port = 57875, sin6_flowinfo = 869005436, sin6_addr = {__in6_u = {__u6_addr8 = '\000' <repeats 15 times>, __u6_addr16 = {0, 0, 0, 0, 0, 0, 0, 0}, __u6_addr32 = {0, 0, 0, 0}}}, sin6_scope_id = 0}}, bind_address = 0x7f3cf595ce10, proto = 1 '\001'} __FUNCTION__ = "udp_rcv_loop" 0000005 0x000000000046716a in main_loop () at main.c:1638 i = <value optimized out> pid = <value optimized out> si = <value optimized out> si_desc = "udp receiver child=0 sock=124.248.203.51:5060\000\000\000\060\203\227\365<\177\000\000\n\000\000\000\377\177\000\000\003", '\000' <repeats 16 times>"\242, \317\322<\177\000\000\001\000\000\000\001\000\000\000\370\260\177\234\377\177\000\000\001", '\000' <repeats 17 times>, "@ \000\000\000" nrprocs = <value optimized out> __FUNCTION__ = "main_loop" 0000006 0x000000000046a002 in main (argc=<value optimized out>, argv=<value optimized out>) at main.c:2566 cfg_stream = <value optimized out> c = <value optimized out> r = <value optimized out> tmp = 0x7fff9c7fcf5c "" tmp_len = 0 options = 0x5c08b0 ":f:cm:M:dVIhEeb:l:L:n:vKrRDTN:W:w:t:u:g:P:G:SQ:O:a:A:" ret = -1 seed = 263013530 rfd = <value optimized out> debug_save = <value optimized out> debug_flag = <value optimized out> dont_fork_cnt = <value optimized out> n_lst = <value optimized out> p = <value optimized out> __FUNCTION__ = "main" More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=367 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 notification settings at the URL shown above.

1 0

Small documentation error in pua_reginfo module
by Marius Pedersen 12 Nov '13

12 Nov '13

Hi, seems to be a typo in the documentation for the pua_reginfo module (for at least 3.4.x, 4.0.x and 4.1.x versions). Section 3.1 default_domain(str), example 1.1 is: modparam("pua_bla", "default_domain", "kamailio.org") Should be: modparam("pua_reginfo", "default_domain", "kamailio.org") -- Marius Pedersen

2 1

git:master: pua_reginfo: fixed typo related to module name in docs example
by Daniel-Constantin Mierla 12 Nov '13

12 Nov '13

Module: sip-router Branch: master Commit: 35ae624ba939b736bb2f52cd5fb4908deec0a133 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=35ae624… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 12 15:50:51 2013 +0100 pua_reginfo: fixed typo related to module name in docs example - reported by Marius Pedersen --- modules/pua_reginfo/README | 2 +- modules/pua_reginfo/doc/pua_reginfo_admin.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/pua_reginfo/README b/modules/pua_reginfo/README index 18260be..0b5709f 100644 --- a/modules/pua_reginfo/README +++ b/modules/pua_reginfo/README @@ -125,7 +125,7 @@ Chapter 1. Admin Guide Example 1.1. Set default_domain parameter ... -modparam("pua_bla", "default_domain", "kamailio.org") +modparam("pua_reginfo", "default_domain", "kamailio.org") ... 3.2. publish_reginfo(int) diff --git a/modules/pua_reginfo/doc/pua_reginfo_admin.xml b/modules/pua_reginfo/doc/pua_reginfo_admin.xml index f18ffe2..210ff95 100644 --- a/modules/pua_reginfo/doc/pua_reginfo_admin.xml +++ b/modules/pua_reginfo/doc/pua_reginfo_admin.xml @@ -99,7 +99,7 @@ <title>Set <varname>default_domain</varname> parameter</title> <programlisting format="linespecific"> ... -modparam("pua_bla", "default_domain", "kamailio.org") +modparam("pua_reginfo", "default_domain", "kamailio.org") ... </programlisting> </example>

1 0

git:master: core: respect order field in NAPTR, as required by RFC 2915
by Daniel-Constantin Mierla 12 Nov '13

12 Nov '13

Module: sip-router Branch: master Commit: a9fc979c839b44411e3c34076591c64c16d2fe87 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=a9fc979… Author: Øyvind Kolbu <oyvind.kolbu(a)usit.uio.no> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Nov 12 15:47:30 2013 +0100 core: respect order field in NAPTR, as required by RFC 2915 - the beaviour is controlled by core parameter dns_naptr_ignore_rfc - default is 1, preserving current behaviouf to ignore rfc requirements (for backward compatibility) --- cfg.lex | 3 ++ cfg.y | 3 ++ cfg_core.c | 11 +++++--- cfg_core.h | 1 + dns_cache.c | 3 +- resolve.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++------------ resolve.h | 2 +- 7 files changed, 72 insertions(+), 22 deletions(-) diff --git a/cfg.lex b/cfg.lex index 127fce5..8e60c1e 100644 --- a/cfg.lex +++ b/cfg.lex @@ -360,6 +360,7 @@ DNS_RETR_NO dns_retr_no DNS_SERVERS_NO dns_servers_no DNS_USE_SEARCH dns_use_search_list DNS_SEARCH_FMATCH dns_search_full_match +DNS_NAPTR_IGNORE_RFC dns_naptr_ignore_rfc /* dns cache */ DNS_CACHE_INIT dns_cache_init DNS_USE_CACHE use_dns_cache @@ -724,6 +725,8 @@ IMPORTFILE "import_file" return DNS_USE_SEARCH; } <INITIAL>{DNS_SEARCH_FMATCH} { count(); yylval.strval=yytext; return DNS_SEARCH_FMATCH; } +<INITIAL>{DNS_NAPTR_IGNORE_RFC} { count(); yylval.strval=yytext; + return DNS_NAPTR_IGNORE_RFC; } <INITIAL>{DNS_CACHE_INIT} { count(); yylval.strval=yytext; return DNS_CACHE_INIT; } <INITIAL>{DNS_USE_CACHE} { count(); yylval.strval=yytext; diff --git a/cfg.y b/cfg.y index 2533f72..195593b 100644 --- a/cfg.y +++ b/cfg.y @@ -409,6 +409,7 @@ extern char *finame; %token DNS_SERVERS_NO %token DNS_USE_SEARCH %token DNS_SEARCH_FMATCH +%token DNS_NAPTR_IGNORE_RFC %token DNS_CACHE_INIT %token DNS_USE_CACHE %token DNS_USE_FAILOVER @@ -865,6 +866,8 @@ assign_stm: | DNS_USE_SEARCH error { yyerror("boolean value expected"); } | DNS_SEARCH_FMATCH EQUAL NUMBER { default_core_cfg.dns_search_fmatch=$3; } | DNS_SEARCH_FMATCH error { yyerror("boolean value expected"); } + | DNS_NAPTR_IGNORE_RFC EQUAL NUMBER { default_core_cfg.dns_naptr_ignore_rfc=$3; } + | DNS_NAPTR_IGNORE_RFC error { yyerror("boolean value expected"); } | DNS_CACHE_INIT EQUAL NUMBER { IF_DNS_CACHE(dns_cache_init=$3); } | DNS_CACHE_INIT error { yyerror("boolean value expected"); } | DNS_USE_CACHE EQUAL NUMBER { IF_DNS_CACHE(default_core_cfg.use_dns_cache=$3); } diff --git a/cfg_core.c b/cfg_core.c index ac67b11..06edb86 100644 --- a/cfg_core.c +++ b/cfg_core.c @@ -88,6 +88,7 @@ struct cfg_group_core default_core_cfg = { 1, /*!< dns_search_list */ 1, /*!< dns_search_fmatch */ 0, /*!< dns_reinit */ + 1, /*!< dns_naptr_ignore_rfc */ /* DNS cache */ #ifdef USE_DNS_CACHE 1, /*!< use_dns_cache -- on by default */ @@ -216,13 +217,13 @@ cfg_def_t core_cfg_def[] = { {"dns_try_naptr", CFG_VAR_INT, 0, 1, 0, 0, #endif "enable/disable NAPTR DNS lookups"}, - {"dns_udp_pref", CFG_VAR_INT, 0, 0, 0, reinit_naptr_proto_prefs, + {"dns_udp_pref", CFG_VAR_INT, 0, 0, 0, reinit_proto_prefs, "udp protocol preference when doing NAPTR lookups"}, - {"dns_tcp_pref", CFG_VAR_INT, 0, 0, 0, reinit_naptr_proto_prefs, + {"dns_tcp_pref", CFG_VAR_INT, 0, 0, 0, reinit_proto_prefs, "tcp protocol preference when doing NAPTR lookups"}, - {"dns_tls_pref", CFG_VAR_INT, 0, 0, 0, reinit_naptr_proto_prefs, + {"dns_tls_pref", CFG_VAR_INT, 0, 0, 0, reinit_proto_prefs, "tls protocol preference when doing NAPTR lookups"}, - {"dns_sctp_pref", CFG_VAR_INT, 0, 0, 0, reinit_naptr_proto_prefs, + {"dns_sctp_pref", CFG_VAR_INT, 0, 0, 0, reinit_proto_prefs, "sctp protocol preference when doing NAPTR lookups"}, {"dns_retr_time", CFG_VAR_INT, 0, 0, 0, resolv_reinit, "time in s before retrying a dns request"}, @@ -239,6 +240,8 @@ cfg_def_t core_cfg_def[] = { {"dns_reinit", CFG_VAR_INT|CFG_INPUT_INT, 1, 1, dns_reinit_fixup, resolv_reinit, "set to 1 in order to reinitialize the DNS resolver"}, + {"dns_naptr_ignore_rfc", CFG_VAR_INT, 0, 0, 0, reinit_proto_prefs, + "ignore the Order field required by RFC 2915"}, /* DNS cache */ #ifdef USE_DNS_CACHE {"use_dns_cache", CFG_VAR_INT, 0, 1, use_dns_cache_fixup, 0, diff --git a/cfg_core.h b/cfg_core.h index 4bfbfbb..3739acb 100644 --- a/cfg_core.h +++ b/cfg_core.h @@ -80,6 +80,7 @@ struct cfg_group_core { int dns_search_list; int dns_search_fmatch; int dns_reinit; + int dns_naptr_ignore_rfc; /* DNS cache */ #ifdef USE_DNS_CACHE int use_dns_cache; diff --git a/dns_cache.c b/dns_cache.c index d9737c8..f3bdda9 100644 --- a/dns_cache.c +++ b/dns_cache.c @@ -3291,12 +3291,11 @@ inline static int dns_srv_sip_resolve(struct dns_srv_handle* h, str* name, srv_name.len=strlen(tmp); if ((ret=dns_srv_resolve_ip(h, &srv_name, ip, port, flags))>=0) { - *proto = srv_proto_list[i].proto; + h->proto = *proto = srv_proto_list[i].proto; #ifdef DNS_CACHE_DEBUG DBG("dns_srv_sip_resolve(%.*s, %d, %d), srv0, ret=%d\n", name->len, name->s, h->srv_no, h->ip_no, ret); #endif - /* proto already set */ return ret; } } diff --git a/resolve.c b/resolve.c index 7450b6f..d0ef16c 100644 --- a/resolve.c +++ b/resolve.c @@ -92,23 +92,58 @@ counter_def_t dns_cnt_defs[] = { #ifdef USE_NAPTR static int naptr_proto_pref[PROTO_LAST+1]; #endif +static int srv_proto_pref[PROTO_LAST+1]; #ifdef USE_NAPTR -void init_naptr_proto_prefs() +static void init_naptr_proto_prefs() { + int ignore_rfc, udp, tcp, tls, sctp; + if ((PROTO_UDP > PROTO_LAST) || (PROTO_TCP > PROTO_LAST) || (PROTO_TLS > PROTO_LAST) || (PROTO_SCTP > PROTO_LAST)){ BUG("init_naptr_proto_prefs: array too small \n"); return; } - naptr_proto_pref[PROTO_UDP]=cfg_get(core, core_cfg, dns_udp_pref); - naptr_proto_pref[PROTO_TCP]=cfg_get(core, core_cfg, dns_tcp_pref); - naptr_proto_pref[PROTO_TLS]=cfg_get(core, core_cfg, dns_tls_pref); - naptr_proto_pref[PROTO_SCTP]=cfg_get(core, core_cfg, dns_sctp_pref); + + ignore_rfc = cfg_get(core, core_cfg, dns_naptr_ignore_rfc); + udp = cfg_get(core, core_cfg, dns_udp_pref); + tcp = cfg_get(core, core_cfg, dns_tcp_pref); + tls = cfg_get(core, core_cfg, dns_tls_pref); + sctp = cfg_get(core, core_cfg, dns_sctp_pref); + + /* Old implementation ignored the Order field in the NAPTR RR and + * thus violated a MUST in RFC 2915. Currently still the default. */ + if (ignore_rfc) { + naptr_proto_pref[PROTO_UDP] = udp; + naptr_proto_pref[PROTO_TCP] = tcp; + naptr_proto_pref[PROTO_TLS] = tls; + naptr_proto_pref[PROTO_SCTP] = sctp; + } else { + /* If value is less than 0, proto is disabled, otherwise + * ignored. */ + naptr_proto_pref[PROTO_UDP] = udp < 0 ? udp : 1; + naptr_proto_pref[PROTO_TCP] = tcp < 0 ? tcp : 1; + naptr_proto_pref[PROTO_TLS] = tls < 0 ? tls : 1; + naptr_proto_pref[PROTO_SCTP] = sctp < 0 ? sctp : 1; + } } #endif /* USE_NAPTR */ +static void init_srv_proto_prefs() +{ + if ((PROTO_UDP > PROTO_LAST) || (PROTO_TCP > PROTO_LAST) || + (PROTO_TLS > PROTO_LAST) || (PROTO_SCTP > PROTO_LAST)){ + BUG("init_srv_proto_prefs: array too small \n"); + return; + } + + srv_proto_pref[PROTO_UDP] = cfg_get(core, core_cfg, dns_udp_pref); + srv_proto_pref[PROTO_TCP] = cfg_get(core, core_cfg, dns_tcp_pref); + srv_proto_pref[PROTO_TLS] = cfg_get(core, core_cfg, dns_tls_pref); + srv_proto_pref[PROTO_SCTP] = cfg_get(core, core_cfg, dns_sctp_pref); +} + #ifdef DNS_WATCHDOG_SUPPORT static on_resolv_reinit on_resolv_reinit_cb = NULL; @@ -178,9 +213,7 @@ int resolv_init(void) int res = -1; _resolv_init(); -#ifdef USE_NAPTR - init_naptr_proto_prefs(); -#endif + reinit_proto_prefs(NULL,NULL); /* init counter API only at startup * This function must be called before DNS cache init method (if available) */ @@ -212,12 +245,13 @@ int dns_reinit_fixup(void *handle, str *gname, str *name, void **val) return 0; } -/* wrapper function to recalculate the naptr protocol preferences */ -void reinit_naptr_proto_prefs(str *gname, str *name) +/* wrapper function to recalculate the naptr and srv protocol preferences */ +void reinit_proto_prefs(str *gname, str *name) { #ifdef USE_NAPTR init_naptr_proto_prefs(); #endif + init_srv_proto_prefs(); } /* fixup function for dns_try_ipv6 @@ -1080,19 +1114,26 @@ char naptr_get_sip_proto(struct naptr_rdata* n) -inline static int proto_pref_score(char proto) +inline static int naptr_proto_pref_score(char proto) { if ((proto>=PROTO_UDP) && (proto<= PROTO_LAST)) return naptr_proto_pref[(int)proto]; return 0; } +inline static int srv_proto_pref_score(char proto) +{ + if ((proto>=PROTO_UDP) && (proto<= PROTO_LAST)) + return srv_proto_pref[(int)proto]; + return 0; +} + /* returns true if we support the protocol */ int naptr_proto_supported(char proto) { - if (proto_pref_score(proto)<0) + if (naptr_proto_pref_score(proto)<0) return 0; switch(proto){ case PROTO_UDP: @@ -1119,7 +1160,7 @@ int naptr_proto_supported(char proto) /* returns true if new_proto is preferred over old_proto */ int naptr_proto_preferred(char new_proto, char old_proto) { - return proto_pref_score(new_proto)>proto_pref_score(old_proto); + return naptr_proto_pref_score(new_proto)>naptr_proto_pref_score(old_proto); } @@ -1451,7 +1492,7 @@ size_t create_srv_pref_list(char *proto, struct dns_srv_proto *list) { list_len = 0; /*get protocols and preference scores, and add availble protocol(s) and score(s) to the list*/ for (i=PROTO_UDP; i<PROTO_LAST;i++) { - tmp.proto_pref = proto_pref_score(i); + tmp.proto_pref = srv_proto_pref_score(i); /* if -1 so disabled continue with next protocol*/ if (naptr_proto_supported(i) == 0) { continue; @@ -1470,7 +1511,7 @@ size_t create_srv_pref_list(char *proto, struct dns_srv_proto *list) { } if (default_order){ for (i=0; i<list_len;i++) { - list[i].proto_pref=proto_pref_score(i); + list[i].proto_pref=srv_proto_pref_score(i); } } diff --git a/resolve.h b/resolve.h index b3e6eba..2d67da7 100644 --- a/resolve.h +++ b/resolve.h @@ -455,7 +455,7 @@ int resolv_init(void); void resolv_reinit(str *gname, str *name); int dns_reinit_fixup(void *handle, str *gname, str *name, void **val); int dns_try_ipv6_fixup(void *handle, str *gname, str *name, void **val); -void reinit_naptr_proto_prefs(str *gname, str *name); +void reinit_proto_prefs(str *gname, str *name); struct dns_srv_proto { char proto;

1 0

[tracker] Task opened: SCA Crashes on sca_appearance_unregister ()
by sip-router 11 Nov '13

11 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. A new Flyspray task has been opened. Details are below. User who did this - Robert Boisvert (rdboisvert) Attached to Project - sip-router Summary - SCA Crashes on sca_appearance_unregister () Task Type - Bug Report Category - Module Status - Unconfirmed Assigned To - Operating System - Linux Severity - Medium Priority - Normal Reported Version - 4.0 Due in Version - Undecided Due Date - Undecided Details - SCA module is crashing randomly on 4.0.4. It has crashed several times with a backtrace that shows these stack calls: (gdb) backtrace #0 0x00000000 in ?? () #1 0x4dceca11 in sca_hash_table_slot_kv_delete_unsafe () from /usr/lib/kamailio/modules/sca.so #2 0x4dcecaaa in sca_hash_table_slot_kv_delete () from /usr/lib/kamailio/modules/sca.so #3 0x4dcecb1e in sca_hash_table_index_kv_delete () from /usr/lib/kamailio/modules/sca.so #4 0x4dcecb99 in sca_hash_table_kv_delete () from /usr/lib/kamailio/modules/sca.so #5 0x4dcf30bc in sca_appearance_unregister () from /usr/lib/kamailio/modules/sca.so #6 0x4dd0d9b9 in sca_call_info_update () from /usr/lib/kamailio/modules/sca.so #7 0x126a6a9a in do_action () #8 0x126af88e in run_actions () #9 0x126a4731 in do_action () #10 0x126af88e in run_actions () #11 0x126b007f in run_top_route () #12 0x1269dd7e in receive_msg () #13 0x12734f01 in udp_rcv_loop () #14 0x126d3f56 in main_loop () #15 0x126d76de in main () The message that seemed to trigger the crash in this particular case was the following INVITE: INVITE sip:35705@10.250.16.71;user=phone SIP/2.0 Record-Route: <sip:10.250.16.70;lr=on;ftag=D8B14B68-93D21A25;did=513b.a3741> Via: SIP/2.0/UDP 10.250.16.70;branch=z9hG4bKc43b.14d180e6.0 Via: SIP/2.0/UDP 10.250.88.116;branch=z9hG4bK8d3ec33e632D8AB3 From: PIN-1 WKL USA <sip:15862@obscured>;tag=D8B14B68-93D21A25 To: <sip:0@obscured;user=phone> CSeq: 1 INVITE Call-ID:c69594c-ff17a5d9-d6ed4f6a@10.250.88.116 Contact: <sip:15862@10.250.88.116> Allow: INVITE, ACK, BYE, CANCEL, OPTIONS, INFO, MESSAGE, SUBSCRIBE, NOTIFY, PRACK, UPDATE, REFER User-Agent: PolycomSoundPointIP-SPIP_335-UA/4.0.3.7562 Accept-Language: en Supported: 100rel,replaces Allow-Events: conference,talk,hold Max-Forwards: 32 Content-Type: application/sdp Content-Length: 296 v=0 o=- 1383792680 1383792680 IN IP4 10.250.88.116 s=Polycom IP Phone c=IN IP4 10.250.88.116 t=0 0 a=sendrecv m=audio 2230 RTP/AVP 9 18 0 8 101 a=rtpmap:9 G722/8000 a=rtpmap:18 G729/8000 a=fmtp:18 annexb=no a=rtpmap:0 PCMU/8000 a=rtpmap:8 PCMA/8000 a=rtpmap:101 telephone-event/8000 I have a pcap trace that shows all the calls from 3 hours prior and this is the first time this device appeared. I followed the code down to the sca_hash_table_slot_kv_delete_unsafe () routine and it appears to have crashed when it tried to use e->free_entry which seems to have been NULL at that point. I'm not sure how it could be NULL since it should have been initialized in sca_hash_table_slot_kv_insert_unsafe (). I'm guessing that either e->free_entry was never initialized or somehow it was overwritten. Since several backtraces end in the same way the bug seems to have be specific to some sequence of events I have not been able to identify. More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=366 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 notification settings at the URL shown above.

1 0

git:master: rtpproxy-ng: remove code artifact that broke IPv6 received-from addresses
by Richard Fuchs 11 Nov '13

11 Nov '13

Module: sip-router Branch: master Commit: 96e021babe6da540ac8e47f35b30bb0fd7146245 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=96e021b… Author: Richard Fuchs <rfuchs(a)sipwise.com> Committer: Richard Fuchs <rfuchs(a)sipwise.com> Date: Mon Nov 11 12:40:05 2013 -0500 rtpproxy-ng: remove code artifact that broke IPv6 received-from addresses --- modules/rtpproxy-ng/rtpproxy.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/modules/rtpproxy-ng/rtpproxy.c b/modules/rtpproxy-ng/rtpproxy.c index 1760892..a8b5da7 100644 --- a/modules/rtpproxy-ng/rtpproxy.c +++ b/modules/rtpproxy-ng/rtpproxy.c @@ -1285,9 +1285,7 @@ static bencode_item_t *rtpp_function_call(bencode_buffer_t *bencbuf, struct sip_ item = bencode_list(bencbuf); bencode_dictionary_add(dict, "received-from", item); bencode_list_add_string(item, (msg->rcv.src_ip.af == AF_INET) ? "IP4" : ( -#ifdef USE_IPV6 (msg->rcv.src_ip.af == AF_INET6) ? "IP6" : -#endif "?" ) ); bencode_list_add_string(item, ip_addr2a(&msg->rcv.src_ip));

1 0

git:master: ChangeLog: set the content with changes since branching for 4.0
by Daniel-Constantin Mierla 11 Nov '13

11 Nov '13

Module: sip-router Branch: master Commit: 3bcf5579c8e47422378fcf6dfaa361e3fd126ce5 URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=3bcf557… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Mon Nov 11 12:23:29 2013 +0100 ChangeLog: set the content with changes since branching for 4.0 --- ChangeLog |13608 +++++++++++++++++++++++++------------------------------------ 1 files changed, 5610 insertions(+), 7998 deletions(-) Diff: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commitdiff;h=3bc…

1 0

[tracker] Comment added: Crash in TCP Read on Kamailio 4.0.1
by sip-router 11 Nov '13

11 Nov '13

THIS IS AN AUTOMATED MESSAGE, DO NOT REPLY. The following task has a new comment added: FS#364 - Crash in TCP Read on Kamailio 4.0.1 User who did this - Daniel-Constantin Mierla (miconda) ---------- Can it be reproducible? Or it happened only one time so far? ---------- More information can be found at the following URL: http://sip-router.org/tracker/index.php?do=details&task_id=364#comment1160 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 notification settings at the URL shown above.

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
22
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

sr-dev November 2013