View | Details | Raw Unified | Return to bug 2423
Collapse All | Expand All

(-)a/src/applications/model/bulk-send-application.cc (-1 / +4 lines)
 Lines 67-72   BulkSendApplication::GetTypeId (void) Link Here 
67 
    .AddTraceSource ("Tx", "A new packet is created and is sent",
 67 
    .AddTraceSource ("Tx", "A new packet is created and is sent",
68 
                     MakeTraceSourceAccessor (&BulkSendApplication::m_txTrace),
 68 
                     MakeTraceSourceAccessor (&BulkSendApplication::m_txTrace),
69 
                     "ns3::Packet::TracedCallback")
 69 
                     "ns3::Packet::TracedCallback")
70 
	.AddTraceSource ("CreateSocket", "A new socket is created",
71 
					MakeTraceSourceAccessor (&BulkSendApplication::m_socketCreateTrace),
72 
					"ns3::Socket::TracedCallback")
70 
  ;
 73 
  ;
71 
  return tid;
 74 
  return tid;
72 
}
 75 
}
 Lines 136-142   void BulkSendApplication::StartApplication (void) // Called at time specified by Link Here 
136 
        {
 139 
        {
137 
          m_socket->Bind ();
 140 
          m_socket->Bind ();
138 
        }
 141 
        }
139 


              142
              
      m_socketCreateTrace(m_socket);

            

        

          140
          
      m_socket->Connect (m_peer);

          143
          
      m_socket->Connect (m_peer);

        

        

          141
          
      m_socket->ShutdownRecv ();

          144
          
      m_socket->ShutdownRecv ();

        

        

          142
          
      m_socket->SetConnectCallback (

          145
          
      m_socket->SetConnectCallback (

        



(-)a/src/applications/model/bulk-send-application.h
      (+3 lines)




  

    

    

       Lines 122-127
      private: 
    
  Link Here 
    

  

        

          122
          
  /// Traced Callback: sent packets

          122
          
  /// Traced Callback: sent packets

        

        

          123
          
  TracedCallback<Ptr<const Packet> > m_txTrace;

          123
          
  TracedCallback<Ptr<const Packet> > m_txTrace;

        

        

          124
          

          124
          

        

            

              
              
              125
              
  /// Traced Callback: socket created

            

            

              126
              
  TracedCallback<Ptr<Socket> > m_socketCreateTrace;

            

            

              127
              

            

        

          125
          
private:

          128
          
private:

        

        

          126
          
  /**

          129
          
  /**

        

        

          127
          
   * \brief Connection Succeeded (called by Socket through a callback)

          130
          
   * \brief Connection Succeeded (called by Socket through a callback)

        



(-)a/src/applications/model/onoff-application.cc
      (+3 lines)




  

    

    

       Lines 89-94
      OnOffApplication::GetTypeId (void) 
    
  Link Here 
    

  

        

          89
          
    .AddTraceSource ("Tx", "A new packet is created and is sent",

          89
          
    .AddTraceSource ("Tx", "A new packet is created and is sent",

        

        

          90
          
                     MakeTraceSourceAccessor (&OnOffApplication::m_txTrace),

          90
          
                     MakeTraceSourceAccessor (&OnOffApplication::m_txTrace),

        

        

          91
          
                     "ns3::Packet::TracedCallback")

          91
          
                     "ns3::Packet::TracedCallback")

        

            

              
              
              92
              
	.AddTraceSource ("CreateSocket", "A new socket is created",

            

            

              93
              
					MakeTraceSourceAccessor (&OnOffApplication::m_socketCreateTrace),

            

            

              94
              
					"ns3::Socket::TracedCallback")

            

        

          92
          
  ;

          95
          
  ;

        

        

          93
          
  return tid;

          96
          
  return tid;

        

        

          94
          
}

          97
          
}

        



(-)a/src/applications/model/onoff-application.h
      (-1 / +2 lines)




  

    

    

       Lines 166-171
      private: 
    
  Link Here 
    

  

        

          166
          

          166
          

        

        

          167
          
  /// Traced Callback: transmitted packets.

          167
          
  /// Traced Callback: transmitted packets.

        

        

          168
          
  TracedCallback<Ptr<const Packet> > m_txTrace;

          168
          
  TracedCallback<Ptr<const Packet> > m_txTrace;

        

            

              
              
              169
              
  /// Traced Callback: socket created

            

            

              170
              
  TracedCallback<Ptr<Socket> > m_socketCreateTrace;

            

        

          169
          

          171
          

        

        

          170
          
private:

          172
          
private:

        

        

          171
          
  /**

          173
          
  /**

        

            

              172
              
- 

              
              
            






  

  Return to bug 2423