F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UdpEcho NS_LOG_INFO bugfix (wrong address type) and cosmetic changes to log output

Browse Source
This commit is contained in:
Vedran Miletić
2012-04-01 13:43:06 +02:00
parent 8eb4c8b945
commit 5f350bece7
2 changed files with 35 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/applications/model/udp-echo-client.cc
View File

@@ -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> 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 ());
}
}
}

37
src/applications/model/udp-echo-server.cc
View File

@@ -147,25 +147,34 @@ UdpEchoServer::HandleRead (Ptr<Socket> 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 ());
}
}
}