--- a/src/applications/model/onoff-application.cc	Fri Nov 09 21:14:59 2012 +0100
+++ b/src/applications/model/onoff-application.cc	Sat Nov 10 15:08:32 2012 +0100
@@ -92,18 +92,18 @@
 
 
 OnOffApplication::OnOffApplication ()
+  : m_socket (0),
+    m_connected (false),
+    m_residualBits (0),
+    m_lastStartTime (Seconds (0)),
+    m_totBytes (0)
 {
-  NS_LOG_FUNCTION_NOARGS ();
-  m_socket = 0;
-  m_connected = false;
-  m_residualBits = 0;
-  m_lastStartTime = Seconds (0);
-  m_totBytes = 0;
+  NS_LOG_FUNCTION (this);
 }
 
 OnOffApplication::~OnOffApplication()
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 }
 
 void 
@@ -132,7 +132,7 @@
 void
 OnOffApplication::DoDispose (void)
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 
   m_socket = 0;
   // chain up
@@ -142,7 +142,7 @@
 // Application Methods
 void OnOffApplication::StartApplication () // Called at time specified by Start
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 
   // Create the socket if not already
   if (!m_socket)
@@ -152,6 +152,10 @@
       m_socket->Connect (m_peer);
       m_socket->SetAllowBroadcast (true);
       m_socket->ShutdownRecv ();
+
+      m_socket->SetConnectCallback (
+        MakeCallback (&OnOffApplication::ConnectionSucceeded, this),
+        MakeCallback (&OnOffApplication::ConnectionFailed, this));
     }
   // Insure no pending event
   CancelEvents ();
@@ -163,7 +167,7 @@
 
 void OnOffApplication::StopApplication () // Called at time specified by Stop
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 
   CancelEvents ();
   if(m_socket != 0)
@@ -178,7 +182,7 @@
 
 void OnOffApplication::CancelEvents ()
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 
   if (m_sendEvent.IsRunning ())
     { // Cancel the pending send packet event
@@ -194,7 +198,7 @@
 // Event handlers
 void OnOffApplication::StartSending ()
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
   m_lastStartTime = Simulator::Now ();
   ScheduleNextTx ();  // Schedule the send packet event
   ScheduleStopEvent ();
@@ -202,7 +206,7 @@
 
 void OnOffApplication::StopSending ()
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
   CancelEvents ();
 
   ScheduleStartEvent ();
@@ -211,7 +215,7 @@
 // Private helpers
 void OnOffApplication::ScheduleNextTx ()
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 
   if (m_maxBytes == 0 || m_totBytes < m_maxBytes)
     {
@@ -231,7 +235,7 @@
 
 void OnOffApplication::ScheduleStartEvent ()
 {  // Schedules the event to start sending data (switch to the "On" state)
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 
   Time offInterval = Seconds (m_offTime->GetValue ());
   NS_LOG_LOGIC ("start at " << offInterval);
@@ -240,7 +244,7 @@
 
 void OnOffApplication::ScheduleStopEvent ()
 {  // Schedules the event to stop sending data (switch to "Off" state)
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 
   Time onInterval = Seconds (m_onTime->GetValue ());
   NS_LOG_LOGIC ("stop at " << onInterval);
@@ -250,7 +254,7 @@
 
 void OnOffApplication::SendPacket ()
 {
-  NS_LOG_FUNCTION_NOARGS ();
+  NS_LOG_FUNCTION (this);
 
   NS_ASSERT (m_sendEvent.IsExpired ());
   Ptr<Packet> packet = Create<Packet> (m_pktSize);
@@ -280,18 +284,17 @@
   ScheduleNextTx ();
 }
 
-void OnOffApplication::ConnectionSucceeded (Ptr<Socket>)
+
+void OnOffApplication::ConnectionSucceeded (Ptr<Socket> socket)
 {
-  NS_LOG_FUNCTION_NOARGS ();
-
+  NS_LOG_FUNCTION (this << socket);
   m_connected = true;
-  ScheduleStartEvent ();
 }
 
-void OnOffApplication::ConnectionFailed (Ptr<Socket>)
+void OnOffApplication::ConnectionFailed (Ptr<Socket> socket)
 {
-  NS_LOG_FUNCTION_NOARGS ();
-  std::cout << "OnOffApplication, Connection Failed" << std::endl;
+  NS_LOG_FUNCTION (this << socket);
 }
 
+
 } // Namespace ns3

--- a/src/applications/model/onoff-application.h	Fri Nov 09 21:14:59 2012 +0100
+++ b/src/applications/model/onoff-application.h	Sat Nov 10 15:08:32 2012 +0100
@@ -160,9 +160,8 @@
   void ScheduleNextTx ();
   void ScheduleStartEvent ();
   void ScheduleStopEvent ();
-  void ConnectionSucceeded (Ptr<Socket>);
-  void ConnectionFailed (Ptr<Socket>);
-  void Ignore (Ptr<Socket>);
+  void ConnectionSucceeded (Ptr<Socket> socket);
+  void ConnectionFailed (Ptr<Socket> socket);
 };
 
 } // namespace ns3