- my ($src) = $row->{'caller_id'} =~ /^sip:(\d+)@/;
- my ($dst) = $row->{'callee_id'} =~ /^sip:(\d+)@/;
+
+ #i guess now we're NANPA-centric, but at least we warn on non-numeric numbers
+ my $src = '';
+ my $src_ip = '';
+ if ( $row->{'caller_id'} =~ /^sip:(\+1?)?(\w+)@(.*)/ ) {
+ $src = $2;
+ my $rest = $3;
+ if ($rest =~ /^([\d\.]{7,15})/) {
+ # canonicalize it so that ascii sort order works
+ $src_ip = sprintf('%03d.%03d.%03d.%03d', split('\.', $1));
+ }
+ } else {
+ warn "unparseable caller_id ". $row->{'caller_id'}. "\n";
+ }
+
+ my $dst = '';
+ my $dst_ip = '';
+ if ( $row->{'callee_id'} =~ /^sip:(\+1?)?(\w+)@(.*)/ ) {
+ $dst = $2;
+ my $rest = $3;
+ if ($rest =~ /^([\d\.]{7,15})/) {
+ $dst_ip = sprintf('%03d.%03d.%03d.%03d', split('\.', $1));
+ }
+ } else {
+ warn "unparseable callee_id ". $row->{'callee_id'}. "\n";
+ }