Added physical layer 'passthrough' noise mode. When configured for

passthrough noise, the physical layer will send all over-the-air messages, provided they have at least one frequency segment above the receiver sensitivity, to the radio model for processing. Spectrum monitor energy recording (signal and noise) does not occur in the physical layer when in passthrough mode. Removed unused boolean flag in SpectrumFilterWindow.
adjacentlink · Mar 23, 2020 · 93cd8c5 · 93cd8c5
1 parent 5fb9905
commit 93cd8c5
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/include/emane/spectrumserviceprovider.h b/include/emane/spectrumserviceprovider.h
@@ -73,15 +73,12 @@ namespace EMANE
    * @param TimePoint Time corresponding to the first bin
    * @param Microseconds The bin duration
    * @param double The receiver sensitivity in mW
-   * @param bool Flag indicating whether the in-band signal
-   * is contained in the binned power values
    * @param size_t Number of subband binned signal energy per time bin
    */
   using SpectrumFilterWindow = std::tuple<std::vector<double>,
                                           TimePoint,
                                           Microseconds,
                                           double,
-                                          bool,
                                           size_t>;
 
   /**

diff --git a/src/libemane/frameworkphy.cc b/src/libemane/frameworkphy.cc
@@ -175,10 +175,10 @@ void EMANE::FrameworkPHY::initialize(Registrar & registrar)
                                                   EMANE::ConfigurationProperties::DEFAULT,
                                                   {"all"},
                                                   "Defines the noise processing mode of operation:"
-                                                  " none, all or outofband.",
+                                                  " none, all, outofband or passthrough.",
                                                   1,
                                                   1,
-                                                  "^(none|all|outofband)$");
+                                                  "^(none|all|outofband|passthrough)$");
 
 
   configRegistrar.registerNumeric<std::uint64_t>("noisebinsize",
@@ -380,6 +380,10 @@ void EMANE::FrameworkPHY::configure(const ConfigurationUpdate & update)
             {
               noiseMode_ = SpectrumMonitor::NoiseMode::NONE;
             }
+          else if(sNoiseMode == "passthrough")
+            {
+              noiseMode_ = SpectrumMonitor::NoiseMode::PASSTHROUGH;
+            }
           else
             {
               noiseMode_ = SpectrumMonitor::NoiseMode::OUTOFBAND;

diff --git a/src/libemane/spectrummonitor.cc b/src/libemane/spectrummonitor.cc
@@ -178,15 +178,20 @@ EMANE::SpectrumMonitor::update(const TimePoint & now,
 
   // if noise processing is disabled just check in-band updates for
   // frequencies of interest
-  if(mode_ == NoiseMode::NONE || (mode_ == NoiseMode::OUTOFBAND && bInBand))
+  if(mode_ == NoiseMode::NONE ||
+     mode_ == NoiseMode::PASSTHROUGH ||
+     (mode_ == NoiseMode::OUTOFBAND && bInBand))
     {
       size_t i{};
 
       bReportAsInBand = true;
 
       for(const auto & segment : segments)
         {
-          if(noiseRecorderMap_.find(segment.getFrequencyHz()) != noiseRecorderMap_.end())
+          // in passthrough mode, you do not need an exact frequency
+          // match for processing like you would for inband messages
+          if(mode_ == NoiseMode::PASSTHROUGH ||
+             noiseRecorderMap_.find(segment.getFrequencyHz()) != noiseRecorderMap_.end())
             {
               if(rxPowersMilliWatt[i] >= dReceiverSensitivityMilliWatt_)
                 {
@@ -564,7 +569,6 @@ EMANE::SpectrumMonitor::requestFilter(FilterIndex filterIndex,
 
       return std::tuple_cat(std::move(ret),std::make_tuple(binSize_,
                                                            dReceiverSensitivityMilliWatt_,
-                                                           false,
                                                            std::get<2>(iter->second)->getSubBandBinCount()));
     }
   else

diff --git a/src/libemane/spectrummonitor.h b/src/libemane/spectrummonitor.h
@@ -55,7 +55,7 @@ namespace EMANE
     SpectrumMonitor();
 
 
-    enum class NoiseMode {NONE, ALL, OUTOFBAND};
+    enum class NoiseMode {NONE, ALL, OUTOFBAND, PASSTHROUGH};
 
     void initialize(uint16_t u16SubId,
                     const FrequencySet & foi,

diff --git a/src/models/mac/tdma/basemodelimpl.cc b/src/models/mac/tdma/basemodelimpl.cc
@@ -470,7 +470,7 @@ void EMANE::Models::TDMA::BaseModel::Implementation::processUpstreamPacket(const
 
 
       packetStatusPublisher_.inbound(pktInfo.getSource(),
-                                     pktInfo.getSource(),
+                                     pktInfo.getDestination(),
                                      pktInfo.getPriority(),
                                      pkt.length(),
                                      PacketStatusPublisher::InboundAction::DROP_REGISTRATION_ID);