Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release 3.42: Fix deprecation warnings #25

Open
wants to merge 1 commit into
base: release-3-41
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions model/quic-socket-base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -878,7 +878,7 @@ QuicSocketBase::Send (Ptr<Packet> p, uint32_t flags)
NS_LOG_FUNCTION (this << flags);
int data = 0;

if (m_drainingPeriodEvent.IsRunning ())
if (m_drainingPeriodEvent.IsPending ())
{
NS_LOG_INFO ("Socket in draining state, cannot send packets");
return 0;
Expand All @@ -900,7 +900,7 @@ QuicSocketBase::Send (Ptr<Packet> p)
{
NS_LOG_FUNCTION (this);

if (m_drainingPeriodEvent.IsRunning ())
if (m_drainingPeriodEvent.IsPending ())
{
NS_LOG_INFO ("Socket in draining state, cannot send packets");
return 0;
Expand Down Expand Up @@ -935,7 +935,7 @@ QuicSocketBase::AppendingTx (Ptr<Packet> frame)

if (m_socketState != IDLE)
{
if (!m_sendPendingDataEvent.IsRunning ())
if (!m_sendPendingDataEvent.IsPending ())
{
m_sendPendingDataEvent = Simulator::Schedule (
TimeStep (1), &QuicSocketBase::SendPendingData, this,
Expand Down Expand Up @@ -1023,7 +1023,7 @@ QuicSocketBase::SendPendingData (bool withAck)
while (availableWindow > 0 and m_txBuffer->AppSize () > 0)
{
// check draining period
if (m_drainingPeriodEvent.IsRunning ())
if (m_drainingPeriodEvent.IsPending ())
{
NS_LOG_INFO ("Draining period: no packets can be sent");
return false;
Expand Down Expand Up @@ -1150,7 +1150,7 @@ QuicSocketBase::MaybeQueueAck ()
{
NS_LOG_INFO ("immediately send ACK - max number of unacked packets reached");
m_queue_ack = true;
if (!m_sendAckEvent.IsRunning ())
if (!m_sendAckEvent.IsPending ())
{
m_sendAckEvent = Simulator::Schedule (TimeStep (1), &QuicSocketBase::SendAck, this);
}
Expand All @@ -1160,7 +1160,7 @@ QuicSocketBase::MaybeQueueAck ()
{
NS_LOG_INFO ("immediately send ACK - some packets have been received out of order");
m_queue_ack = true;
if (!m_sendAckEvent.IsRunning ())
if (!m_sendAckEvent.IsPending ())
{
m_sendAckEvent = Simulator::Schedule (TimeStep (1), &QuicSocketBase::SendAck, this);
}
Expand All @@ -1172,14 +1172,14 @@ QuicSocketBase::MaybeQueueAck ()
{
NS_LOG_INFO ("immediately send ACK - more than 2 packets received");
m_queue_ack = true;
if (!m_sendAckEvent.IsRunning ())
if (!m_sendAckEvent.IsPending ())
{
m_sendAckEvent = Simulator::Schedule (TimeStep (1), &QuicSocketBase::SendAck, this);
}
}
else
{
if (!m_delAckEvent.IsRunning ())
if (!m_delAckEvent.IsPending ())
{
NS_LOG_INFO ("Schedule a delayed ACK");
// schedule a delayed ACK
Expand Down Expand Up @@ -1272,7 +1272,7 @@ QuicSocketBase::SendDataPacket (SequenceNumber32 packetNumber,
{
NS_LOG_FUNCTION (this << packetNumber << maxSize << withAck);

if (!m_drainingPeriodEvent.IsRunning ())
if (!m_drainingPeriodEvent.IsPending ())
{
m_idleTimeoutEvent.Cancel ();
NS_LOG_LOGIC (
Expand Down Expand Up @@ -1698,7 +1698,7 @@ QuicSocketBase::Close (void)

m_receivedTransportParameters = false;

if (m_idleTimeoutEvent.IsRunning () and m_socketState != IDLE
if (m_idleTimeoutEvent.IsPending () and m_socketState != IDLE
and m_socketState != CLOSING) //Connection Close from application signal
{
SetState (CLOSING);
Expand Down Expand Up @@ -2608,7 +2608,7 @@ QuicSocketBase::ReceivedData (Ptr<Packet> p, const QuicHeader& quicHeader,
NS_LOG_INFO ("Received packet of size " << p->GetSize ());

// check if this packet is not received during the draining period
if (!m_drainingPeriodEvent.IsRunning ())
if (!m_drainingPeriodEvent.IsPending ())
{
m_idleTimeoutEvent.Cancel (); // reset the IDLE timeout
NS_LOG_LOGIC (
Expand Down
2 changes: 1 addition & 1 deletion model/quic-stream-base.cc
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ QuicStreamBase::Send (Ptr<Packet> frame)

if ((m_streamStateSend == OPEN or m_streamStateSend == SEND) and AvailableWindow () > 0)
{
if (!m_streamSendPendingDataEvent.IsRunning ())
if (!m_streamSendPendingDataEvent.IsPending ())
{
m_streamSendPendingDataEvent = Simulator::Schedule (TimeStep (1), &QuicStreamBase::SendPendingData, this);
}
Expand Down
6 changes: 3 additions & 3 deletions test/quic-header-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1203,10 +1203,10 @@ class QuicHeaderTestSuite : public TestSuite
{
public:
QuicHeaderTestSuite () :
TestSuite ("quic-header", UNIT)
TestSuite ("quic-header", Type::UNIT)
{
AddTestCase (new QuicHeaderTestCase, TestCase::QUICK);
AddTestCase (new QuicSubHeaderTestCase, TestCase::QUICK);
AddTestCase (new QuicHeaderTestCase, TestCase::Duration::QUICK);
AddTestCase (new QuicSubHeaderTestCase, TestCase::Duration::QUICK);
}
};
static QuicHeaderTestSuite g_QuicHeaderTestSuite;
4 changes: 2 additions & 2 deletions test/quic-rx-buffer-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -376,9 +376,9 @@ class QuicRxBufferTestSuite : public TestSuite
{
public:
QuicRxBufferTestSuite () :
TestSuite ("quic-rx-buffer", UNIT)
TestSuite ("quic-rx-buffer", Type::UNIT)
{
AddTestCase (new QuicRxBufferTestCase, TestCase::QUICK);
AddTestCase (new QuicRxBufferTestCase, TestCase::Duration::QUICK);
}
};
static QuicRxBufferTestSuite g_quicRxBufferTestSuite;
4 changes: 2 additions & 2 deletions test/quic-tx-buffer-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -948,12 +948,12 @@ class QuicTxBufferTestSuite : public TestSuite
{
public:
QuicTxBufferTestSuite () :
TestSuite ("quic-tx-buffer", UNIT)
TestSuite ("quic-tx-buffer", Type::UNIT)
{
LogComponentEnable ("QuicTxBufferTestSuite", LOG_LEVEL_ALL);
LogComponentEnable ("QuicSocketTxBuffer", LOG_LEVEL_LOGIC);

AddTestCase (new QuicTxBufferTestCase, TestCase::QUICK);
AddTestCase (new QuicTxBufferTestCase, TestCase::Duration::QUICK);
}
};

Expand Down