Merge remote-tracking branch 'origin/KAZOO-3792' into 3.20

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);

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;
         }
     }