Attachment #1172 for bug #1185

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




  return MicroSeconds (duration);
}


void
WifiPhy::NotifyTxBegin (Ptr<const Packet> packet, 
                        Ptr<const Object> nd,
                        const Time& duration,
                        uint32_t    nReceivers)
{
  m_phyTxBeginTrace (packet, nd, duration, nReceivers);
}

void 
WifiPhy::NotifyTxEnd (Ptr<const Packet> packet,
                      Ptr<const Object> nd)
{
  m_phyTxEndTrace (packet, nd);
}

void 
WifiPhy::NotifyTxDrop (Ptr<const Packet> packet,
                      Ptr<const Object> nd)
{
  m_phyTxDropTrace (packet, nd);
}

void 
WifiPhy::NotifyRxBegin (Ptr<const Packet> packet,
                        Ptr<const Object> nd) 
{
  m_phyRxBeginTrace (packet, nd);
}

void 
WifiPhy::NotifyRxEnd (Ptr<const Packet> packet,
                      Ptr<const Object> nd) 
{
  m_phyRxEndTrace (packet, nd);
}

void 
WifiPhy::NotifyRxDrop (Ptr<const Packet> packet,
                      Ptr<const Object> nd) 
{
  m_phyRxDropTrace (packet, nd);
}

void

(-)a/src/wifi/model/wifi-phy.h (-23 / +44 lines)

Lines 380-418	Link Here

380

/**

380

/**

381

   * Public method used to fire a PhyTxBegin trace.  Implemented for encapsulation

381

   * Public method used to fire a PhyTxBegin trace.  Implemented for encapsulation

382

   * purposes.

382

   * purposes.

383

   * \param Ptr to packet to be transmitted

384

   * \param Ptr to device used to transmit

385

   * \param Duration for transmission

386

   * \param Number of receivers for the transmission

383

*/

387

*/

384

  void NotifyTxBegin (Ptr<const Packet> packet);

388

  void NotifyTxBegin (Ptr<const Packet> packet,

385

389

                      Ptr<const Object> nd,

390

                      const Time& duration,

391

                      uint32_t    nReceivers);

386

/**

392

/**

387

   * Public method used to fire a PhyTxEnd trace.  Implemented for encapsulation

393

   * Public method used to fire a PhyTxEnd trace.  Implemented for encapsulation

388

   * purposes.

394

   * purposes.

395

   * \param Ptr to packet transmitted

396

   * \param Ptr to device used to transmit

389

*/

397

*/

390

  void NotifyTxEnd (Ptr<const Packet> packet);

398

  void NotifyTxEnd (Ptr<const Packet> packet, Ptr<const Object> nd);

391

392

/**

399

/**

393

   * Public method used to fire a PhyTxDrop trace.  Implemented for encapsulation

400

   * Public method used to fire a PhyTxDrop trace.  Implemented for encapsulation

394

   * purposes.

401

   * purposes.

402

   * \param Ptr to packet to be dropped before transmission

403

   * \param Ptr to device used to transmit

395

*/

404

*/

396

  void NotifyTxDrop (Ptr<const Packet> packet);

405

  void NotifyTxDrop (Ptr<const Packet> packet, Ptr<const Object> nd);

397

398

/**

406

/**

399

   * Public method used to fire a PhyRxBegin trace.  Implemented for encapsulation

407

   * Public method used to fire a PhyRxBegin trace.  Implemented for encapsulation

400

   * purposes.

408

   * purposes.

409

   * \param Ptr to packet to be received

410

   * \param Ptr to device used to receive

401

*/

411

*/

402

  void NotifyRxBegin (Ptr<const Packet> packet);

412

  void NotifyRxBegin (Ptr<const Packet> packet, Ptr<const Object> nd);

403

404

/**

413

/**

405

   * Public method used to fire a PhyRxEnd trace.  Implemented for encapsulation

414

   * Public method used to fire a PhyRxEnd trace.  Implemented for encapsulation

406

   * purposes.

415

   * purposes.

416

   * \param Ptr to packet received

417

   * \param Ptr to device used to receive

407

*/

418

*/

408

  void NotifyRxEnd (Ptr<const Packet> packet);

419

  void NotifyRxEnd (Ptr<const Packet> packet, Ptr<const Object> nd);

409

410

/**

420

/**

411

   * Public method used to fire a PhyRxDrop trace.  Implemented for encapsulation

421

   * Public method used to fire a PhyRxDrop trace.  Implemented for encapsulation

412

   * purposes.

422

   * purposes.

423

   * \param Ptr to packet to be dropped on reception

424

   * \param Ptr to device used to receive

413

*/

425

*/

414

  void NotifyRxDrop (Ptr<const Packet> packet);

426

  void NotifyRxDrop (Ptr<const Packet> packet, Ptr<const Object> nd);

415

416

/**

427

/**

417

428

418

   * Public method used to fire a PromiscSniffer trace for a wifi packet being received.  Implemented for encapsulation

429

   * Public method used to fire a PromiscSniffer trace for a wifi packet being received.  Implemented for encapsulation

Lines 456-505	Link Here

456

/**

467

/**

457

   * The trace source fired when a packet begins the transmission process on

468

   * The trace source fired when a packet begins the transmission process on

458

   * the medium.

469

   * the medium.

459

470

   * \param Ptr to packet to be transmitted

471

   * \param Ptr to device used to transmit

472

   * \param Duration for transmission

473

   * \param Number of receivers for the transmission

474

460

   * \see class CallBackTraceSource

475

   * \see class CallBackTraceSource

461

*/

476

*/

462

  TracedCallback<Ptr<const Packet> > m_phyTxBeginTrace;

477

  TracedCallback<Ptr<const Packet>, Ptr<const Object>, const Time&, uint32_t> m_phyTxBeginTrace;

463

478

464

/**

479

/**

465

   * The trace source fired when a packet ends the transmission process on

480

   * The trace source fired when a packet ends the transmission process on

466

   * the medium.

481

   * the medium.

482

   * \param Ptr to packet transmitted

483

   * \param Ptr to device used to transmit

467

484

468

   * \see class CallBackTraceSource

485

   * \see class CallBackTraceSource

469

*/

486

*/

470

  TracedCallback<Ptr<const Packet> > m_phyTxEndTrace;

487

  TracedCallback<Ptr<const Packet>, Ptr<const Object> > m_phyTxEndTrace;

471

488

472

/**

489

/**

473

   * The trace source fired when the phy layer drops a packet as it tries

490

   * The trace source fired when the phy layer drops a packet as it tries

474

   * to transmit it.

491

   * to transmit it.

492

   * \param Ptr to packet to be dropped before transmission

493

   * \param Ptr to device used to transmit

475

494

476

   * \see class CallBackTraceSource

495

   * \see class CallBackTraceSource

477

*/

496

*/

478

  TracedCallback<Ptr<const Packet> > m_phyTxDropTrace;

497

  TracedCallback<Ptr<const Packet>, Ptr<const Object> > m_phyTxDropTrace;

479

480

/**

498

/**

481

   * The trace source fired when a packet begins the reception process from

499

   * The trace source fired when a packet begins the reception process from

482

   * the medium.

500

   * the medium.

501

   * \param Ptr to packet to be received

502

   * \param Ptr to device used to receive

483

503

484

   * \see class CallBackTraceSource

504

   * \see class CallBackTraceSource

485

*/

505

*/

486

  TracedCallback<Ptr<const Packet> > m_phyRxBeginTrace;

506

  TracedCallback<Ptr<const Packet>, Ptr<const Object> > m_phyRxBeginTrace;

487

488

/**

507

/**

489

   * The trace source fired when a packet ends the reception process from

508

   * The trace source fired when a packet ends the reception process from

490

   * the medium.

509

   * the medium.

510

   * \param Ptr to packet received

511

   * \param Ptr to device used to receive

491

512

492

   * \see class CallBackTraceSource

513

   * \see class CallBackTraceSource

493

*/

514

*/

494

  TracedCallback<Ptr<const Packet> > m_phyRxEndTrace;

515

  TracedCallback<Ptr<const Packet> , Ptr<const Object> > m_phyRxEndTrace;

495

496

/**

516

/**

497

   * The trace source fired when the phy layer drops a packet it has received.

517

   * The trace source fired when the phy layer drops a packet it has received.

518

   * \param Ptr to packet to be dropped on reception

519

   * \param Ptr to device used to receive

498

520

499

   * \see class CallBackTraceSource

521

   * \see class CallBackTraceSource

500

*/

522

*/

501

  TracedCallback<Ptr<const Packet> > m_phyRxDropTrace;

523

  TracedCallback<Ptr<const Packet> , Ptr<const Object> > m_phyRxDropTrace;

502

503

/**

524

/**

504

   * A trace source that emulates a wifi device in monitor mode

525

   * A trace source that emulates a wifi device in monitor mode

505

   * sniffing a packet being received.

526

   * sniffing a packet being received.




  m_delay = delay;
}

uint32_t
YansWifiChannel::Send (Ptr<YansWifiPhy> sender, Ptr<const Packet> packet, double txPowerDbm,
                       WifiMode wifiMode, WifiPreamble preamble) const
{
  Ptr<MobilityModel> senderMobility = sender->GetMobility ()->GetObject<MobilityModel> ();
  NS_ASSERT (senderMobility != 0);
  uint32_t j = 0;
  uint32_t nReceivers = 0;
  for (PhyList::const_iterator i = m_phyList.begin (); i != m_phyList.end (); i++, j++)
    {
      if (sender != (*i))

            {
              dstNode = dstNetDevice->GetObject<NetDevice> ()->GetNode ()->GetId ();
            }
          nReceivers++;
          Simulator::ScheduleWithContext (dstNode,
                                          delay, &YansWifiChannel::Receive, this,
                                          j, copy, rxPowerDbm, wifiMode, preamble);
        }
    }
  return nReceivers;
}

void




   * \param wifiMode the tx mode associated to the packet
   * \param preamble the preamble associated to the packet
   *
   * returns the number of receivers that will receive the packet
   * This method should not be invoked by normal users. It is
   * currently invoked only from WifiPhy::Send. YansWifiChannel
   * delivers packets only between PHYs with the same m_channelNumber,
   * e.g. PHYs that are operating on the same channel.
   */
  uint32_t Send (Ptr<YansWifiPhy> sender, Ptr<const Packet> packet, double txPowerDbm,
             WifiMode wifiMode, WifiPreamble preamble) const;

private:




    {
    case YansWifiPhy::SWITCHING:
      NS_LOG_DEBUG ("drop packet because of channel switching");
      NotifyRxDrop (packet, GetDevice ());
      /*
       * Packets received on the upcoming channel are added to the event list
       * during the switching state. This way the medium can be correctly sensed

    case YansWifiPhy::RX:
      NS_LOG_DEBUG ("drop packet because already in Rx (power=" <<
                    rxPowerW << "W)");
      NotifyRxDrop (packet, GetDevice ());
      if (endRx > Simulator::Now () + m_state->GetDelayUntilIdle ())
        {
          // that packet will be noise _after_ the reception of the

    case YansWifiPhy::TX:
      NS_LOG_DEBUG ("drop packet because already in Tx (power=" <<
                    rxPowerW << "W)");
      NotifyRxDrop (packet, GetDevice ());
      if (endRx > Simulator::Now () + m_state->GetDelayUntilIdle ())
        {
          // that packet will be noise _after_ the transmission of the

          // sync to signal
          m_state->SwitchToRx (rxDuration);
          NS_ASSERT (m_endRxEvent.IsExpired ());
          NotifyRxBegin (packet, GetDevice ());
          m_interference.NotifyRxStart ();
          m_endRxEvent = Simulator::Schedule (rxDuration, &YansWifiPhy::EndReceive, this,
                                              packet,

        {
          NS_LOG_DEBUG ("drop packet because signal power too Small (" <<
                        rxPowerW << "<" << m_edThresholdW << ")");
          NotifyRxDrop (packet, GetDevice ());
          goto maybeCcaBusy;
        }
      break;

      m_endRxEvent.Cancel ();
      m_interference.NotifyRxEnd ();
    }
  NotifyTxBegin (packet);
  uint32_t dataRate500KbpsUnits = txMode.GetDataRate () / 500000;
  bool isShortPreamble = (WIFI_PREAMBLE_SHORT == preamble);
  NotifyPromiscSniffTx (packet, (uint16_t)GetChannelFrequencyMhz (), GetChannelNumber (), dataRate500KbpsUnits, isShortPreamble);
  m_state->SwitchToTx (txDuration, packet, txMode, preamble, txPower);
  uint32_t nReceivers = m_channel->Send (this, packet, GetPowerDbm (txPower) + m_txGainDb, txMode, preamble);
  NotifyTxBegin (packet, GetDevice (), txDuration, nReceivers);
}

uint32_t

                ", snr=" << snrPer.snr << ", per=" << snrPer.per << ", size=" << packet->GetSize ());
  if (m_random.GetValue () > snrPer.per)
    {
      NotifyRxEnd (packet, GetDevice ());
      uint32_t dataRate500KbpsUnits = event->GetPayloadMode ().GetDataRate () / 500000;
      bool isShortPreamble = (WIFI_PREAMBLE_SHORT == event->GetPreambleType ());
      double signalDbm = RatioToDb (event->GetRxPowerW ()) + 30;

  else
    {
      /* failure. */
      NotifyRxDrop (packet, GetDevice ());
      m_state->SwitchFromRxEndError (packet, snrPer.snr);
    }
}

Return to bug 1185