cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add more patches for net/cflowd but still not working properly under

Browse Source 
-current / gcc 3.2.1.

Maybe somebody with more C++ knowledge can have a look at the current
errors it is stuck with?
This commit is contained in:
Edwin Groothuis 2003-08-30 03:44:47 +00:00
parent 5d269a0883
commit 0c565f3cc2
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=88043
4 changed files with 108 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
net-mgmt/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh Normal file
View File

@ -0,0 +1,26 @@
--- classes/include/CflowdNetMatrixKey.hh.orig Fri Aug 29 20:35:27 2003
+++ classes/include/CflowdNetMatrixKey.hh Fri Aug 29 20:36:00 2003
@@ -191,9 +191,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 +263,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);
}

28
net-mgmt/cflowd/files/patch-classes::src::CflowdProtocolTable.cc Normal file
View File

@ -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);

26
net/cflowd/files/patch-classes::include::CflowdNetMatrixKey.hh Normal file
View File

@ -0,0 +1,26 @@
--- classes/include/CflowdNetMatrixKey.hh.orig Fri Aug 29 20:35:27 2003
+++ classes/include/CflowdNetMatrixKey.hh Fri Aug 29 20:36:00 2003
@@ -191,9 +191,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 +263,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);
}

28
net/cflowd/files/patch-classes::src::CflowdProtocolTable.cc Normal file
View File

@ -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);