Moving around path weight tagging. Now CcnxFace owns metric field, which is used for tagging.
Correcting bugs in blackhole-sprint scenario. This time it should be
the right one:
- instead of a hijacker app, all faces on hijacked node are turned down
- there was a trick with RTT estimation (when batch, it is necessary to
reset history upon a new batch)
- instead of random runs, trying all possible combinations of
producer/hijacker
diff --git a/model/annotated-topology-reader.h b/model/annotated-topology-reader.h
index 6edcb34..91e6d26 100644
--- a/model/annotated-topology-reader.h
+++ b/model/annotated-topology-reader.h
@@ -80,12 +80,28 @@
void
AssignIpv4Addresses (Ipv4Address base);
+ /**
+ * \brief Set bounding box where nodes will be randomly places (if positions are unspecified)
+ * \param ulx Upper left x coordinate
+ * \param uly Upper left y coordinate
+ * \param lrx Lower right x coordinate
+ * \param lry Lower right y coordinate
+ */
void
SetBoundingBox (double ulx, double uly, double lrx, double lry);
+ /**
+ * \brief Set mobility model to be used on nodes
+ * \param model class name of the model
+ */
void
SetMobilityModel (const std::string &model);
+ /**
+ * \brief Apply OSPF metric on Ipv4 (if exists) and Ccnx (if exists) stacks
+ */
+ void ApplyOspfMetric ();
+
protected:
Ptr<Node>
CreateNode (const std::string name);
@@ -100,7 +116,6 @@
* NodeContainer from Read method
*/
void ApplySettings ();
- void ApplyOspfMetric ();
protected:
std::string m_path;