1.1 --- a/src/contrib/flow-monitor/flow-probe.h	Wed Apr 29 14:40:52 2009 +0100
     1.2 +++ b/src/contrib/flow-monitor/flow-probe.h	Wed Apr 29 14:41:12 2009 +0100
     1.3 @@ -55,7 +55,7 @@
     1.4    void AddPacketStats (FlowId flowId, uint32_t packetSize, Time delayFromFirstProbe);
     1.5    Stats GetStats () const;
     1.6  
     1.7 -private:
     1.8 +protected:
     1.9    Ptr<FlowMonitor> m_flowMonitor;
    1.10    Stats m_stats;
    1.11  

     2.1 --- a/src/contrib/flow-monitor/ipv4-flow-probe.cc	Wed Apr 29 14:40:52 2009 +0100
     2.2 +++ b/src/contrib/flow-monitor/ipv4-flow-probe.cc	Wed Apr 29 14:41:12 2009 +0100
     2.3 @@ -67,7 +67,7 @@
     2.4    if (m_classifier->Classify (ipHeader, ipPayload, &flowId, &packetId))
     2.5      {
     2.6        uint32_t size = (ipPayload->GetSize () + ipHeader.GetSerializedSize ());
     2.7 -      m_monitor->ReportFirstTx (this, flowId, packetId, size);
     2.8 +      m_flowMonitor->ReportFirstTx (this, flowId, packetId, size);
     2.9      }
    2.10  }
    2.11  
    2.12 @@ -80,7 +80,7 @@
    2.13    if (m_classifier->Classify (ipHeader, ipPayload, &flowId, &packetId))
    2.14      {
    2.15        uint32_t size = (ipPayload->GetSize () + ipHeader.GetSerializedSize ());
    2.16 -      m_monitor->ReportForwarding (this, flowId, packetId, size);
    2.17 +      m_flowMonitor->ReportForwarding (this, flowId, packetId, size);
    2.18      }
    2.19  
    2.20  }
    2.21 @@ -95,7 +95,7 @@
    2.22    if (m_classifier->Classify (ipHeader, ipPayload, &flowId, &packetId))
    2.23      {
    2.24        uint32_t size = (ipPayload->GetSize () + ipHeader.GetSerializedSize ());
    2.25 -      m_monitor->ReportLastRx (this, flowId, packetId, size);
    2.26 +      m_flowMonitor->ReportLastRx (this, flowId, packetId, size);
    2.27      }
    2.28  }
    2.29  

     3.1 --- a/src/contrib/flow-monitor/ipv4-flow-probe.h	Wed Apr 29 14:40:52 2009 +0100
     3.2 +++ b/src/contrib/flow-monitor/ipv4-flow-probe.h	Wed Apr 29 14:41:12 2009 +0100
     3.3 @@ -42,7 +42,6 @@
     3.4    void ForwardLogger (const Ipv4Header &ipHeader, Ptr<const Packet> ipPayload, uint32_t interface);
     3.5    void ForwardUpLogger (const Ipv4Header &ipHeader, Ptr<const Packet> ipPayload, uint32_t interface);
     3.6  
     3.7 -  Ptr<FlowMonitor> m_monitor;
     3.8    Ptr<Ipv4FlowClassifier> m_classifier;
     3.9  };
    3.10