Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1589] trunk
|
From: <xb...@us...> - 2013-02-19 23:45:04
|
Revision: 1589
http://scstudio.svn.sourceforge.net/scstudio/?rev=1589&view=rev
Author: xborza
Date: 2013-02-19 23:44:54 +0000 (Tue, 19 Feb 2013)
Log Message:
-----------
pcap documentation update + small fix in pcap_settings.cpp
Modified Paths:
--------------
trunk/doc/help/pcap/pcap.body.htm
trunk/doc/help/pcap/pcap.head.htm
trunk/doc/help/pcap/pictures/http_clear.png
trunk/doc/help/pcap/pictures/http_parts.png
trunk/doc/help/pcap/pictures/http_reassembly.png
trunk/src/data/pcap/pcap_settings.cpp
Added Paths:
-----------
trunk/doc/help/pcap/capture/
trunk/doc/help/pcap/capture/arp.pcap
trunk/doc/help/pcap/capture/bfd-raw-auth.pcap
trunk/doc/help/pcap/capture/dhcp.pcap
trunk/doc/help/pcap/capture/dns.pcap
trunk/doc/help/pcap/capture/ftpv6.pcap
trunk/doc/help/pcap/capture/http.pcap
trunk/doc/help/pcap/capture/http_gzip.pcap
trunk/doc/help/pcap/capture/ipv4_cisco_option.pcap
trunk/doc/help/pcap/capture/ipv6.pcap
trunk/doc/help/pcap/capture/sample.pcap
trunk/doc/help/pcap/capture/sip_call.pcap
trunk/doc/help/pcap/capture/sip_rtp.pcap
trunk/doc/help/pcap/capture/skypeIRC.pcap
trunk/doc/help/pcap/capture/smtp.pcap
trunk/doc/help/pcap/capture/tcp_ecn.pcap
trunk/doc/help/pcap/capture/telnet_raw.pcap
trunk/doc/help/pcap/pictures/http_clear.vsd
trunk/doc/help/pcap/pictures/http_parts.vsd
trunk/doc/help/pcap/pictures/http_reassembly.vsd
trunk/doc/help/pcap/pictures/ipv4_all_equal.png
trunk/doc/help/pcap/pictures/ipv4_all_equal.vsd
trunk/doc/help/pcap/pictures/ipv4_bothway.png
trunk/doc/help/pcap/pictures/ipv4_bothway.vsd
trunk/doc/help/pcap/pictures/ipv4_no_aggregation.png
trunk/doc/help/pcap/pictures/ipv4_no_aggregation.vsd
trunk/doc/help/pcap/pictures/ipv4_oneway.png
trunk/doc/help/pcap/pictures/ipv4_oneway.vsd
trunk/doc/help/pcap/pictures/ipv4_sucequal.png
trunk/doc/help/pcap/pictures/ipv4_sucequal.vsd
trunk/doc/help/pcap/pictures/ipv4_time_aggreg.png
trunk/doc/help/pcap/pictures/ipv4_time_aggreg.vsd
Added: trunk/doc/help/pcap/capture/arp.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/arp.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/bfd-raw-auth.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/bfd-raw-auth.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/dhcp.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/dhcp.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/dns.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/dns.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/ftpv6.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/ftpv6.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/http.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/http.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/http_gzip.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/http_gzip.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/ipv4_cisco_option.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/ipv4_cisco_option.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/ipv6.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/ipv6.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/sample.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/sample.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/sip_call.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/sip_call.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/sip_rtp.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/sip_rtp.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/skypeIRC.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/skypeIRC.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/smtp.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/smtp.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/tcp_ecn.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/tcp_ecn.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/capture/telnet_raw.pcap
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/capture/telnet_raw.pcap
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/doc/help/pcap/pcap.body.htm
===================================================================
--- trunk/doc/help/pcap/pcap.body.htm 2013-02-19 12:11:16 UTC (rev 1588)
+++ trunk/doc/help/pcap/pcap.body.htm 2013-02-19 23:44:54 UTC (rev 1589)
@@ -6,6 +6,27 @@
The main aim of this function is to import <code>".pcap"</code> files and visualize them as BMSC diagrams. It
is accessible via menu <code>Check -> Drawing -> Import...</code>
</p>
+ <p>
+ <h3>Some pcap files to download</h3>
+ <ul>
+ <li><a href="capture/sample.pcap">Sample (used in this tutorial)</a></li>
+ <li><a href="capture/arp.pcap">Arp</a></li>
+ <li><a href="capture/bfd-raw-auth.pcap">Bfd-raw-auth</a></li>
+ <li><a href="capture/dhcp.pcap">Dhcp</a></li>
+ <li><a href="capture/dns.pcap">Dns</a></li>
+ <li><a href="capture/ftpv6.pcap">Ftpv6</a></li>
+ <li><a href="capture/http.pcap">Http</a></li>
+ <li><a href="capture/http_gzip.pcap">Http_gzip</a></li>
+ <li><a href="capture/ipv4_cisco_option.pcap">Ipv4_cisco_option</a></li>
+ <li><a href="capture/ipv6.pcap">Ipv6</a></li>
+ <li><a href="capture/sip_call.pcap">Sip_call</a></li>
+ <li><a href="capture/sip_rtp.pcap">Sip_rtp</a></li>
+ <li><a href="capture/skypeIRC.pcap">Skype_IRC</a></li>
+ <li><a href="capture/smtp.pcap">Smtp</a></li>
+ <li><a href="capture/tcp_ecn.pcap">Tcp_ecn</a></li>
+ <li><a href="capture/telnet_raw.pcap">Telnet_raw</a></li>
+ </ul>
+ </p>
<h3>
Setting of parameteres
</h3>
@@ -75,13 +96,21 @@
<p>
<ul>
<li>
- Example of HTTP communication without reassembling and showing data segments </br></br>
+ Example of HTTP communication without reassembling and showing splitted parts of data </br></br>
<ul class="gallery">
- <li>
- </li>
+ <li>
+ <ul>
+ <a href="pictures/http_clear.vsd">
<li>
- <img src="pictures/http_clear.png" width="500" border="1" alt="http without res and date segments"/>
+ <img src="pictures/http_clear.png" width="500" border="0"
+ alt="Without reassembling and showing data segments" />
</li>
+ <li class="caption">
+ HTTP without reassembling and showing splitted parts
+ </li>
+ </a>
+ </ul>
+ </li>
</ul>
</li>
</ul>
@@ -91,11 +120,19 @@
<li>
Example of HTTP communication with showing data segments </br></br>
<ul class="gallery">
- <li>
- </li>
+ <li>
+ <ul>
+ <a href="pictures/http_parts.vsd">
<li>
- <img src="pictures/http_parts.png" width="500" border="1" alt="http without res and date segments"/>
+ <img src="pictures/http_parts.png" width="600" border="0"
+ alt="With showing splitted parts" />
</li>
+ <li class="caption">
+ HTTP with showing splitted parts
+ </li>
+ </a>
+ </ul>
+ </li>
</ul>
</li>
</ul>
@@ -105,12 +142,18 @@
<li>
Example of HTTP communication with reassembling </br>(the information about count or size of reassembled packets will be shown accroding to settings in <code>view settings</code>) </br></br>
<ul class="gallery">
- <li>
- </li>
+ <li>
+ <ul>
+ <a href="pictures/http_reassembly.vsd">
<li>
- <img src="pictures/http_reassembly.png" width="500" border="1" alt="http with reassembling"/>
+ <img src="pictures/http_reassembly.png" width="500" border="0"
+ alt="With reassembling" />
</li>
- </ul>
+ <li class="caption">
+ HTTP with reassembling
+ </li>
+ </a>
+ </ul>
</li>
</ul>
</p>
@@ -144,112 +187,145 @@
<li>
Example of Ipv4 communication without aggregation </br></br>
<ul class="gallery">
- <li>
- </li>
+ <li>
+ <ul>
+ <a href="pictures/ipv4_no_aggregation.vsd">
<li>
- <img src="pictures/no_flow.png" width="550" border="1" alt="no aggregation"/>
+ <img src="pictures/ipv4_no_aggregation.png" width="500" border="0"
+ alt="ipv4_no_aggregation" />
</li>
+ <li class="caption">
+ Ipv4 without aggregation
+ </li>
+ </a>
</ul>
</li>
</ul>
<p>
- <ul>
+ </li>
<li>
Example of Ipv4 communication with aggregation:</br>
<ul>
<li>Equality rule:<code> Network protocol</code></li>
- <li>Aggreagation rule:<code> Succesive equal packets in entire communication</code>
- <li><i>The aggregation is relating to all channels TOGETHER. All succesive "equal" packets are joined together.</i>
- </br><font size="1.5" color="red">The differences with last example are highlighted with red color</font></li>
+ <li>Aggregation rule:<code> Succesive equal packets in entire communication</code></li>
+ <li><i>The aggregation is relating to all channels TOGETHER. All succesive "equal" packets are joined together.</i></li>
</ul>
</br></br>
<ul class="gallery">
- <li>
- </li>
+ <li>
+ <ul>
+ <a href="pictures/ipv4_sucequal.vsd">
<li>
- <img src="pictures/lst_flow.png" width="550" border="1" alt="Succesive equal packets in entire communication"/>
+ <img src="pictures/ipv4_sucequal.png" width="500" border="0"
+ alt="ipv4 successive eual" />
</li>
+ <li class="caption">
+ Ipv4 succesive equal packets in entire communication
+ </li>
+ </a>
</ul>
</li>
</ul>
+ </li>
<p>
- <ul>
<li>
Example of Ipv4 communication with aggregation:</br>
<ul>
<li>Equality rule:<code> Network protocol</code></li>
- <li>Aggreagation rule:<code> Continuous one-way communication in every channel</code></li>
- <li><i>The aggregation is relating to every channel SEPARATELY. All "equal" packets with same direction are joining together until start of communication in opposite direction. </i></br>
- <font size="1.5" color="red">The differences with last example are highlighted with red color</font></li>
+ <li>Aggregation rule:<code> Continuous one-way communication in every channel</code></li>
+ <li><i>The aggregation is relating to every channel SEPARATELY. All "equal" packets with same direction are joining together until start of communication in opposite direction. </i></li>
</ul>
</br></br>
- <ul class="gallery">
- <li>
- </li>
+ <ul class="gallery">
+ <li>
+ <ul>
+ <a href="pictures/ipv4_oneway.vsd">
<li>
- <img src="pictures/continuous_ow.png" width="550" border="1" alt="Continuous one-way communication in every channel"/>
+ <img src="pictures/ipv4_oneway.png" width="500" border="0"
+ alt="ipv4 one way" />
</li>
+ <li class="caption">
+ Ipv4 continuous one-way communication in every channel
+ </li>
+ </a>
</ul>
</li>
</ul>
<p>
- <ul>
<li>
Example of Ipv4 communication with aggregation:</br>
<ul>
<li>Equality rule:<code> Network protocol</code></li>
- <li>Aggreagation rule:<code> Continuous both-way communication in every channel</code></li>
+ <li>Aggregation rule:<code> Continuous both-way communication in every channel</code></li>
<li><i>The aggregation is relating to every channel SEPARATELY. All "equal" packets in the same communication channel are joining together until start of communication in the other channel.</i></li>
</ul>
</br></br>
- <ul class="gallery">
- <li>
- </li>
+ <ul class="gallery">
+ <li>
+ <ul>
+ <a href="pictures/ipv4_bothway.vsd">
<li>
- <img src="pictures/continuous_bw.png" width="550" border="1" alt="Continuous both-way communication in every channel"/>
+ <img src="pictures/ipv4_bothway.png" width="500" border="0"
+ alt="ipv4 both way" />
</li>
+ <li class="caption">
+ Ipv4 continuous both-way communication in every channel
+ </li>
+ </a>
</ul>
</li>
</ul>
<p>
- <ul>
<li>
Example of Ipv4 communication with aggregation:</br>
<ul>
<li>Equality rule:<code> Network protocol</code></li>
- <li>Aggreagation rule:<code> Equal packets in entire communication </code></li>
+ <li>Aggregation rule:<code> Equal packets in entire communication </code></li>
<li><i>The aggregation is relating to all channels TOGETHER. All "equal" packets with the same direction are simply joined together.</i></li>
</ul>
</br></br>
- <ul class="gallery">
- <li>
- </li>
+ <ul class="gallery">
+ <li>
+ <ul>
+ <a href="pictures/ipv4_all_equal.vsd">
<li>
- <img src="pictures/all_flow.png" width="550" border="1" alt="Equal packets in entire communication"/>
+ <img src="pictures/ipv4_all_equal.png" width="500" border="0"
+ alt="ipv4 all equal" />
</li>
+ <li class="caption">
+ Ipv4 equal packets in entire communication
+ </li>
+ </a>
</ul>
</li>
</ul>
<p>
- <ul>
<li>
Example of Ipv4 communication with aggregation:</br>
<ul>
<li>Equality rule:<code> Network protocol</code></li>
- <li>Aggreagation rule:<code> Equal packets in interval[100]time units<font size="2">(in ms for this case) </font></code></li>
- <li><i>The aggregation is relating to all channels TOGETHER. All "equal" packets in the section of 100 ms are simply joined together.</i></br>
- <font size="1.5" color="red">The different time sections are highlighted with red color</font></li>
+ <li>Aggregation rule:<code> Equal packets in interval[100]time units<font size="2">(in ms for this case) </font></code></li>
+ <li><i>The aggregation is relating to all channels TOGETHER. All "equal" packets in the section of 100 ms are simply joined together.</i></li>
</ul>
</br></br>
<ul class="gallery">
- <li>
- </li>
+ <li>
+ <ul>
+ <a href="pictures/ipv4_time_aggreg.vsd">
<li>
- <img src="pictures/time_flow.png" width="550" border="1" alt="Equal packets in interval[100]time units"/>
+ <img src="pictures/ipv4_time_aggreg.png" width="500" border="0"
+ alt="ipv4 equal packets in interval 100 ms" />
</li>
+ <li class="caption">
+ Ipv4 euqal packets in interval 100 time units
+ </li>
+ </a>
</ul>
</li>
</ul>
+ </li>
+ </li>
+ </ul>
</div>
</body>
</html>
\ No newline at end of file
Modified: trunk/doc/help/pcap/pcap.head.htm
===================================================================
--- trunk/doc/help/pcap/pcap.head.htm 2013-02-19 12:11:16 UTC (rev 1588)
+++ trunk/doc/help/pcap/pcap.head.htm 2013-02-19 23:44:54 UTC (rev 1589)
@@ -7,7 +7,7 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>
- Beautify
+ Pcap
</title>
<link href="../help.css" rel="stylesheet" type="text/css" />
</head>
Modified: trunk/doc/help/pcap/pictures/http_clear.png
===================================================================
(Binary files differ)
Added: trunk/doc/help/pcap/pictures/http_clear.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/http_clear.vsd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/doc/help/pcap/pictures/http_parts.png
===================================================================
(Binary files differ)
Added: trunk/doc/help/pcap/pictures/http_parts.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/http_parts.vsd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/doc/help/pcap/pictures/http_reassembly.png
===================================================================
(Binary files differ)
Added: trunk/doc/help/pcap/pictures/http_reassembly.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/http_reassembly.vsd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_all_equal.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_all_equal.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_all_equal.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_all_equal.vsd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_bothway.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_bothway.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_bothway.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_bothway.vsd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_no_aggregation.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_no_aggregation.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_no_aggregation.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_no_aggregation.vsd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_oneway.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_oneway.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_oneway.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_oneway.vsd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_sucequal.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_sucequal.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_sucequal.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_sucequal.vsd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_time_aggreg.png
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_time_aggreg.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/doc/help/pcap/pictures/ipv4_time_aggreg.vsd
===================================================================
(Binary files differ)
Property changes on: trunk/doc/help/pcap/pictures/ipv4_time_aggreg.vsd
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Modified: trunk/src/data/pcap/pcap_settings.cpp
===================================================================
--- trunk/src/data/pcap/pcap_settings.cpp 2013-02-19 12:11:16 UTC (rev 1588)
+++ trunk/src/data/pcap/pcap_settings.cpp 2013-02-19 23:44:54 UTC (rev 1589)
@@ -104,6 +104,9 @@
bool PcapSettings::is_aggregation_active()
{
+ if(flow_settings->apply_aggreg)
+ return false;
+
return (adv_settings->http_settings->reassembly || adv_settings->tcp_settings->reassembly
|| adv_settings->sip_settings->reassembly);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
