Pretty-print timestamp in call flows.

agranig/1_0_subfix
Andreas Granig 13 years ago
parent 036caca71e
commit bd60a1dbda

@ -125,17 +125,14 @@ sub get_packet :Chained('callflow_base') :PathPart('packet') :Args() {
my $pkg = { $packet->get_inflated_columns };
my $t = DateTime->from_epoch(
epoch => $pkg->{timestamp},
time_zone => DateTime::TimeZone->new(name => 'local'),
);
my $tstamp = $t->ymd('-') . ' ' . $t->hms(':') . '.' . $t->millisecond;
my $t = $packet->timestamp;
my $tstamp = $t->ymd('-') . ' ' . $t->hms(':') . '.' . $t->microsecond;
$pkg->{payload} = encode_entities($pkg->{payload});
$pkg->{payload} =~ s/\r//g;
$pkg->{payload} =~ s/([^\n]{120})/$1<br\/>/g;
$pkg->{payload} =~ s/^([^\n]+)\n/<b>$1<\/b>\n/;
$pkg->{payload} = $tstamp .' ('.$pkg->{timestamp}.')<br/>'.
$pkg->{payload} = $tstamp .' ('.$t->hires_epoch.')<br/>'.
$pkg->{src_ip}.':'.$pkg->{src_port}.' &rarr; '. $pkg->{dst_ip}.':'.$pkg->{dst_port}.'<br/><br/>'.
$pkg->{payload};
$pkg->{payload} =~ s/\n([a-zA-Z0-9\-_]+\:)/\n<b>$1<\/b>/g;

@ -2465,17 +2465,14 @@ sub get_packet :Chained('callflow_base') :PathPart('packet') :Args() {
my $pkg = { $packet->get_inflated_columns };
my $t = DateTime->from_epoch(
epoch => $pkg->{timestamp},
time_zone => DateTime::TimeZone->new(name => 'local'),
);
my $tstamp = $t->ymd('-') . ' ' . $t->hms(':') . '.' . $t->millisecond;
my $t = $packet->timestamp;
my $tstamp = $t->ymd('-') . ' ' . $t->hms(':') . '.' . $t->microsecond;
$pkg->{payload} = encode_entities($pkg->{payload});
$pkg->{payload} =~ s/\r//g;
$pkg->{payload} =~ s/([^\n]{120})/$1<br\/>/g;
$pkg->{payload} =~ s/^([^\n]+)\n/<b>$1<\/b>\n/;
$pkg->{payload} = $tstamp .' ('.$pkg->{timestamp}.')<br/>'.
$pkg->{payload} = $tstamp .' ('.$t->hires_epoch.')<br/>'.
$pkg->{src_ip}.':'.$pkg->{src_port}.' &rarr; '. $pkg->{dst_ip}.':'.$pkg->{dst_port}.'<br/><br/>'.
$pkg->{payload};
$pkg->{payload} =~ s/\n([a-zA-Z0-9\-_]+\:)/\n<b>$1<\/b>/g;

@ -175,7 +175,7 @@ sub process_callmap {
my $y_offset = $canvas_margin + $canvas_pkg_distance;
$i = 1;
foreach my $packet(@{$packets}) {
my $time_offset = defined $last_timestamp ? ($packet->timestamp - $last_timestamp) : 0;
my $time_offset = defined $last_timestamp ? ($packet->timestamp->hires_epoch - $last_timestamp->hires_epoch) : 0;
$last_timestamp = $packet->timestamp;
my $from_x = $uas_pos_x{$packet->src_ip.':'.$packet->src_port};
my $to_x = $uas_pos_x{$packet->dst_ip.':'.$packet->dst_port};

@ -16,7 +16,7 @@
<li><a href="[% c.uri_for('/ncos') %]">NCOS Levels</a></li>
<li><a href="[% c.uri_for('/sound') %]">Sound Sets</a></li>
<li><a href="[% c.uri_for('/security') %]">Security Bans</a></li>
<li><a href="[% c.uri_for('/security') %]">SIP Call Flows</a></li>
<li><a href="[% c.uri_for('/callflow') %]">SIP Call Flows</a></li>
</ul>
</li>
[% # vim: set tabstop=4 syntax=html expandtab: -%]

Loading…
Cancel
Save