default to a session cookie instead of setting an explicit timeout, weird timezone...

[freeside.git] / bin / cdr-voipswitch.import

diff --git a/bin/cdr-voipswitch.import b/bin/cdr-voipswitch.import
old mode 100644 (file)
new mode 100755 (executable)
index ce5b453..69d0636
--- 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 $cdr = FS::cdr->new(
+  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}),
@@ -138,7 +144,7 @@ while ( $row = $sth->fetchrow_hashref ) {
       uniqueid                => $row->{id_cc},
       orig_call_id            => $row->{clid},
       billsec                 => $row->{effective_duration},
-      lastdata                => $row->{dtmf},
+      #lastdata                => $row->{dtmf},
       disposition             => $row->{call_data},
 
       cdrbatchnum   => $cdrbatchnum,