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

(-)a/src/dsr/model/dsr-routing.cc (+18 lines)
 Lines 283-288   TypeId DsrRouting::GetTypeId () Link Here 
283
                     MakeTraceSourceAccessor (&DsrRouting::m_txPacketTrace))
283
                     MakeTraceSourceAccessor (&DsrRouting::m_txPacketTrace))
284
    .AddTraceSource ("Drop", "Drop DSR packet",
284
    .AddTraceSource ("Drop", "Drop DSR packet",
285
                     MakeTraceSourceAccessor (&DsrRouting::m_dropTrace))
285
                     MakeTraceSourceAccessor (&DsrRouting::m_dropTrace))
286
    .AddTraceSource ("TxDsr", "Send DSR control packet.",
287
                      MakeTraceSourceAccessor (&DsrRouting::m_txDsr))
286
  ;
288
  ;
287
  return tid;
289
  return tid;
288
}
290
}
 Lines 1093-1098   void DsrRouting::CheckSendBuffer () Link Here 
1093
                  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
1095
                  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
1094
                  NS_LOG_LOGIC ("Will be inserting into priority queue number: " << priority);
1096
                  NS_LOG_LOGIC ("Will be inserting into priority queue number: " << priority);
1095
1097
1098
                  m_txDsr(newPacket);
1099
1096
                  m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
1100
                  m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
1097
1101
1098
                  /// \todo New DsrNetworkQueueEntry
1102
                  /// \todo New DsrNetworkQueueEntry
 Lines 1474-1479   DsrRouting::SendUnreachError (Ipv4Addres Link Here 
1474
      Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
1478
      Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
1475
      NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
1479
      NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
1476
1480
1481
      m_txDsr(newPacket);
1482
1477
      m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
1483
      m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
1478
1484
1479
      /// \todo New DsrNetworkQueueEntry
1485
      /// \todo New DsrNetworkQueueEntry
 Lines 1519-1524   DsrRouting::ForwardErrPacket (DsrOptionR Link Here 
1519
  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
1525
  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
1520
  NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
1526
  NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
1521
1527
1528
  m_txDsr(packet);
1529
1522
  m_downTarget (packet, m_mainAddress, nextHop, GetProtocolNumber (), route);
1530
  m_downTarget (packet, m_mainAddress, nextHop, GetProtocolNumber (), route);
1523
1531
1524
  /// \todo New DsrNetworkQueueEntry
1532
  /// \todo New DsrNetworkQueueEntry
 Lines 2037-2042   DsrRouting::SendPacketFromBuffer (DsrOpt Link Here 
2037
                  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
2045
                  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
2038
                  NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
2046
                  NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
2039
2047
2048
                  m_txDsr(newPacket);
2049
2040
                  m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
2050
                  m_downTarget (newPacket, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
2041
2051
2042
                  /// \todo New DsrNetworkQueueEntry
2052
                  /// \todo New DsrNetworkQueueEntry
 Lines 2389-2394   DsrRouting::SalvagePacket (Ptr<const Pac Link Here 
2389
      Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
2399
      Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
2390
      NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
2400
      NS_LOG_DEBUG ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
2391
2401
2402
      m_txPacketTrace (sourceRoute);
2403
2392
      m_downTarget (p, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
2404
      m_downTarget (p, m_mainAddress, nextHop, GetProtocolNumber (), m_ipv4Route);
2393
2405
2394
      /// \todo New DsrNetworkQueueEntry
2406
      /// \todo New DsrNetworkQueueEntry
 Lines 3226-3231   DsrRouting::SendRequest (Ptr<Packet> pac Link Here 
3226
  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
3238
  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
3227
  NS_LOG_LOGIC ("Inserting into priority queue number: " << priority);
3239
  NS_LOG_LOGIC ("Inserting into priority queue number: " << priority);
3228
3240
3241
  m_txDsr(packet);
3242
3229
  m_downTarget (packet, source, m_broadcast, GetProtocolNumber (), 0);
3243
  m_downTarget (packet, source, m_broadcast, GetProtocolNumber (), 0);
3230
3244
3231
  /// \todo New DsrNetworkQueueEntry
3245
  /// \todo New DsrNetworkQueueEntry
 Lines 3332-3337   DsrRouting::SendReply (Ptr<Packet> packe Link Here 
3332
  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
3346
  Ptr<dsr::DsrNetworkQueue> dsrNetworkQueue = i->second;
3333
  NS_LOG_INFO ("Inserting into priority queue number: " << priority);
3347
  NS_LOG_INFO ("Inserting into priority queue number: " << priority);
3334
3348
3349
  m_txDsr(packet);
3350
3335
  m_downTarget (packet, source, nextHop, GetProtocolNumber (), route);
3351
  m_downTarget (packet, source, nextHop, GetProtocolNumber (), route);
3336
3352
3337
  /// \todo New DsrNetworkQueueEntry
3353
  /// \todo New DsrNetworkQueueEntry
 Lines 3409-3414   DsrRouting::SendAck (uint16_t ackId, Link Here 
3409
3425
3410
  NS_LOG_LOGIC ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
3426
  NS_LOG_LOGIC ("Will be inserting into priority queue " << dsrNetworkQueue << " number: " << priority);
3411
3427
3428
  m_txDsr(packet);
3429
3412
  m_downTarget (packet, m_mainAddress, destination, GetProtocolNumber (), route);
3430
  m_downTarget (packet, m_mainAddress, destination, GetProtocolNumber (), route);
3413
3431
3414
  /// \todo New DsrNetworkQueueEntry
3432
  /// \todo New DsrNetworkQueueEntry
(-)a/src/dsr/model/dsr-routing.h (+1 lines)
 Lines 574-579   protected: Link Here 
574
   */
574
   */
575
  TracedCallback<Ptr<const Packet> > m_dropTrace;
575
  TracedCallback<Ptr<const Packet> > m_dropTrace;
576
  TracedCallback <const DsrOptionSRHeader &> m_txPacketTrace;
576
  TracedCallback <const DsrOptionSRHeader &> m_txPacketTrace;
577
  TracedCallback <Ptr<const Packet> > m_txDsr;
577
578
578
private:
579
private:
579
580

Return to bug 1902