Merge pull request #11 from signetlabdei/overload_fix

Overloaded method fix in QUIC BBR

model/quic-bbr.cc

@@ -525,6 +525,8 @@ QuicBbr::UpdateBtlBw (Ptr<QuicSocketState> tcb, const struct RateSample * rs)
     }
 }
 
+
+
 void
 QuicBbr::UpdateModelAndState (Ptr<QuicSocketState> tcb, const struct RateSample * rs)
 {
@@ -608,6 +610,16 @@ QuicBbr::CongControl (Ptr<QuicSocketState> tcb, const struct RateSample *rs)
   UpdateControlParameters (tcb, rs);
 }
 
+void
+QuicBbr::CongControl (Ptr<TcpSocketState> tcb,
+                      const TcpRateOps::TcpRateConnection &rc,
+                      const TcpRateOps::TcpRateSample &rs)
+{
+    NS_LOG_FUNCTION (this << tcb);
+    NS_UNUSED (rc);
+    NS_UNUSED (rs);
+}
+
 void
 QuicBbr::CongestionStateSet (Ptr<TcpSocketState> tcb,
                              const TcpSocketState::TcpCongState_t newState)

model/quic-bbr.h

@@ -1,7 +1,8 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /*
- * Copyright (c) 2018 NITK Surathkal, 2020 SIGNET Lab, Department of
- * Information Engineering, University of Padova
+ * Copyright (c) 2018 NITK Surathkal, 
+ * Copyright (c) 2020 SIGNET Lab, Department of Information Engineering, 
+ * University of Padova
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -105,6 +106,13 @@ class QuicBbr : public QuicCongestionOps
   virtual void IncreaseWindow (Ptr<TcpSocketState> tcb,
                                uint32_t segmentsAcked);
   virtual Ptr<TcpCongestionOps> Fork ();
+
+  /**
+   * \brief Unused function, added here to avoid overloading the one in TcpCongestionOps
+   */
+  virtual void CongControl (Ptr<TcpSocketState> tcb,
+                            const TcpRateOps::TcpRateConnection &rc,
+                            const TcpRateOps::TcpRateSample &rs);
 
 protected:
   void OnPacketAcked (Ptr<TcpSocketState> tcb, Ptr<QuicSocketTxItem> ackedPacket);