diff -r 5c136769b9ad src/visualizer/model/pyviz.cc --- a/src/visualizer/model/pyviz.cc Fri Jun 03 11:41:43 2011 +0100 +++ b/src/visualizer/model/pyviz.cc Fri Jun 03 15:15:23 2011 +0100 @@ -153,12 +153,19 @@ Config::Connect ("/NodeList/*/DeviceList/*/$ns3::PointToPointNetDevice/MacRx", MakeCallback (&PyViz::TraceNetDevRxPointToPoint, this)); + // WiMax Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WimaxNetDevice/Tx", MakeCallback (&PyViz::TraceNetDevTxWimax, this)); Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WimaxNetDevice/Rx", MakeCallback (&PyViz::TraceNetDevRxWimax, this)); + // LTE + Config::Connect ("/NodeList/*/DeviceList/*/$ns3::LteNetDevice/Tx", + MakeCallback (&PyViz::TraceNetDevTxLte, this)); + + Config::Connect ("/NodeList/*/DeviceList/*/$ns3::LteNetDevice/Rx", + MakeCallback (&PyViz::TraceNetDevRxLte, this)); } void @@ -820,6 +827,19 @@ TraceNetDevRxCommon (context, packet, source); } +void +PyViz::TraceNetDevTxLte (std::string context, Ptr packet, Mac48Address const &destination) +{ + NS_LOG_FUNCTION (context); + TraceNetDevTxCommon (context, packet, destination); +} + +void +PyViz::TraceNetDevRxLte (std::string context, Ptr packet, Mac48Address const &source) +{ + NS_LOG_FUNCTION (context); + TraceNetDevRxCommon (context, packet, source); +} // --------------------- diff -r 5c136769b9ad src/visualizer/model/pyviz.h --- a/src/visualizer/model/pyviz.h Fri Jun 03 11:41:43 2011 +0100 +++ b/src/visualizer/model/pyviz.h Fri Jun 03 15:15:23 2011 +0100 @@ -212,6 +212,9 @@ void TraceNetDevTxWimax (std::string context, Ptr packet, Mac48Address const &destination); void TraceNetDevRxWimax (std::string context, Ptr packet, Mac48Address const &source); + void TraceNetDevTxLte (std::string context, Ptr packet, Mac48Address const &destination); + void TraceNetDevRxLte (std::string context, Ptr packet, Mac48Address const &source); + inline NetDeviceStatistics & FindNetDeviceStatistics (int node, int interface); void DoPause (std::string const &message); diff -r 5c136769b9ad src/visualizer/visualizer/base.py --- a/src/visualizer/visualizer/base.py Fri Jun 03 11:41:43 2011 +0100 +++ b/src/visualizer/visualizer/base.py Fri Jun 03 15:15:23 2011 +0100 @@ -34,6 +34,8 @@ ns3.MeshPointDevice: NetDeviceTraits(is_virtual=True), ns3.SubscriberStationNetDevice: NetDeviceTraits(is_wireless=True), ns3.BaseStationNetDevice: NetDeviceTraits(is_wireless=True), + ns3.UeNetDevice: NetDeviceTraits(is_wireless=True), + ns3.EnbNetDevice: NetDeviceTraits(is_wireless=True), } def lookup_netdevice_traits(class_type):