F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

application: Fix setting connect callback for OnOffApplication

Browse Source 
Thanks to Sharan Naribole for spotting this issue
This commit is contained in:
Stefano Avallone
2022-10-04 08:39:14 +02:00
parent 41fed49054
commit eaa62db26f
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/applications/model/onoff-application.cc
View File

@@ -200,22 +200,27 @@ void OnOffApplication::StartApplication () // Called at time specified by Start
NS_FATAL_ERROR ("Failed to bind socket");
}
m_socket->Connect (m_peer);
m_socket->SetAllowBroadcast (true);
m_socket->ShutdownRecv ();
m_socket->SetConnectCallback (
MakeCallback (&OnOffApplication::ConnectionSucceeded, this),
MakeCallback (&OnOffApplication::ConnectionFailed, this));
m_socket->Connect (m_peer);
m_socket->SetAllowBroadcast (true);
m_socket->ShutdownRecv ();
}
m_cbrRateFailSafe = m_cbrRate;
// Insure no pending event
// Ensure no pending event
CancelEvents ();
// If we are not yet connected, there is nothing to do here
// The ConnectionComplete upcall will start timers at that time
//if (!m_connected) return;
ScheduleStartEvent ();
// If we are not yet connected, there is nothing to do here,
// the ConnectionComplete upcall will start timers at that time.
// If we are already connected, CancelEvents did remove the events,
// so we have to start them again.
if (m_connected)
{
ScheduleStartEvent ();
}
}
void OnOffApplication::StopApplication () // Called at time specified by Stop
@@ -387,6 +392,8 @@ void OnOffApplication::SendPacket ()
void OnOffApplication::ConnectionSucceeded (Ptr<Socket> socket)
{
NS_LOG_FUNCTION (this << socket);
ScheduleStartEvent ();
m_connected = true;
}