--- a/src/applications/udp-echo/udp-echo-client.cc	Fri May 16 08:41:19 2008 -0700
+++ b/src/applications/udp-echo/udp-echo-client.cc	Fri May 16 10:11:49 2008 -0700
@@ -93,7 +93,7 @@
 {
   NS_LOG_FUNCTION_NOARGS ();
 
-  if (!m_socket)
+  if (m_socket == 0)
     {
       TypeId tid = TypeId::LookupByName ("ns3::Udp");
       Ptr<SocketFactory> socketFactory = 
@@ -113,10 +113,10 @@
 {
   NS_LOG_FUNCTION_NOARGS ();
 
-  if (!m_socket) 
+  if (m_socket != 0) 
     {
-      m_socket->SetRecvCallback(MakeNullCallback<void, Ptr<Socket>, Ptr<Packet>,
-                                const Address &> ());
+      m_socket->SetRecvCallback(MakeNullCallback<void, Ptr<Socket>, 
+        Ptr<Packet>, const Address &> ());
     }
 
   Simulator::Cancel(m_sendEvent);

--- a/src/applications/udp-echo/udp-echo-server.cc	Fri May 16 08:41:19 2008 -0700
+++ b/src/applications/udp-echo/udp-echo-server.cc	Fri May 16 10:11:49 2008 -0700
@@ -69,13 +69,14 @@
 {
   NS_LOG_FUNCTION_NOARGS ();
 
-  if (!m_socket)
+  if (m_socket == 0)
     {
       TypeId tid = TypeId::LookupByName ("ns3::Udp");
       Ptr<SocketFactory> socketFactory = 
         GetNode ()->GetObject<SocketFactory> (tid);
       m_socket = socketFactory->CreateSocket ();
-      InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), m_port);
+      InetSocketAddress local = 
+        InetSocketAddress (Ipv4Address::GetAny (), m_port);
       m_socket->Bind (local);
     }
 
@@ -87,7 +88,7 @@
 {
   NS_LOG_FUNCTION_NOARGS ();
 
-  if (!m_socket) 
+  if (m_socket != 0) 
     {
       m_socket->SetRecvCallback(MakeNullCallback<void, Ptr<Socket>, 
         Ptr<Packet>, const Address &> ());