callflow-svn Mailing List for Callflow Sequence Diagram Generator (Page 3)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 179
          http://callflow.svn.sourceforge.net/callflow/?rev=179&view=rev
Author:   rbos
Date:     2012-06-22 09:24:59 +0000 (Fri, 22 Jun 2012)
Log Message:
-----------
Ensure that the callflow is time ordered

Modified Paths:
--------------
    callflow

Modified: callflow
===================================================================

--- callflow	2012-06-22 09:04:25 UTC (rev 178)
+++ callflow	2012-06-22 09:24:59 UTC (rev 179)
@@ -62,15 +62,17 @@
 
 function make_long_and_short_caches_of_pcap_trace() {
 
-  tshark -r $inputfile $FARG "$FVAL" -V > $DESTDIR/callflow.long
+  PCAP_FILE=$1
 
+  tshark -r $PCAP_FILE $FARG "$FVAL" -V > $DESTDIR/callflow.long
+
   # Create a datafile with the data needed to create the callflow.
   # This is done in 2 steps, because of the following reasons:  the tshark command
   # with the '-T fields' argument, provides the IP addresses and SIP CSeq and Call-ID
   # data.  Some additional information about the Call-ID; this field can show up
   # in (at least) 2 ways in SIP messages.  The field can indeed be called "Call-ID",
   # but just "i" in abbreviated SIP messages!  Both formats can be used in 1 call.
-  tshark -r $inputfile $FARG "$FVAL" -t a -T fields -E separator='|' \
+  tshark -r $PCAP_FILE $FARG "$FVAL" -t a -T fields -E separator='|' \
     -e frame.number -e ip.src -e ip.dst -e sip.CSeq -e sip.Call-ID \
     -e sdp.connection_info -e sdp.media -e sdp.media_attr | awk '
   BEGIN {
@@ -145,7 +147,7 @@
   # - Megaco has a "|" in its info string, this character is however the
   #   field separator in the output file, remove it.  The actual string
   #   being removed is " |=".
-  tshark -r $inputfile $FARG "$FVAL" -t a \
+  tshark -r $PCAP_FILE $FARG "$FVAL" -t a \
     -o 'column.format: "No.", "%m", "Time", %t, "Protocol", "%p", "srcport", %S, "dstport", %D, "Info", "%i"' |
       sed -e 's/^[[:blank:]]*//' \
         -e 's/[[:blank:]]*|=/=/' \
@@ -396,22 +398,39 @@
 
     LOG_MSG_LINE_NR++
 
-  }' $inputfile
+  }' $1
 }
 
 function make_long_and_short_caches() {
 
+  # The make_long_and_short_caches_of_..... functions result
+  # in 2 files, being $DESTDIR/callflow.short and $DESTDIR/callflow.long
+
   # Try to be smart and figure out the format of the input file
   INPUT_FILE_FORMAT=$(file $inputfile | cut -d: -f2)
   case $INPUT_FILE_FORMAT in
   *ASCII*)
-     make_long_and_short_caches_of_broadworks_log
+     make_long_and_short_caches_of_broadworks_log $inputfile
      ;;
   *)
-     # If file type unknown, assume a network trace
-     make_long_and_short_caches_of_pcap_trace
+     # Any other file type is considered a network trace
+     make_long_and_short_caches_of_pcap_trace $inputfile
   esac
 
+  # It sometimes happens that the frames in the trace are not time
+  # ordered (they are ordered at frame number), for this reason
+  # re-order the callflow.short cache on time.
+  # Example of a wrong order:
+  # 13.14.15.625340|1|.....
+  # 13.14.15.625360|2|.....
+  # 13.14.15.625350|3|..... <<< this one is at the wrong spot
+  # The timestamp is the first field in the callflow.short cache, hence
+  # re-ordering on time is rather easy using just sort.
+  sort -o $DESTDIR/callflow.short $DESTDIR/callflow.short
+
+  # Store the input characteristics.  It will be used in subsequent runs
+  # to determine that the cache can be used, or that the input must be
+  # processed again.
   TRACE_FILE=$(basename $inputfile)
   MD5SUM=$(md5sum $inputfile | awk '{print $1}')
   echo "$TRACE_FILE|$MD5SUM|$FVAL" > $DESTDIR/metadb
@@ -751,7 +770,7 @@
   make_long_and_short_caches
 }
 
-# We have to check if short and long file exist
+# Check that the short and long caches exist
 if [ ! -f $DESTDIR/callflow.long ]; then
   echo "$PRGNAME: error: File callflow.long does not exist!"
   exit 1;

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





2010	Jan	Feb	Mar	Apr	May (33)	Jun (14)	Jul (1)	Aug	Sep	Oct	Nov	Dec
2011	Jan	Feb	Mar	Apr	May (19)	Jun (13)	Jul	Aug (1)	Sep (9)	Oct (8)	Nov	Dec
2012	Jan	Feb	Mar	Apr	May	Jun (14)	Jul	Aug	Sep (7)	Oct (7)	Nov	Dec
2014	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (3)	Nov	Dec
2015	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (1)	Dec
2016	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec (15)
2017	Jan (11)	Feb	Mar (4)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

callflow-svn Mailing List for Callflow Sequence Diagram Generator (Page 3)

Callflow Sequence Diagram Generator

callflow-svn — SVN developers mailing list