|
From: <rb...@us...> - 2014-10-23 16:59:54
|
<!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:[197] 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/197">197</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2014-10-23 16:59:51 +0000 (Thu, 23 Oct 2014)</dd> </dl> <h3>Log Message</h3> <pre>Corrected typo: unknow -> unknown</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflow">callflow</a></li> <li><a href="#callflowversion">callflow.version</a></li> <li><a href="#scriptsremovedupssh">scripts/removedups.sh</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflow"></a> <div class="modfile"><h4>Modified: callflow (196 => 197)</h4> <pre class="diff"><span> <span class="info">--- callflow 2012-10-14 12:34:52 UTC (rev 196) +++ callflow 2014-10-23 16:59:51 UTC (rev 197) </span><span class="lines">@@ -263,7 +263,7 @@ </span><span class="cx"> ;; </span><span class="cx"> --version|-v) echo "$PRGNAME version: $PRGVRSN"; exit;; </span><span class="cx"> --) shift; break;; </span><del>- *) echo "unknow argument \"$1\""; exit $ERR_ARGUMENT;; </del><ins>+ *) echo "unknown argument \"$1\""; exit $ERR_ARGUMENT;; </ins><span class="cx"> esac </span><span class="cx"> shift </span><span class="cx"> done </span></span></pre></div> <a id="callflowversion"></a> <div class="modfile"><h4>Modified: callflow.version (196 => 197)</h4> <pre class="diff"><span> <span class="info">--- callflow.version 2012-10-14 12:34:52 UTC (rev 196) +++ callflow.version 2014-10-23 16:59:51 UTC (rev 197) </span><span class="lines">@@ -1 +1 @@ </span><del>-20120919 </del><ins>+20141023 </ins></span></pre></div> <a id="scriptsremovedupssh"></a> <div class="modfile"><h4>Modified: scripts/removedups.sh (196 => 197)</h4> <pre class="diff"><span> <span class="info">--- scripts/removedups.sh 2012-10-14 12:34:52 UTC (rev 196) +++ scripts/removedups.sh 2014-10-23 16:59:51 UTC (rev 197) </span><span class="lines">@@ -181,7 +181,7 @@ </span><span class="cx"> done | awk '{print $1}' | sort -n > $TMPDIR/pckts.$$ </span><span class="cx"> </span><span class="cx"> else </span><del>- echo "error: unknow mode: \"$MODE\"" >&2 </del><ins>+ echo "error: unknown mode: \"$MODE\"" >&2 </ins><span class="cx"> exit 1 </span><span class="cx"> fi </span><span class="cx"> </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> |
|
From: <rb...@us...> - 2015-11-21 16:12:30
|
<!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:[200] 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/200">200</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2015-11-21 16:12:28 +0000 (Sat, 21 Nov 2015)</dd> </dl> <h3>Log Message</h3> <pre>Bug fixes</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflowversion">callflow.version</a></li> <li><a href="#scriptslong2htmlawk">scripts/long2html.awk</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 (199 => 200)</h4> <pre class="diff"><span> <span class="info">--- callflow.version 2014-10-23 17:33:31 UTC (rev 199) +++ callflow.version 2015-11-21 16:12:28 UTC (rev 200) </span><span class="lines">@@ -1 +1 @@ </span><del>-20141023 </del><ins>+20151121 </ins></span></pre></div> <a id="scriptslong2htmlawk"></a> <div class="modfile"><h4>Modified: scripts/long2html.awk (199 => 200)</h4> <pre class="diff"><span> <span class="info">--- scripts/long2html.awk 2014-10-23 17:33:31 UTC (rev 199) +++ scripts/long2html.awk 2015-11-21 16:12:28 UTC (rev 200) </span><span class="lines">@@ -16,7 +16,8 @@ </span><span class="cx"> first = 1 </span><span class="cx"> } </span><span class="cx"> </span><del>-/^Frame [0-9]+: (.*)/ { </del><ins>+# See bug #7 +/^Frame [0-9]+:? (.*)/ { </ins><span class="cx"> # New frame, closing <pre> and html> from previous frame before compute new filename </span><span class="cx"> if (first == 0) { </span><span class="cx"> </span></span></pre></div> <a id="scriptspcapparsersh"></a> <div class="modfile"><h4>Modified: scripts/pcap-parser.sh (199 => 200)</h4> <pre class="diff"><span> <span class="info">--- scripts/pcap-parser.sh 2014-10-23 17:33:31 UTC (rev 199) +++ scripts/pcap-parser.sh 2015-11-21 16:12:28 UTC (rev 200) </span><span class="lines">@@ -88,7 +88,7 @@ </span><span class="cx"> # field separator in the output file, remove it. The actual string </span><span class="cx"> # being removed is " |=". </span><span class="cx"> tshark -r $PCAP_FILE $FARG "$FVAL" -t a \ </span><del>- -o 'column.format: "No.", "%m", "Time", %t, "Protocol", "%p", "srcport", %S, "dstport", %D, "Info", "%i"' | </del><ins>+ -o 'gui.column.format: "No.", "%m", "Time", %t, "Protocol", "%p", "srcport", %S, "dstport", %D, "Info", "%i"' | </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> |
|
From: <rb...@us...> - 2016-12-10 13:28:07
|
<!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:[201] 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/201">201</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2016-12-10 13:28:04 +0000 (Sat, 10 Dec 2016)</dd> </dl> <h3>Log Message</h3> <pre>white space cleanup</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflow">callflow</a></li> <li><a href="#scriptsremovedupssh">scripts/removedups.sh</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflow"></a> <div class="modfile"><h4>Modified: callflow (200 => 201)</h4> <pre class="diff"><span> <span class="info">--- callflow 2015-11-21 16:12:28 UTC (rev 200) +++ callflow 2016-12-10 13:28:04 UTC (rev 201) </span><span class="lines">@@ -270,7 +270,7 @@ </span><span class="cx"> done </span><span class="cx"> </span><span class="cx"> inputfile="$1" </span><del>-if [[ ! -f "$inputfile" ]]; then </del><ins>+if [[ ! -f "$inputfile" ]]; then </ins><span class="cx"> echo "$PRGNAME: error: Input file ($inputfile) does not exists!" </span><span class="cx"> exit 1; </span><span class="cx"> else </span><span class="lines">@@ -350,14 +350,14 @@ </span><span class="cx"> [[ $ARCHIVE_TYPE != "files" ]] && { </span><span class="cx"> </span><span class="cx"> ARCHIVE_NAME=$(basename $DESTDIR) </span><del>- case $ARCHIVE_TYPE in - bz2|bzip2) </del><ins>+ case $ARCHIVE_TYPE in + bz2|bzip2) </ins><span class="cx"> ARCHIVE_FILE=$ARCHIVE_NAME.tar.bz2 </span><span class="cx"> ;; </span><span class="cx"> *) </span><span class="cx"> ARCHIVE_FILE=$ARCHIVE_NAME.$ARCHIVE_TYPE </span><span class="cx"> ;; </span><del>- esac </del><ins>+ esac </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> fi </span></span></pre></div> <a id="scriptsremovedupssh"></a> <div class="modfile"><h4>Modified: scripts/removedups.sh (200 => 201)</h4> <pre class="diff"><span> <span class="info">--- scripts/removedups.sh 2015-11-21 16:12:28 UTC (rev 200) +++ scripts/removedups.sh 2016-12-10 13:28:04 UTC (rev 201) </span><span class="lines">@@ -36,7 +36,7 @@ </span><span class="cx"> ) </span><span class="cx"> </span><span class="cx"> if [[ $MODE = "REMOVE_MIRROR_DUPS" ]]; then </span><del>- </del><ins>+ </ins><span class="cx"> ( echo "$MODE is deprecated, may be removed in the future without notice," </span><span class="cx"> echo " please use \"REMOVE_MIRROR_DUPS_2\" instead." </span><span class="cx"> ) >&2 </span><span class="lines">@@ -50,7 +50,7 @@ </span><span class="cx"> FRAMES[NR] = $0 </span><span class="cx"> </span><span class="cx"> } END { </span><del>- </del><ins>+ </ins><span class="cx"> # Print first frame number </span><span class="cx"> split(FRAMES[1], F, " ") </span><span class="cx"> print F[1] </span><span class="lines">@@ -60,7 +60,7 @@ </span><span class="cx"> for (i=2; i<=MAX; i++) { </span><span class="cx"> </span><span class="cx"> split(FRAMES[i], F, " ") </span><del>- CUR_MD5 = F[2] </del><ins>+ CUR_MD5 = F[2] </ins><span class="cx"> </span><span class="cx"> if (CUR_MD5 != PREV_MD5) { </span><span class="cx"> # Print the current frame number </span><span class="lines">@@ -117,7 +117,7 @@ </span><span class="cx"> SEEN = "no" </span><span class="cx"> CONT = 1 </span><span class="cx"> while (CONT) { </span><del>- </del><ins>+ </ins><span class="cx"> if (DEBUG) printf "DEBUG 1: i = %d, Frame = %d, Time = %s, MD5SUM = %s\n", i, FRAME[i], TIME[i], MD5SUM[i] </span><span class="cx"> if (DEBUG) printf "DEBUG 2: p = %d, Frame = %d, Time = %s, MD5SUM = %s\n", p, FRAME[p], TIME[p], MD5SUM[p] </span><span class="cx"> </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> |
|
From: <rb...@us...> - 2016-12-16 08:10:08
|
<!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:[203] 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/203">203</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2016-12-16 08:10:06 +0000 (Fri, 16 Dec 2016)</dd> </dl> <h3>Log Message</h3> <pre>Repeat node labels, every 28th line. Patch provided by Zoltan Miricz.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#AUTHORS">AUTHORS</a></li> <li><a href="#scriptscallflowawk">scripts/callflow.awk</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="AUTHORS"></a> <div class="modfile"><h4>Modified: AUTHORS (202 => 203)</h4> <pre class="diff"><span> <span class="info">--- AUTHORS 2016-12-10 15:35:02 UTC (rev 202) +++ AUTHORS 2016-12-16 08:10:06 UTC (rev 203) </span><span class="lines">@@ -1,9 +1,10 @@ </span><span class="cx"> This is a list of the Callflow authors (in alphabetical order). </span><span class="cx"> </span><span class="cx"> Callflow is available thanks to the work of: </span><del>-Richard Bos, -Kevin Chmilar, -Alan Hawrylyshen, -Cullen Jennings, -Arnaud Morin, </del><ins>+Richard Bos +Kevin Chmilar +Alan Hawrylyshen +Cullen Jennings +Zoltan Miricz +Arnaud Morin </ins><span class="cx"> Jon Ringle </span></span></pre></div> <a id="scriptscallflowawk"></a> <div class="modfile"><h4>Modified: scripts/callflow.awk (202 => 203)</h4> <pre class="diff"><span> <span class="info">--- scripts/callflow.awk 2016-12-10 15:35:02 UTC (rev 202) +++ scripts/callflow.awk 2016-12-16 08:10:06 UTC (rev 203) </span><span class="lines">@@ -7,7 +7,10 @@ </span><span class="cx"> lookup[hosts[i]] = i; </span><span class="cx"> printf "<!-- lookup['%s'] = %d -->\n", hosts[i], i; </span><span class="cx"> } </span><del>- </del><ins>+ # Define the vertical distance between the node labels + Z = 0; + # Where the first line should start after node label + Q = 0; </ins><span class="cx"> w = (numHosts-1) * xHostSpace + leftMargin + rightMargin; </span><span class="cx"> h = numLines * yLineSpace + topMargin + bottomMargin; </span><span class="cx"> </span><span class="lines">@@ -30,7 +33,8 @@ </span><span class="cx"> </span><span class="cx"> printf "<text x=\"%d\" y=\"%d\" class=\"label host-text\">%s</text>\n", </span><span class="cx"> leftMargin+(i*xHostSpace), </span><del>- ystart-(15*(i%2)+2), </del><ins>+ # Make the node labes inline + ystart, </ins><span class="cx"> label[i]; </span><span class="cx"> </span><span class="cx"> printf "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" class=\"element-line\" />\n", leftMargin+(i*xHostSpace), ystart, leftMargin+(i*xHostSpace), yend; </span><span class="lines">@@ -114,7 +118,21 @@ </span><span class="cx"> { </span><span class="cx"> y = NR; </span><span class="cx"> y = y * yLineSpace + ystart; </span><del>- </del><ins>+ y = y + (Q * 20); + Z = Z + 1; + # Insert Node labels after every 28th lines + if ((Z % 28 == 1) && (Z != 1)){ + for(i=0;i<numTraces;i++) { + if (label[i] == "") + label[i] = hosts[i]; + printf "<text x=\"%d\" y=\"%d\" class=\"label host-text\">%s</text>\n", + leftMargin+(i*xHostSpace), + y, + label[i]; + } + y = y + 20; + Q = Q + 1; + } </ins><span class="cx"> if ($0 ~ "^#") { </span><span class="cx"> </span><span class="cx"> # The "!" is the link identifier </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> |
|
From: <rb...@us...> - 2016-12-16 12:06:51
|
<!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:[204] 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/204">204</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2016-12-16 12:06:48 +0000 (Fri, 16 Dec 2016)</dd> </dl> <h3>Log Message</h3> <pre>- Add IPv6 support - Remove SIP duplicates (if an SIP message arrives, for the second time, within 2 seconds from its previous message and it is the same message) Patch provided by Zoltan Miricz</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflow">callflow</a></li> <li><a href="#scriptspcapparsersh">scripts/pcap-parser.sh</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflow"></a> <div class="modfile"><h4>Modified: callflow (203 => 204)</h4> <pre class="diff"><span> <span class="info">--- callflow 2016-12-16 08:10:06 UTC (rev 203) +++ callflow 2016-12-16 12:06:48 UTC (rev 204) </span><span class="lines">@@ -79,17 +79,6 @@ </span><span class="cx"> make_long_and_short_caches_of_pcap_trace $inputfile </span><span class="cx"> esac </span><span class="cx"> </span><del>- # 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 - </del><span class="cx"> # Store the input characteristics. It will be used in subsequent runs </span><span class="cx"> # to determine that the cache can be used, or that the input must be </span><span class="cx"> # processed again. </span></span></pre></div> <a id="scriptspcapparsersh"></a> <div class="modfile"><h4>Modified: scripts/pcap-parser.sh (203 => 204)</h4> <pre class="diff"><span> <span class="info">--- scripts/pcap-parser.sh 2016-12-16 08:10:06 UTC (rev 203) +++ scripts/pcap-parser.sh 2016-12-16 12:06:48 UTC (rev 204) </span><span class="lines">@@ -1,6 +1,11 @@ </span><span class="cx"> function make_long_and_short_caches_of_pcap_trace() { </span><span class="cx"> </span><span class="cx"> PCAP_FILE=$1 </span><ins>+ unset PREV_CALL_ID + unset PREV_TIME + unset PREV_SRC_IP + unset PREV_DST_IP + unset PREV_CSEQ </ins><span class="cx"> </span><span class="cx"> tshark -r $PCAP_FILE $FARG "$FVAL" -V > $DESTDIR/callflow.long </span><span class="cx"> </span><span class="lines">@@ -12,7 +17,7 @@ </span><span class="cx"> # but just "i" in abbreviated SIP messages! Both formats can be used in 1 call. </span><span class="cx"> tshark -r $PCAP_FILE $FARG "$FVAL" -t a -T fields -E separator='|' \ </span><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 | awk ' </del><ins>+ -e sdp.connection_info -e sdp.media -e sdp.media_attr -e ipv6.src -e ipv6.dst | awk ' </ins><span class="cx"> BEGIN { </span><span class="cx"> FS = "|" </span><span class="cx"> OFS = "|" </span><span class="lines">@@ -52,17 +57,26 @@ </span><span class="cx"> # </span><span class="cx"> # No Description </span><span class="cx"> # 1 frame.number </span><del>- # 2 tracefile - # 3 ip.src - # 4 ip.dst - # 5 sip.CSeq - # 6 sip.Call-ID - # 7 sdp.connection_info (ip addr) - # 8 sdp.media (audio port) - # 9 sdp.media (audio format) - # 10 sdp.media_attr (audio direction (sendrecv, sendonly, recvonly)) - printf "%s||%s|%s|%s|{%s}|%s|%s|%s|%s\n", $1, $2, $3, $4, CALLID[$5], $6, PORT, FORMAT, DIRECTION </del><ins>+ # 2 ip.src + # 3 ip.dst + # 4 sip.CSeq + # 5 sip.Call-ID + # 6 sdp.connection_info (ip addr) + # 7 sdp.media (audio port audio format) + # 8 sdp.media_attr (audio direction (sendrecv, sendonly, recvonly)) + # 9 ipv6.src + # 10 ipv6.dst + # Its an IPv6 address we have to fill source and destination address with the correct IP version + if (length($10) > 1) { + CURR_SRC_IP=$9 + CURR_DST_IP=$10 + } else { + CURR_SRC_IP=$2 + CURR_DST_IP=$3 + } </ins><span class="cx"> </span><ins>+ printf "%s||%s|%s|%s|{%s}|%s|%s|%s|%s\n", $1, CURR_SRC_IP, CURR_DST_IP, $4, CALLID[$5], $6, PORT, FORMAT, DIRECTION + </ins><span class="cx"> }' > $TMPDIR/${PRGNAME}-tshark-1.$$ </span><span class="cx"> </span><span class="cx"> # The second step in getting SIP data required by callflow. This step delivers </span><span class="lines">@@ -88,7 +102,7 @@ </span><span class="cx"> # field separator in the output file, remove it. The actual string </span><span class="cx"> # being removed is " |=". </span><span class="cx"> tshark -r $PCAP_FILE $FARG "$FVAL" -t a \ </span><del>- -o 'gui.column.format: "No.", "%m", "Time", %t, "Protocol", "%p", "srcport", %S, "dstport", %D, "Info", "%i"' | </del><ins>+ -o 'column.format: "No.", "%m", "Time", %t, "Protocol", "%p", "srcport", %S, "dstport", %D, "Info", "%i"' | </ins><span class="cx"> sed -e 's/^[[:blank:]]*//' \ </span><span class="cx"> -e 's/[[:blank:]]*|=/=/' \ </span><span class="cx"> -e 's/ Status: / /' \ </span><span class="lines">@@ -178,15 +192,98 @@ </span><span class="cx"> } </span><span class="cx"> </span><span class="cx"> # Perform the actual mapping of the input to the output fields </span><del>- L = length(A) - for (i = 1; i < L; i++) { - printf "%s|", $A[i] </del><ins>+ L = length(A) + for (i = 1; i < L; i++) { + printf "%s|", $A[i] + } + + printf "%s\n", $A[L] + + + }' $TMPDIR/${PRGNAME}-tshark-3.$$ > $TMPDIR/${PRGNAME}-tshark-4.$$ + + # 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 $TMPDIR/${PRGNAME}-tshark-4.$$ $TMPDIR/${PRGNAME}-tshark-4.$$ + + awk 'BEGIN { + FS = "|" + OFS = "|" + } + { + # The order in which the fields will be arranged in the output file + # + # No Description + # 1 time + # 2 tracefile + # 3 frame.number + # 4 ip.src + # 5 ip.srcport + # 6 session information + # 7 ip.dst + # 8 ip.dstport + # 9 protocol + # 10 info field + # 11 SIP CSeq + # 12 Connection info (IP addr) + # 13 Media info (Port) + # 14 Media info (Protocol) + # 15 Media attribute direction + + # Convert timestamp onto milliseconds to calculate time difference between packets + TIME=substr($1,1,8) + $1 = substr($1,1,10) + m=split(TIME,t,":") + n=split(PREV_TIME,w,":") + FIRSTTIME= (t[1]*3600) + (t[2]*60) + t[3] + SECONDTIME= (w[1]*3600) + (w[2]*60) + w[3] + TIME_DIFF=(FIRSTTIME - SECONDTIME) + + # Store current IPs + CURR_SRC_IP=$4 + CURR_DST_IP=$7 + + # 1) if protocol is SIP lets start the duplication removal + # 2) if previous src&dst IPs are different > OK + # 3) if IPs are the same and Call-Id, CSEQ is same, but time diff is bigger than 2sec > OK (retransmission) + # 4) if diff is less than 2 sec > drop the packet + # 5) keep everything else + if ($9 ~ "SIP") { + if ((PREV_SRC_IP != CURR_SRC_IP) && + (PREV_DST_IP != CURR_DST_IP)) { + print $0 + } else if ((PREV_CALL_ID == $10) && + (PREV_CSEQ == $11) && + (TIME_DIFF >= 2)) { + print $0 + } else if ((PREV_CALL_ID == $10) && + (PREV_CSEQ == $11) && + (TIME_DIFF < 2)) { + # Do Nothing just drop the packet (silently) + } else { + print $0 + } + } else { + # Not an SIP Packet -> do not remove duplicates + print $0 </ins><span class="cx"> } </span><span class="cx"> </span><del>- printf "%s\n", $A[L] </del><ins>+ # Store necessary information to eliminate duplicated packets in the next round. + PREV_TIME = TIME + PREV_CALL_ID = $10 + PREV_CSEQ = $11 + PREV_SRC_IP = CURR_SRC_IP + PREV_DST_IP = CURR_DST_IP </ins><span class="cx"> </span><del>- }' $TMPDIR/${PRGNAME}-tshark-3.$$ > $DESTDIR/callflow.short </del><ins>+ }' $TMPDIR/${PRGNAME}-tshark-4.$$ > $DESTDIR/callflow.short </ins><span class="cx"> </span><del>- rm $TMPDIR/${PRGNAME}-tshark-[123].$$ </del><ins>+ rm $TMPDIR/${PRGNAME}-tshark-[1234].$$ </ins><span class="cx"> } </span><span class="cx"> </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> |
|
From: <rb...@us...> - 2016-12-17 16:17:35
|
<!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:[208] 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/208">208</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2016-12-17 16:17:33 +0000 (Sat, 17 Dec 2016)</dd> </dl> <h3>Log Message</h3> <pre>- Direct the browser command line output to /dev/null - Introduce new argument: --lines-between-nodes. This argument allows the callflow user to specify the number of lines after which the node labels are repeated. Value is not restricted nor checked, a sensible value is between 5 and 30. Default value: 28.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflow">callflow</a></li> <li><a href="#callflowversion">callflow.version</a></li> <li><a href="#confcallflowconf">conf/callflow.conf</a></li> <li><a href="#mancallflow1">man/callflow.1</a></li> <li><a href="#scriptscallflowawk">scripts/callflow.awk</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflow"></a> <div class="modfile"><h4>Modified: callflow (207 => 208)</h4> <pre class="diff"><span> <span class="info">--- callflow 2016-12-17 15:31:26 UTC (rev 207) +++ callflow 2016-12-17 16:17:33 UTC (rev 208) </span><span class="lines">@@ -175,9 +175,9 @@ </span><span class="cx"> # Command line argument parsing, the allowed arguments are </span><span class="cx"> # alphabetically listed, keep it this way please. </span><span class="cx"> LOPT="archive:,browser" </span><del>-LOPT="$LOPT,capture-filter:,help,list-nodes,no-archive,no-loops,no-sdp,no-time,nodenames:" -LOPT="$LOPT,refresh-cache,remove-duplicate-frames,title:,with-sdp,width-between-nodes:" -LOPT="$LOPT,version" </del><ins>+LOPT="$LOPT,capture-filter:,help,lines-between-nodes:,list-nodes,no-archive,no-loops" +LOPT="$LOPT,no-sdp,no-time,nodenames:,refresh-cache,remove-duplicate-frames,title:,with-sdp" +LOPT="$LOPT,width-between-nodes:,version" </ins><span class="cx"> </span><span class="cx"> # Note that we use `"$@"' to let each command-line parameter expand to a </span><span class="cx"> # separate word. The quotes around `$@' are essential! </span><span class="lines">@@ -209,6 +209,9 @@ </span><span class="cx"> OPT_FILTER=$2; shift </span><span class="cx"> #echo " * Will use the following filter: $OPT_FILTER" </span><span class="cx"> ;; </span><ins>+ --lines-between-nodes) + NR_OF_LINES_BETWEEN_NODES=$2; shift + ;; </ins><span class="cx"> --list-nodes|-o) </span><span class="cx"> ORDER=1 </span><span class="cx"> ;; </span><span class="lines">@@ -510,6 +513,7 @@ </span><span class="cx"> # Add graph variables </span><span class="cx"> yLineSpace = 24 </span><span class="cx"> xHostSpace = $WIDTH_BETWEEN_NODES </span><ins>+ yHostSpace = ${NR_OF_LINES_BETWEEN_NODES:=28} </ins><span class="cx"> rightMargin = 100 </span><span class="cx"> topMargin = 50 </span><span class="cx"> bottomMargin = 50 </span><span class="lines">@@ -745,9 +749,9 @@ </span><span class="cx"> if [[ "$START_BROWSER" == "yes" ]]; then </span><span class="cx"> # Start the browser in the background </span><span class="cx"> if [[ -z "$CALLFLOW_URL" ]]; then </span><del>- "${BROWSER:=firefox}" "$DESTDIR/index.html" & </del><ins>+ "${BROWSER:=firefox}" "$DESTDIR/index.html" >/dev/null & </ins><span class="cx"> else </span><del>- "${BROWSER:=firefox}" "$CALLFLOW_URL/$DESTDIR/index.html" & </del><ins>+ "${BROWSER:=firefox}" "$CALLFLOW_URL/$DESTDIR/index.html" >/dev/null & </ins><span class="cx"> fi </span><span class="cx"> else </span><span class="cx"> echo </span></span></pre></div> <a id="callflowversion"></a> <div class="modfile"><h4>Modified: callflow.version (207 => 208)</h4> <pre class="diff"><span> <span class="info">--- callflow.version 2016-12-17 15:31:26 UTC (rev 207) +++ callflow.version 2016-12-17 16:17:33 UTC (rev 208) </span><span class="lines">@@ -1 +1 @@ </span><del>-20151121 </del><ins>+20161217 </ins></span></pre></div> <a id="confcallflowconf"></a> <div class="modfile"><h4>Modified: conf/callflow.conf (207 => 208)</h4> <pre class="diff"><span> <span class="info">--- conf/callflow.conf 2016-12-17 15:31:26 UTC (rev 207) +++ conf/callflow.conf 2016-12-17 16:17:33 UTC (rev 208) </span><span class="lines">@@ -50,6 +50,11 @@ </span><span class="cx"> # Minimun value = 100, Maximum value = 250, </span><span class="cx"> WIDTH_BETWEEN_NODES= </span><span class="cx"> </span><ins>+# NR_OF_LINES_BETWEEN_NODES, the number of lines after which the node +# labels are repeated +# Default value = 28 +# NR_OF_LINES_BETWEEN_NODES=28 + </ins><span class="cx"> # SIP_MSG_FONT_SIZE, font size for the SIP messages frame. </span><span class="cx"> # Default font size: small </span><span class="cx"> # Possible values are CSS defined font size values like small, medium, large </span></span></pre></div> <a id="mancallflow1"></a> <div class="modfile"><h4>Modified: man/callflow.1 (207 => 208)</h4> <pre class="diff"><span> <span class="info">--- man/callflow.1 2016-12-17 15:31:26 UTC (rev 207) +++ man/callflow.1 2016-12-17 16:17:33 UTC (rev 208) </span><span class="lines">@@ -64,6 +64,11 @@ </span><span class="cx"> </span><span class="cx"> .TP </span><span class="cx"> .PD 0 </span><ins>+.BI --lines-between-nodes "<value>" +Lines between nodes determines the number of lines after which the node labels are repeated. Value is not restricted nor checked, a sensible value is between 5 and 30. Default value: 28. + +.TP +.PD 0 </ins><span class="cx"> .BI --capture-filter " filter" </span><span class="cx"> A filter can be used to show only those frames that match the given filter criteria. This filter is for traces that have been captured with programs such as wireshark, snoop, tcpdump, thsark and the like. Callflow uses tshark's DISPLAY filter functionality to filter the trace. More information about tshark's DISPLAY filter can be obtained from the tshark man page. A useful filter for SIP traffic is "sip". </span><span class="cx"> </span></span></pre></div> <a id="scriptscallflowawk"></a> <div class="modfile"><h4>Modified: scripts/callflow.awk (207 => 208)</h4> <pre class="diff"><span> <span class="info">--- scripts/callflow.awk 2016-12-17 15:31:26 UTC (rev 207) +++ scripts/callflow.awk 2016-12-17 16:17:33 UTC (rev 208) </span><span class="lines">@@ -120,8 +120,8 @@ </span><span class="cx"> y = y * yLineSpace + ystart; </span><span class="cx"> y = y + (Q * 20); </span><span class="cx"> Z = Z + 1; </span><del>- # Insert Node labels after every 28th lines - if ((Z % 28 == 1) && (Z != 1)){ </del><ins>+ # Insert Node labels after every \"yHostSpace\" lines + if ((Z % yHostSpace == 1) && (Z != 1)){ </ins><span class="cx"> for(i=0;i<numTraces;i++) { </span><span class="cx"> if (label[i] == "") </span><span class="cx"> label[i] = hosts[i]; </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> |
|
From: <rb...@us...> - 2016-12-23 13:15:34
|
<!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:[212] 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/212">212</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2016-12-23 13:15:33 +0000 (Fri, 23 Dec 2016)</dd> </dl> <h3>Log Message</h3> <pre>Make the space required by the inline node names a variable. Patch provided by Zolt?\195?\161n Miricz</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflow">callflow</a></li> <li><a href="#scriptscallflowawk">scripts/callflow.awk</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflow"></a> <div class="modfile"><h4>Modified: callflow (211 => 212)</h4> <pre class="diff"><span> <span class="info">--- callflow 2016-12-23 08:40:48 UTC (rev 211) +++ callflow 2016-12-23 13:15:33 UTC (rev 212) </span><span class="lines">@@ -519,11 +519,12 @@ </span><span class="cx"> yLineSpace = 24 </span><span class="cx"> xHostSpace = $WIDTH_BETWEEN_NODES </span><span class="cx"> yHostSpace = ${NR_OF_LINES_BETWEEN_NODES:=28} </span><ins>+ yBoxSpace = 20 </ins><span class="cx"> rightMargin = 100 </span><span class="cx"> topMargin = 50 </span><span class="cx"> bottomMargin = 50 </span><ins>+ showSDP = "$SHOW_SDP" </ins><span class="cx"> showTime = "$SHOW_TIME" </span><del>- showSDP = "$SHOW_SDP" </del><span class="cx"> if ( showTime == "yes" ) { </span><span class="cx"> leftMargin = 125 </span><span class="cx"> } else { </span></span></pre></div> <a id="scriptscallflowawk"></a> <div class="modfile"><h4>Modified: scripts/callflow.awk (211 => 212)</h4> <pre class="diff"><span> <span class="info">--- scripts/callflow.awk 2016-12-23 08:40:48 UTC (rev 211) +++ scripts/callflow.awk 2016-12-23 13:15:33 UTC (rev 212) </span><span class="lines">@@ -12,8 +12,8 @@ </span><span class="cx"> # Where the first line should start after node label </span><span class="cx"> Q = 0; </span><span class="cx"> w = (numHosts-1) * xHostSpace + leftMargin + rightMargin; </span><del>- h = numLines * yLineSpace + topMargin + bottomMargin; - </del><ins>+ nodes_extra_height = int(numLines / yHostSpace) * yBoxSpace; + h = numLines * yLineSpace + topMargin + bottomMargin + nodes_extra_height; </ins><span class="cx"> printf "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"%d\" height=\"%d\" viewBox=\"0 0 %d %d\">\n",w,h,w,h; </span><span class="cx"> </span><span class="cx"> insertStyleDefs(); </span><span class="lines">@@ -118,7 +118,7 @@ </span><span class="cx"> { </span><span class="cx"> y = NR; </span><span class="cx"> y = y * yLineSpace + ystart; </span><del>- y = y + (Q * 20); </del><ins>+ y = y + (Q * yBoxSpace); </ins><span class="cx"> Z = Z + 1; </span><span class="cx"> # Insert Node labels after every \"yHostSpace\" lines </span><span class="cx"> if ((Z % yHostSpace == 1) && (Z != 1)){ </span><span class="lines">@@ -130,7 +130,7 @@ </span><span class="cx"> y, </span><span class="cx"> label[i]; </span><span class="cx"> } </span><del>- y = y + 20; </del><ins>+ y = y + yBoxSpace; </ins><span class="cx"> Q = Q + 1; </span><span class="cx"> } </span><span class="cx"> if ($0 ~ "^#") { </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> |
|
From: <rb...@us...> - 2016-12-23 16:48:29
|
<!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:[214] 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/214">214</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2016-12-23 16:48:26 +0000 (Fri, 23 Dec 2016)</dd> </dl> <h3>Log Message</h3> <pre>Correct typo Formatting update</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflowversion">callflow.version</a></li> <li><a href="#scriptscallflowawk">scripts/callflow.awk</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 (213 => 214)</h4> <pre class="diff"><span> <span class="info">--- callflow.version 2016-12-23 16:35:47 UTC (rev 213) +++ callflow.version 2016-12-23 16:48:26 UTC (rev 214) </span><span class="lines">@@ -1 +1 @@ </span><del>-20161217 </del><ins>+20161223.3 </ins></span></pre></div> <a id="scriptscallflowawk"></a> <div class="modfile"><h4>Modified: scripts/callflow.awk (213 => 214)</h4> <pre class="diff"><span> <span class="info">--- scripts/callflow.awk 2016-12-23 16:35:47 UTC (rev 213) +++ scripts/callflow.awk 2016-12-23 16:48:26 UTC (rev 214) </span><span class="lines">@@ -7,11 +7,15 @@ </span><span class="cx"> lookup[hosts[i]] = i; </span><span class="cx"> printf "<!-- lookup['%s'] = %d -->\n", hosts[i], i; </span><span class="cx"> } </span><ins>+ </ins><span class="cx"> # Define the vertical distance between the node labels </span><span class="cx"> Z = 0; </span><ins>+ </ins><span class="cx"> # Where the first line should start after node label </span><span class="cx"> Q = 0; </span><ins>+ </ins><span class="cx"> w = (numHosts-1) * xHostSpace + leftMargin + rightMargin; </span><ins>+ </ins><span class="cx"> nodes_extra_height = int(numLines / yHostSpace) * yBoxSpace; </span><span class="cx"> h = numLines * yLineSpace + topMargin + bottomMargin + nodes_extra_height; </span><span class="cx"> printf "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"%d\" height=\"%d\" viewBox=\"0 0 %d %d\">\n",w,h,w,h; </span></span></pre></div> <a id="scriptspcapparsersh"></a> <div class="modfile"><h4>Modified: scripts/pcap-parser.sh (213 => 214)</h4> <pre class="diff"><span> <span class="info">--- scripts/pcap-parser.sh 2016-12-23 16:35:47 UTC (rev 213) +++ scripts/pcap-parser.sh 2016-12-23 16:48:26 UTC (rev 214) </span><span class="lines">@@ -83,7 +83,7 @@ </span><span class="cx"> # the source and destination ports independent whether the datagram is UDP or </span><span class="cx"> # TCP based. As SIP can be delivered over UDP or TCP using this tshark command </span><span class="cx"> # seems to be good choice. Further more this command delivers the frame information </span><del>- # (summary), that can not be obtained with tshart '-T fields' command above. </del><ins>+ # (summary), that can not be obtained with tshark '-T fields' command above. </ins><span class="cx"> # </span><span class="cx"> # For messages containing ISUP payload this step could deliver the IP addresses </span><span class="cx"> # when using % variables %ns and %nd (network source and destination). If the </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> |
|
From: <rb...@us...> - 2017-01-15 12:54:52
|
<!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:[216] 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/216">216</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2017-01-15 12:54:49 +0000 (Sun, 15 Jan 2017)</dd> </dl> <h3>Log Message</h3> <pre>- Improve the code providing the camel pattern - By default the node names are printed in one flat line, however when the node names are too long camel pattern is activated - Add an argument to force nodes to be printed in camel pattern</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflow">callflow</a></li> <li><a href="#callflowversion">callflow.version</a></li> <li><a href="#confcallflowconf">conf/callflow.conf</a></li> <li><a href="#mancallflow1">man/callflow.1</a></li> <li><a href="#scriptscallflowawk">scripts/callflow.awk</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflow"></a> <div class="modfile"><h4>Modified: callflow (215 => 216)</h4> <pre class="diff"><span> <span class="info">--- callflow 2016-12-23 17:06:52 UTC (rev 215) +++ callflow 2017-01-15 12:54:49 UTC (rev 216) </span><span class="lines">@@ -9,6 +9,7 @@ </span><span class="cx"> ARCHIVE=yes </span><span class="cx"> ARCHIVE_TYPE=bz2 </span><span class="cx"> CONFDIR=/etc/callflow </span><ins>+CAMEL_CASE=no </ins><span class="cx"> removeDF=0 # do not remove duplicate frames </span><span class="cx"> SVG_TO_PDF=no # default value for PDF conversion </span><span class="cx"> ORDER=0 # do not build order file </span><span class="lines">@@ -115,6 +116,9 @@ </span><span class="cx"> --browser </span><span class="cx"> Launch a browser with the callflow. </span><span class="cx"> </span><ins>+ --camel-case + Node names are displayed in a high-low alternating pattern. + </ins><span class="cx"> --display-filter <filter>, -f <filter> </span><span class="cx"> A filter can be used to show only those frames that match the </span><span class="cx"> given filter criteria. This filter is for traces that have been </span><span class="lines">@@ -182,7 +186,7 @@ </span><span class="cx"> </span><span class="cx"> # Command line argument parsing, the allowed arguments are </span><span class="cx"> # alphabetically listed, keep it this way please. </span><del>-LOPT="archive:,browser" </del><ins>+LOPT="archive:,browser,camel-case" </ins><span class="cx"> LOPT="$LOPT,display-filter:,help,lines-between-nodes:,list-nodes,no-archive,no-loops" </span><span class="cx"> LOPT="$LOPT,no-sdp,no-time,nodenames:,pdf,refresh-cache,remove-duplicate-frames,title:,with-sdp" </span><span class="cx"> LOPT="$LOPT,width-between-nodes:,version" </span><span class="lines">@@ -217,6 +221,10 @@ </span><span class="cx"> OPT_FILTER=$2; shift </span><span class="cx"> #echo " * Will use the following filter: $OPT_FILTER" </span><span class="cx"> ;; </span><ins>+ --camel-case) + # Force high-low name pattern during SVG generation + CAMEL_CASE="always"; + ;; </ins><span class="cx"> --lines-between-nodes) </span><span class="cx"> NR_OF_LINES_BETWEEN_NODES=$2; shift </span><span class="cx"> ;; </span><span class="lines">@@ -525,12 +533,13 @@ </span><span class="cx"> # Add graph variables </span><span class="cx"> yLineSpace = 24 </span><span class="cx"> xHostSpace = $WIDTH_BETWEEN_NODES </span><del>- yHostSpace = ${NR_OF_LINES_BETWEEN_NODES:=28} - yBoxSpace = 20 </del><ins>+ yLinesBetweenNodes = ${NR_OF_LINES_BETWEEN_NODES:=28} + yHostNameSpace = 20 </ins><span class="cx"> rightMargin = 100 </span><span class="cx"> topMargin = 50 </span><span class="cx"> bottomMargin = 50 </span><span class="cx"> showSDP = "$SHOW_SDP" </span><ins>+ camelcase = "$CAMEL_CASE" </ins><span class="cx"> showTime = "$SHOW_TIME" </span><span class="cx"> if ( showTime == "yes" ) { </span><span class="cx"> leftMargin = 125 </span></span></pre></div> <a id="callflowversion"></a> <div class="modfile"><h4>Modified: callflow.version (215 => 216)</h4> <pre class="diff"><span> <span class="info">--- callflow.version 2016-12-23 17:06:52 UTC (rev 215) +++ callflow.version 2017-01-15 12:54:49 UTC (rev 216) </span><span class="lines">@@ -1 +1 @@ </span><del>-20161223.4 </del><ins>+20170115.01 </ins></span></pre></div> <a id="confcallflowconf"></a> <div class="modfile"><h4>Modified: conf/callflow.conf (215 => 216)</h4> <pre class="diff"><span> <span class="info">--- conf/callflow.conf 2016-12-23 17:06:52 UTC (rev 215) +++ conf/callflow.conf 2017-01-15 12:54:49 UTC (rev 216) </span><span class="lines">@@ -91,6 +91,17 @@ </span><span class="cx"> # Default value: no </span><span class="cx"> # SVG_TO_PDF=yes </span><span class="cx"> </span><ins>+# CAMEL_CASE: Node names will be displayed in a high-low alternating pattern. +# +# By default the node names are displayed in a horizontal line. +# CAMEL_CASE=always; prevents overlapping of long node names. +# +# Depending on the on the horizontal width between the nodes and the longest +# node name, the high-low alternating pattern will be enabled automatically. +# +# CAMEL_CASE=always + + </ins><span class="cx"> # Duplicate packet removal: </span><span class="cx"> # </span><span class="cx"> # REMOVE_DUP_MODE, how aggressive should callflow be with respect to removing </span></span></pre></div> <a id="mancallflow1"></a> <div class="modfile"><h4>Modified: man/callflow.1 (215 => 216)</h4> <pre class="diff"><span> <span class="info">--- man/callflow.1 2016-12-23 17:06:52 UTC (rev 215) +++ man/callflow.1 2017-01-15 12:54:49 UTC (rev 216) </span><span class="lines">@@ -64,6 +64,12 @@ </span><span class="cx"> </span><span class="cx"> .TP </span><span class="cx"> .PD 0 </span><ins>+.B --camel-case +Node names are displayed in a high-low alternating pattern. It prevents overlapping of long node names. By default the node labels are displayed in a horizontal line. Depending on the on the horizontal width between the nodes and the longest node name, the high-low alternating pattern will be enabled automatically. This option enforces the high-low alternating pattern for node names. + + +.TP +.PD 0 </ins><span class="cx"> .BI --lines-between-nodes "<value>" </span><span class="cx"> Lines between nodes determines the number of lines after which the node labels are repeated. Value is not restricted nor checked, a sensible value is between 5 and 30. Default value: 28. </span><span class="cx"> </span></span></pre></div> <a id="scriptscallflowawk"></a> <div class="modfile"><h4>Modified: scripts/callflow.awk (215 => 216)</h4> <pre class="diff"><span> <span class="info">--- scripts/callflow.awk 2016-12-23 17:06:52 UTC (rev 215) +++ scripts/callflow.awk 2017-01-15 12:54:49 UTC (rev 216) </span><span class="lines">@@ -3,50 +3,60 @@ </span><span class="cx"> print "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>"; </span><span class="cx"> print "<!DOCTYPE svg PUBLIC \"-//W3C//DTD SVG 1.0//EN\" \"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd\">"; </span><span class="cx"> </span><ins>+ longNames = "no" + + # A character takes on average between 6-7 pixels (dots). When 7 is used a lot of + # node name space is offered to prevent overlapping node names. When 6 pixels are used + # a little overlap occurs at the boundary of activating the camel pattern. In this + # case it is up to user to play with --width-between-nodes value to prevent overlapping + # name labels or use shorter node names. + maxCharsForName = int ( xHostSpace / 6 ) + </ins><span class="cx"> for(i=0;i<numHosts;i++) { </span><span class="cx"> lookup[hosts[i]] = i; </span><span class="cx"> printf "<!-- lookup['%s'] = %d -->\n", hosts[i], i; </span><ins>+ if ((camelcase == "always") || (length(label[i]) > maxCharsForName)) + longNames = "yes"; </ins><span class="cx"> } </span><span class="cx"> </span><del>- # Define the vertical distance between the node labels - Z = 0; </del><ins>+ nodes_extra_height = ( int(numLines / yLinesBetweenNodes) + 1 ) * yHostNameSpace + if (longNames == "yes") { + # Take the camel pattern into account when the node names are long + nodes_extra_height *= 2 + } </ins><span class="cx"> </span><del>- # Where the first line should start after node label - Q = 0; - </del><span class="cx"> w = (numHosts-1) * xHostSpace + leftMargin + rightMargin; </span><del>- - nodes_extra_height = int(numLines / yHostSpace) * yBoxSpace; </del><span class="cx"> h = numLines * yLineSpace + topMargin + bottomMargin + nodes_extra_height; </span><del>- printf "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"%d\" height=\"%d\" viewBox=\"0 0 %d %d\">\n",w,h,w,h; </del><ins>+ yend = h; + printf "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"%d\" height=\"%d\" viewBox=\"0 0 %d %d\">\n", w, h, w, h </ins><span class="cx"> </span><span class="cx"> insertStyleDefs(); </span><span class="cx"> </span><del>- ystart = 60; - yend = h; </del><ins>+ y = 25; </ins><span class="cx"> </span><ins>+ # With 'leftMargin + ( 1.5 * xHostSpace )' the title is centered above + # the second column </ins><span class="cx"> printf "<text x=\"%d\" y=\"%d\" class=\"label title-text\">%s</text>\n", </span><del>- (w/2), - ystart-35, </del><ins>+ leftMargin + ( 1.5 * xHostSpace ), + y, </ins><span class="cx"> title; </span><span class="cx"> </span><del>- for(i=0;i<numTraces;i++) { </del><ins>+ y += yHostNameSpace </ins><span class="cx"> </span><del>- if (label[i] == "") - label[i] = hosts[i]; </del><ins>+ # Take the camel pattern into account in case the node names are long + if (longNames == "yes") { + y += yHostNameSpace + } </ins><span class="cx"> </span><del>- printf "<text x=\"%d\" y=\"%d\" class=\"label host-text\">%s</text>\n", - leftMargin+(i*xHostSpace), - # Make the node labes inline - ystart, - label[i]; </del><ins>+ # 1: print the vertical node lines + print_nodes(y, 1); </ins><span class="cx"> </span><del>- printf "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" class=\"element-line\" />\n", leftMargin+(i*xHostSpace), ystart, leftMargin+(i*xHostSpace), yend; - } - </del><span class="cx"> printf " <map name=\"callflowmap\" id=\"callflowmap\">\n" > "imagemap"; </span><span class="cx"> } </span><span class="cx"> </span><ins>+ +################ Fuction Definition ################## + </ins><span class="cx"> func insertStyleDefs () { </span><span class="cx"> printf "<defs>\n<style type=\"text/css\"><![CDATA[\n"; </span><span class="cx"> printf " .traceline { stroke-width: 1pt; stroke:black; }\n"; </span><span class="lines">@@ -119,24 +129,45 @@ </span><span class="cx"> printf "</a>\n"; </span><span class="cx"> } </span><span class="cx"> </span><del>-{ - y = NR; - y = y * yLineSpace + ystart; - y = y + (Q * yBoxSpace); - Z = Z + 1; - # Insert Node labels after every \"yHostSpace\" lines - if ((Z % yHostSpace == 1) && (Z != 1)){ - for(i=0;i<numTraces;i++) { </del><ins>+func print_nodes(yPos, first_line) { + for(i=0;i<numTraces;i++) { + </ins><span class="cx"> if (label[i] == "") </span><span class="cx"> label[i] = hosts[i]; </span><del>- printf "<text x=\"%d\" y=\"%d\" class=\"label host-text\">%s</text>\n", </del><ins>+ + # Display the node names in a camel case (low-high) pattern when longNames == yes + if (longNames == "yes") { + adjustment = yHostNameSpace*(i%2) + } + + printf "<text x=\"%d\" y=\"%d\" class=\"label host-text\">%s</text>\n", </ins><span class="cx"> leftMargin+(i*xHostSpace), </span><del>- y, </del><ins>+ yPos-adjustment, </ins><span class="cx"> label[i]; </span><ins>+ + # Drawing the lines for the actors only needed once + if (first_line){ + printf "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" class=\"element-line\" />\n", leftMargin+(i*xHostSpace), yPos+2, leftMargin+(i*xHostSpace), yend; </ins><span class="cx"> } </span><del>- y = y + yBoxSpace; - Q = Q + 1; </del><span class="cx"> } </span><ins>+} + +################ Main ################## +{ + if ( NR % yLinesBetweenNodes == 0 ) { + + y += yHostNameSpace + + if ( longNames == "yes" ) { + y += yHostNameSpace + } + + # 0: only print the node names + print_nodes(y, 0) + } + + y += yLineSpace + </ins><span class="cx"> if ($0 ~ "^#") { </span><span class="cx"> </span><span class="cx"> # The "!" is the link identifier </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> |
|
From: <rb...@us...> - 2017-01-15 13:07:20
|
<!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:[217] 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/217">217</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2017-01-15 13:07:18 +0000 (Sun, 15 Jan 2017)</dd> </dl> <h3>Log Message</h3> <pre>Add lines for debug. By default disabled, can be enabled by altering the source scripts callflow.awk.</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflowversion">callflow.version</a></li> <li><a href="#scriptscallflowawk">scripts/callflow.awk</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflowversion"></a> <div class="modfile"><h4>Modified: callflow.version (216 => 217)</h4> <pre class="diff"><span> <span class="info">--- callflow.version 2017-01-15 12:54:49 UTC (rev 216) +++ callflow.version 2017-01-15 13:07:18 UTC (rev 217) </span><span class="lines">@@ -1 +1 @@ </span><del>-20170115.01 </del><ins>+20170115.02 </ins></span></pre></div> <a id="scriptscallflowawk"></a> <div class="modfile"><h4>Modified: scripts/callflow.awk (216 => 217)</h4> <pre class="diff"><span> <span class="info">--- scripts/callflow.awk 2017-01-15 12:54:49 UTC (rev 216) +++ scripts/callflow.awk 2017-01-15 13:07:18 UTC (rev 217) </span><span class="lines">@@ -30,6 +30,40 @@ </span><span class="cx"> yend = h; </span><span class="cx"> printf "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"%d\" height=\"%d\" viewBox=\"0 0 %d %d\">\n", w, h, w, h </span><span class="cx"> </span><ins>+ # Info for debugging + debug = 0 + if (debug) { + printf "<!--\n" + printf " DEBUG: == Set Values ==\n" + printf " DEBUG: topMargin = %d\n", topMargin + printf " DEBUG: bottomMargin = %d\n", bottomMargin + printf " DEBUG: rightMargin = %d\n", rightMargin + printf " DEBUG: leftMargin = %d\n", leftMargin + printf " DEBUG: xHostSpace = %d\n", xHostSpace + printf " DEBUG: yLineSpace = %d\n", yLineSpace + printf " DEBUG: yLinesBetweenNodes = %d\n", yLinesBetweenNodes + printf " DEBUG: \n" + printf " DEBUG: == Calculated Values ==\n" + printf " DEBUG: maxCharsForName = %d\n", maxCharsForName; + printf " DEBUG: numlines = %d\n", numLines + printf " DEBUG: Extra inline node name lines = %d\n", int(numLines / yLinesBetweenNodes) + printf " DEBUG: nodes_extra_height = %d\n", nodes_extra_height + printf " DEBUG: yHostNameSpace = %d\n", yHostNameSpace + printf " DEBUG: Height = %d\n", h + printf " DEBUG: Width = %d\n", w + printf "-->\n\n" + + # The actual size of the drawing can be obtained by executed the following + # shell script in the data directory. + # ( grep -E "<polygon" $DESTDIR/callflow.svg | + # awk -F\" '{print $2}' | awk -F, '{print $NF}' + # + # grep -E "<line|<text" callflow-dir/callflow.svg | + # awk '{print $3}' | cut -d\" -f2 + # + # ) | sort -n | tail -1 + } + </ins><span class="cx"> insertStyleDefs(); </span><span class="cx"> </span><span class="cx"> y = 25; </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> |
|
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> |
|
From: <rb...@us...> - 2017-01-15 14:26:17
|
<!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:[220] 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/220">220</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2017-01-15 14:26:14 +0000 (Sun, 15 Jan 2017)</dd> </dl> <h3>Log Message</h3> <pre>- Use a temp file in /tmp for the imagemap. This prevents errors in case callflow is run from a non writable directory</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflow">callflow</a></li> <li><a href="#callflowversion">callflow.version</a></li> <li><a href="#scriptscallflowawk">scripts/callflow.awk</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflow"></a> <div class="modfile"><h4>Modified: callflow (219 => 220)</h4> <pre class="diff"><span> <span class="info">--- callflow 2017-01-15 13:18:18 UTC (rev 219) +++ callflow 2017-01-15 14:26:14 UTC (rev 220) </span><span class="lines">@@ -381,7 +381,7 @@ </span><span class="cx"> if [[ -n "$OPT_TITLE" ]]; then </span><span class="cx"> TITLE="$OPT_TITLE" </span><span class="cx"> else </span><del>- TITLE="$inputfile" </del><ins>+ TITLE=$( basename "$inputfile" ) </ins><span class="cx"> fi </span><span class="cx"> </span><span class="cx"> if [[ -z "$OPT_SHOW_SDP" ]]; then </span><span class="lines">@@ -524,6 +524,8 @@ </span><span class="cx"> finalOrderFile=$TMPDIR/callflow.auto-uniq.$PPID </span><span class="cx"> fi </span><span class="cx"> </span><ins>+IMAGE_MAP=$TMPDIR/$PRGNAME.imagemap.$$ + </ins><span class="cx"> ( awk -f $SETUPDIR/scripts/makevars.awk $finalOrderFile </span><span class="cx"> </span><span class="cx"> cat << AWK_BEGIN_SECTION </span><span class="lines">@@ -547,6 +549,7 @@ </span><span class="cx"> leftMargin = 50 </span><span class="cx"> } </span><span class="cx"> numTraces = numHosts </span><ins>+ imageMap = "$IMAGE_MAP" </ins><span class="cx"> </span><span class="cx"> # Add localLoop to vars in order to delete self messaging </span><span class="cx"> localLoop = "$localLoop" </span><span class="lines">@@ -624,7 +627,7 @@ </span><span class="cx"> echo " </head>" </span><span class="cx"> echo " <body>" </span><span class="cx"> echo " <div class=\"callflow-image\">" </span><del>- cat imagemap </del><ins>+ cat $IMAGE_MAP </ins><span class="cx"> echo " <p>" </span><span class="cx"> echo " <img src=\"callflow.png\" usemap=\"#callflowmap\" alt=\"Call flow sequence diagram for $inputfile\"/>" </span><span class="cx"> echo " </p>" </span><span class="lines">@@ -671,7 +674,7 @@ </span><span class="cx"> echo " </head>" </span><span class="cx"> echo " <body>" </span><span class="cx"> echo " <div class=\"callflow-image\">" </span><del>- cat imagemap </del><ins>+ cat $IMAGE_MAP </ins><span class="cx"> echo " <p>" </span><span class="cx"> echo " <img src=\"callflow.png\" usemap=\"#callflowmap\" alt=\"Call flow sequence diagram for $inputfile\"/>" </span><span class="cx"> echo " </p>" </span><span class="lines">@@ -723,9 +726,9 @@ </span><span class="cx"> mkdir -p $DESTDIR/images </span><span class="cx"> cp -a $SETUPDIR/images/*png $DESTDIR/images </span><span class="cx"> sed \ </span><del>- -e "s/@TRACE@/$inputfile/" \ - -e "s/@TITLE@/$PRGNAME - $TITLE/" \ - -e "s/@ARCHIVE_FILE@/$ARCHIVE_FILE/" \ </del><ins>+ -e "s|@TRACE@|$inputfile|" \ + -e "s|@TITLE@|$PRGNAME - $TITLE|" \ + -e "s|@ARCHIVE_FILE@|$ARCHIVE_FILE|" \ </ins><span class="cx"> $SETUPDIR/images/index.tpl > $DESTDIR/index.html </span><span class="cx"> [[ $ARCHIVE != "yes" ]] && sed -i '/@@@ARCHIVE_FILE@@@/d' $DESTDIR/index.html </span><span class="cx"> [[ "$SVG_TO_PDF" != "yes" ]] && sed -i '/@@@PDF_FILE@@@/d' $DESTDIR/index.html </span></span></pre></div> <a id="callflowversion"></a> <div class="modfile"><h4>Modified: callflow.version (219 => 220)</h4> <pre class="diff"><span> <span class="info">--- callflow.version 2017-01-15 13:18:18 UTC (rev 219) +++ callflow.version 2017-01-15 14:26:14 UTC (rev 220) </span><span class="lines">@@ -1 +1 @@ </span><del>-20170115.03 </del><ins>+20170115.04 </ins></span></pre></div> <a id="scriptscallflowawk"></a> <div class="modfile"><h4>Modified: scripts/callflow.awk (219 => 220)</h4> <pre class="diff"><span> <span class="info">--- scripts/callflow.awk 2017-01-15 13:18:18 UTC (rev 219) +++ scripts/callflow.awk 2017-01-15 14:26:14 UTC (rev 220) </span><span class="lines">@@ -85,7 +85,7 @@ </span><span class="cx"> # 1: print the vertical node lines </span><span class="cx"> print_nodes(y, 1); </span><span class="cx"> </span><del>- printf " <map name=\"callflowmap\" id=\"callflowmap\">\n" > "imagemap"; </del><ins>+ printf " <map name=\"callflowmap\" id=\"callflowmap\">\n" > imageMap; </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> </span><span class="lines">@@ -139,7 +139,7 @@ </span><span class="cx"> </span><span class="cx"> xtext = x1 + 18; </span><span class="cx"> </span><del>- printf " <area href=\"frames/Frame%d.html\" coords=\"%d,%d,%d,%d\" alt=\"frame %d\" onmouseover=\"return getFrame('frames/Frame%d.html');\" onmouseout=\"return nd();\"/>\n", $3, x1, y-yLineSpace+2, x1+15, y+7+1, $3, $3 >> "imagemap" </del><ins>+ printf " <area href=\"frames/Frame%d.html\" coords=\"%d,%d,%d,%d\" alt=\"frame %d\" onmouseover=\"return getFrame('frames/Frame%d.html');\" onmouseout=\"return nd();\"/>\n", $3, x1, y-yLineSpace+2, x1+15, y+7+1, $3, $3 >> imageMap </ins><span class="cx"> </span><span class="cx"> } else if (x1<x2) { </span><span class="cx"> printf "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" class=\"traceline\" style=\"stroke: %s;\"/>\n", x1, y, x2, y, color[c]; </span><span class="lines">@@ -147,7 +147,7 @@ </span><span class="cx"> </span><span class="cx"> xtext = x1 + 10; </span><span class="cx"> </span><del>- printf " <area href=\"frames/Frame%d.html\" coords=\"%d,%d,%d,%d\" alt=\"frame %d\" onmouseover=\"return getFrame('frames/Frame%d.html');\" onmouseout=\"return nd();\"/>\n", $3, x1, y-yLineSpace+2, x2, y+1, $3, $3 >> "imagemap" </del><ins>+ printf " <area href=\"frames/Frame%d.html\" coords=\"%d,%d,%d,%d\" alt=\"frame %d\" onmouseover=\"return getFrame('frames/Frame%d.html');\" onmouseout=\"return nd();\"/>\n", $3, x1, y-yLineSpace+2, x2, y+1, $3, $3 >> imageMap </ins><span class="cx"> </span><span class="cx"> } else { </span><span class="cx"> printf "<line x1=\"%d\" y1=\"%d\" x2=\"%d\" y2=\"%d\" class=\"traceline\" style=\"stroke: %s;\"/>\n", x1, y, x2, y, color[c]; </span><span class="lines">@@ -155,7 +155,7 @@ </span><span class="cx"> </span><span class="cx"> xtext = x2 + 10; </span><span class="cx"> </span><del>- printf " <area href=\"frames/Frame%d.html\" coords=\"%d,%d,%d,%d\" alt=\"frame %d\" onmouseover=\"return getFrame('frames/Frame%d.html');\" onmouseout=\"return nd();\"/>\n", $3, x2, y-yLineSpace+2, x1, y+1, $3, $3 >> "imagemap" </del><ins>+ printf " <area href=\"frames/Frame%d.html\" coords=\"%d,%d,%d,%d\" alt=\"frame %d\" onmouseover=\"return getFrame('frames/Frame%d.html');\" onmouseout=\"return nd();\"/>\n", $3, x2, y-yLineSpace+2, x1, y+1, $3, $3 >> imageMap </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> printf "<a href=\"frames/Frame%d.html\" target=\"_blank\">\n", $3; </span><span class="lines">@@ -219,7 +219,7 @@ </span><span class="cx"> link = substr($0, LINK + 1) </span><span class="cx"> </span><span class="cx"> printf("<text x=\"%d\" y=\"%d\" class=\"link\" xml:space=\"preserve\">%s</text>\n", leftMargin + 5, y, output); </span><del>- printf(" <area href=\"%s\" coords=\"%d,%d,%d,%d\"/>\n", link, leftMargin + 5, y-yLineSpace+2, w, y+1) >> "imagemap"; </del><ins>+ printf(" <area href=\"%s\" coords=\"%d,%d,%d,%d\"/>\n", link, leftMargin + 5, y-yLineSpace+2, w, y+1) >> imageMap; </ins><span class="cx"> } </span><span class="cx"> </span><span class="cx"> } else { </span><span class="lines">@@ -280,7 +280,7 @@ </span><span class="cx"> } </span><span class="cx"> </span><span class="cx"> END { </span><del>- printf " </map>\n" >> "imagemap"; </del><ins>+ printf " </map>\n" >> imageMap; </ins><span class="cx"> printf "</svg>\n"; </span><span class="cx"> } </span><span class="cx"> </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> |
|
From: <rb...@us...> - 2017-01-15 16:22:42
|
<!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:[225] 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/225">225</a></dd> <dt>Author</dt> <dd>rbos</dd> <dt>Date</dt> <dd>2017-01-15 16:22:39 +0000 (Sun, 15 Jan 2017)</dd> </dl> <h3>Log Message</h3> <pre>Font size for pkt- and comment-text increased to 10pt</pre> <h3>Modified Paths</h3> <ul> <li><a href="#callflow">callflow</a></li> <li><a href="#callflowversion">callflow.version</a></li> <li><a href="#scriptscallflowawk">scripts/callflow.awk</a></li> </ul> </div> <div id="patch"> <h3>Diff</h3> <a id="callflow"></a> <div class="modfile"><h4>Modified: callflow (224 => 225)</h4> <pre class="diff"><span> <span class="info">--- callflow 2017-01-15 16:02:51 UTC (rev 224) +++ callflow 2017-01-15 16:22:39 UTC (rev 225) </span><span class="lines">@@ -544,7 +544,7 @@ </span><span class="cx"> camelcase = "$CAMEL_CASE" </span><span class="cx"> showTime = "$SHOW_TIME" </span><span class="cx"> if ( showTime == "yes" ) { </span><del>- leftMargin = 125 </del><ins>+ leftMargin = 150 </ins><span class="cx"> } else { </span><span class="cx"> leftMargin = 50 </span><span class="cx"> } </span></span></pre></div> <a id="callflowversion"></a> <div class="modfile"><h4>Modified: callflow.version (224 => 225)</h4> <pre class="diff"><span> <span class="info">--- callflow.version 2017-01-15 16:02:51 UTC (rev 224) +++ callflow.version 2017-01-15 16:22:39 UTC (rev 225) </span><span class="lines">@@ -1 +1 @@ </span><del>-20170115.06 </del><ins>+20170115.07 </ins></span></pre></div> <a id="scriptscallflowawk"></a> <div class="modfile"><h4>Modified: scripts/callflow.awk (224 => 225)</h4> <pre class="diff"><span> <span class="info">--- scripts/callflow.awk 2017-01-15 16:02:51 UTC (rev 224) +++ scripts/callflow.awk 2017-01-15 16:22:39 UTC (rev 225) </span><span class="lines">@@ -95,9 +95,9 @@ </span><span class="cx"> printf "<defs>\n<style type=\"text/css\"><![CDATA[\n"; </span><span class="cx"> printf " .traceline { stroke-width: 1pt; stroke:black; }\n"; </span><span class="cx"> printf " .pkt-text { color: red; font-family: Trebuchet MS,Helvetica, sans-serif;\n"; </span><del>- printf " font-size: 8pt; stroke: none; fill: black;}\n"; </del><ins>+ printf " font-size: 10pt; stroke: none; fill: black;}\n"; </ins><span class="cx"> printf " .comment-text { color: black; font-family: Trebuchet MS,Helvetica, sans-serif;\n"; </span><del>- printf " font-size: 9pt; stroke: none; fill: green;}\n"; </del><ins>+ printf " font-size: 10pt; stroke: none; fill: green;}\n"; </ins><span class="cx"> printf " .host-text { color: black; font-family: Trebuchet MS,Helvetica,sans-serif;\n"; </span><span class="cx"> printf " font-size: 10pt; stroke:none; fill:blue;}\n"; </span><span class="cx"> printf " .title-text { color: black; font-family: Trebuchet MS,Helvetica,sans-serif;\n"; </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> |