From 08a006d08a4c35d2c3ecc9a3d10cf7fd14661a84 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Tue, 29 Jul 2014 17:12:47 +0000 Subject: Rename all patches that contain '::' as a path separator, and use '__' instead. --- ...tch-apps::cflowdmux::CflowdRawFlowClientList.hh | 10 -- ...tch-apps__cflowdmux__CflowdRawFlowClientList.hh | 10 ++ .../files/patch-classes::include::CflowdCisco.hh | 11 -- .../patch-classes::include::CflowdCollectorMap.hh | 10 -- .../patch-classes::include::CflowdFlowFilter.hh | 10 -- .../patch-classes::include::CflowdFlowPortList.hh | 10 -- .../patch-classes::include::CflowdNetMatrixKey.hh | 37 ---- .../patch-classes::include::CflowdRawFlowLogger.hh | 11 -- .../files/patch-classes::include::CflowdVersion.hh | 10 -- .../files/patch-classes::src::CflowdCisco.cc | 31 ---- .../patch-classes::src::CflowdCiscoFlowEngine.cc | 19 -- .../files/patch-classes::src::CflowdCiscoMap.cc | 19 -- .../files/patch-classes::src::CflowdCollector.cc | 10 -- .../patch-classes::src::CflowdNextHopTable.cc | 31 ---- .../files/patch-classes::src::CflowdPacketQueue.cc | 28 --- .../patch-classes::src::CflowdProtocolTable.cc | 28 --- .../files/patch-classes::src::CflowdRawFlow.cc | 200 --------------------- .../patch-classes::src::CflowdRawFlowConvertor.cc | 10 -- .../files/patch-classes::src::CflowdTosTable.cc | 28 --- .../cflowd/files/patch-classes::src::FlowFilter.y | 10 -- .../cflowd/files/patch-classes::src::Signal.cc | 10 -- .../files/patch-classes__include__CflowdCisco.hh | 11 ++ .../patch-classes__include__CflowdCollectorMap.hh | 10 ++ .../patch-classes__include__CflowdFlowFilter.hh | 10 ++ .../patch-classes__include__CflowdFlowPortList.hh | 10 ++ .../patch-classes__include__CflowdNetMatrixKey.hh | 37 ++++ .../patch-classes__include__CflowdRawFlowLogger.hh | 11 ++ .../files/patch-classes__include__CflowdVersion.hh | 10 ++ .../files/patch-classes__src__CflowdCisco.cc | 31 ++++ .../patch-classes__src__CflowdCiscoFlowEngine.cc | 19 ++ .../files/patch-classes__src__CflowdCiscoMap.cc | 19 ++ .../files/patch-classes__src__CflowdCollector.cc | 10 ++ .../patch-classes__src__CflowdNextHopTable.cc | 31 ++++ .../files/patch-classes__src__CflowdPacketQueue.cc | 28 +++ .../patch-classes__src__CflowdProtocolTable.cc | 28 +++ .../files/patch-classes__src__CflowdRawFlow.cc | 200 +++++++++++++++++++++ .../patch-classes__src__CflowdRawFlowConvertor.cc | 10 ++ .../files/patch-classes__src__CflowdTosTable.cc | 28 +++ .../cflowd/files/patch-classes__src__FlowFilter.y | 10 ++ .../cflowd/files/patch-classes__src__Signal.cc | 10 ++ 40 files changed, 533 insertions(+), 533 deletions(-) delete mode 100644 net-mgmt/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh create mode 100644 net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh delete mode 100644 net-mgmt/cflowd/files/patch-classes::include::CflowdCisco.hh delete mode 100644 net-mgmt/cflowd/files/patch-classes::include::CflowdCollectorMap.hh delete mode 100644 net-mgmt/cflowd/files/patch-classes::include::CflowdFlowFilter.hh delete mode 100644 net-mgmt/cflowd/files/patch-classes::include::CflowdFlowPortList.hh delete mode 100644 net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh delete mode 100644 net-mgmt/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh delete mode 100644 net-mgmt/cflowd/files/patch-classes::include::CflowdVersion.hh delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdCisco.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoMap.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdCollector.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdNextHopTable.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdPacketQueue.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdProtocolTable.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlow.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::CflowdTosTable.cc delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::FlowFilter.y delete mode 100644 net-mgmt/cflowd/files/patch-classes::src::Signal.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh create mode 100644 net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh create mode 100644 net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh create mode 100644 net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh create mode 100644 net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh create mode 100644 net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh create mode 100644 net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc create mode 100644 net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y create mode 100644 net-mgmt/cflowd/files/patch-classes__src__Signal.cc (limited to 'net-mgmt/cflowd/files') diff --git a/net-mgmt/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh b/net-mgmt/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh deleted file mode 100644 index 04944850c639..000000000000 --- a/net-mgmt/cflowd/files/patch-apps::cflowdmux::CflowdRawFlowClientList.hh +++ /dev/null @@ -1,10 +0,0 @@ ---- apps/cflowdmux/CflowdRawFlowClientList.hh.orig Fri Aug 29 22:10:51 2003 -+++ apps/cflowdmux/CflowdRawFlowClientList.hh Fri Aug 29 22:11:03 2003 -@@ -51,6 +51,7 @@ - #include "caida_t.h" - } - -+using namespace std; - #include - - //--------------------------------------------------------------------------- diff --git a/net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh b/net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh new file mode 100644 index 000000000000..04944850c639 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-apps__cflowdmux__CflowdRawFlowClientList.hh @@ -0,0 +1,10 @@ +--- apps/cflowdmux/CflowdRawFlowClientList.hh.orig Fri Aug 29 22:10:51 2003 ++++ apps/cflowdmux/CflowdRawFlowClientList.hh Fri Aug 29 22:11:03 2003 +@@ -51,6 +51,7 @@ + #include "caida_t.h" + } + ++using namespace std; + #include + + //--------------------------------------------------------------------------- diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdCisco.hh b/net-mgmt/cflowd/files/patch-classes::include::CflowdCisco.hh deleted file mode 100644 index a3b7bafbcc18..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::include::CflowdCisco.hh +++ /dev/null @@ -1,11 +0,0 @@ ---- classes/include/CflowdCisco.hh.orig Fri Aug 29 20:49:59 2003 -+++ classes/include/CflowdCisco.hh Fri Aug 29 20:53:49 2003 -@@ -48,6 +48,8 @@ - #include "caida_t.h" - } - -+using namespace std; -+ - #include "CflowdRawFlow.hh" - #include "CflowdRawFlowLogger.hh" - #include "CflowdCiscoFlowInterfaceMap.hh" diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdCollectorMap.hh b/net-mgmt/cflowd/files/patch-classes::include::CflowdCollectorMap.hh deleted file mode 100644 index 81d2d1b497a8..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::include::CflowdCollectorMap.hh +++ /dev/null @@ -1,10 +0,0 @@ ---- classes/include/CflowdCollectorMap.hh.orig Fri Aug 29 21:48:40 2003 -+++ classes/include/CflowdCollectorMap.hh Fri Aug 29 21:49:10 2003 -@@ -47,6 +47,7 @@ - #include "caida_t.h" - } - -+using namespace std; - #include - - #include "CflowdCollector.hh" diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowFilter.hh b/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowFilter.hh deleted file mode 100644 index 73a5b121621e..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowFilter.hh +++ /dev/null @@ -1,10 +0,0 @@ ---- classes/include/CflowdFlowFilter.hh.orig Fri Aug 29 22:06:03 2003 -+++ classes/include/CflowdFlowFilter.hh Fri Aug 29 22:06:16 2003 -@@ -42,6 +42,7 @@ - #ifndef _CFLOWDFLOWFILTER_HH_ - #define _CFLOWDFLOWFILTER_HH_ - -+using namespace std; - #include - #include - diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowPortList.hh b/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowPortList.hh deleted file mode 100644 index 301579739cc2..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::include::CflowdFlowPortList.hh +++ /dev/null @@ -1,10 +0,0 @@ ---- classes/include/CflowdFlowPortList.hh.orig Fri Aug 29 21:50:14 2003 -+++ classes/include/CflowdFlowPortList.hh Fri Aug 29 21:50:29 2003 -@@ -48,6 +48,7 @@ - #include "caida_t.h" - } - -+using namespace std; - #include - - //--------------------------------------------------------------------------- diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh b/net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh deleted file mode 100644 index 624fd85175ba..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh +++ /dev/null @@ -1,37 +0,0 @@ ---- classes/include/CflowdNetMatrixKey.hh.orig Fri Jun 15 16:36:13 2007 -+++ classes/include/CflowdNetMatrixKey.hh Fri Jun 15 16:45:41 2007 -@@ -53,8 +53,10 @@ - } - - #include -+#include - - #include "ArtsPrimitive.hh" -+using namespace std; - - extern ArtsPrimitive g_CfdArtsPrimitive; - -@@ -191,9 +193,9 @@ - inline istream & read(istream & is) - { - g_CfdArtsPrimitive.ReadIpv4Network(is,this->_src,sizeof(this->_src)); -- is.read(&(this->_srcMaskLen),sizeof(this->_srcMaskLen)); -+ is.read((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen)); - g_CfdArtsPrimitive.ReadIpv4Network(is,this->_dst,sizeof(this->_dst)); -- is.read(&(this->_dstMaskLen),sizeof(this->_dstMaskLen)); -+ is.read((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen)); - - return(is); - } -@@ -263,9 +265,9 @@ - inline ostream & write(ostream & os) const - { - g_CfdArtsPrimitive.WriteIpv4Network(os,this->_src,sizeof(this->_src)); -- os.write(&(this->_srcMaskLen),sizeof(this->_srcMaskLen)); -+ os.write((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen)); - g_CfdArtsPrimitive.WriteIpv4Network(os,this->_dst,sizeof(this->_dst)); -- os.write(&(this->_dstMaskLen),sizeof(this->_dstMaskLen)); -+ os.write((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen)); - return(os); - } - diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh b/net-mgmt/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh deleted file mode 100644 index d3e1118f829d..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::include::CflowdRawFlowLogger.hh +++ /dev/null @@ -1,11 +0,0 @@ ---- classes/include/CflowdRawFlowLogger.hh.orig Fri Aug 29 21:59:45 2003 -+++ classes/include/CflowdRawFlowLogger.hh Fri Aug 29 22:00:04 2003 -@@ -42,6 +42,8 @@ - #ifndef _CFLOWDRAWFLOWLOGGER_HH_ - #define _CFLOWDRAWFLOWLOGGER_HH_ - -+using namespace std; -+ - //--------------------------------------------------------------------------- - // class CflowdRawFlowLogger - //--------------------------------------------------------------------------- diff --git a/net-mgmt/cflowd/files/patch-classes::include::CflowdVersion.hh b/net-mgmt/cflowd/files/patch-classes::include::CflowdVersion.hh deleted file mode 100644 index b5352ae38c19..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::include::CflowdVersion.hh +++ /dev/null @@ -1,10 +0,0 @@ ---- classes/include/CflowdVersion.hh.orig Fri Aug 29 22:04:44 2003 -+++ classes/include/CflowdVersion.hh Fri Aug 29 22:04:56 2003 -@@ -42,6 +42,7 @@ - #ifndef _CFLOWDVERSION_HH_ - #define _CFLOWDVERSION_HH_ - -+using namespace std; - #include - - //--------------------------------------------------------------------------- diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdCisco.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdCisco.cc deleted file mode 100644 index ea5de5ca0d1f..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdCisco.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- classes/src/CflowdCisco.cc.orig Fri Aug 29 21:02:38 2003 -+++ classes/src/CflowdCisco.cc Fri Aug 29 21:12:30 2003 -@@ -699,22 +699,22 @@ - engineIter != this->FlowEngines().end(); engineIter++) { - for (uint8_t aggMethod = 0; aggMethod <= k_CiscoV8FlowExportMaxAggType; - aggMethod++) { -- if ((*engineIter).second.MissedFlows(aggMethod) > -+ if ((*engineIter).second.MissedFlows((char)aggMethod) > - this->_missedFlowsThreshold) { - struct in_addr addrIn; - addrIn.s_addr = this->IpAddress(); -- uint64_t totalFlows = ((*engineIter).second.MissedFlows(aggMethod) + -- (*engineIter).second.FlowsReceived(aggMethod)); -+ uint64_t totalFlows = ((*engineIter).second.MissedFlows((char)aggMethod) + -+ (*engineIter).second.FlowsReceived((char)aggMethod)); - syslog(LOG_INFO, - "[I] missed %u of %u flows from %s" - " engine %d agg_method %d (%g%% loss)", -- (*engineIter).second.MissedFlows(aggMethod), -+ (*engineIter).second.MissedFlows((char)aggMethod), - totalFlows, - inet_ntoa(addrIn), - (*engineIter).first, - aggMethod, -- ((*engineIter).second.MissedFlows(aggMethod) * 100.0) / -- totalFlows); -+ ((*engineIter).second.MissedFlows((char)(aggMethod) * 100.0) / -+ totalFlows)); - } - (*engineIter).second.MissedFlows(0,aggMethod); - (*engineIter).second.FlowsReceived(0,aggMethod); diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc deleted file mode 100644 index 06aa42814714..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoFlowEngine.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- classes/src/CflowdCiscoFlowEngine.cc.orig Fri Aug 29 21:13:33 2003 -+++ classes/src/CflowdCiscoFlowEngine.cc Fri Aug 29 21:17:18 2003 -@@ -43,6 +43,7 @@ - #include "caida_t.h" - } - -+using namespace std; - #include - - #include "CflowdCiscoFlowEngine.hh" -@@ -58,7 +59,7 @@ - //------------------------------------------------------------------------- - uint32_t CflowdCiscoFlowEngine::SequenceNumber(uint32_t seqNumber, - uint16_t flowCount, -- uint8_t aggMethod = 0) -+ uint8_t aggMethod ) - { - if (aggMethod > k_CiscoV8FlowExportMaxAggType) { - syslog(LOG_ERR, diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoMap.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoMap.cc deleted file mode 100644 index 33f4f19ba9d4..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdCiscoMap.cc +++ /dev/null @@ -1,19 +0,0 @@ ---- classes/src/CflowdCiscoMap.cc.orig Fri Aug 29 21:26:58 2003 -+++ classes/src/CflowdCiscoMap.cc Fri Aug 29 21:28:13 2003 -@@ -39,6 +39,7 @@ - // info@caida.org - //=========================================================================== - -+using namespace std; - #include - #include - -@@ -112,7 +113,7 @@ - } - - numCiscos = htonl(numCiscos); -- os.write(&numCiscos,sizeof(numCiscos)); -+ os.write((char *)&numCiscos,sizeof(numCiscos)); - - for (ciscomIter = (*this).begin(); ciscomIter != (*this).end(); - ciscomIter++) { diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdCollector.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdCollector.cc deleted file mode 100644 index 736a89066122..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdCollector.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- classes/src/CflowdCollector.cc.orig Fri Aug 29 21:47:25 2003 -+++ classes/src/CflowdCollector.cc Fri Aug 29 21:47:36 2003 -@@ -39,6 +39,7 @@ - // info@caida.org - //=========================================================================== - -+using namespace std; - #include - - #include "CflowdCollector.hh" diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdNextHopTable.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdNextHopTable.cc deleted file mode 100644 index 87dce681b4f1..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdNextHopTable.cc +++ /dev/null @@ -1,31 +0,0 @@ ---- classes/src/CflowdNextHopTable.cc.orig Fri Aug 29 21:52:18 2003 -+++ classes/src/CflowdNextHopTable.cc Fri Aug 29 21:53:26 2003 -@@ -82,11 +82,11 @@ - (*this).erase((*this).begin(),(*this).end()); - } - -- is.read(&numNextHops,sizeof(numNextHops)); -+ is.read((char *)&numNextHops,sizeof(numNextHops)); - numNextHops = ntohl(numNextHops); - - for (nextHopNum = 0; nextHopNum < numNextHops; nextHopNum++) { -- is.read(&nextHop,sizeof(nextHop)); -+ is.read((char *)&nextHop,sizeof(nextHop)); - nextHopTraffic.read(is); - (*this)[nextHop] = nextHopTraffic; - } -@@ -154,12 +154,12 @@ - - numNextHops = (*this).size(); - numNextHops = htonl(numNextHops); -- os.write(&numNextHops,sizeof(numNextHops)); -+ os.write((char *)&numNextHops,sizeof(numNextHops)); - - for (nextHopIter = (*this).begin(); nextHopIter != (*this).end(); - nextHopIter++) { - nextHop = (*nextHopIter).first; -- os.write(&nextHop,sizeof(nextHop)); -+ os.write((char *)&nextHop,sizeof(nextHop)); - (*nextHopIter).second.write(os); - } - return(os); diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdPacketQueue.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdPacketQueue.cc deleted file mode 100644 index d60c99e2a6b0..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdPacketQueue.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- classes/src/CflowdPacketQueue.cc.orig Fri Aug 29 21:54:26 2003 -+++ classes/src/CflowdPacketQueue.cc Fri Aug 29 21:58:48 2003 -@@ -54,6 +54,7 @@ - #include - #include - -+using namespace std; - #include "caida_t.h" - #include "CflowdFlowPdu.h" - -@@ -401,7 +402,7 @@ - //......................................................................... - // - //------------------------------------------------------------------------- --int CflowdPacketQueue::GetLock(uint8_t bufNum = 0xff) -+int CflowdPacketQueue::GetLock(uint8_t bufNum) - { - if (bufNum == 0xff) - bufNum = this->_currentBuffer; -@@ -424,7 +425,7 @@ - //......................................................................... - // - //------------------------------------------------------------------------- --int CflowdPacketQueue::ReleaseLock(uint8_t bufNum = 0xff) -+int CflowdPacketQueue::ReleaseLock(uint8_t bufNum) - { - if (bufNum == 0xff) - bufNum = this->_currentBuffer; diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdProtocolTable.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdProtocolTable.cc deleted file mode 100644 index e9c91b97b5c6..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdProtocolTable.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- classes/src/CflowdProtocolTable.cc.orig Fri Aug 29 20:37:48 2003 -+++ classes/src/CflowdProtocolTable.cc Fri Aug 29 20:39:55 2003 -@@ -82,9 +82,9 @@ - (*this).erase((*this).begin(),(*this).end()); - } - -- is.read(&numProtocols,sizeof(numProtocols)); -+ is.read((char *)&numProtocols,sizeof(numProtocols)); - for (protocolNum = 0; protocolNum < numProtocols; protocolNum++) { -- is.read(&protocol,sizeof(protocol)); -+ is.read((char *)&protocol,sizeof(protocol)); - protoTraffic.read(is); - (*this)[protocol] = protoTraffic; - } -@@ -151,11 +151,11 @@ - CflowdProtocolTable::const_iterator protoIter; - - numProtocols = (*this).size(); -- os.write(&numProtocols,sizeof(numProtocols)); -+ os.write((char *)&numProtocols,sizeof(numProtocols)); - - for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) { - protocol = (*protoIter).first; -- os.write(&protocol,sizeof(protocol)); -+ os.write((const char *)&protocol,sizeof(protocol)); - (*protoIter).second.write(os); - } - return(os); diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlow.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlow.cc deleted file mode 100644 index 85b4536529e8..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlow.cc +++ /dev/null @@ -1,200 +0,0 @@ ---- classes/src/CflowdRawFlow.cc.orig Fri Aug 29 21:18:36 2003 -+++ classes/src/CflowdRawFlow.cc Fri Aug 29 21:22:55 2003 -@@ -44,6 +44,7 @@ - #include - } - -+using namespace std; - #include - - #include "CflowdRawFlow.hh" -@@ -336,82 +337,82 @@ - - this->data._isHostOrder = false; - -- is.read(&(this->data._index),sizeof(this->data._index)); -+ is.read((char *)&(this->data._index),sizeof(this->data._index)); - if (! is) - return(is); - flowIndex = ntohl(this->data._index); - - if (flowIndex & CflowdRawFlow::k_routerMask) { -- is.read(&(this->data._router),sizeof(this->data._router)); -+ is.read((char *)&(this->data._router),sizeof(this->data._router)); - } - if (flowIndex & CflowdRawFlow::k_srcIpAddrMask) { -- is.read(&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr)); -+ is.read((char *)&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr)); - } - if (flowIndex & CflowdRawFlow::k_dstIpAddrMask) { -- is.read(&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr)); -+ is.read((char *)&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr)); - } - if (flowIndex & CflowdRawFlow::k_inputIfIndexMask) { -- is.read(&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex)); -+ is.read((char *)&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex)); - } - if (flowIndex & CflowdRawFlow::k_outputIfIndexMask) { -- is.read(&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex)); -+ is.read((char *)&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex)); - } - if (flowIndex & CflowdRawFlow::k_srcPortMask) { -- is.read(&(this->data._srcPort),sizeof(this->data._srcPort)); -+ is.read((char *)&(this->data._srcPort),sizeof(this->data._srcPort)); - } - if (flowIndex & CflowdRawFlow::k_dstPortMask) { -- is.read(&(this->data._dstPort),sizeof(this->data._dstPort)); -+ is.read((char *)&(this->data._dstPort),sizeof(this->data._dstPort)); - } - if (flowIndex & CflowdRawFlow::k_pktsMask) { -- is.read(&(this->data._pkts),sizeof(this->data._pkts)); -+ is.read((char *)&(this->data._pkts),sizeof(this->data._pkts)); - } - if (flowIndex & CflowdRawFlow::k_bytesMask) { -- is.read(&(this->data._bytes),sizeof(this->data._bytes)); -+ is.read((char *)&(this->data._bytes),sizeof(this->data._bytes)); - } - if (flowIndex & CflowdRawFlow::k_ipNextHopMask) { -- is.read(&(this->data._ipNextHop),sizeof(this->data._ipNextHop)); -+ is.read((char *)&(this->data._ipNextHop),sizeof(this->data._ipNextHop)); - } - if (flowIndex & CflowdRawFlow::k_startTimeMask) { -- is.read(&(this->data._startTime),sizeof(this->data._startTime)); -+ is.read((char *)&(this->data._startTime),sizeof(this->data._startTime)); - } - if (flowIndex & CflowdRawFlow::k_endTimeMask) { -- is.read(&(this->data._endTime),sizeof(this->data._endTime)); -+ is.read((char *)&(this->data._endTime),sizeof(this->data._endTime)); - } - if (flowIndex & CflowdRawFlow::k_protocolMask) { -- is.read(&(this->data._protocol),sizeof(this->data._protocol)); -+ is.read((char *)&(this->data._protocol),sizeof(this->data._protocol)); - } - if (flowIndex & CflowdRawFlow::k_tosMask) { -- is.read(&(this->data._tos),sizeof(this->data._tos)); -+ is.read((char *)&(this->data._tos),sizeof(this->data._tos)); - } - if (flowIndex & CflowdRawFlow::k_srcAsMask) { -- is.read(&(this->data._srcAs),sizeof(this->data._srcAs)); -+ is.read((char *)&(this->data._srcAs),sizeof(this->data._srcAs)); - } - if (flowIndex & CflowdRawFlow::k_dstAsMask) { -- is.read(&(this->data._dstAs),sizeof(this->data._dstAs)); -+ is.read((char *)&(this->data._dstAs),sizeof(this->data._dstAs)); - } - if (flowIndex & CflowdRawFlow::k_srcMaskLenMask) { -- is.read(&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen)); -+ is.read((char *)&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen)); - } - if (flowIndex & CflowdRawFlow::k_dstMaskLenMask) { -- is.read(&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen)); -+ is.read((char *)&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen)); - } - if (flowIndex & CflowdRawFlow::k_tcpFlagsMask) { -- is.read(&(this->data._tcpFlags),sizeof(this->data._tcpFlags)); -+ is.read((char *)&(this->data._tcpFlags),sizeof(this->data._tcpFlags)); - } - if (flowIndex & CflowdRawFlow::k_inputEncapMask) { -- is.read(&(this->data._inputEncap),sizeof(this->data._inputEncap)); -+ is.read((char *)&(this->data._inputEncap),sizeof(this->data._inputEncap)); - } - if (flowIndex & CflowdRawFlow::k_outputEncapMask) { -- is.read(&(this->data._outputEncap),sizeof(this->data._outputEncap)); -+ is.read((char *)&(this->data._outputEncap),sizeof(this->data._outputEncap)); - } - if (flowIndex & CflowdRawFlow::k_peerNextHopMask) { -- is.read(&(this->data._peerNextHop),sizeof(this->data._peerNextHop)); -+ is.read((char *)&(this->data._peerNextHop),sizeof(this->data._peerNextHop)); - } - if (flowIndex & CflowdRawFlow::k_engineTypeMask) { -- is.read(&(this->data._engineType),sizeof(this->data._engineType)); -+ is.read((char *)&(this->data._engineType),sizeof(this->data._engineType)); - } - if (flowIndex & CflowdRawFlow::k_engineIdMask) { -- is.read(&(this->data._engineId),sizeof(this->data._engineId)); -+ is.read((char *)&(this->data._engineId),sizeof(this->data._engineId)); - } - - // convert to host byte order -@@ -982,56 +983,56 @@ - - rawFlow.ToNetworkByteOrder(); - -- os.write(&(dataPtr->_index),sizeof(dataPtr->_index)); -+ os.write((char *)&(dataPtr->_index),sizeof(dataPtr->_index)); - - if (flowIndex & CflowdRawFlow::k_routerMask) -- os.write(&(dataPtr->_router),sizeof(dataPtr->_router)); -+ os.write((char *)&(dataPtr->_router),sizeof(dataPtr->_router)); - if (flowIndex & CflowdRawFlow::k_srcIpAddrMask) -- os.write(&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr)); -+ os.write((char *)&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr)); - if (flowIndex & CflowdRawFlow::k_dstIpAddrMask) -- os.write(&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr)); -+ os.write((char *)&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr)); - if (flowIndex & CflowdRawFlow::k_inputIfIndexMask) -- os.write(&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex)); -+ os.write((char *)&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex)); - if (flowIndex & CflowdRawFlow::k_outputIfIndexMask) -- os.write(&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex)); -+ os.write((char *)&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex)); - if (flowIndex & CflowdRawFlow::k_srcPortMask) -- os.write(&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort)); -+ os.write((char *)&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort)); - if (flowIndex & CflowdRawFlow::k_dstPortMask) -- os.write(&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort)); -+ os.write((char *)&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort)); - if (flowIndex & CflowdRawFlow::k_pktsMask) -- os.write(&(dataPtr->_pkts),sizeof(dataPtr->_pkts)); -+ os.write((char *)&(dataPtr->_pkts),sizeof(dataPtr->_pkts)); - if (flowIndex & CflowdRawFlow::k_bytesMask) -- os.write(&(dataPtr->_bytes),sizeof(dataPtr->_bytes)); -+ os.write((char *)&(dataPtr->_bytes),sizeof(dataPtr->_bytes)); - if (flowIndex & CflowdRawFlow::k_ipNextHopMask) -- os.write(&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop)); -+ os.write((char *)&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop)); - if (flowIndex & CflowdRawFlow::k_startTimeMask) -- os.write(&(dataPtr->_startTime),sizeof(dataPtr->_startTime)); -+ os.write((char *)&(dataPtr->_startTime),sizeof(dataPtr->_startTime)); - if (flowIndex & CflowdRawFlow::k_endTimeMask) -- os.write(&(dataPtr->_endTime),sizeof(dataPtr->_endTime)); -+ os.write((char *)&(dataPtr->_endTime),sizeof(dataPtr->_endTime)); - if (flowIndex & CflowdRawFlow::k_protocolMask) -- os.write(&(dataPtr->_protocol),sizeof(dataPtr->_protocol)); -+ os.write((char *)&(dataPtr->_protocol),sizeof(dataPtr->_protocol)); - if (flowIndex & CflowdRawFlow::k_tosMask) -- os.write(&(dataPtr->_tos),sizeof(dataPtr->_tos)); -+ os.write((char *)&(dataPtr->_tos),sizeof(dataPtr->_tos)); - if (flowIndex & CflowdRawFlow::k_srcAsMask) -- os.write(&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs)); -+ os.write((char *)&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs)); - if (flowIndex & CflowdRawFlow::k_dstAsMask) -- os.write(&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs)); -+ os.write((char *)&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs)); - if (flowIndex & CflowdRawFlow::k_srcMaskLenMask) -- os.write(&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen)); -+ os.write((char *)&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen)); - if (flowIndex & CflowdRawFlow::k_dstMaskLenMask) -- os.write(&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen)); -+ os.write((char *)&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen)); - if (flowIndex & CflowdRawFlow::k_tcpFlagsMask) -- os.write(&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags)); -+ os.write((char *)&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags)); - if (flowIndex & CflowdRawFlow::k_inputEncapMask) -- os.write(&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap)); -+ os.write((char *)&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap)); - if (flowIndex & CflowdRawFlow::k_outputEncapMask) -- os.write(&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap)); -+ os.write((char *)&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap)); - if (flowIndex & CflowdRawFlow::k_peerNextHopMask) -- os.write(&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop)); -+ os.write((char *)&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop)); - if (flowIndex & CflowdRawFlow::k_engineTypeMask) -- os.write(&(dataPtr->_engineType),sizeof(dataPtr->_engineType)); -+ os.write((char *)&(dataPtr->_engineType),sizeof(dataPtr->_engineType)); - if (flowIndex & CflowdRawFlow::k_engineIdMask) -- os.write(&(dataPtr->_engineId),sizeof(dataPtr->_engineId)); -+ os.write((char *)&(dataPtr->_engineId),sizeof(dataPtr->_engineId)); - - return(os); - } diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc deleted file mode 100644 index d9880ef1758e..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdRawFlowConvertor.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- classes/src/CflowdRawFlowConverter.cc.orig Fri Aug 29 21:24:00 2003 -+++ classes/src/CflowdRawFlowConverter.cc Fri Aug 29 21:24:16 2003 -@@ -43,6 +43,7 @@ - #include - } - -+using namespace std; - #include - - #include "CflowdRawFlowConverter.hh" diff --git a/net-mgmt/cflowd/files/patch-classes::src::CflowdTosTable.cc b/net-mgmt/cflowd/files/patch-classes::src::CflowdTosTable.cc deleted file mode 100644 index 4ac063a72e69..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::CflowdTosTable.cc +++ /dev/null @@ -1,28 +0,0 @@ ---- classes/src/CflowdTosTable.cc.orig Fri Aug 29 22:01:28 2003 -+++ classes/src/CflowdTosTable.cc Fri Aug 29 22:01:52 2003 -@@ -82,9 +82,9 @@ - (*this).erase((*this).begin(),(*this).end()); - } - -- is.read(&numToss,sizeof(numToss)); -+ is.read((char *)&numToss,sizeof(numToss)); - for (tosNum = 0; tosNum < numToss; tosNum++) { -- is.read(&tos,sizeof(tos)); -+ is.read((char *)&tos,sizeof(tos)); - protoTraffic.read(is); - (*this)[tos] = protoTraffic; - } -@@ -151,11 +151,11 @@ - CflowdTosTable::const_iterator protoIter; - - numToss = (*this).size(); -- os.write(&numToss,sizeof(numToss)); -+ os.write((char *)&numToss,sizeof(numToss)); - - for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) { - tos = (*protoIter).first; -- os.write(&tos,sizeof(tos)); -+ os.write((char *)&tos,sizeof(tos)); - (*protoIter).second.write(os); - } - return(os); diff --git a/net-mgmt/cflowd/files/patch-classes::src::FlowFilter.y b/net-mgmt/cflowd/files/patch-classes::src::FlowFilter.y deleted file mode 100644 index 19f5a595becd..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::FlowFilter.y +++ /dev/null @@ -1,10 +0,0 @@ ---- classes/src/FlowFilter.y.orig Fri Aug 29 22:08:43 2003 -+++ classes/src/FlowFilter.y Fri Aug 29 22:08:51 2003 -@@ -42,6 +42,7 @@ - - #include - -+ using namespace std; - #include - - #include "CflowdRawFlow.hh" diff --git a/net-mgmt/cflowd/files/patch-classes::src::Signal.cc b/net-mgmt/cflowd/files/patch-classes::src::Signal.cc deleted file mode 100644 index aafc0dc77f59..000000000000 --- a/net-mgmt/cflowd/files/patch-classes::src::Signal.cc +++ /dev/null @@ -1,10 +0,0 @@ ---- classes/src/Signal.cc.orig Fri Aug 29 21:25:46 2003 -+++ classes/src/Signal.cc Fri Aug 29 21:25:16 2003 -@@ -8,6 +8,7 @@ - #include - } - -+using namespace std; - #include - #include "Signal.hh" - diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh new file mode 100644 index 000000000000..a3b7bafbcc18 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdCisco.hh @@ -0,0 +1,11 @@ +--- classes/include/CflowdCisco.hh.orig Fri Aug 29 20:49:59 2003 ++++ classes/include/CflowdCisco.hh Fri Aug 29 20:53:49 2003 +@@ -48,6 +48,8 @@ + #include "caida_t.h" + } + ++using namespace std; ++ + #include "CflowdRawFlow.hh" + #include "CflowdRawFlowLogger.hh" + #include "CflowdCiscoFlowInterfaceMap.hh" diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh new file mode 100644 index 000000000000..81d2d1b497a8 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdCollectorMap.hh @@ -0,0 +1,10 @@ +--- classes/include/CflowdCollectorMap.hh.orig Fri Aug 29 21:48:40 2003 ++++ classes/include/CflowdCollectorMap.hh Fri Aug 29 21:49:10 2003 +@@ -47,6 +47,7 @@ + #include "caida_t.h" + } + ++using namespace std; + #include + + #include "CflowdCollector.hh" diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh new file mode 100644 index 000000000000..73a5b121621e --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowFilter.hh @@ -0,0 +1,10 @@ +--- classes/include/CflowdFlowFilter.hh.orig Fri Aug 29 22:06:03 2003 ++++ classes/include/CflowdFlowFilter.hh Fri Aug 29 22:06:16 2003 +@@ -42,6 +42,7 @@ + #ifndef _CFLOWDFLOWFILTER_HH_ + #define _CFLOWDFLOWFILTER_HH_ + ++using namespace std; + #include + #include + diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh new file mode 100644 index 000000000000..301579739cc2 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdFlowPortList.hh @@ -0,0 +1,10 @@ +--- classes/include/CflowdFlowPortList.hh.orig Fri Aug 29 21:50:14 2003 ++++ classes/include/CflowdFlowPortList.hh Fri Aug 29 21:50:29 2003 +@@ -48,6 +48,7 @@ + #include "caida_t.h" + } + ++using namespace std; + #include + + //--------------------------------------------------------------------------- diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh new file mode 100644 index 000000000000..624fd85175ba --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdNetMatrixKey.hh @@ -0,0 +1,37 @@ +--- classes/include/CflowdNetMatrixKey.hh.orig Fri Jun 15 16:36:13 2007 ++++ classes/include/CflowdNetMatrixKey.hh Fri Jun 15 16:45:41 2007 +@@ -53,8 +53,10 @@ + } + + #include ++#include + + #include "ArtsPrimitive.hh" ++using namespace std; + + extern ArtsPrimitive g_CfdArtsPrimitive; + +@@ -191,9 +193,9 @@ + inline istream & read(istream & is) + { + g_CfdArtsPrimitive.ReadIpv4Network(is,this->_src,sizeof(this->_src)); +- is.read(&(this->_srcMaskLen),sizeof(this->_srcMaskLen)); ++ is.read((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen)); + g_CfdArtsPrimitive.ReadIpv4Network(is,this->_dst,sizeof(this->_dst)); +- is.read(&(this->_dstMaskLen),sizeof(this->_dstMaskLen)); ++ is.read((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen)); + + return(is); + } +@@ -263,9 +265,9 @@ + inline ostream & write(ostream & os) const + { + g_CfdArtsPrimitive.WriteIpv4Network(os,this->_src,sizeof(this->_src)); +- os.write(&(this->_srcMaskLen),sizeof(this->_srcMaskLen)); ++ os.write((char *)&(this->_srcMaskLen),sizeof(this->_srcMaskLen)); + g_CfdArtsPrimitive.WriteIpv4Network(os,this->_dst,sizeof(this->_dst)); +- os.write(&(this->_dstMaskLen),sizeof(this->_dstMaskLen)); ++ os.write((char *)&(this->_dstMaskLen),sizeof(this->_dstMaskLen)); + return(os); + } + diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh new file mode 100644 index 000000000000..d3e1118f829d --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdRawFlowLogger.hh @@ -0,0 +1,11 @@ +--- classes/include/CflowdRawFlowLogger.hh.orig Fri Aug 29 21:59:45 2003 ++++ classes/include/CflowdRawFlowLogger.hh Fri Aug 29 22:00:04 2003 +@@ -42,6 +42,8 @@ + #ifndef _CFLOWDRAWFLOWLOGGER_HH_ + #define _CFLOWDRAWFLOWLOGGER_HH_ + ++using namespace std; ++ + //--------------------------------------------------------------------------- + // class CflowdRawFlowLogger + //--------------------------------------------------------------------------- diff --git a/net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh b/net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh new file mode 100644 index 000000000000..b5352ae38c19 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__include__CflowdVersion.hh @@ -0,0 +1,10 @@ +--- classes/include/CflowdVersion.hh.orig Fri Aug 29 22:04:44 2003 ++++ classes/include/CflowdVersion.hh Fri Aug 29 22:04:56 2003 +@@ -42,6 +42,7 @@ + #ifndef _CFLOWDVERSION_HH_ + #define _CFLOWDVERSION_HH_ + ++using namespace std; + #include + + //--------------------------------------------------------------------------- diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc new file mode 100644 index 000000000000..ea5de5ca0d1f --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdCisco.cc @@ -0,0 +1,31 @@ +--- classes/src/CflowdCisco.cc.orig Fri Aug 29 21:02:38 2003 ++++ classes/src/CflowdCisco.cc Fri Aug 29 21:12:30 2003 +@@ -699,22 +699,22 @@ + engineIter != this->FlowEngines().end(); engineIter++) { + for (uint8_t aggMethod = 0; aggMethod <= k_CiscoV8FlowExportMaxAggType; + aggMethod++) { +- if ((*engineIter).second.MissedFlows(aggMethod) > ++ if ((*engineIter).second.MissedFlows((char)aggMethod) > + this->_missedFlowsThreshold) { + struct in_addr addrIn; + addrIn.s_addr = this->IpAddress(); +- uint64_t totalFlows = ((*engineIter).second.MissedFlows(aggMethod) + +- (*engineIter).second.FlowsReceived(aggMethod)); ++ uint64_t totalFlows = ((*engineIter).second.MissedFlows((char)aggMethod) + ++ (*engineIter).second.FlowsReceived((char)aggMethod)); + syslog(LOG_INFO, + "[I] missed %u of %u flows from %s" + " engine %d agg_method %d (%g%% loss)", +- (*engineIter).second.MissedFlows(aggMethod), ++ (*engineIter).second.MissedFlows((char)aggMethod), + totalFlows, + inet_ntoa(addrIn), + (*engineIter).first, + aggMethod, +- ((*engineIter).second.MissedFlows(aggMethod) * 100.0) / +- totalFlows); ++ ((*engineIter).second.MissedFlows((char)(aggMethod) * 100.0) / ++ totalFlows)); + } + (*engineIter).second.MissedFlows(0,aggMethod); + (*engineIter).second.FlowsReceived(0,aggMethod); diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc new file mode 100644 index 000000000000..06aa42814714 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoFlowEngine.cc @@ -0,0 +1,19 @@ +--- classes/src/CflowdCiscoFlowEngine.cc.orig Fri Aug 29 21:13:33 2003 ++++ classes/src/CflowdCiscoFlowEngine.cc Fri Aug 29 21:17:18 2003 +@@ -43,6 +43,7 @@ + #include "caida_t.h" + } + ++using namespace std; + #include + + #include "CflowdCiscoFlowEngine.hh" +@@ -58,7 +59,7 @@ + //------------------------------------------------------------------------- + uint32_t CflowdCiscoFlowEngine::SequenceNumber(uint32_t seqNumber, + uint16_t flowCount, +- uint8_t aggMethod = 0) ++ uint8_t aggMethod ) + { + if (aggMethod > k_CiscoV8FlowExportMaxAggType) { + syslog(LOG_ERR, diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc new file mode 100644 index 000000000000..33f4f19ba9d4 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdCiscoMap.cc @@ -0,0 +1,19 @@ +--- classes/src/CflowdCiscoMap.cc.orig Fri Aug 29 21:26:58 2003 ++++ classes/src/CflowdCiscoMap.cc Fri Aug 29 21:28:13 2003 +@@ -39,6 +39,7 @@ + // info@caida.org + //=========================================================================== + ++using namespace std; + #include + #include + +@@ -112,7 +113,7 @@ + } + + numCiscos = htonl(numCiscos); +- os.write(&numCiscos,sizeof(numCiscos)); ++ os.write((char *)&numCiscos,sizeof(numCiscos)); + + for (ciscomIter = (*this).begin(); ciscomIter != (*this).end(); + ciscomIter++) { diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc new file mode 100644 index 000000000000..736a89066122 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdCollector.cc @@ -0,0 +1,10 @@ +--- classes/src/CflowdCollector.cc.orig Fri Aug 29 21:47:25 2003 ++++ classes/src/CflowdCollector.cc Fri Aug 29 21:47:36 2003 +@@ -39,6 +39,7 @@ + // info@caida.org + //=========================================================================== + ++using namespace std; + #include + + #include "CflowdCollector.hh" diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc new file mode 100644 index 000000000000..87dce681b4f1 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdNextHopTable.cc @@ -0,0 +1,31 @@ +--- classes/src/CflowdNextHopTable.cc.orig Fri Aug 29 21:52:18 2003 ++++ classes/src/CflowdNextHopTable.cc Fri Aug 29 21:53:26 2003 +@@ -82,11 +82,11 @@ + (*this).erase((*this).begin(),(*this).end()); + } + +- is.read(&numNextHops,sizeof(numNextHops)); ++ is.read((char *)&numNextHops,sizeof(numNextHops)); + numNextHops = ntohl(numNextHops); + + for (nextHopNum = 0; nextHopNum < numNextHops; nextHopNum++) { +- is.read(&nextHop,sizeof(nextHop)); ++ is.read((char *)&nextHop,sizeof(nextHop)); + nextHopTraffic.read(is); + (*this)[nextHop] = nextHopTraffic; + } +@@ -154,12 +154,12 @@ + + numNextHops = (*this).size(); + numNextHops = htonl(numNextHops); +- os.write(&numNextHops,sizeof(numNextHops)); ++ os.write((char *)&numNextHops,sizeof(numNextHops)); + + for (nextHopIter = (*this).begin(); nextHopIter != (*this).end(); + nextHopIter++) { + nextHop = (*nextHopIter).first; +- os.write(&nextHop,sizeof(nextHop)); ++ os.write((char *)&nextHop,sizeof(nextHop)); + (*nextHopIter).second.write(os); + } + return(os); diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc new file mode 100644 index 000000000000..d60c99e2a6b0 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdPacketQueue.cc @@ -0,0 +1,28 @@ +--- classes/src/CflowdPacketQueue.cc.orig Fri Aug 29 21:54:26 2003 ++++ classes/src/CflowdPacketQueue.cc Fri Aug 29 21:58:48 2003 +@@ -54,6 +54,7 @@ + #include + #include + ++using namespace std; + #include "caida_t.h" + #include "CflowdFlowPdu.h" + +@@ -401,7 +402,7 @@ + //......................................................................... + // + //------------------------------------------------------------------------- +-int CflowdPacketQueue::GetLock(uint8_t bufNum = 0xff) ++int CflowdPacketQueue::GetLock(uint8_t bufNum) + { + if (bufNum == 0xff) + bufNum = this->_currentBuffer; +@@ -424,7 +425,7 @@ + //......................................................................... + // + //------------------------------------------------------------------------- +-int CflowdPacketQueue::ReleaseLock(uint8_t bufNum = 0xff) ++int CflowdPacketQueue::ReleaseLock(uint8_t bufNum) + { + if (bufNum == 0xff) + bufNum = this->_currentBuffer; diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc new file mode 100644 index 000000000000..e9c91b97b5c6 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdProtocolTable.cc @@ -0,0 +1,28 @@ +--- classes/src/CflowdProtocolTable.cc.orig Fri Aug 29 20:37:48 2003 ++++ classes/src/CflowdProtocolTable.cc Fri Aug 29 20:39:55 2003 +@@ -82,9 +82,9 @@ + (*this).erase((*this).begin(),(*this).end()); + } + +- is.read(&numProtocols,sizeof(numProtocols)); ++ is.read((char *)&numProtocols,sizeof(numProtocols)); + for (protocolNum = 0; protocolNum < numProtocols; protocolNum++) { +- is.read(&protocol,sizeof(protocol)); ++ is.read((char *)&protocol,sizeof(protocol)); + protoTraffic.read(is); + (*this)[protocol] = protoTraffic; + } +@@ -151,11 +151,11 @@ + CflowdProtocolTable::const_iterator protoIter; + + numProtocols = (*this).size(); +- os.write(&numProtocols,sizeof(numProtocols)); ++ os.write((char *)&numProtocols,sizeof(numProtocols)); + + for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) { + protocol = (*protoIter).first; +- os.write(&protocol,sizeof(protocol)); ++ os.write((const char *)&protocol,sizeof(protocol)); + (*protoIter).second.write(os); + } + return(os); diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc new file mode 100644 index 000000000000..85b4536529e8 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlow.cc @@ -0,0 +1,200 @@ +--- classes/src/CflowdRawFlow.cc.orig Fri Aug 29 21:18:36 2003 ++++ classes/src/CflowdRawFlow.cc Fri Aug 29 21:22:55 2003 +@@ -44,6 +44,7 @@ + #include + } + ++using namespace std; + #include + + #include "CflowdRawFlow.hh" +@@ -336,82 +337,82 @@ + + this->data._isHostOrder = false; + +- is.read(&(this->data._index),sizeof(this->data._index)); ++ is.read((char *)&(this->data._index),sizeof(this->data._index)); + if (! is) + return(is); + flowIndex = ntohl(this->data._index); + + if (flowIndex & CflowdRawFlow::k_routerMask) { +- is.read(&(this->data._router),sizeof(this->data._router)); ++ is.read((char *)&(this->data._router),sizeof(this->data._router)); + } + if (flowIndex & CflowdRawFlow::k_srcIpAddrMask) { +- is.read(&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr)); ++ is.read((char *)&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr)); + } + if (flowIndex & CflowdRawFlow::k_dstIpAddrMask) { +- is.read(&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr)); ++ is.read((char *)&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr)); + } + if (flowIndex & CflowdRawFlow::k_inputIfIndexMask) { +- is.read(&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex)); ++ is.read((char *)&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex)); + } + if (flowIndex & CflowdRawFlow::k_outputIfIndexMask) { +- is.read(&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex)); ++ is.read((char *)&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex)); + } + if (flowIndex & CflowdRawFlow::k_srcPortMask) { +- is.read(&(this->data._srcPort),sizeof(this->data._srcPort)); ++ is.read((char *)&(this->data._srcPort),sizeof(this->data._srcPort)); + } + if (flowIndex & CflowdRawFlow::k_dstPortMask) { +- is.read(&(this->data._dstPort),sizeof(this->data._dstPort)); ++ is.read((char *)&(this->data._dstPort),sizeof(this->data._dstPort)); + } + if (flowIndex & CflowdRawFlow::k_pktsMask) { +- is.read(&(this->data._pkts),sizeof(this->data._pkts)); ++ is.read((char *)&(this->data._pkts),sizeof(this->data._pkts)); + } + if (flowIndex & CflowdRawFlow::k_bytesMask) { +- is.read(&(this->data._bytes),sizeof(this->data._bytes)); ++ is.read((char *)&(this->data._bytes),sizeof(this->data._bytes)); + } + if (flowIndex & CflowdRawFlow::k_ipNextHopMask) { +- is.read(&(this->data._ipNextHop),sizeof(this->data._ipNextHop)); ++ is.read((char *)&(this->data._ipNextHop),sizeof(this->data._ipNextHop)); + } + if (flowIndex & CflowdRawFlow::k_startTimeMask) { +- is.read(&(this->data._startTime),sizeof(this->data._startTime)); ++ is.read((char *)&(this->data._startTime),sizeof(this->data._startTime)); + } + if (flowIndex & CflowdRawFlow::k_endTimeMask) { +- is.read(&(this->data._endTime),sizeof(this->data._endTime)); ++ is.read((char *)&(this->data._endTime),sizeof(this->data._endTime)); + } + if (flowIndex & CflowdRawFlow::k_protocolMask) { +- is.read(&(this->data._protocol),sizeof(this->data._protocol)); ++ is.read((char *)&(this->data._protocol),sizeof(this->data._protocol)); + } + if (flowIndex & CflowdRawFlow::k_tosMask) { +- is.read(&(this->data._tos),sizeof(this->data._tos)); ++ is.read((char *)&(this->data._tos),sizeof(this->data._tos)); + } + if (flowIndex & CflowdRawFlow::k_srcAsMask) { +- is.read(&(this->data._srcAs),sizeof(this->data._srcAs)); ++ is.read((char *)&(this->data._srcAs),sizeof(this->data._srcAs)); + } + if (flowIndex & CflowdRawFlow::k_dstAsMask) { +- is.read(&(this->data._dstAs),sizeof(this->data._dstAs)); ++ is.read((char *)&(this->data._dstAs),sizeof(this->data._dstAs)); + } + if (flowIndex & CflowdRawFlow::k_srcMaskLenMask) { +- is.read(&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen)); ++ is.read((char *)&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen)); + } + if (flowIndex & CflowdRawFlow::k_dstMaskLenMask) { +- is.read(&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen)); ++ is.read((char *)&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen)); + } + if (flowIndex & CflowdRawFlow::k_tcpFlagsMask) { +- is.read(&(this->data._tcpFlags),sizeof(this->data._tcpFlags)); ++ is.read((char *)&(this->data._tcpFlags),sizeof(this->data._tcpFlags)); + } + if (flowIndex & CflowdRawFlow::k_inputEncapMask) { +- is.read(&(this->data._inputEncap),sizeof(this->data._inputEncap)); ++ is.read((char *)&(this->data._inputEncap),sizeof(this->data._inputEncap)); + } + if (flowIndex & CflowdRawFlow::k_outputEncapMask) { +- is.read(&(this->data._outputEncap),sizeof(this->data._outputEncap)); ++ is.read((char *)&(this->data._outputEncap),sizeof(this->data._outputEncap)); + } + if (flowIndex & CflowdRawFlow::k_peerNextHopMask) { +- is.read(&(this->data._peerNextHop),sizeof(this->data._peerNextHop)); ++ is.read((char *)&(this->data._peerNextHop),sizeof(this->data._peerNextHop)); + } + if (flowIndex & CflowdRawFlow::k_engineTypeMask) { +- is.read(&(this->data._engineType),sizeof(this->data._engineType)); ++ is.read((char *)&(this->data._engineType),sizeof(this->data._engineType)); + } + if (flowIndex & CflowdRawFlow::k_engineIdMask) { +- is.read(&(this->data._engineId),sizeof(this->data._engineId)); ++ is.read((char *)&(this->data._engineId),sizeof(this->data._engineId)); + } + + // convert to host byte order +@@ -982,56 +983,56 @@ + + rawFlow.ToNetworkByteOrder(); + +- os.write(&(dataPtr->_index),sizeof(dataPtr->_index)); ++ os.write((char *)&(dataPtr->_index),sizeof(dataPtr->_index)); + + if (flowIndex & CflowdRawFlow::k_routerMask) +- os.write(&(dataPtr->_router),sizeof(dataPtr->_router)); ++ os.write((char *)&(dataPtr->_router),sizeof(dataPtr->_router)); + if (flowIndex & CflowdRawFlow::k_srcIpAddrMask) +- os.write(&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr)); ++ os.write((char *)&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr)); + if (flowIndex & CflowdRawFlow::k_dstIpAddrMask) +- os.write(&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr)); ++ os.write((char *)&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr)); + if (flowIndex & CflowdRawFlow::k_inputIfIndexMask) +- os.write(&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex)); ++ os.write((char *)&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex)); + if (flowIndex & CflowdRawFlow::k_outputIfIndexMask) +- os.write(&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex)); ++ os.write((char *)&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex)); + if (flowIndex & CflowdRawFlow::k_srcPortMask) +- os.write(&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort)); ++ os.write((char *)&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort)); + if (flowIndex & CflowdRawFlow::k_dstPortMask) +- os.write(&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort)); ++ os.write((char *)&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort)); + if (flowIndex & CflowdRawFlow::k_pktsMask) +- os.write(&(dataPtr->_pkts),sizeof(dataPtr->_pkts)); ++ os.write((char *)&(dataPtr->_pkts),sizeof(dataPtr->_pkts)); + if (flowIndex & CflowdRawFlow::k_bytesMask) +- os.write(&(dataPtr->_bytes),sizeof(dataPtr->_bytes)); ++ os.write((char *)&(dataPtr->_bytes),sizeof(dataPtr->_bytes)); + if (flowIndex & CflowdRawFlow::k_ipNextHopMask) +- os.write(&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop)); ++ os.write((char *)&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop)); + if (flowIndex & CflowdRawFlow::k_startTimeMask) +- os.write(&(dataPtr->_startTime),sizeof(dataPtr->_startTime)); ++ os.write((char *)&(dataPtr->_startTime),sizeof(dataPtr->_startTime)); + if (flowIndex & CflowdRawFlow::k_endTimeMask) +- os.write(&(dataPtr->_endTime),sizeof(dataPtr->_endTime)); ++ os.write((char *)&(dataPtr->_endTime),sizeof(dataPtr->_endTime)); + if (flowIndex & CflowdRawFlow::k_protocolMask) +- os.write(&(dataPtr->_protocol),sizeof(dataPtr->_protocol)); ++ os.write((char *)&(dataPtr->_protocol),sizeof(dataPtr->_protocol)); + if (flowIndex & CflowdRawFlow::k_tosMask) +- os.write(&(dataPtr->_tos),sizeof(dataPtr->_tos)); ++ os.write((char *)&(dataPtr->_tos),sizeof(dataPtr->_tos)); + if (flowIndex & CflowdRawFlow::k_srcAsMask) +- os.write(&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs)); ++ os.write((char *)&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs)); + if (flowIndex & CflowdRawFlow::k_dstAsMask) +- os.write(&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs)); ++ os.write((char *)&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs)); + if (flowIndex & CflowdRawFlow::k_srcMaskLenMask) +- os.write(&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen)); ++ os.write((char *)&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen)); + if (flowIndex & CflowdRawFlow::k_dstMaskLenMask) +- os.write(&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen)); ++ os.write((char *)&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen)); + if (flowIndex & CflowdRawFlow::k_tcpFlagsMask) +- os.write(&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags)); ++ os.write((char *)&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags)); + if (flowIndex & CflowdRawFlow::k_inputEncapMask) +- os.write(&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap)); ++ os.write((char *)&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap)); + if (flowIndex & CflowdRawFlow::k_outputEncapMask) +- os.write(&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap)); ++ os.write((char *)&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap)); + if (flowIndex & CflowdRawFlow::k_peerNextHopMask) +- os.write(&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop)); ++ os.write((char *)&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop)); + if (flowIndex & CflowdRawFlow::k_engineTypeMask) +- os.write(&(dataPtr->_engineType),sizeof(dataPtr->_engineType)); ++ os.write((char *)&(dataPtr->_engineType),sizeof(dataPtr->_engineType)); + if (flowIndex & CflowdRawFlow::k_engineIdMask) +- os.write(&(dataPtr->_engineId),sizeof(dataPtr->_engineId)); ++ os.write((char *)&(dataPtr->_engineId),sizeof(dataPtr->_engineId)); + + return(os); + } diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc new file mode 100644 index 000000000000..d9880ef1758e --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdRawFlowConvertor.cc @@ -0,0 +1,10 @@ +--- classes/src/CflowdRawFlowConverter.cc.orig Fri Aug 29 21:24:00 2003 ++++ classes/src/CflowdRawFlowConverter.cc Fri Aug 29 21:24:16 2003 +@@ -43,6 +43,7 @@ + #include + } + ++using namespace std; + #include + + #include "CflowdRawFlowConverter.hh" diff --git a/net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc b/net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc new file mode 100644 index 000000000000..4ac063a72e69 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__CflowdTosTable.cc @@ -0,0 +1,28 @@ +--- classes/src/CflowdTosTable.cc.orig Fri Aug 29 22:01:28 2003 ++++ classes/src/CflowdTosTable.cc Fri Aug 29 22:01:52 2003 +@@ -82,9 +82,9 @@ + (*this).erase((*this).begin(),(*this).end()); + } + +- is.read(&numToss,sizeof(numToss)); ++ is.read((char *)&numToss,sizeof(numToss)); + for (tosNum = 0; tosNum < numToss; tosNum++) { +- is.read(&tos,sizeof(tos)); ++ is.read((char *)&tos,sizeof(tos)); + protoTraffic.read(is); + (*this)[tos] = protoTraffic; + } +@@ -151,11 +151,11 @@ + CflowdTosTable::const_iterator protoIter; + + numToss = (*this).size(); +- os.write(&numToss,sizeof(numToss)); ++ os.write((char *)&numToss,sizeof(numToss)); + + for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) { + tos = (*protoIter).first; +- os.write(&tos,sizeof(tos)); ++ os.write((char *)&tos,sizeof(tos)); + (*protoIter).second.write(os); + } + return(os); diff --git a/net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y b/net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y new file mode 100644 index 000000000000..19f5a595becd --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__FlowFilter.y @@ -0,0 +1,10 @@ +--- classes/src/FlowFilter.y.orig Fri Aug 29 22:08:43 2003 ++++ classes/src/FlowFilter.y Fri Aug 29 22:08:51 2003 +@@ -42,6 +42,7 @@ + + #include + ++ using namespace std; + #include + + #include "CflowdRawFlow.hh" diff --git a/net-mgmt/cflowd/files/patch-classes__src__Signal.cc b/net-mgmt/cflowd/files/patch-classes__src__Signal.cc new file mode 100644 index 000000000000..aafc0dc77f59 --- /dev/null +++ b/net-mgmt/cflowd/files/patch-classes__src__Signal.cc @@ -0,0 +1,10 @@ +--- classes/src/Signal.cc.orig Fri Aug 29 21:25:46 2003 ++++ classes/src/Signal.cc Fri Aug 29 21:25:16 2003 +@@ -8,6 +8,7 @@ + #include + } + ++using namespace std; + #include + #include "Signal.hh" + -- cgit v1.2.3