[freeside-commits] branch master updated. 08c277b9867608b9ba8ddc8ae8c67d1ca8bb3ff5

[Ivan]

The branch, master has been updated
       via  08c277b9867608b9ba8ddc8ae8c67d1ca8bb3ff5 (commit)
      from  bcdf7aa475b84adf5efc0bc775e84975f7e830a5 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 08c277b9867608b9ba8ddc8ae8c67d1ca8bb3ff5
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sat Feb 15 17:30:39 2014 -0800

    import public IP in voipswitch CDRs, RT#26228

diff --git a/bin/cdr-voipswitch.import b/bin/cdr-voipswitch.import
index 817c4bc..a8ab9d9 100644
--- a/bin/cdr-voipswitch.import
+++ b/bin/cdr-voipswitch.import
@@ -121,11 +121,17 @@ my $imported = 0;
 my $row;
 while ( $row = $sth->fetchrow_hashref ) {
 
+  my $ip = $row->{ip_number};
+  if ( $ip =~ /^([\d\.]+)\/([\d\.]*)$/ ) {
+    $ip = $1;
+    #$nat_ip = $2;
+  }
+
   my $cdr = FS::cdr->new({
       cdrid                   => $row->{id_call},
       charged_party           => sprintf('%.2d', $row->{client_type}).
                                  $row->{id_client},
-      src_ip_addr             => $row->{ip_number},
+      src_ip_addr             => $ip,
       src                     => $row->{caller_id},
       dst                     => $row->{called_number},
       startdate               => str2time($row->{call_start}),

-----------------------------------------------------------------------

Summary of changes:
 bin/cdr-voipswitch.import |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)