cleanup unused redirect logic

kamailio/default.cfg

@@ -69,7 +69,6 @@ loadmodule "sdpops.so"
 ######## Generic Hash Table container in shared memory ########
 loadmodule "htable.so"
 modparam("htable", "htable", "associations=>size=16;autoexpire=7200")
-modparam("htable", "htable", "redirects=>size=16;autoexpire=5")
 modparam("htable", "db_url", "KAZOO_DB_URL")
 
 ####### RTIMER module ##########
@@ -725,12 +724,6 @@ onreply_route[INTERNAL_REPLY]
         !isflagset(FLAG_SESSION_PROGRESS) &&
         t_check_status("(180)|(183)|(200)")
         ) {
-        if ($avp(AVP_REDIRECT_KEY) != $null &&
-            $sht(redirects=>$avp(AVP_REDIRECT_KEY)) != $null
-            ) {
-            xlog("L_INFO", "$ci|log|removing redirect mapping $avp(AVP_REDIRECT_KEY)\n");
-            $sht(redirects=>$avp(AVP_REDIRECT_KEY)) = $null;
-        }
         xlog("L_INFO", "$ci|log|call setup, now ignoring abnormal termination\n");
         setflag(FLAG_SESSION_PROGRESS);
     }
@@ -755,16 +748,8 @@ failure_route[INTERNAL_FAULT]
     }
 
     # Handle redirects
-    if (t_check_status("302")) {
-        if($T_rpl($hdr(X-Redirect-Server)) != $null) {
-           route(INTERNAL_REDIRECT);
-        }
-    } else if (!t_check_status("407") &&
-               $avp(AVP_REDIRECT_KEY) != $null &&
-               $sht(redirects=>$avp(AVP_REDIRECT_KEY)) != $null
-               ) {
-        xlog("L_INFO", "$ci|log|removing redirect mapping $avp(AVP_REDIRECT_KEY)\n");
-        $sht(redirects=>$avp(AVP_REDIRECT_KEY)) = $null;
+    if (t_check_status("302") && $T_rpl($hdr(X-Redirect-Server)) != $null) {
+        route(INTERNAL_REDIRECT);
     }
 
     remove_hf_re("^X-.*");

kamailio/dispatcher-role-5.1.cfg

@@ -139,15 +139,7 @@ route[DISPATCHER_FIND_ROUTES]
     }
 
     $var(user_source) = $(ct{tobody.user}) + "@" + $si + ":" + $sp;
-    $var(redirect) = @from.uri.user + "@" + @from.uri.host + "->"
-        + @ruri.user + "@" + @ruri.host;
-    if ($sht(redirects=>$var(redirect)) != $null) {
-        $var(prefered_route) = $sht(redirects=>$var(redirect));
-        xlog("L_INFO", "$ci|log|found redirect for $var(redirect)\n");
-        if (route(DISPATCHER_PREFERRED_ROUTE)) {
-            $avp(AVP_REDIRECT_KEY) = $var(redirect);
-        }
-    } else if ($sht(associations=>$var(user_source)) != $null) {
+    if ($sht(associations=>$var(user_source)) != $null) {
         if($sel(cfg_get.kazoo.dispatcher_route_to_associated_media) == 1) {
             $var(prefered_route) = $sht(associations=>$var(user_source));
             xlog("L_INFO", "$ci|route|found association for contact uri $var(user_source)\n");

kamailio/dispatcher-role-5.2.cfg

@@ -142,18 +142,7 @@ route[DISPATCHER_FIND_ROUTES]
     route(PRINT_ROUTES);
 
     $var(user_source) = $(ct{tobody.user}) + "@" + $si + ":" + $sp;
-    $var(redirect) = @from.uri.user + "@" + @from.uri.host + "->"
-        + @ruri.user + "@" + @ruri.host;
-    if ($sht(redirects=>$var(redirect)) != $null) {
-        $var(prefered_route) = $sht(redirects=>$var(redirect));
-        xlog("L_INFO", "$ci|route|found redirect for $var(redirect)\n");
-        if (route(DISPATCHER_PREFERRED_ROUTE)) {
-            $avp(AVP_REDIRECT_KEY) = $var(redirect);
-            xlog("L_INFO", "$ci|route|REORDER OK $var(redirect)\n");
-        } else {
-            xlog("L_INFO", "$ci|route|REORDER KO $var(redirect)\n");
-        }
-    } else if ($sht(associations=>$var(user_source)) != $null) {
+    if ($sht(associations=>$var(user_source)) != $null) {
         if($sel(cfg_get.kazoo.dispatcher_route_to_associated_media) == 1) {
             $var(prefered_route) = $sht(associations=>$var(user_source));
             xlog("L_INFO", "$ci|route|found association for contact uri $var(user_source)\n");