Menu
▾
▴
callflow:[218] scripts
|
From: <rb...@us...> - 2017-01-15 13:14:06
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head><meta http-equiv="content-type" content="text/html; charset=utf-8" /> <title>callflow:[218] scripts</title> </head> <body> <style type="text/css"><!-- #msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; } #msg dl.meta dt { float: left; width: 6em; font-weight: bold; } #msg dt:after { content:':';} #msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; } #msg dl a { font-weight: bold} #msg dl a:link { color:#fc3; } #msg dl a:active { color:#ff0; } #msg dl a:visited { color:#cc6; } h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; } #msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; } #logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; } #logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; } #logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; } #logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; } #logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; } #logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; } #logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; } #logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; } #logmsg pre { background: #eee; padding: 1em; } #logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;} #logmsg dl { margin: 0; } #logmsg dt { font-weight: bold; } #logmsg dd { margin: 0; padding: 0 0 0.5em 0; } #logmsg dd:before { content:'\00bb';} #logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; } #logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; } #logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; } #logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; } #logmsg table th.Corner { text-align: left; } #logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; } #header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; } #patch { width: 100%; } #patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;} #patch .propset h4, #patch .binary h4 {margin:0;} #patch pre {padding:0;line-height:1.2em;margin:0;} #patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;} #patch .propset .diff, #patch .binary .diff {padding:10px 0;} #patch span {display:block;padding:0 10px;} #patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;} #patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;} #patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;} #patch .lines, .info {color:#888;background:#fff;} --></style> <div id="msg"> <dl class="meta"> <dt>Revision</dt> <dd><a href="http://sourceforge.net/p/callflow/code/218">218</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2017-01-15 13:14:04 +0000 (Sun, 15 Jan 2017)</dd> </dl> <h3>Log Message</h3> <pre>- Make it possible to specify an empty filter (--display-filter "")</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflowversion">callflow.version</a></li> <li><a href="#scriptspcapparsersh">scripts/pcap-parser.sh</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflowversion"></a> <div class="modfile"><h4>Modified: callflow.version (217 => 218)</h4> <pre class="diff"><span> <span class="info">--- callflow.version 2017-01-15 13:07:18 UTC (rev 217) +++ callflow.version 2017-01-15 13:14:04 UTC (rev 218) </span><span class="lines">@@ -1 +1 @@ </span><del>-20170115.02 </del><ins>+20170115.03 </ins></span></pre></div> <a id="scriptspcapparsersh"></a> <div class="modfile"><h4>Modified: scripts/pcap-parser.sh (217 => 218)</h4> <pre class="diff"><span> <span class="info">--- scripts/pcap-parser.sh 2017-01-15 13:07:18 UTC (rev 217) +++ scripts/pcap-parser.sh 2017-01-15 13:14:04 UTC (rev 218) </span><span class="lines">@@ -7,7 +7,7 @@ </span><span class="cx"> unset PREV_DST_IP </span><span class="cx"> unset PREV_CSEQ </span><span class="cx"> </span><del>- tshark -r $PCAP_FILE $FARG "$FVAL" -V > $DESTDIR/callflow.long </del><ins>+ tshark -V -r $PCAP_FILE $FARG "$FVAL" > $DESTDIR/callflow.long </ins><span class="cx"> </span><span class="cx"> # Create a datafile with the data needed to create the callflow. </span><span class="cx"> # This is done in 2 steps, because of the following reasons: the tshark command </span><span class="lines">@@ -15,9 +15,10 @@ </span><span class="cx"> # data. Some additional information about the Call-ID; this field can show up </span><span class="cx"> # in (at least) 2 ways in SIP messages. The field can indeed be called "Call-ID", </span><span class="cx"> # but just "i" in abbreviated SIP messages! Both formats can be used in 1 call. </span><del>- tshark -r $PCAP_FILE $FARG "$FVAL" -t a -T fields -E separator='|' \ </del><ins>+ tshark -r $PCAP_FILE -t a -T fields -E separator='|' \ </ins><span class="cx"> -e frame.number -e ip.src -e ip.dst -e sip.CSeq -e sip.Call-ID \ </span><del>- -e sdp.connection_info -e sdp.media -e sdp.media_attr -e ipv6.src -e ipv6.dst | awk ' </del><ins>+ -e sdp.connection_info -e sdp.media -e sdp.media_attr -e ipv6.src -e ipv6.dst \ + $FARG "$FVAL" | awk ' </ins><span class="cx"> BEGIN { </span><span class="cx"> FS = "|" </span><span class="cx"> OFS = "|" </span><span class="lines">@@ -101,8 +102,9 @@ </span><span class="cx"> # - Megaco has a "|" in its info string, this character is however the </span><span class="cx"> # field separator in the output file, remove it. The actual string </span><span class="cx"> # being removed is " |=". </span><del>- tshark -r $PCAP_FILE $FARG "$FVAL" -t a \ - -o 'gui.column.format: "No.", "%m", "Time", %t, "Protocol", "%p", "srcport", %S, "dstport", %D, "Info", "%i"' | </del><ins>+ tshark -r $PCAP_FILE -t a \ + -o 'gui.column.format: "No.", "%m", "Time", %t, "Protocol", "%p", "srcport", %S, "dstport", %D, "Info", "%i"' \ + $FARG "$FVAL" | </ins><span class="cx"> sed -e 's/^[[:blank:]]*//' \ </span><span class="cx"> -e 's/[[:blank:]]*|=/=/' \ </span><span class="cx"> -e 's/ Status: / /' \ </span></span></pre> </div> </div> <div id="footer">This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.</div> </body> </html> |
