From 6fa71afc1a41a894b90f938db2b4ed9bc039729c Mon Sep 17 00:00:00 2001 From: karl anderson Date: Mon, 11 May 2015 15:57:40 -0400 Subject: [PATCH 1/2] KAZOO-3491: if the request is to the proxy directly treat it as an external source --- kamailio/dispatcher-role.cfg | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/kamailio/dispatcher-role.cfg b/kamailio/dispatcher-role.cfg index 6b22f9c..85d29f9 100644 --- a/kamailio/dispatcher-role.cfg +++ b/kamailio/dispatcher-role.cfg @@ -32,11 +32,15 @@ modparam("dispatcher", "ds_ping_from", "sip:sipcheck@MY_IP_ADDRESS") ####### Dispatcher Logic ######## route[DISPATCHER_CLASSIFY_SOURCE] { - if (ds_is_from_list(1, 3) || - ds_is_from_list(2, 3) || - ds_is_from_list(3, 3) || - ds_is_from_list(10, 3) || - ds_is_from_list(20, 3)) { + if (is_myself("$ou")) { + xlog("L_INFO", "$ci|log|original R-URI ($ou) is this proxy, treating as external sources"); + } else if ( + ds_is_from_list(1, 3) || + ds_is_from_list(2, 3) || + ds_is_from_list(3, 3) || + ds_is_from_list(10, 3) || + ds_is_from_list(20, 3) + ) { xlog("L_INFO", "$ci|log|originated from internal sources"); setflag(FLAG_INTERNALLY_SOURCED); From d159f692fbc660bc8aa9ec2f081b358b2715e4cd Mon Sep 17 00:00:00 2001 From: lazedo Date: Fri, 5 Jun 2015 01:20:06 +0100 Subject: [PATCH 2/2] KAZOO-3792 Retry-After on amqp error --- kamailio/registrar-role.cfg | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kamailio/registrar-role.cfg b/kamailio/registrar-role.cfg index 1da60da..8e3b36b 100644 --- a/kamailio/registrar-role.cfg +++ b/kamailio/registrar-role.cfg @@ -89,6 +89,9 @@ route[ATTEMPT_AUTHORIZATION] xlog("L_INFO", "$ci|log|authenticating $Au via Kazoo query response"); } else { xlog("L_INFO", "$ci|log|failed to query Kazoo for authentication credentials for $Au $si:$sp"); + append_to_reply("Retry-After: 60\r\n"); + sl_send_reply("500", "Retry Later"); + exit; } }