Follow ReceiveQueueBasedCallback -> BufferingCallback rename in TcpSo…

…cket
inet-framework · Sep 27, 2023 · beea8c2 · beea8c2
1 parent 66a778a
commit beea8c2
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/inet/networklayer/ldp/Ldp.cc b/src/inet/networklayer/ldp/Ldp.cc
@@ -668,7 +668,7 @@ void Ldp::socketDataArrived(TcpSocket *socket)
     peer_info& peer = myPeers[(uintptr_t)socket->getUserData()];
     EV_INFO << "Message arrived over TCP from peer " << peer.peerIP << "\n";
 
-    auto queue = socket->getReceiveQueue();
+    auto queue = socket->getReadBuffer();
     while (queue->has<LdpPacket>()) {
         auto header = queue->pop<LdpPacket>();
         processLdpPacketFromTcp(header);

diff --git a/src/inet/networklayer/ldp/Ldp.h b/src/inet/networklayer/ldp/Ldp.h
@@ -43,7 +43,7 @@ class Ted;
 /**
  * LDP (rfc 3036) protocol implementation.
  */
-class INET_API Ldp : public RoutingProtocolBase, public TcpSocket::ReceiveQueueBasedCallback, public UdpSocket::ICallback, public IIngressClassifier, public cListener
+class INET_API Ldp : public RoutingProtocolBase, public TcpSocket::BufferingCallback, public UdpSocket::ICallback, public IIngressClassifier, public cListener
 {
   public:
 

diff --git a/src/inet/routing/bgpv4/BgpRouter.cc b/src/inet/routing/bgpv4/BgpRouter.cc
@@ -417,7 +417,7 @@ void BgpRouter::socketFailure(TcpSocket *socket, int code)
 
 void BgpRouter::socketDataArrived(TcpSocket *socket)
 {
-    auto queue = socket->getReceiveQueue();
+    auto queue = socket->getReadBuffer();
     while (queue->has<BgpHeader>()) {
         auto header = queue->pop<BgpHeader>();
         processChunks(*header.get());
@@ -428,7 +428,7 @@ void BgpRouter::socketDataArrived(TcpSocket *socket, Packet *packet, bool urgent
 {
     _currSessionId = findIdFromSocketConnId(_BGPSessions, socket->getSocketId());
     if (_currSessionId != static_cast<SessionId>(-1))
-        ReceiveQueueBasedCallback::socketDataArrived(socket, packet, urgent);
+        BufferingCallback::socketDataArrived(socket, packet, urgent);
     else
         delete packet;
 }

diff --git a/src/inet/routing/bgpv4/BgpRouter.h b/src/inet/routing/bgpv4/BgpRouter.h
@@ -23,7 +23,7 @@ namespace bgp {
 
 class BgpSession;
 
-class INET_API BgpRouter : public TcpSocket::ReceiveQueueBasedCallback
+class INET_API BgpRouter : public TcpSocket::BufferingCallback
 {
   private:
     IInterfaceTable *ift = nullptr;