From 93c031cd06f417bad91a8104df53530c7a87159c Mon Sep 17 00:00:00 2001 From: Harald Welte Date: Mon, 28 Mar 2011 21:12:06 +0200 Subject: [PATCH] Improve racal2pcap for other tests like 6113 call signalling tests The text logs have stuff like UNIT DATA INDICATION which we didn't parse so far --- racal6113/racal2pcap.pl | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/racal6113/racal2pcap.pl b/racal6113/racal2pcap.pl index a89bc13..db0276b 100755 --- a/racal6113/racal2pcap.pl +++ b/racal6113/racal2pcap.pl @@ -80,16 +80,18 @@ while (my $line = ) { } } if ($state == 0) { - if ($line =~ /^MDL_ASSIGN_REQUEST ces = (\d+),tei = (\d+)/) { + if ($line =~ /MDL_ASSIGN_REQUEST ces = (\d+),tei = (\d+)/) { $ces_to_tei{$1} = $2; + } elsif ($line =~ /^\**DL ESTABLISH REQUEST sapi = (\d+), ces = (\d+)/) { + $ces_to_tei{$2} = $1; } - if ($line =~ /^DL DATA INDICATION sapi = (\d+), ces = (\d+)/) { - $tei = $ces_to_tei{$2}; - $sapi = $1; + if ($line =~ /DL (UNIT )?DATA INDICATION sapi = (\d+), ces = (\d+)/) { + $tei = $ces_to_tei{$3}; + $sapi = $2; $state = 1; $msg_hex = ""; - } elsif ($line =~ /^DL_DATA_REQUEST sapi = (\d+)/) { - $sapi = $1; + } elsif ($line =~ /DL_(UNIT)?DATA_REQUEST sapi = (\d+)/) { + $sapi = $2; $state = 2; $msg_hex = ""; }