cflowd-gcc3.patch

   1 --- cflowd-2-1-b1/apps/cfdcollect/CflowdServer.cc.orig  Fri Oct 15 20:52:03 1999
   2 +++ cflowd-2-1-b1/apps/cfdcollect/CflowdServer.cc       Fri Feb 13 20:09:49 2004
   3 @@ -52,12 +52,14 @@
   4  }
   5
   6  #include <fstream.h>
   7 -#include <strstream.h>
   8 +#include <strstream>
   9  #include <string>
  10
  11  #include "CflowdServer.hh"
  12  #include "CflowdCisco.hh"
  13
  14 +using namespace std;
  15 +
  16  static const string rcsid = "@(#) $Name$ $Id$";
  17
  18  #ifndef INADDR_NONE
  19 --- cflowd-2-1-b1/apps/cflowd/cflowd.cc.orig    Fri Feb 13 19:00:42 2004
  20 +++ cflowd-2-1-b1/apps/cflowd/cflowd.cc Fri Feb 13 20:07:36 2004
  21 @@ -67,7 +67,7 @@
  22  }
  23
  24  #include <string>
  25 -#include <strstream.h>
  26 +#include <strstream>
  27
  28  #include "CflowdConfig.hh"
  29  #include "CflowdConfigLex.hh"
  30 @@ -77,6 +77,8 @@
  31  #include "CflowdVersion.hh"
  32  #include "Signal.hh"
  33
  34 +using namespace std;
  35 +
  36  #define k_flowsToRead  64
  37
  38  static const string         rcsid = "@(#) $Name$ $Id$";
  39 --- cflowd-2-1-b1/apps/cflowdmux/CflowdRawFlowClientList.hh.orig        Mon Sep 14 20:10:23 1998
  40 +++ cflowd-2-1-b1/apps/cflowdmux/CflowdRawFlowClientList.hh     Fri Feb 13 20:06:07 2004
  41 @@ -53,6 +53,8 @@
  42
  43  #include <list>
  44
  45 +using std::list;
  46 +
  47  //---------------------------------------------------------------------------
  48  //  class CflowdRawFlowClient
  49  //---------------------------------------------------------------------------
  50 --- cflowd-2-1-b1/apps/cflowdmux/CflowdRawFlowClientList.cc.orig        Thu Aug 19 03:52:14 1999
  51 +++ cflowd-2-1-b1/apps/cflowdmux/CflowdRawFlowClientList.cc     Fri Feb 13 20:06:28 2004
  52 @@ -47,6 +47,8 @@
  53
  54  #include "CflowdRawFlowClientList.hh"
  55
  56 +using namespace std;
  57 +
  58  static const string rcsid = "@(#) $Name$ $Id$";
  59
  60  //-------------------------------------------------------------------------
  61 --- cflowd-2-1-b1/classes/include/CflowdAsMatrix.hh.orig        Mon Sep 21 18:31:43 1998
  62 +++ cflowd-2-1-b1/classes/include/CflowdAsMatrix.hh     Fri Feb 13 19:11:02 2004
  63 @@ -55,6 +55,9 @@
  64  #include "CflowdAsMatrixTrafficCounter.hh"
  65  #include "CflowdRawFlow.hh"
  66
  67 +using std::map;
  68 +using std::less;
  69 +
  70  typedef  map<CflowdAsMatrixKey, CflowdAsMatrixTrafficCounter, less<CflowdAsMatrixKey> >   CflowdAsMatrixMap_t;
  71
  72  //---------------------------------------------------------------------------
  73 --- cflowd-2-1-b1/classes/include/CflowdNetMatrixKey.hh.orig    Sun Feb  7 19:16:39 1999
  74 +++ cflowd-2-1-b1/classes/include/CflowdNetMatrixKey.hh Fri Feb 13 19:13:13 2004
  75 @@ -191,9 +191,9 @@
  76    inline istream & read(istream & is)
  77    {
  78      g_CfdArtsPrimitive.ReadIpv4Network(is,this->_src,sizeof(this->_src));
  79 -    is.read(&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
  80 +    is.read((char*)&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
  81      g_CfdArtsPrimitive.ReadIpv4Network(is,this->_dst,sizeof(this->_dst));
  82 -    is.read(&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
  83 +    is.read((char*)&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
  84
  85      return(is);
  86    }
  87 @@ -263,9 +263,9 @@
  88    inline ostream & write(ostream & os) const
  89    {
  90      g_CfdArtsPrimitive.WriteIpv4Network(os,this->_src,sizeof(this->_src));
  91 -    os.write(&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
  92 +    os.write((char*)&(this->_srcMaskLen),sizeof(this->_srcMaskLen));
  93      g_CfdArtsPrimitive.WriteIpv4Network(os,this->_dst,sizeof(this->_dst));
  94 -    os.write(&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
  95 +    os.write((char*)&(this->_dstMaskLen),sizeof(this->_dstMaskLen));
  96      return(os);
  97    }
  98
  99 --- cflowd-2-1-b1/classes/include/CflowdNetMatrix.hh.orig       Mon Sep 21 21:14:58 1998
 100 +++ cflowd-2-1-b1/classes/include/CflowdNetMatrix.hh    Fri Feb 13 19:13:50 2004
 101 @@ -55,6 +55,9 @@
 102  #include "CflowdNetMatrixTrafficCounter.hh"
 103  #include "CflowdRawFlow.hh"
 104
 105 +using std::map;
 106 +using std::less;
 107 +
 108  typedef  map<CflowdNetMatrixKey, CflowdNetMatrixTrafficCounter, less<CflowdNetMatrixKey> >   CflowdNetMatrixMap_t;
 109
 110  //---------------------------------------------------------------------------
 111 --- cflowd-2-1-b1/classes/include/CflowdPortMatrix.hh.orig      Mon Sep 21 21:28:33 1998
 112 +++ cflowd-2-1-b1/classes/include/CflowdPortMatrix.hh   Fri Feb 13 19:15:15 2004
 113 @@ -56,6 +56,9 @@
 114  #include "CflowdPortMatrixTrafficCounter.hh"
 115  #include "CflowdRawFlow.hh"
 116
 117 +using std::map;
 118 +using std::less;
 119 +
 120  typedef  map<CflowdPortMatrixKey, CflowdPortMatrixTrafficCounter, less<CflowdPortMatrixKey> >   CflowdPortMatrixMap_t;
 121
 122  //---------------------------------------------------------------------------
 123 --- cflowd-2-1-b1/classes/include/CflowdProtocolTable.hh.orig   Wed Sep 16 19:53:33 1998
 124 +++ cflowd-2-1-b1/classes/include/CflowdProtocolTable.hh        Fri Feb 13 19:17:52 2004
 125 @@ -55,6 +55,9 @@
 126  #include "CflowdProtocolTableTrafficCounter.hh"
 127  #include "CflowdRawFlow.hh"
 128
 129 +using std::map;
 130 +using std::less;
 131 +
 132  typedef map<uint8_t,CflowdProtocolTableTrafficCounter,less<uint8_t> > _CflowdProtocolTableMap_t;
 133
 134  //---------------------------------------------------------------------------
 135 --- cflowd-2-1-b1/classes/include/CflowdRawFlowLogger.hh.orig   Wed Aug 11 18:11:35 1999
 136 +++ cflowd-2-1-b1/classes/include/CflowdRawFlowLogger.hh        Fri Feb 13 19:21:44 2004
 137 @@ -42,6 +42,9 @@
 138  #ifndef _CFLOWDRAWFLOWLOGGER_HH_
 139  #define _CFLOWDRAWFLOWLOGGER_HH_
 140
 141 +#include <string>
 142 +using std::string;
 143 +
 144  //---------------------------------------------------------------------------
 145  //  class CflowdRawFlowLogger
 146  //---------------------------------------------------------------------------
 147 --- cflowd-2-1-b1/classes/include/CflowdCiscoFlowEngine.hh.orig Thu Feb 18 09:00:44 1999
 148 +++ cflowd-2-1-b1/classes/include/CflowdCiscoFlowEngine.hh      Fri Feb 13 19:27:22 2004
 149 @@ -169,7 +169,7 @@
 150    //  Sets and returns the number of missed flows for the flow engine for
 151    //  a given aggregaiton method.
 152    //--------------------------------------------------------------------------
 153 -  inline uint32_t MissedFlows(uint32_t missedFlows, uint8_t aggMethod = 0)
 154 +  inline uint32_t MissedFlows(uint32_t missedFlows, uint8_t aggMethod /* = 0 -- ambiguous */)
 155    {
 156      if (aggMethod > k_CiscoV8FlowExportMaxAggType) {
 157        syslog(LOG_ERR,
 158 @@ -210,7 +210,7 @@
 159    //  engine for a given aggregation method.
 160    //--------------------------------------------------------------------------
 161    inline uint32_t FlowsReceived(uint32_t flowsReceived,
 162 -                                uint8_t aggMethod = 0)
 163 +                                uint8_t aggMethod /* = 0 -- ambiguous */)
 164    {
 165      if (aggMethod > k_CiscoV8FlowExportMaxAggType) {
 166        syslog(LOG_ERR,
 167 --- cflowd-2-1-b1/classes/include/CflowdInterfaceInfo.hh.orig   Wed May 26 13:36:59 1999
 168 +++ cflowd-2-1-b1/classes/include/CflowdInterfaceInfo.hh        Fri Feb 13 19:47:53 2004
 169 @@ -51,6 +51,8 @@
 170
 171  #include "snmp++/snmp_pp.h"
 172
 173 +using std::string;
 174 +
 175  #ifndef INADDR_NONE
 176    #define INADDR_NONE 0xffffffff
 177  #endif
 178 --- cflowd-2-1-b1/classes/include/CflowdInterfaceMatrix.hh.orig Mon Sep 21 20:54:27 1998
 179 +++ cflowd-2-1-b1/classes/include/CflowdInterfaceMatrix.hh      Fri Feb 13 19:48:54 2004
 180 @@ -55,6 +55,9 @@
 181  #include "CflowdInterfaceMatrixTrafficCounter.hh"
 182  #include "CflowdRawFlow.hh"
 183
 184 +using std::map;
 185 +using std::less;
 186 +
 187  typedef  map<CflowdInterfaceMatrixKey, CflowdInterfaceMatrixTrafficCounter, less<CflowdInterfaceMatrixKey> >   CflowdInterfaceMatrixMap_t;
 188
 189  //---------------------------------------------------------------------------
 190 --- cflowd-2-1-b1/classes/include/CflowdTosTable.hh.orig        Fri Apr 30 22:02:15 1999
 191 +++ cflowd-2-1-b1/classes/include/CflowdTosTable.hh     Fri Feb 13 19:55:10 2004
 192 @@ -55,6 +55,9 @@
 193  #include "CflowdTosTableTrafficCounter.hh"
 194  #include "CflowdRawFlow.hh"
 195
 196 +using std::map;
 197 +using std::less;
 198 +
 199  typedef map<uint8_t,CflowdTosTableTrafficCounter,less<uint8_t> > _CflowdTosTableMap_t;
 200
 201  //---------------------------------------------------------------------------
 202 --- cflowd-2-1-b1/classes/include/CflowdRawFlowConverter.hh.orig        Fri Sep 25 07:27:08 1998
 203 +++ cflowd-2-1-b1/classes/include/CflowdRawFlowConverter.hh     Fri Feb 13 19:32:55 2004
 204 @@ -52,6 +52,8 @@
 205
 206  #include "CflowdRawFlow.hh"
 207
 208 +using std::vector;
 209 +
 210  //---------------------------------------------------------------------------
 211  //  class CflowdRawFlowConverter
 212  //---------------------------------------------------------------------------
 213 --- cflowd-2-1-b1/classes/include/CflowdFlowFilter.hh.orig      Sat Dec 12 11:06:37 1998
 214 +++ cflowd-2-1-b1/classes/include/CflowdFlowFilter.hh   Fri Feb 13 19:58:29 2004
 215 @@ -47,6 +47,8 @@
 216
 217  #include "CflowdRawFlow.hh"
 218
 219 +using std::vector;
 220 +
 221  extern int          flowfiltparse (void);
 222  extern int          flowfiltparseval;
 223
 224 --- cflowd-2-1-b1/classes/include/CflowdFlowPortList.hh.orig    Tue Oct 20 00:40:50 1998
 225 +++ cflowd-2-1-b1/classes/include/CflowdFlowPortList.hh Fri Feb 13 19:39:53 2004
 226 @@ -50,6 +50,8 @@
 227
 228  #include <list>
 229
 230 +using std::list;
 231 +
 232  //---------------------------------------------------------------------------
 233  //  class CflowdFlowPort
 234  //---------------------------------------------------------------------------
 235 --- cflowd-2-1-b1/classes/include/Signal.hh.orig        Mon Sep 14 19:07:32 1998
 236 +++ cflowd-2-1-b1/classes/include/Signal.hh     Fri Feb 13 19:41:36 2004
 237 @@ -47,6 +47,8 @@
 238  #include <signal.h>
 239  }
 240
 241 +using std::deque;
 242 +
 243  typedef struct sigaction sigactStruct;
 244
 245  //+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 246 --- cflowd-2-1-b1/classes/include/CflowdNextHopTable.hh.orig    Fri Sep 18 13:33:33 1998
 247 +++ cflowd-2-1-b1/classes/include/CflowdNextHopTable.hh Fri Feb 13 19:50:19 2004
 248 @@ -57,6 +57,9 @@
 249  #include "CflowdNextHopTableTrafficCounter.hh"
 250  #include "CflowdRawFlow.hh"
 251
 252 +using std::map;
 253 +using std::less;
 254 +
 255  typedef map<ipv4addr_t,CflowdNextHopTableTrafficCounter,less<ipv4addr_t> > _CflowdNextHopTableMap_t;
 256
 257  //---------------------------------------------------------------------------
 258 --- cflowd-2-1-b1/classes/include/CflowdVersion.hh.orig Tue Oct 13 02:00:39 1998
 259 +++ cflowd-2-1-b1/classes/include/CflowdVersion.hh      Fri Feb 13 19:57:06 2004
 260 @@ -44,6 +44,8 @@
 261
 262  #include <string>
 263
 264 +using std::string;
 265 +
 266  //---------------------------------------------------------------------------
 267  //  class CflowdVersion
 268  //---------------------------------------------------------------------------
 269 --- cflowd-2-1-b1/classes/include/CflowdCollectorMap.hh.orig    Mon Sep 21 19:48:32 1998
 270 +++ cflowd-2-1-b1/classes/include/CflowdCollectorMap.hh Fri Feb 13 19:44:10 2004
 271 @@ -51,6 +51,9 @@
 272
 273  #include "CflowdCollector.hh"
 274
 275 +using std::map;
 276 +using std::less;
 277 +
 278  typedef map<ipv4addr_t,CflowdCollector *,less<ipv4addr_t> > _CflowdCollectorMap_t;
 279
 280  //---------------------------------------------------------------------------
 281 --- cflowd-2-1-b1/classes/src/CflowdCollectorMap.cc.orig        Wed Sep 16 14:22:05 1998
 282 +++ cflowd-2-1-b1/classes/src/CflowdCollectorMap.cc     Fri Feb 13 19:46:02 2004
 283 @@ -43,6 +43,8 @@
 284
 285  #include "CflowdCollectorMap.hh"
 286
 287 +using namespace std;
 288 +
 289  static const string rcsid = "@(#) $Name$ $Id$";
 290
 291  //-------------------------------------------------------------------------
 292 --- cflowd-2-1-b1/classes/src/CflowdTosTable.cc.orig    Fri Apr 30 22:02:17 1999
 293 +++ cflowd-2-1-b1/classes/src/CflowdTosTable.cc Fri Feb 13 19:56:28 2004
 294 @@ -43,6 +43,8 @@
 295
 296  #include "CflowdTosTable.hh"
 297
 298 +using namespace std;
 299 +
 300  #define k_flowTosTableFieldsMask (CflowdRawFlow::k_tosMask|\
 301                                         CflowdRawFlow::k_pktsMask|\
 302                                         CflowdRawFlow::k_bytesMask)
 303 @@ -82,9 +84,9 @@
 304      (*this).erase((*this).begin(),(*this).end());
 305    }
 306
 307 -  is.read(&numToss,sizeof(numToss));
 308 +  is.read((char*)&numToss,sizeof(numToss));
 309    for (tosNum = 0; tosNum < numToss; tosNum++) {
 310 -    is.read(&tos,sizeof(tos));
 311 +    is.read((char*)&tos,sizeof(tos));
 312      protoTraffic.read(is);
 313      (*this)[tos] = protoTraffic;
 314    }
 315 @@ -151,11 +153,11 @@
 316    CflowdTosTable::const_iterator  protoIter;
 317
 318    numToss = (*this).size();
 319 -  os.write(&numToss,sizeof(numToss));
 320 +  os.write((char*)&numToss,sizeof(numToss));
 321
 322    for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) {
 323      tos = (*protoIter).first;
 324 -    os.write(&tos,sizeof(tos));
 325 +    os.write((char*)&tos,sizeof(tos));
 326      (*protoIter).second.write(os);
 327    }
 328    return(os);
 329 --- cflowd-2-1-b1/classes/src/FlowFilterLex.cc.orig     Sat Dec 12 10:53:19 1998
 330 +++ cflowd-2-1-b1/classes/src/FlowFilterLex.cc  Fri Feb 13 19:59:28 2004
 331 @@ -45,6 +45,7 @@
 332  #include "CflowdFlowFilter.hh"
 333  #include "flowfilt.tab.h"
 334
 335 +using namespace std;
 336  extern int       flowfiltlval;
 337
 338  static const string rcsid = "@(#) $Name$ $Id$";
 339 --- cflowd-2-1-b1/classes/src/CflowdAsMatrix.cc.orig    Fri Feb 19 03:20:04 1999
 340 +++ cflowd-2-1-b1/classes/src/CflowdAsMatrix.cc Fri Feb 13 19:09:35 2004
 341 @@ -40,11 +40,13 @@
 342  //===========================================================================
 343
 344  #include <string>
 345 -#include <strstream.h>
 346 +#include <strstream>
 347
 348  #include "ArtsPrimitive.hh"
 349  #include "CflowdAsMatrix.hh"
 350
 351 +using namespace std;
 352 +
 353  #define k_flowAsMatrixFieldsMask  (CflowdRawFlow::k_srcAsMask|\
 354                                     CflowdRawFlow::k_dstAsMask|\
 355                                     CflowdRawFlow::k_pktsMask|\
 356 --- cflowd-2-1-b1/classes/src/CflowdCollector.cc.orig   Wed Sep 16 14:20:26 1998
 357 +++ cflowd-2-1-b1/classes/src/CflowdCollector.cc        Fri Feb 13 19:43:40 2004
 358 @@ -43,6 +43,8 @@
 359
 360  #include "CflowdCollector.hh"
 361
 362 +using namespace std;
 363 +
 364  static const string rcsid = "@(#) $Name$ $Id$";
 365
 366  //-------------------------------------------------------------------------
 367 --- cflowd-2-1-b1/classes/src/CflowdNetMatrix.cc.orig   Sat Aug 28 10:52:02 1999
 368 +++ cflowd-2-1-b1/classes/src/CflowdNetMatrix.cc        Fri Feb 13 19:11:45 2004
 369 @@ -40,11 +40,13 @@
 370  //===========================================================================
 371
 372  #include <string>
 373 -#include <strstream.h>
 374 +#include <strstream>
 375
 376  #include "ArtsPrimitive.hh"
 377  #include "CflowdNetMatrix.hh"
 378
 379 +using namespace std;
 380 +
 381  #define k_flowNetMatrixV5FieldsMask (CflowdRawFlow::k_srcIpAddrMask|\
 382                                       CflowdRawFlow::k_dstIpAddrMask|\
 383                                       CflowdRawFlow::k_srcMaskLenMask|\
 384 --- cflowd-2-1-b1/classes/src/CflowdPortMatrix.cc.orig  Tue Feb  9 20:12:51 1999
 385 +++ cflowd-2-1-b1/classes/src/CflowdPortMatrix.cc       Fri Feb 13 19:15:43 2004
 386 @@ -40,11 +40,13 @@
 387  //===========================================================================
 388
 389  #include <string>
 390 -#include <strstream.h>
 391 +#include <strstream>
 392
 393  #include "ArtsPrimitive.hh"
 394  #include "CflowdPortMatrix.hh"
 395
 396 +using namespace std;
 397 +
 398  #define k_flowPortMatrixFieldsMask (CflowdRawFlow::k_srcPortMask|\
 399                                      CflowdRawFlow::k_dstPortMask|\
 400                                      CflowdRawFlow::k_pktsMask|\
 401 --- cflowd-2-1-b1/classes/src/FlowFilter.y.orig Fri Dec 11 17:06:50 1998
 402 +++ cflowd-2-1-b1/classes/src/FlowFilter.y      Fri Feb 13 20:01:24 2004
 403 @@ -46,6 +46,8 @@
 404
 405    #include "CflowdRawFlow.hh"
 406
 407 +  using namespace std;
 408 +
 409    static const string rcsid = "@(#) $Name$ $Id$";
 410
 411    extern int            flowfiltparseval;
 412 --- cflowd-2-1-b1/classes/src/CflowdProtocolTable.cc.orig       Fri Dec 11 11:17:51 1998
 413 +++ cflowd-2-1-b1/classes/src/CflowdProtocolTable.cc    Fri Feb 13 19:20:41 2004
 414 @@ -43,6 +43,8 @@
 415
 416  #include "CflowdProtocolTable.hh"
 417
 418 +using namespace std;
 419 +
 420  #define k_flowProtocolTableFieldsMask (CflowdRawFlow::k_protocolMask|\
 421                                         CflowdRawFlow::k_pktsMask|\
 422                                         CflowdRawFlow::k_bytesMask)
 423 @@ -82,9 +84,9 @@
 424      (*this).erase((*this).begin(),(*this).end());
 425    }
 426
 427 -  is.read(&numProtocols,sizeof(numProtocols));
 428 +  is.read((char*)&numProtocols,sizeof(numProtocols));
 429    for (protocolNum = 0; protocolNum < numProtocols; protocolNum++) {
 430 -    is.read(&protocol,sizeof(protocol));
 431 +    is.read((char*)&protocol,sizeof(protocol));
 432      protoTraffic.read(is);
 433      (*this)[protocol] = protoTraffic;
 434    }
 435 @@ -151,11 +153,11 @@
 436    CflowdProtocolTable::const_iterator  protoIter;
 437
 438    numProtocols = (*this).size();
 439 -  os.write(&numProtocols,sizeof(numProtocols));
 440 +  os.write((char*)&numProtocols,sizeof(numProtocols));
 441
 442    for (protoIter = (*this).begin(); protoIter != (*this).end(); protoIter++) {
 443      protocol = (*protoIter).first;
 444 -    os.write(&protocol,sizeof(protocol));
 445 +    os.write((char*)&protocol,sizeof(protocol));
 446      (*protoIter).second.write(os);
 447    }
 448    return(os);
 449 --- cflowd-2-1-b1/classes/src/CflowdNextHopTable.cc.orig        Fri Dec 11 11:17:50 1998
 450 +++ cflowd-2-1-b1/classes/src/CflowdNextHopTable.cc     Fri Feb 13 19:52:07 2004
 451 @@ -43,6 +43,8 @@
 452
 453  #include "CflowdNextHopTable.hh"
 454
 455 +using namespace std;
 456 +
 457  #define k_flowNextHopTableFieldsMask (CflowdRawFlow::k_ipNextHopMask|\
 458                                        CflowdRawFlow::k_pktsMask|\
 459                                        CflowdRawFlow::k_bytesMask)
 460 @@ -82,11 +84,11 @@
 461      (*this).erase((*this).begin(),(*this).end());
 462    }
 463
 464 -  is.read(&numNextHops,sizeof(numNextHops));
 465 +  is.read((char*)&numNextHops,sizeof(numNextHops));
 466    numNextHops = ntohl(numNextHops);
 467
 468    for (nextHopNum = 0; nextHopNum < numNextHops; nextHopNum++) {
 469 -    is.read(&nextHop,sizeof(nextHop));
 470 +    is.read((char*)&nextHop,sizeof(nextHop));
 471      nextHopTraffic.read(is);
 472      (*this)[nextHop] = nextHopTraffic;
 473    }
 474 @@ -154,12 +156,12 @@
 475
 476    numNextHops = (*this).size();
 477    numNextHops = htonl(numNextHops);
 478 -  os.write(&numNextHops,sizeof(numNextHops));
 479 +  os.write((char*)&numNextHops,sizeof(numNextHops));
 480
 481    for (nextHopIter = (*this).begin(); nextHopIter != (*this).end();
 482         nextHopIter++) {
 483      nextHop = (*nextHopIter).first;
 484 -    os.write(&nextHop,sizeof(nextHop));
 485 +    os.write((char*)&nextHop,sizeof(nextHop));
 486      (*nextHopIter).second.write(os);
 487    }
 488    return(os);
 489 --- cflowd-2-1-b1/classes/src/CflowdCisco.cc.orig       Thu Aug  3 19:20:45 2000
 490 +++ cflowd-2-1-b1/classes/src/CflowdCisco.cc    Fri Feb 13 19:26:14 2004
 491 @@ -47,10 +47,12 @@
 492  }
 493
 494  #include <string>
 495 -#include <strstream.h>
 496 +#include <strstream>
 497
 498  #include "CflowdCisco.hh"
 499
 500 +using namespace std;
 501 +
 502  static const string rcsid = "@(#) $Name$ $Id$";
 503
 504  static Oid   g_ipAdEntIfIndexOid("1.3.6.1.2.1.4.20.1.2");
 505 --- cflowd-2-1-b1/classes/src/CflowdPacketQueue.cc.orig Tue Oct 24 18:18:55 2000
 506 +++ cflowd-2-1-b1/classes/src/CflowdPacketQueue.cc      Fri Feb 13 19:53:58 2004
 507 @@ -77,6 +77,8 @@
 508
 509  #include "CflowdPacketQueue.hh"
 510
 511 +using namespace std;
 512 +
 513  static const string rcsid = "@(#) $Name$ $Id$";
 514
 515  //-------------------------------------------------------------------------
 516 @@ -401,7 +403,7 @@
 517  //.........................................................................
 518  //
 519  //-------------------------------------------------------------------------
 520 -int CflowdPacketQueue::GetLock(uint8_t bufNum = 0xff)
 521 +int CflowdPacketQueue::GetLock(uint8_t bufNum /* = 0xff */)
 522  {
 523    if (bufNum == 0xff)
 524      bufNum = this->_currentBuffer;
 525 @@ -424,7 +426,7 @@
 526  //.........................................................................
 527  //
 528  //-------------------------------------------------------------------------
 529 -int CflowdPacketQueue::ReleaseLock(uint8_t bufNum = 0xff)
 530 +int CflowdPacketQueue::ReleaseLock(uint8_t bufNum /* = 0xff */)
 531  {
 532    if (bufNum == 0xff)
 533      bufNum = this->_currentBuffer;
 534 --- cflowd-2-1-b1/classes/src/CflowdCiscoFlowEngine.cc.orig     Thu Feb 18 09:04:41 1999
 535 +++ cflowd-2-1-b1/classes/src/CflowdCiscoFlowEngine.cc  Fri Feb 13 19:28:31 2004
 536 @@ -47,6 +47,8 @@
 537
 538  #include "CflowdCiscoFlowEngine.hh"
 539
 540 +using namespace std;
 541 +
 542  static const string rcsid = "@(#) $Name$ $Id$";
 543
 544  //-------------------------------------------------------------------------
 545 @@ -58,7 +60,7 @@
 546  //-------------------------------------------------------------------------
 547  uint32_t CflowdCiscoFlowEngine::SequenceNumber(uint32_t seqNumber,
 548                                                 uint16_t flowCount,
 549 -                                               uint8_t aggMethod = 0)
 550 +                                               uint8_t aggMethod /* = 0 */)
 551  {
 552    if (aggMethod > k_CiscoV8FlowExportMaxAggType) {
 553      syslog(LOG_ERR,
 554 --- cflowd-2-1-b1/classes/src/CflowdRawFlowLogger.cc.orig       Wed Dec 23 00:35:57 1998
 555 +++ cflowd-2-1-b1/classes/src/CflowdRawFlowLogger.cc    Fri Feb 13 19:54:37 2004
 556 @@ -63,12 +63,14 @@
 557  #endif
 558
 559  #include <string>
 560 -#include <strstream.h>
 561 +#include <strstream>
 562
 563  #include "CflowdRawFlow.hh"
 564  #include "CflowdRawFlowLogger.hh"
 565  #include "ArtsPrimitive.hh"
 566
 567 +using namespace std;
 568 +
 569  extern ArtsPrimitive g_CfdArtsPrimitive;
 570
 571  static const string rcsid = "@(#) $Name$ $Id$";
 572 --- cflowd-2-1-b1/classes/src/CflowdInterfaceMatrix.cc.orig     Fri Dec 11 11:17:50 1998
 573 +++ cflowd-2-1-b1/classes/src/CflowdInterfaceMatrix.cc  Fri Feb 13 19:49:42 2004
 574 @@ -44,6 +44,8 @@
 575  #include "ArtsPrimitive.hh"
 576  #include "CflowdInterfaceMatrix.hh"
 577
 578 +using namespace std;
 579 +
 580  #define k_flowInterfaceMatrixFieldsMask (CflowdRawFlow::k_inputIfIndexMask|\
 581                                           CflowdRawFlow::k_outputIfIndexMask|\
 582                                           CflowdRawFlow::k_pktsMask|\
 583 --- cflowd-2-1-b1/classes/src/CflowdCiscoMap.cc.orig    Tue May 25 12:27:07 1999
 584 +++ cflowd-2-1-b1/classes/src/CflowdCiscoMap.cc Fri Feb 13 19:43:13 2004
 585 @@ -112,7 +112,7 @@
 586    }
 587
 588    numCiscos = htonl(numCiscos);
 589 -  os.write(&numCiscos,sizeof(numCiscos));
 590 +  os.write((char*)&numCiscos,sizeof(numCiscos));
 591
 592    for (ciscomIter = (*this).begin(); ciscomIter != (*this).end();
 593         ciscomIter++) {
 594 --- cflowd-2-1-b1/classes/src/filtexpr.lex.orig Wed May 26 13:01:09 1999
 595 +++ cflowd-2-1-b1/classes/src/filtexpr.lex      Fri Feb 13 20:04:30 2004
 596 @@ -59,6 +59,8 @@
 597  #include "CflowdFlowFilter.hh"
 598  #include "flowfilt.tab.h"
 599
 600 +using namespace std;
 601 +
 602  extern int       flowfiltlval;
 603  extern int       flowfiltparse (void);
 604
 605 --- cflowd-2-1-b1/classes/src/CflowdRawFlow.cc.orig     Sat Jan  8 01:57:33 2000
 606 +++ cflowd-2-1-b1/classes/src/CflowdRawFlow.cc  Fri Feb 13 19:32:16 2004
 607 @@ -49,6 +49,8 @@
 608  #include "CflowdRawFlow.hh"
 609  #include "ArtsPrimitive.hh"
 610
 611 +using namespace std;
 612 +
 613  extern ArtsPrimitive g_CfdArtsPrimitive;
 614
 615  static const string rcsid = "@(#) $Name$ $Id$";
 616 @@ -336,82 +338,82 @@
 617
 618    this->data._isHostOrder = false;
 619
 620 -  is.read(&(this->data._index),sizeof(this->data._index));
 621 +  is.read((char*)&(this->data._index),sizeof(this->data._index));
 622    if (! is)
 623      return(is);
 624    flowIndex = ntohl(this->data._index);
 625
 626    if (flowIndex & CflowdRawFlow::k_routerMask) {
 627 -    is.read(&(this->data._router),sizeof(this->data._router));
 628 +    is.read((char*)&(this->data._router),sizeof(this->data._router));
 629    }
 630    if (flowIndex & CflowdRawFlow::k_srcIpAddrMask) {
 631 -    is.read(&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr));
 632 +    is.read((char*)&(this->data._srcIpAddr),sizeof(this->data._srcIpAddr));
 633    }
 634    if (flowIndex & CflowdRawFlow::k_dstIpAddrMask) {
 635 -    is.read(&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr));
 636 +    is.read((char*)&(this->data._dstIpAddr),sizeof(this->data._dstIpAddr));
 637    }
 638    if (flowIndex & CflowdRawFlow::k_inputIfIndexMask) {
 639 -    is.read(&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex));
 640 +    is.read((char*)&(this->data._inputIfIndex),sizeof(this->data._inputIfIndex));
 641    }
 642    if (flowIndex & CflowdRawFlow::k_outputIfIndexMask) {
 643 -    is.read(&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex));
 644 +    is.read((char*)&(this->data._outputIfIndex),sizeof(this->data._outputIfIndex));
 645    }
 646    if (flowIndex & CflowdRawFlow::k_srcPortMask) {
 647 -    is.read(&(this->data._srcPort),sizeof(this->data._srcPort));
 648 +    is.read((char*)&(this->data._srcPort),sizeof(this->data._srcPort));
 649    }
 650    if (flowIndex & CflowdRawFlow::k_dstPortMask) {
 651 -    is.read(&(this->data._dstPort),sizeof(this->data._dstPort));
 652 +    is.read((char*)&(this->data._dstPort),sizeof(this->data._dstPort));
 653    }
 654    if (flowIndex & CflowdRawFlow::k_pktsMask) {
 655 -    is.read(&(this->data._pkts),sizeof(this->data._pkts));
 656 +    is.read((char*)&(this->data._pkts),sizeof(this->data._pkts));
 657    }
 658    if (flowIndex & CflowdRawFlow::k_bytesMask) {
 659 -    is.read(&(this->data._bytes),sizeof(this->data._bytes));
 660 +    is.read((char*)&(this->data._bytes),sizeof(this->data._bytes));
 661    }
 662    if (flowIndex & CflowdRawFlow::k_ipNextHopMask) {
 663 -    is.read(&(this->data._ipNextHop),sizeof(this->data._ipNextHop));
 664 +    is.read((char*)&(this->data._ipNextHop),sizeof(this->data._ipNextHop));
 665    }
 666    if (flowIndex & CflowdRawFlow::k_startTimeMask) {
 667 -    is.read(&(this->data._startTime),sizeof(this->data._startTime));
 668 +    is.read((char*)&(this->data._startTime),sizeof(this->data._startTime));
 669    }
 670    if (flowIndex & CflowdRawFlow::k_endTimeMask) {
 671 -    is.read(&(this->data._endTime),sizeof(this->data._endTime));
 672 +    is.read((char*)&(this->data._endTime),sizeof(this->data._endTime));
 673    }
 674    if (flowIndex & CflowdRawFlow::k_protocolMask) {
 675 -    is.read(&(this->data._protocol),sizeof(this->data._protocol));
 676 +    is.read((char*)&(this->data._protocol),sizeof(this->data._protocol));
 677    }
 678    if (flowIndex & CflowdRawFlow::k_tosMask) {
 679 -    is.read(&(this->data._tos),sizeof(this->data._tos));
 680 +    is.read((char*)&(this->data._tos),sizeof(this->data._tos));
 681    }
 682    if (flowIndex & CflowdRawFlow::k_srcAsMask) {
 683 -    is.read(&(this->data._srcAs),sizeof(this->data._srcAs));
 684 +    is.read((char*)&(this->data._srcAs),sizeof(this->data._srcAs));
 685    }
 686    if (flowIndex & CflowdRawFlow::k_dstAsMask) {
 687 -    is.read(&(this->data._dstAs),sizeof(this->data._dstAs));
 688 +    is.read((char*)&(this->data._dstAs),sizeof(this->data._dstAs));
 689    }
 690    if (flowIndex & CflowdRawFlow::k_srcMaskLenMask) {
 691 -    is.read(&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen));
 692 +    is.read((char*)&(this->data._srcMaskLen),sizeof(this->data._srcMaskLen));
 693    }
 694    if (flowIndex & CflowdRawFlow::k_dstMaskLenMask) {
 695 -    is.read(&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen));
 696 +    is.read((char*)&(this->data._dstMaskLen),sizeof(this->data._dstMaskLen));
 697    }
 698    if (flowIndex & CflowdRawFlow::k_tcpFlagsMask) {
 699 -    is.read(&(this->data._tcpFlags),sizeof(this->data._tcpFlags));
 700 +    is.read((char*)&(this->data._tcpFlags),sizeof(this->data._tcpFlags));
 701    }
 702    if (flowIndex & CflowdRawFlow::k_inputEncapMask) {
 703 -    is.read(&(this->data._inputEncap),sizeof(this->data._inputEncap));
 704 +    is.read((char*)&(this->data._inputEncap),sizeof(this->data._inputEncap));
 705    }
 706    if (flowIndex & CflowdRawFlow::k_outputEncapMask) {
 707 -    is.read(&(this->data._outputEncap),sizeof(this->data._outputEncap));
 708 +    is.read((char*)&(this->data._outputEncap),sizeof(this->data._outputEncap));
 709    }
 710    if (flowIndex & CflowdRawFlow::k_peerNextHopMask) {
 711 -    is.read(&(this->data._peerNextHop),sizeof(this->data._peerNextHop));
 712 +    is.read((char*)&(this->data._peerNextHop),sizeof(this->data._peerNextHop));
 713    }
 714    if (flowIndex & CflowdRawFlow::k_engineTypeMask) {
 715 -    is.read(&(this->data._engineType),sizeof(this->data._engineType));
 716 +    is.read((char*)&(this->data._engineType),sizeof(this->data._engineType));
 717    }
 718    if (flowIndex & CflowdRawFlow::k_engineIdMask) {
 719 -    is.read(&(this->data._engineId),sizeof(this->data._engineId));
 720 +    is.read((char*)&(this->data._engineId),sizeof(this->data._engineId));
 721    }
 722
 723    //  convert to host byte order
 724 @@ -982,56 +984,56 @@
 725
 726    rawFlow.ToNetworkByteOrder();
 727
 728 -  os.write(&(dataPtr->_index),sizeof(dataPtr->_index));
 729 +  os.write((char*)&(dataPtr->_index),sizeof(dataPtr->_index));
 730
 731    if (flowIndex & CflowdRawFlow::k_routerMask)
 732 -    os.write(&(dataPtr->_router),sizeof(dataPtr->_router));
 733 +    os.write((char*)&(dataPtr->_router),sizeof(dataPtr->_router));
 734    if (flowIndex & CflowdRawFlow::k_srcIpAddrMask)
 735 -    os.write(&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr));
 736 +    os.write((char*)&(dataPtr->_srcIpAddr),sizeof(dataPtr->_srcIpAddr));
 737    if (flowIndex & CflowdRawFlow::k_dstIpAddrMask)
 738 -    os.write(&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr));
 739 +    os.write((char*)&(dataPtr->_dstIpAddr),sizeof(dataPtr->_dstIpAddr));
 740    if (flowIndex & CflowdRawFlow::k_inputIfIndexMask)
 741 -    os.write(&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex));
 742 +    os.write((char*)&(dataPtr->_inputIfIndex),sizeof(dataPtr->_inputIfIndex));
 743    if (flowIndex & CflowdRawFlow::k_outputIfIndexMask)
 744 -    os.write(&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex));
 745 +    os.write((char*)&(dataPtr->_outputIfIndex),sizeof(dataPtr->_outputIfIndex));
 746    if (flowIndex & CflowdRawFlow::k_srcPortMask)
 747 -    os.write(&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort));
 748 +    os.write((char*)&(dataPtr->_srcPort),sizeof(dataPtr->_srcPort));
 749    if (flowIndex & CflowdRawFlow::k_dstPortMask)
 750 -    os.write(&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort));
 751 +    os.write((char*)&(dataPtr->_dstPort),sizeof(dataPtr->_dstPort));
 752    if (flowIndex & CflowdRawFlow::k_pktsMask)
 753 -    os.write(&(dataPtr->_pkts),sizeof(dataPtr->_pkts));
 754 +    os.write((char*)&(dataPtr->_pkts),sizeof(dataPtr->_pkts));
 755    if (flowIndex & CflowdRawFlow::k_bytesMask)
 756 -    os.write(&(dataPtr->_bytes),sizeof(dataPtr->_bytes));
 757 +    os.write((char*)&(dataPtr->_bytes),sizeof(dataPtr->_bytes));
 758    if (flowIndex & CflowdRawFlow::k_ipNextHopMask)
 759 -    os.write(&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop));
 760 +    os.write((char*)&(dataPtr->_ipNextHop),sizeof(dataPtr->_ipNextHop));
 761    if (flowIndex & CflowdRawFlow::k_startTimeMask)
 762 -    os.write(&(dataPtr->_startTime),sizeof(dataPtr->_startTime));
 763 +    os.write((char*)&(dataPtr->_startTime),sizeof(dataPtr->_startTime));
 764    if (flowIndex & CflowdRawFlow::k_endTimeMask)
 765 -    os.write(&(dataPtr->_endTime),sizeof(dataPtr->_endTime));
 766 +    os.write((char*)&(dataPtr->_endTime),sizeof(dataPtr->_endTime));
 767    if (flowIndex & CflowdRawFlow::k_protocolMask)
 768 -    os.write(&(dataPtr->_protocol),sizeof(dataPtr->_protocol));
 769 +    os.write((char*)&(dataPtr->_protocol),sizeof(dataPtr->_protocol));
 770    if (flowIndex & CflowdRawFlow::k_tosMask)
 771 -    os.write(&(dataPtr->_tos),sizeof(dataPtr->_tos));
 772 +    os.write((char*)&(dataPtr->_tos),sizeof(dataPtr->_tos));
 773    if (flowIndex & CflowdRawFlow::k_srcAsMask)
 774 -    os.write(&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs));
 775 +    os.write((char*)&(dataPtr->_srcAs),sizeof(dataPtr->_srcAs));
 776    if (flowIndex & CflowdRawFlow::k_dstAsMask)
 777 -    os.write(&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs));
 778 +    os.write((char*)&(dataPtr->_dstAs),sizeof(dataPtr->_dstAs));
 779    if (flowIndex & CflowdRawFlow::k_srcMaskLenMask)
 780 -    os.write(&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen));
 781 +    os.write((char*)&(dataPtr->_srcMaskLen),sizeof(dataPtr->_srcMaskLen));
 782    if (flowIndex & CflowdRawFlow::k_dstMaskLenMask)
 783 -    os.write(&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen));
 784 +    os.write((char*)&(dataPtr->_dstMaskLen),sizeof(dataPtr->_dstMaskLen));
 785    if (flowIndex & CflowdRawFlow::k_tcpFlagsMask)
 786 -    os.write(&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags));
 787 +    os.write((char*)&(dataPtr->_tcpFlags),sizeof(dataPtr->_tcpFlags));
 788    if (flowIndex & CflowdRawFlow::k_inputEncapMask)
 789 -    os.write(&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap));
 790 +    os.write((char*)&(dataPtr->_inputEncap),sizeof(dataPtr->_inputEncap));
 791    if (flowIndex & CflowdRawFlow::k_outputEncapMask)
 792 -    os.write(&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap));
 793 +    os.write((char*)&(dataPtr->_outputEncap),sizeof(dataPtr->_outputEncap));
 794    if (flowIndex & CflowdRawFlow::k_peerNextHopMask)
 795 -    os.write(&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop));
 796 +    os.write((char*)&(dataPtr->_peerNextHop),sizeof(dataPtr->_peerNextHop));
 797    if (flowIndex & CflowdRawFlow::k_engineTypeMask)
 798 -    os.write(&(dataPtr->_engineType),sizeof(dataPtr->_engineType));
 799 +    os.write((char*)&(dataPtr->_engineType),sizeof(dataPtr->_engineType));
 800    if (flowIndex & CflowdRawFlow::k_engineIdMask)
 801 -    os.write(&(dataPtr->_engineId),sizeof(dataPtr->_engineId));
 802 +    os.write((char*)&(dataPtr->_engineId),sizeof(dataPtr->_engineId));
 803
 804    return(os);
 805  }
 806 --- cflowd-2-1-b1/classes/src/CflowdRawFlowConverter.cc.orig    Thu Feb  4 23:03:18 1999
 807 +++ cflowd-2-1-b1/classes/src/CflowdRawFlowConverter.cc Fri Feb 13 19:33:26 2004
 808 @@ -47,6 +47,8 @@
 809
 810  #include "CflowdRawFlowConverter.hh"
 811
 812 +using namespace std;
 813 +
 814  static const string rcsid = "@(#) $Name$ $Id$";
 815
 816  //-------------------------------------------------------------------------
 817 --- cflowd-2-1-b1/classes/src/Signal.cc.orig    Mon Sep 14 19:06:33 1998
 818 +++ cflowd-2-1-b1/classes/src/Signal.cc Fri Feb 13 19:42:03 2004
 819 @@ -11,6 +11,8 @@
 820  #include <string>
 821  #include "Signal.hh"
 822
 823 +using namespace std;
 824 +
 825  static const string rcsid = "@(#) $Name$ $Id$";
 826
 827  static sigset_t _caughtSignals;
 828 --- cflowd-2-1-b1/classes/src/CflowdFlowPortList.cc.orig        Fri Dec 11 11:17:49 1998
 829 +++ cflowd-2-1-b1/classes/src/CflowdFlowPortList.cc     Fri Feb 13 19:46:56 2004
 830 @@ -61,6 +61,8 @@
 831
 832  #include "CflowdFlowPortList.hh"
 833
 834 +using namespace std;
 835 +
 836  static const string rcsid = "@(#) $Name$ $Id$";
 837
 838  //-------------------------------------------------------------------------
 839 --- cflowd-2-1-b1/classes/src/CflowdFlowFilter.cc.orig  Fri Dec 11 12:05:25 1998
 840 +++ cflowd-2-1-b1/classes/src/CflowdFlowFilter.cc       Fri Feb 13 19:59:59 2004
 841 @@ -42,6 +42,8 @@
 842
 843  #include "CflowdFlowFilter.hh"
 844
 845 +using namespace std;
 846 +
 847  extern int          flowfiltparse (void);
 848
 849  static const string rcsid = "@(#) $Name$ $Id$";
 850 --- cflowd-2-1-b1/snmp++/classes/include/snmp++/oid.h.orig      Wed Aug 18 08:56:22 1999
 851 +++ cflowd-2-1-b1/snmp++/classes/include/snmp++/oid.h   Fri Feb 13 19:04:58 2004
 852 @@ -62,6 +62,8 @@
 853  #include "smival.h"                // derived class for all values
 854  #include "collect.h"
 855
 856 +using std::vector;
 857 +
 858  //-----------------------------------------------------------------------
 859  //------------[ SNMP++ OID CLASS DEF  ]----------------------------------
 860  //-----------------------------------------------------------------------