Attachment #2310 for bug #2314

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




void
WifiPhyStats::PhyTxDrop (std::string context, Ptr<const Packet> packet)
{
  //NS_LOG_UNCOND ("PHY Tx Drop");
}

void
WifiPhyStats::PhyRxDrop (std::string context, Ptr<const Packet> packet)
{
  //NS_LOG_UNCOND ("PHY Rx Drop");
}

uint32_t

  // which is used to determine the total amount of
  // data transmitted, and then used to calculate
  // the MAC/PHY overhead beyond the app-data
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/State/Tx", MakeCallback (&WifiPhyStats::PhyTxTrace, m_wifiPhyStats));
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/PhyTxDrop", MakeCallback (&WifiPhyStats::PhyTxDrop, m_wifiPhyStats));
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WifiNetDevice/Phy/PhyRxDrop", MakeCallback (&WifiPhyStats::PhyRxDrop, m_wifiPhyStats));

  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WaveNetDevice/PhyEntities/*/State/Tx", MakeCallback (&WifiPhyStats::PhyTxTrace, m_wifiPhyStats));
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WaveNetDevice/PhyEntities/*/PhyRxDrop", MakeCallback (&WifiPhyStats::PhyRxDrop, m_wifiPhyStats));
  Config::Connect ("/NodeList/*/DeviceList/*/$ns3::WaveNetDevice/PhyEntities/*/PhyRxDrop", MakeCallback (&WifiPhyStats::PhyRxDrop, m_wifiPhyStats));
}

void




  m_adhocTxInterfaces = &i;
  m_nodeId = nodeId;
  m_txMaxDelay = txMaxDelay;

  // check whether current device is a WAVE device,
  // so alternating channel access assignment will be support.
  Ptr<Node> node = Application::GetNode();
  Ptr<NetDevice> device = node->GetDevice(0);
  Ptr<WaveNetDevice> waveDevice = DynamicCast<WaveNetDevice>(device);
  if (waveDevice == 0)
    return;

  // assign channel access and register txprofile for sending packets
  if (m_chAccessMode == 1)
  {
    // assign alternating channel access for SCH1 and CCH
    SchInfo info = SchInfo (SCH1, false, EXTENDED_ALTERNATING);
    Simulator::Schedule (Seconds (0), &WaveNetDevice::StartSch, waveDevice, info);
  }
  else
  {
    // assign continuous channel access for SCH1
    SchInfo info = SchInfo (SCH1, false, EXTENDED_CONTINUOUS);
    Simulator::Schedule (Seconds (0), &WaveNetDevice::StartSch, waveDevice, info);
  }

  // register a tx profile for IP-based packets
  const TxProfile txProfile = TxProfile (SCH1);
  Simulator::Schedule (Seconds (0), &WaveNetDevice::RegisterTxProfile, waveDevice, txProfile);
}

void




      txVector.SetTxPowerLevel (txInfo.txPowerLevel);
      txVector.SetMode (txInfo.dataRate);
      HigherLayerTxVectorTag tag = HigherLayerTxVectorTag (txVector, false);
      packet->ReplacePacketTag (tag);
    }

  LlcSnapHeader llc;

  // according to channel number and priority,
  // route the packet to a proper queue.
  QosTag qos = QosTag (txInfo.priority);
  packet->ReplacePacketTag (qos);
  Ptr<WifiMac> mac = GetMac (txInfo.channelNumber);
  Mac48Address realTo = Mac48Address::ConvertFrom (dest);
  mac->NotifyTx (packet);

      txVector.SetTxPowerLevel (m_txProfile->txPowerLevel);
      txVector.SetMode (m_txProfile->dataRate);
      HigherLayerTxVectorTag tag = HigherLayerTxVectorTag (txVector, m_txProfile->adaptable);
      packet->ReplacePacketTag (tag);
    }

  LlcSnapHeader llc;

(-)a/src/wifi/model/dcf-manager.cc (+6 lines)

Lines 474-479	Link Here

474

475

      return true;

475

      return true;

476

477

  // CCA busy

478

  Time lastBusyEnd = m_lastBusyStart + m_lastBusyDuration;

479

  if (lastBusyEnd >= Simulator::Now ())

480

481

      return true;

482

477

  // NAV busy

483

  // NAV busy

478

  Time lastNavEnd = m_lastNavStart + m_lastNavDuration;

484

  Time lastNavEnd = m_lastNavStart + m_lastNavDuration;

479

  if (lastNavEnd > Simulator::Now ())

485

  if (lastNavEnd > Simulator::Now ())

Return to bug 2314