[Scstudio-commits] SF.net SVN: scstudio:[1742] trunk

[<xb...@us...>]

Revision: 1742
          http://sourceforge.net/p/scstudio/code/1742
Author:   xborza
Date:     2013-03-28 12:19:34 +0000 (Thu, 28 Mar 2013)
Log Message:
-----------
pcap fix

Modified Paths:
--------------
    trunk/src/data/pcap/bytes.h
    trunk/src/data/pcap/pcap_handler.h
    trunk/src/data/pcap/pcap_settings.cpp
    trunk/tests/pcap/pcap_test.cpp

Modified: trunk/src/data/pcap/bytes.h
===================================================================
--- trunk/src/data/pcap/bytes.h	2013-03-28 11:39:45 UTC (rev 1741)
+++ trunk/src/data/pcap/bytes.h	2013-03-28 12:19:34 UTC (rev 1742)
@@ -1,5 +1,5 @@
-#ifndef __BYTES_H__
-#define __BYTES_H__
+#ifndef BYTES_H_INCLUDED
+#define BYTES_H_INCLUDED
 
 #include <pcap.h>
 
@@ -44,5 +44,4 @@
 #define TO_NTOHL(data) (ntohl(data))
 #endif
 
-#endif
-
+#endif
\ No newline at end of file

Modified: trunk/src/data/pcap/pcap_handler.h
===================================================================
--- trunk/src/data/pcap/pcap_handler.h	2013-03-28 11:39:45 UTC (rev 1741)
+++ trunk/src/data/pcap/pcap_handler.h	2013-03-28 12:19:34 UTC (rev 1742)
@@ -1,3 +1,6 @@
+#ifndef PCAP_HANDLER_INCLUDED
+#define PCAP_HANDLER_INCLUDED
+
 #include "pcap_settings.h"
 #include <pcap.h>
 #include "packet.h"
@@ -119,4 +122,4 @@
 	pcap_t* handle;
 }handStruct;
 
-
+#endif
\ No newline at end of file

Modified: trunk/src/data/pcap/pcap_settings.cpp
===================================================================
--- trunk/src/data/pcap/pcap_settings.cpp	2013-03-28 11:39:45 UTC (rev 1741)
+++ trunk/src/data/pcap/pcap_settings.cpp	2013-03-28 12:19:34 UTC (rev 1742)
@@ -1,5 +1,4 @@
 #include "pcap_settings.h"
-#include <iostream>
 
 double round(double num, int prec)
 {
@@ -87,7 +86,7 @@
 
 bool PcapSettings::add_packet_to_diagram(Packet* p, ParseLayer layer)
 {
-	return (this->parse_layer == layer && p->get_upper_proto() == -1 && !this->ignore_packets);
+	return (this->parse_layer == layer || (p->get_upper_proto() == -1 && !this->ignore_packets));
 }
 
 bool PcapSettings::ignore_packet(Packet* p)

Modified: trunk/tests/pcap/pcap_test.cpp
===================================================================
--- trunk/tests/pcap/pcap_test.cpp	2013-03-28 11:39:45 UTC (rev 1741)
+++ trunk/tests/pcap/pcap_test.cpp	2013-03-28 12:19:34 UTC (rev 1742)
@@ -94,8 +94,8 @@
 	// read aggregation settings
 	AggregSettings* agg_set = new AggregSettings();
 	agg_set->apply_aggreg = pt.get<bool>("AggregSettings.ApplyAggregation");
-	agg_set->level = (FlowLevel)pt.get<int>("AggregSettings.AggregLevel");
-	agg_set->type = (FlowType)pt.get<int>("AggregSettings.AggregType");
+	agg_set->level = (AggrLevel)pt.get<int>("AggregSettings.AggregLevel");
+	agg_set->type = (AggregType)pt.get<int>("AggregSettings.AggregType");
 	agg_set->time_interval = pt.get<double>("AggregSettings.TimeInterval");
 	agg_set->ignore_packets = pt.get<bool>("AggregSettings.IgnorePackets");
 	agg_set->show_data_size = pt.get<bool>("AggregSettings.DataSize");

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