Attachment #2825 for bug #2399

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




    .SetParent<RegularWifiMac> ()
    .SetGroupName ("Wifi")
    .AddConstructor<StaWifiMac> ()
	/* Edited by manish ProbeRequestTimeout is no more in use , can be remove */
    .AddAttribute ("ProbeRequestTimeout", "The interval between two consecutive probe request attempts.",
                   TimeValue (Seconds (0.05)),
                   MakeTimeAccessor (&StaWifiMac::m_probeRequestTimeout),

                   TimeValue (Seconds (0.5)),
                   MakeTimeAccessor (&StaWifiMac::m_assocRequestTimeout),
                   MakeTimeChecker ())
    .AddAttribute ("ScanningTimeout", "The interval to dwell on a channel while scanning during passive probring",
                   TimeValue (MilliSeconds (120)),
                   MakeTimeAccessor (&StaWifiMac::m_scanningTimeout),
                   MakeTimeChecker ())

                   BooleanValue (false),
                   MakeBooleanAccessor (&StaWifiMac::SetActiveProbing, &StaWifiMac::GetActiveProbing),
                   MakeBooleanChecker ())
	/* Edited by manish MinChannelTimeout */
	.AddAttribute ("MinChannelTimeout", "The time duration upto which the station have to wait"
                   "for probe response (in active probing )if no activity found on channel till the end of this time duration.",
                   TimeValue (Seconds (0.010)),
                   MakeTimeAccessor (&StaWifiMac::m_minChannelTimeout),
                   MakeTimeChecker ())
	/* Edited by manish MaxChannelTimeout */
	.AddAttribute ("MaxChannelTimeout", "The time duration upto which the station have to wait"
                   "for probe response (in active probing )if some activity found on channel till the end of this time duration.",
                   TimeValue (Seconds (0.040)),
                   MakeTimeAccessor (&StaWifiMac::m_maxChannelTimeout),
                   MakeTimeChecker ())
    .AddTraceSource ("Assoc", "Associated with an access point.",
                     MakeTraceSourceAccessor (&StaWifiMac::m_assocLogger),
                     "ns3::Mac48Address::TracedCallback")

void
StaWifiMac::DoInitialize (void)
{
    StartScanning ();
}

void

    {
      m_probeRequestEvent.Cancel ();
    }
	//edited by manish start 
 // if (m_candidateChannels.size () == 0)
   // {
	//	//m_probeRequestEvent = Simulator::Schedule (m_probeRequestTimeout,
    //                                         &StaWifiMac::ProbeRequestTimeout, this);
	//}
	//edited by manish end
}

void

      if (m_activeProbing)
        {
          SetState (WAIT_PROBE_RESP);
          //m_bestBeaconObserved.Clear ();removed by manish as resulting in clearing of best becon data of channel
          SendProbeRequest ();
        }
      else

            {
              m_waitBeaconEvent.Cancel ();
            }
          //m_bestBeaconObserved.Clear ();removed by manish as resulting in clearing of best becon data of channel
          //m_waitBeaconEvent = Simulator::Schedule (m_scanningTimeout,
          //                             &StaWifiMac::WaitBeaconTimeout, this);
		  //no need to call WaitBeaconTimeout as it is not end of scanning 
          SetState (WAIT_BEACON);
        }
      break;

      SetBssid (m_bestBeaconObserved.m_bssid);
      Time delay = MicroSeconds (m_bestBeaconObserved.m_probeResp.GetBeaconIntervalUs () * m_maxMissedBeacons);
      RestartBeaconWatchdog (delay);
      NS_LOG_DEBUG ("Stopping scanning; best beacon found on channel " << m_bestBeaconObserved.m_channelNumber);//manish 
      m_phy->SetChannelNumber (m_bestBeaconObserved.m_channelNumber);//manish
	  if (m_probeRequestEvent.IsRunning ())
        {
          m_probeRequestEvent.Cancel ();
        }

  else
    {
      NS_LOG_DEBUG ("no probe responses received; resend request");
      StartScanning ();//manish restart scanning process 
    }
}


      NS_LOG_DEBUG ("Beacon found, selecting " << m_bestBeaconObserved.m_bssid);
      SetBssid (m_bestBeaconObserved.m_bssid);
      SetState (WAIT_ASSOC_RESP);
	  m_phy->SetChannelNumber (m_bestBeaconObserved.m_channelNumber);//manish
      SendAssociationRequest ();
    }
 // edited by manish check allready present in channelScanning Timeout
 //else
   // {
     // NS_LOG_DEBUG ("no beacons received; restart scanning");
      //StartScanning ();
    //} 
}

void

StaWifiMac::StartScanning (void)
{
  NS_LOG_FUNCTION (this);
  m_bestBeaconObserved.Clear ();//rev manish moved from TryToEnsureAssociated 
  SetState (SCANNING);
  m_candidateChannels = m_phy->GetOperationalChannelList (); 
  if (m_candidateChannels.size () == 1)
    {
      NS_LOG_DEBUG ("No need to scan; only one channel possible");
	  //rev1.0 manish setting channel number and communicating to phy layer
	  uint32_t nextChannel = m_candidateChannels.back (); 
	  m_phy->SetChannelNumber (nextChannel);
      m_candidateChannels.clear ();
	  SetState (UNASSOCIATED);
      TryToEnsureAssociated ();
      return;
    }
  // Keep track of whether we find any good beacons, so that if we do
  // not, we restart scanning
  //m_bestBeaconObserved.Clear ();rev1.0 manish moved above
  uint32_t nextChannel = m_candidateChannels.back ();
  m_candidateChannels.pop_back ();
  NS_LOG_DEBUG ("Scanning channel " << nextChannel);  
  m_phy->SetChannelNumber (nextChannel);//rev1.0 manish setting channel number
  SetState (UNASSOCIATED);//rev1.0 manish setting state 
 
 // edited by manish checking whether active probing or passive probing
  if (m_activeProbing)
     {  
         Simulator::Schedule (m_minChannelTimeout, &StaWifiMac::MinScanningTimeout, this);
	  }
  else
  {
         Simulator::Schedule (m_scanningTimeout, &StaWifiMac::ChannelScanningTimeout, this);
  }
  TryToEnsureAssociated ();//rev1.0 manish 	   
}
//edited by manish adding new function
void
StaWifiMac::MinScanningTimeout (void) 
{
 if (! activityDetected)
 { Simulator::ScheduleNow ( &StaWifiMac::ChannelScanningTimeout, this);
  }
 else{Simulator::Schedule (m_maxChannelTimeout - m_minChannelTimeout ), 
                             &StaWifiMac::ChannelScanningTimeout, this);
	activityDetected = false ;
	}
}

void
StaWifiMac::ChannelScanningTimeout (void)
{
  NS_LOG_FUNCTION (this);
  if (m_candidateChannels.size () == 0)
    {
     if (m_bestBeaconObserved.m_channelNumber == 0)
      {
         NS_LOG_DEBUG ("No beacons/ probe reponse found when scanning; restart scanning");
         StartScanning ();
         return;
      }
      NS_LOG_DEBUG ("Stopping scanning; best beacon found on channel " << m_bestBeaconObserved.m_channelNumber);
      //edited by manish no need of following lines at this place
	  // m_phy->SetChannelNumber (m_bestBeaconObserved.m_channelNumber);
      //SetState (UNASSOCIATED);
      //TryToEnsureAssociated ();
	  
	  // manish checking active /passive probing
	 if (m_activeProbing)
     {  
        m_probeRequestEvent = Simulator::ScheduleNow (&StaWifiMac::ProbeRequestTimeout, this);//manish
	  }
  else
  {
         m_waitBeaconEvent = Simulator::Schedule (m_scanningTimeout,&StaWifiMac::WaitBeaconTimeout, this);
  } //manish 
	   
     	  
      return;
    }
  uint32_t nextChannel = m_candidateChannels.back ();
  m_candidateChannels.pop_back ();
  NS_LOG_DEBUG ("Scanning channel " << nextChannel);
  m_phy->SetChannelNumber (nextChannel);//rev1.0 manish setting channel number
  SetState (UNASSOCIATED);//rev1.0 manish setting channel number
  // manish checking active /passive probing
  if (m_activeProbing)
     {  
         Simulator::Schedule (m_minChannelTimeout, &StaWifiMac::MinScanningTimeout, this);
	  }
  else
      (
         Simulator::Schedule (m_scanningTimeout, &StaWifiMac::ChannelScanningTimeout, this);
	   )//manish 
  TryToEnsureAssociated ();//rev1.0 manish setting channel number
}

void

{
  NS_LOG_FUNCTION (this << packet << hdr);
  NS_ASSERT (!hdr->IsCtl ());
  activityDetected = true ;//new variable to sense channel
  if (hdr->GetAddr3 () == GetAddress ())
    {
      NS_LOG_LOGIC ("packet sent by us.");

          m_stationManager->SetShortPreambleEnabled (isShortPreambleEnabled);
          m_stationManager->SetShortSlotTimeEnabled (capabilities.IsShortSlotTime ());
        }
     // if (goodBeacon && m_state == UNASSOCIATED)
       // {
         // SetState (WAIT_ASSOC_RESP);
          //SendAssociationRequest ();
        //} edited by manish no need to send association request 
      if (goodBeacon && (m_state == SCANNING || m_state == WAIT_BEACON) && !m_activeProbing)
        {
          NS_LOG_DEBUG ("Beacon received while scanning");
          if (m_bestBeaconObserved.m_snr < tag.Get ())

(-)original/sta-wifi-mac.h (-1 / +9 lines)

Lines 213-222	Link Here

213

   * Start the scanning process to find the strongest beacon

213

   * Start the scanning process to find the strongest beacon

214

*/

214

*/

215

  void StartScanning (void);

215

  void StartScanning (void);

216

/**

217

   * (edited by manish)To check the waiting time (MaxTime Or MinTime) on the channel during Active Probing

218

*/

219

  void MinScanningTimeout (void);

216

/**

220

/**

221

   * Edited by Manish old ScanningTimeout is now channel scanning timeout

217

   * Continue scanning process or terminate if no further channels to scan

222

   * Continue scanning process or terminate if no further channels to scan

218

*/

223

*/

219

  void ScanningTimeout (void);

224

  void ChannelScanningTimeout (void);

220

225

221

  virtual void DoInitialize (void);

226

  virtual void DoInitialize (void);

222

227

Lines 224-229	Link Here

224

  Time m_probeRequestTimeout;

229

  Time m_probeRequestTimeout;

225

  Time m_assocRequestTimeout;

230

  Time m_assocRequestTimeout;

226

  Time m_scanningTimeout;

231

  Time m_scanningTimeout;

232

  Time m_minChannelTimeout;// edited by manish used when scanning

233

  Time m_maxChannelTimeout;// edited by manish used when scanning

227

  EventId m_probeRequestEvent;

234

  EventId m_probeRequestEvent;

228

  EventId m_assocRequestEvent;

235

  EventId m_assocRequestEvent;

229

  EventId m_beaconWatchdog;

236

  EventId m_beaconWatchdog;

Lines 231-236	Link Here

231

  Time m_beaconWatchdogEnd;

238

  Time m_beaconWatchdogEnd;

232

  uint32_t m_maxMissedBeacons;

239

  uint32_t m_maxMissedBeacons;

233

  bool m_activeProbing;

240

  bool m_activeProbing;

241

  bool activityDetected ;// edited by manish used when scanning

234

  std::vector<uint16_t> m_candidateChannels; /// used when scanning

242

  std::vector<uint16_t> m_candidateChannels; /// used when scanning

235

  BeaconInfo m_bestBeaconObserved; /// used when scanning

243

  BeaconInfo m_bestBeaconObserved; /// used when scanning

(-)original/yans-wifi-phy.cc (-2 / +4 lines)

Lines 515-522	Link Here

515

516

      if (m_operationalChannelList[i] != m_channelNumber)

516

      if (m_operationalChannelList[i] != m_channelNumber)

517

518

          channelList.push_back (m_channelNumber);

518

          //edited by Manish Puraswani ver 1.0 as the original one was not updating channel list

519

		  //channelList.push_back (m_channelNumber); (original code)

520

          channelList.push_back (m_operationalChannelList[i]);

521

520

522

521

  return channelList;

523

  return channelList;

522

524

Return to bug 2399