From 526f912683400664344be8f0c2d8cd4de055f72f Mon Sep 17 00:00:00 2001 From: lazedo Date: Thu, 4 Jun 2015 20:46:34 +0100 Subject: [PATCH 1/2] KAZOO-3840 allow pre-loaded routes for grandstream --- kamailio/default.cfg | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/kamailio/default.cfg b/kamailio/default.cfg index f7955fa..5a15993 100644 --- a/kamailio/default.cfg +++ b/kamailio/default.cfg @@ -517,9 +517,15 @@ route[PREPARE_INITIAL_REQUESTS] } if (loose_route()) { - xlog("L_WARN", "$ci|end|denying initial request with route-set"); - sl_send_reply("403", "No pre-loaded routes"); - exit(); + $xavp(regcfg=>match_received) = $su; + $xavp(regcfg[0]=>match_contact) = $(ct{nameaddr.uri}); + if(registered("location", "$rz:$Au", 6) == 1 && ($ua =~ "Grandstream") ) { + xlog("L_INFO", "$ci|chk|allowing initial route-set for $Au"); + } else { + xlog("L_WARN", "$ci|end|denying initial request with route-set"); + sl_send_reply("403", "No pre-loaded routes"); + exit(); + } } if (!is_method("MESSAGE")) { From 3bb7c6e92773e82d5065237d124512cef3bcca5a Mon Sep 17 00:00:00 2001 From: karl anderson Date: Fri, 5 Jun 2015 11:32:57 -0700 Subject: [PATCH 2/2] KAZOO-3840: remove ua check and updated log line --- kamailio/default.cfg | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/kamailio/default.cfg b/kamailio/default.cfg index 5a15993..9c07d60 100644 --- a/kamailio/default.cfg +++ b/kamailio/default.cfg @@ -519,10 +519,10 @@ route[PREPARE_INITIAL_REQUESTS] if (loose_route()) { $xavp(regcfg=>match_received) = $su; $xavp(regcfg[0]=>match_contact) = $(ct{nameaddr.uri}); - if(registered("location", "$rz:$Au", 6) == 1 && ($ua =~ "Grandstream") ) { - xlog("L_INFO", "$ci|chk|allowing initial route-set for $Au"); + if(registered("location", "$rz:$Au", 6) == 1) { + xlog("L_INFO", "$ci|log|allowing initial route-set for $Au"); } else { - xlog("L_WARN", "$ci|end|denying initial request with route-set"); + xlog("L_WARN", "$ci|end|dropping initial request with route-set"); sl_send_reply("403", "No pre-loaded routes"); exit(); }