Attachment #1156 for bug #1180

View | Details | Raw Unified | Return to bug 1180
Collapse All | Expand All

(-)a/src/lte/model/lte-net-device.cc (-4 / +10 lines)

Lines 62-67	Link Here

                   PointerValue (),

                   PointerValue (),

                   MakePointerAccessor (&LteNetDevice::GetPhy, &LteNetDevice::SetPhy),

                   MakePointerAccessor (&LteNetDevice::GetPhy, &LteNetDevice::SetPhy),

                   MakePointerChecker<LtePhy> ())

                   MakePointerChecker<LtePhy> ())

    .AddTraceSource ("Rx", "Receive trace", MakeTraceSourceAccessor (&LteNetDevice::m_macRxTrace))

    .AddTraceSource ("Tx", "Transmit trace", MakeTraceSourceAccessor (&LteNetDevice::m_macTxTrace));

  return tid;

  return tid;

Lines 185-196	Link Here

185

189

186

  NS_LOG_FUNCTION (this << packet);

190

  NS_LOG_FUNCTION (this << packet);

187

191

188

  m_macRxTrace (packet);

189

190

  LteMacHeader header;

192

  LteMacHeader header;

191

  packet->RemoveHeader (header);

193

  packet->RemoveHeader (header);

192

  NS_LOG_LOGIC ("packet " << header.GetSource () << " --> " << header.GetDestination () << " (here: " << m_address << ")");

194

  NS_LOG_LOGIC ("packet " << header.GetSource () << " --> " << header.GetDestination () << " (here: " << m_address << ")");

193

195

196

  m_macRxTrace (packet, header.GetSource ());

197

194

  LlcSnapHeader llc;

198

  LlcSnapHeader llc;

195

  packet->RemoveHeader (llc);

199

  packet->RemoveHeader (llc);

196

200

Lines 212-223	Link Here

212

216

213

  NS_LOG_FUNCTION (packet << source << dest << protocolNumber);

217

  NS_LOG_FUNCTION (packet << source << dest << protocolNumber);

214

218

219

  Mac48Address from = Mac48Address::ConvertFrom (source);

220

  Mac48Address to = Mac48Address::ConvertFrom (dest);

221

215

  LlcSnapHeader llcHdr;

222

  LlcSnapHeader llcHdr;

216

  llcHdr.SetType (protocolNumber);

223

  llcHdr.SetType (protocolNumber);

217

  packet->AddHeader (llcHdr);

224

  packet->AddHeader (llcHdr);

218

225

219

  Mac48Address from = Mac48Address::ConvertFrom (source);

226

  m_macTxTrace (packet, to);

220

  Mac48Address to = Mac48Address::ConvertFrom (dest);

221

227

222

  LteMacHeader header;

228

  LteMacHeader header;

223

  header.SetSource (from);

229

  header.SetSource (from);

(-)a/src/lte/model/lte-net-device.h (-4 / +4 lines)

Lines 185-194	Link Here

185

186

  Ptr<RrcEntity> m_rrcEntity;

186

  Ptr<RrcEntity> m_rrcEntity;

187

188

  TracedCallback<Ptr<const Packet> > m_macTxTrace;

188

  TracedCallback<Ptr<const Packet>, const Mac48Address&> m_macTxTrace;

189

  TracedCallback<Ptr<const Packet> > m_macTxDropTrace;

189

  // TracedCallback<Ptr<const Packet>, const Mac48Address&> m_macTxDropTrace;

190

  TracedCallback<Ptr<const Packet> > m_macPromiscRxTrace;

190

  // TracedCallback<Ptr<const Packet>, const Mac48Address&> m_macPromiscRxTrace;

191

  TracedCallback<Ptr<const Packet> > m_macRxTrace;

191

  TracedCallback<Ptr<const Packet>, const Mac48Address&> m_macRxTrace;

192

193

  NetDevice::ReceiveCallback m_rxCallback;

193

  NetDevice::ReceiveCallback m_rxCallback;

194

  NetDevice::PromiscReceiveCallback m_promiscRxCallback;

194

  NetDevice::PromiscReceiveCallback m_promiscRxCallback;

Return to bug 1180