diff -r e09c25931173 src/visualizer/model/pyviz.cc
--- a/src/visualizer/model/pyviz.cc	Thu Oct 24 09:04:46 2013 -0700
+++ b/src/visualizer/model/pyviz.cc	Sat Oct 26 20:21:32 2013 +0100
@@ -579,38 +579,10 @@
 }
 
 void
-PyViz::TraceNetDevTxWifi (std::string context, Ptr<const Packet> packet)
+PyViz::TraceNetDevTxWifi (std::string context, Ptr<const Packet> packet, Mac48Address destination, Mac48Address source)
 {
-  NS_LOG_FUNCTION (context << packet->GetUid () << *packet);
-
-  /*
-   *  To DS    From DS   Address 1    Address 2    Address 3    Address 4 
-   *----------------------------------------------------------------------
-   *    0        0       Destination  Source        BSSID         N/A
-   *    0        1       Destination  BSSID         Source        N/A
-   *    1        0       BSSID        Source        Destination   N/A
-   *    1        1       Receiver     Transmitter   Destination   Source
-   */
-  WifiMacHeader hdr;
-  NS_ABORT_IF (packet->PeekHeader (hdr) == 0);
-  Mac48Address destinationAddress;
-  if (hdr.IsToDs () && !hdr.IsFromDs ())
-    {
-      destinationAddress = hdr.GetAddr3 ();
-    }
-  else if (!hdr.IsToDs () && hdr.IsFromDs ())
-    {
-      destinationAddress = hdr.GetAddr1 ();
-    }
-  else if (!hdr.IsToDs () && !hdr.IsFromDs ())
-    {
-      destinationAddress = hdr.GetAddr1 ();
-    }
-  else
-    {
-      destinationAddress = hdr.GetAddr3 ();
-    }
-  TraceNetDevTxCommon (context, packet, destinationAddress);
+  NS_LOG_FUNCTION (context << packet->GetUid () << destination << source);
+  TraceNetDevTxCommon (context, packet, destination);
 }
 
 
@@ -748,40 +720,10 @@
 }
 
 void
-PyViz::TraceNetDevRxWifi (std::string context, Ptr<const Packet> packet)
+PyViz::TraceNetDevRxWifi (std::string context, Ptr<const Packet> packet, Mac48Address destination, Mac48Address source)
 {
-  NS_LOG_FUNCTION (context << packet->GetUid ());
-
-
-  /*
-   *  To DS    From DS   Address 1    Address 2    Address 3    Address 4 
-   *----------------------------------------------------------------------
-   *    0        0       Destination  Source        BSSID         N/A
-   *    0        1       Destination  BSSID         Source        N/A
-   *    1        0       BSSID        Source        Destination   N/A
-   *    1        1       Receiver     Transmitter   Destination   Source
-   */
-  WifiMacHeader hdr;
-  NS_ABORT_IF (packet->PeekHeader (hdr) == 0);
-  Mac48Address sourceAddress;
-  if (hdr.IsToDs () && !hdr.IsFromDs ())
-    {
-      sourceAddress = hdr.GetAddr2 ();
-    }
-  else if (!hdr.IsToDs () && hdr.IsFromDs ())
-    {
-      sourceAddress = hdr.GetAddr3 ();
-    }
-  else if (!hdr.IsToDs () && !hdr.IsFromDs ())
-    {
-      sourceAddress = hdr.GetAddr2 ();
-    }
-  else
-    {
-      sourceAddress = hdr.GetAddr4 ();
-    }
-
-  TraceNetDevRxCommon (context, packet, sourceAddress);
+  NS_LOG_FUNCTION (context << packet->GetUid () << destination << source);
+  TraceNetDevRxCommon (context, packet, source);
 }
 
 
diff -r e09c25931173 src/visualizer/model/pyviz.h
--- a/src/visualizer/model/pyviz.h	Thu Oct 24 09:04:46 2013 -0700
+++ b/src/visualizer/model/pyviz.h	Sat Oct 26 20:21:32 2013 +0100
@@ -195,8 +195,8 @@
   void TraceNetDevTxCommon (std::string const &context, Ptr<const Packet> packet, Mac48Address const &destination);
   void TraceNetDevRxCommon (std::string const &context, Ptr<const Packet> packet, Mac48Address const &source);
 
-  void TraceNetDevTxWifi (std::string context, Ptr<const Packet> packet);
-  void TraceNetDevRxWifi (std::string context, Ptr<const Packet> packet);
+  void TraceNetDevTxWifi (std::string context, Ptr<const Packet> packet, Mac48Address destination, Mac48Address source);
+  void TraceNetDevRxWifi (std::string context, Ptr<const Packet> packet, Mac48Address destination, Mac48Address source);
 
   void TraceDevQueueDrop (std::string context, Ptr<const Packet> packet);
   void TraceIpv4Drop (std::string context, ns3::Ipv4Header const &hdr, Ptr<const Packet> packet,