From f5a28141dcd7c50fc6885f0f5e1fd1a45e1f1ac4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= <sebastien.deronne@gmail.com>
Date: Sun, 2 Jun 2024 12:23:55 +0200
Subject: [PATCH] applications: Extend logging for some applications

---
 src/applications/model/packet-sink.cc      |  7 +++++++
 src/applications/model/udp-client.cc       |  7 +++++--
 src/applications/model/udp-server.cc       | 16 ++++++++++++++++
 src/applications/model/udp-trace-client.cc | 10 +++++++---
 4 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/src/applications/model/packet-sink.cc b/src/applications/model/packet-sink.cc
index b9fd7cf17..f632bbb4d 100644
--- a/src/applications/model/packet-sink.cc
+++ b/src/applications/model/packet-sink.cc
@@ -139,14 +139,21 @@ PacketSink::StartApplication() // Called at time specified by Start
         if (local.IsInvalid())
         {
             local = InetSocketAddress(Ipv4Address::GetAny(), m_port);
+            NS_LOG_INFO(this << " Binding on port " << m_port << " / " << local << ".");
         }
         else if (InetSocketAddress::IsMatchingType(local))
         {
             m_port = InetSocketAddress::ConvertFrom(local).GetPort();
+            const auto ipv4 = InetSocketAddress::ConvertFrom(local).GetIpv4();
+            NS_LOG_INFO(this << " Binding on " << ipv4 << " port " << m_port << " / " << local
+                             << ".");
         }
         else if (Inet6SocketAddress::IsMatchingType(local))
         {
             m_port = Inet6SocketAddress::ConvertFrom(local).GetPort();
+            const auto ipv6 = Inet6SocketAddress::ConvertFrom(local).GetIpv6();
+            NS_LOG_INFO(this << " Binding on " << ipv6 << " port " << m_port << " / " << local
+                             << ".");
         }
         if (m_socket->Bind(local) == -1)
         {
diff --git a/src/applications/model/udp-client.cc b/src/applications/model/udp-client.cc
index f084f74cd..da1140289 100644
--- a/src/applications/model/udp-client.cc
+++ b/src/applications/model/udp-client.cc
@@ -236,11 +236,14 @@ UdpClient::StartApplication()
     std::stringstream peerAddressStringStream;
     if (InetSocketAddress::IsMatchingType(m_peer))
     {
-        peerAddressStringStream << InetSocketAddress::ConvertFrom(m_peer).GetIpv4();
+        peerAddressStringStream << InetSocketAddress::ConvertFrom(m_peer).GetIpv4() << ":"
+                                << InetSocketAddress::ConvertFrom(m_peer).GetPort();
+        ;
     }
     else if (Inet6SocketAddress::IsMatchingType(m_peer))
     {
-        peerAddressStringStream << Inet6SocketAddress::ConvertFrom(m_peer).GetIpv6();
+        peerAddressStringStream << Inet6SocketAddress::ConvertFrom(m_peer).GetIpv6() << ":"
+                                << Inet6SocketAddress::ConvertFrom(m_peer).GetPort();
     }
     m_peerString = peerAddressStringStream.str();
 #endif // NS3_LOG_ENABLE
diff --git a/src/applications/model/udp-server.cc b/src/applications/model/udp-server.cc
index b05af1d09..c1f553bf3 100644
--- a/src/applications/model/udp-server.cc
+++ b/src/applications/model/udp-server.cc
@@ -128,6 +128,22 @@ UdpServer::StartApplication()
         if (local.IsInvalid())
         {
             local = InetSocketAddress(Ipv4Address::GetAny(), m_port);
+            NS_LOG_INFO(this << " Binding on port " << m_port << " / " << local << ".");
+        }
+        else
+        {
+            if (InetSocketAddress::IsMatchingType(m_local))
+            {
+                const auto ipv4 = InetSocketAddress::ConvertFrom(m_local).GetIpv4();
+                NS_LOG_INFO(this << " Binding on " << ipv4 << " port " << m_port << " / " << m_local
+                                 << ".");
+            }
+            else if (Ipv6Address::IsMatchingType(m_local))
+            {
+                const auto ipv6 = Inet6SocketAddress::ConvertFrom(m_local).GetIpv6();
+                NS_LOG_INFO(this << " Binding on " << ipv6 << " port " << m_port << " / " << m_local
+                                 << ".");
+            }
         }
         if (m_socket->Bind(local) == -1)
         {
diff --git a/src/applications/model/udp-trace-client.cc b/src/applications/model/udp-trace-client.cc
index 49b5c223b..916032047 100644
--- a/src/applications/model/udp-trace-client.cc
+++ b/src/applications/model/udp-trace-client.cc
@@ -375,15 +375,19 @@ UdpTraceClient::SendPacket(uint32_t size)
     seqTs.SetSeq(m_sent);
     p->AddHeader(seqTs);
 
-    std::stringstream addressString;
+    std::stringstream addressString{};
+#ifdef NS3_LOG_ENABLE
     if (InetSocketAddress::IsMatchingType(m_peer))
     {
-        addressString << InetSocketAddress::ConvertFrom(m_peer).GetIpv4();
+        addressString << InetSocketAddress::ConvertFrom(m_peer).GetIpv4() << ":"
+                      << InetSocketAddress::ConvertFrom(m_peer).GetPort();
     }
     else if (Inet6SocketAddress::IsMatchingType(m_peer))
     {
-        addressString << Inet6SocketAddress::ConvertFrom(m_peer).GetIpv6();
+        addressString << Inet6SocketAddress::ConvertFrom(m_peer).GetIpv6() << ":"
+                      << Inet6SocketAddress::ConvertFrom(m_peer).GetPort();
     }
+#endif
 
     if ((m_socket->Send(p)) >= 0)
     {