From 5f350bece70598d47b917845fb4d8c25a99ddbfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vedran=20Mileti=C4=87?= Date: Sun, 1 Apr 2012 13:43:06 +0200 Subject: [PATCH] UdpEcho NS_LOG_INFO bugfix (wrong address type) and cosmetic changes to log output --- src/applications/model/udp-echo-client.cc | 22 ++++++++------ src/applications/model/udp-echo-server.cc | 37 ++++++++++++++--------- 2 files changed, 35 insertions(+), 24 deletions(-) diff --git a/src/applications/model/udp-echo-client.cc b/src/applications/model/udp-echo-client.cc index b9466ce5e..591d1c6aa 100644 --- a/src/applications/model/udp-echo-client.cc +++ b/src/applications/model/udp-echo-client.cc @@ -306,15 +306,15 @@ UdpEchoClient::Send (void) ++m_sent; - if (InetSocketAddress::IsMatchingType (m_peerAddress)) + if (Ipv4Address::IsMatchingType (m_peerAddress)) { - NS_LOG_INFO ("Sent " << m_size << " bytes to " << - InetSocketAddress::ConvertFrom (m_peerAddress)); + NS_LOG_INFO ("Client sent " << m_size << " bytes to " << + Ipv4Address::ConvertFrom (m_peerAddress) << " port " << m_peerPort); } - else if (Inet6SocketAddress::IsMatchingType (m_peerAddress)) + else if (Ipv6Address::IsMatchingType (m_peerAddress)) { - NS_LOG_INFO ("Sent " << m_size << " bytes to " << - Inet6SocketAddress::ConvertFrom (m_peerAddress)); + NS_LOG_INFO ("Client sent " << m_size << " bytes to " << + Ipv6Address::ConvertFrom (m_peerAddress) << " port " << m_peerPort); } if (m_sent < m_count) @@ -333,13 +333,15 @@ UdpEchoClient::HandleRead (Ptr socket) { if (InetSocketAddress::IsMatchingType (from)) { - NS_LOG_INFO ("Received " << packet->GetSize () << " bytes from " << - InetSocketAddress::ConvertFrom (from).GetIpv4 ()); + NS_LOG_INFO ("Client received " << packet->GetSize () << " bytes from " << + InetSocketAddress::ConvertFrom (from).GetIpv4 () << " port " << + InetSocketAddress::ConvertFrom (from).GetPort ()); } else if (Inet6SocketAddress::IsMatchingType (from)) { - NS_LOG_INFO ("Received " << packet->GetSize () << " bytes from " << - Inet6SocketAddress::ConvertFrom (from).GetIpv6 ()); + NS_LOG_INFO ("Client received " << packet->GetSize () << " bytes from " << + Inet6SocketAddress::ConvertFrom (from).GetIpv6 () << " port " << + Inet6SocketAddress::ConvertFrom (from).GetPort ()); } } } diff --git a/src/applications/model/udp-echo-server.cc b/src/applications/model/udp-echo-server.cc index 3a21b41c0..662a50923 100644 --- a/src/applications/model/udp-echo-server.cc +++ b/src/applications/model/udp-echo-server.cc @@ -147,25 +147,34 @@ UdpEchoServer::HandleRead (Ptr socket) { if (InetSocketAddress::IsMatchingType (from)) { - NS_LOG_INFO ("Received " << packet->GetSize () << " bytes from " << - InetSocketAddress::ConvertFrom (from).GetIpv4 ()); - - packet->RemoveAllPacketTags (); - packet->RemoveAllByteTags (); - - NS_LOG_LOGIC ("Echoing packet"); - socket->SendTo (packet, 0, from); + NS_LOG_INFO ("Server received " << packet->GetSize () << " bytes from " << + InetSocketAddress::ConvertFrom (from).GetIpv4 () << " port " << + InetSocketAddress::ConvertFrom (from).GetPort ()); } else if (Inet6SocketAddress::IsMatchingType (from)) { - NS_LOG_INFO ("Received " << packet->GetSize () << " bytes from " << - Inet6SocketAddress::ConvertFrom (from).GetIpv6 ()); + NS_LOG_INFO ("Server received " << packet->GetSize () << " bytes from " << + Inet6SocketAddress::ConvertFrom (from).GetIpv6 () << " port " << + InetSocketAddress::ConvertFrom (from).GetPort ()); + } - packet->RemoveAllPacketTags (); - packet->RemoveAllByteTags (); + packet->RemoveAllPacketTags (); + packet->RemoveAllByteTags (); - NS_LOG_LOGIC ("Echoing packet"); - socket->SendTo (packet, 0, from); + NS_LOG_LOGIC ("Echoing packet"); + socket->SendTo (packet, 0, from); + + if (InetSocketAddress::IsMatchingType (from)) + { + NS_LOG_INFO ("Server sent " << packet->GetSize () << " bytes to " << + InetSocketAddress::ConvertFrom (from).GetIpv4 () << " port " << + InetSocketAddress::ConvertFrom (from).GetPort ()); + } + else if (Inet6SocketAddress::IsMatchingType (from)) + { + NS_LOG_INFO ("Server sent " << packet->GetSize () << " bytes to " << + Inet6SocketAddress::ConvertFrom (from).GetIpv6 () << " port " << + InetSocketAddress::ConvertFrom (from).GetPort ()); } } }