From 2426f590601c19b216121cdf4af92c5c5984addd Mon Sep 17 00:00:00 2001
From: Kirill Solomko <ksolomko@sipwise.com>
Date: Mon, 21 Nov 2016 13:13:26 +0100
Subject: [PATCH] TT#5554 CallRouting: fix use caller_in/callee_in for the
 internal processing

    * caller/callee should not be used after rewrite rules
      but caller_in/callee_in instead as they contain the
      normalised values where caller/callee contain the original ones

Change-Id: I42081a6221945208477a1d0ce80b4d2369099242
---
 lib/NGCP/Panel/Controller/CallRouting.pm | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/NGCP/Panel/Controller/CallRouting.pm b/lib/NGCP/Panel/Controller/CallRouting.pm
index 26466ee581..cac1e19ae4 100644
--- a/lib/NGCP/Panel/Controller/CallRouting.pm
+++ b/lib/NGCP/Panel/Controller/CallRouting.pm
@@ -249,22 +249,22 @@ sub callroutingverify :Chained('/') :PathPart('callroutingverify') :Args(0) {
             }
         }
         my $match = map { $_ =~ s/\*/.*/g;
-                          $data->{caller} =~ /^$_$/;
+                          $data->{caller_in} =~ /^$_$/;
                         } @{$usr_prefs{allowed_clis}};
         if ($match) {
             push @log, sprintf
                 "caller %s is accepted as it matches subscriber's 'allowed_clis'",
-                    $data->{caller};
+                    $data->{caller_in};
         } else {
             push @log, sprintf
                 "caller %s is rejected as it does not match subscriber's 'allowed_clis'",
-                    $data->{caller};
+                    $data->{caller_in};
             if (defined $usr_prefs{allowed_clis_reject_policy}) {
                 SWITCH: for ($usr_prefs{allowed_clis_reject_policy}[0]) {
                     /^override_by_clir$/ && do {
                         push @log,
                             "'allowed_cli' reject policy is 'override_by_clir', anonymising caller";
-                        $data->{caller} = 'anonymous';
+                        $data->{caller_in} = 'anonymous';
                         last SWITCH;
                     };
                     /^override_by_usernpn$/ && do {
@@ -272,7 +272,7 @@ sub callroutingverify :Chained('/') :PathPart('callroutingverify') :Args(0) {
                             "'allowed_cli' reject policy is 'override_by_usernpn'";
                         foreach my $cli (qw(user_cli cli)) {
                             if (defined $usr_prefs{$cli}) {
-                                $data->{caller} = $usr_prefs{$cli}[0];
+                                $data->{caller_in} = $usr_prefs{$cli}[0];
                                 $log[-1] .= sprintf ", taken from '$cli' %s",
                                     $usr_prefs{$cli}[0];
                                 last;
@@ -310,11 +310,11 @@ sub callroutingverify :Chained('/') :PathPart('callroutingverify') :Args(0) {
         $data->{callee_peer_host} = $data->{callee_peer}->voip_peer_hosts->first;
     } else {
         push @log, sprintf "callee subscriber lookup based on %s",
-            $data->{callee};
+            $data->{callee_in};
         $data->{callee_subscriber} =
             NGCP::Panel::Utils::Subscriber::lookup(
                                     c => $c,
-                                    lookup => $data->{callee},
+                                    lookup => $data->{callee_in},
                                  );
         if ($data->{callee_subscriber}) {
             $data->{callee_subscriber_id} = $data->{callee_subscriber}->id;
@@ -325,13 +325,13 @@ sub callroutingverify :Chained('/') :PathPart('callroutingverify') :Args(0) {
                         $sub, $data->{callee_subscriber_id};
         } else {
             foreach my $type (qw(caller callee)) {
-                $data->{$type.'_uri'} = $data->{$type};
+                $data->{$type.'_uri'} = $data->{$type.'_in'};
                 if ($data->{$type.'_domain'}) {
                     $data->{$type.'_uri'} .= '@' . $data->{$type.'_domain'};
                 }
             }
             push @log,
-                sprintf "no callee subscriber found, performing a peer lookup with caller uri %s and callee uri %s and callee %s",
+                sprintf "no callee subscriber found, performing peer lookup with caller uri %s and callee uri %s and callee %s",
                     @{$data}{qw(caller_uri callee_uri callee_in)};
             $data->{callee_peers} =
                 NGCP::Panel::Utils::Peering::lookup(
@@ -450,7 +450,7 @@ sub callroutingverify :Chained('/') :PathPart('callroutingverify') :Args(0) {
 
     # apply outbound rewrite rules
     foreach my $type (qw(caller callee)) {
-        $data->{$type.'_out'} = $data->{$type};
+        $data->{$type.'_out'} = $data->{$type.'_in'};
         next unless $data->{callee_rewrite};
         my $new;
         if ($data->{callee_subscriber_id}) {