Removed now unnecessary functions for the IP hack

floxyz · May 12, 2015 · efca8f3 · efca8f3
1 parent 2bfea3a
commit efca8f3
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 18 deletions.
diff --git a/inet/src/networklayer/autorouting/ipv4/IPv4NetworkConfigurator.cc b/inet/src/networklayer/autorouting/ipv4/IPv4NetworkConfigurator.cc
@@ -99,7 +99,6 @@ void IPv4NetworkConfigurator::computeConfiguration()
 {
     long initializeStartTime = clock();
     topology.clear();
-    topology.linkInfos.clear();
     // extract topology into the IPv4Topology object, then fill in a LinkInfo[] vector
     T(extractTopology(topology));
     // read the configuration from XML; it will serve as input for address assignment
@@ -734,6 +733,7 @@ void IPv4NetworkConfigurator::collectCompatibleInterfaces(const std::vector<Inte
 
     }
     // sort compatibleInterfaces moving the most constrained interfaces first
+    std::sort(compatibleInterfaces.begin(), compatibleInterfaces.end(), compareInterfaceInfos);
     EV_DEBUG << "Found " << compatibleInterfaces.size() << " compatible interfaces" << endl;
 }
 
@@ -2192,16 +2192,3 @@ bool IPv4NetworkConfigurator::getInterfaceIPv4Address(IPvXAddress &ret, Interfac
         return interfaceInfo->configure;
     }
 }
-void IPv4NetworkConfigurator::updateTopology(){
-    computeConfiguration();
-    configureAllInterfaces();
-    configureAllRoutingTables();
-}
-
-void IPv4NetworkConfigurator::removeNodeFromTopology(cModule* module){
-    topology.deleteNode(topology.getNodeFor(module));
-    if (simulation.getSimulationStage() != CTX_FINISH){
-        configureAllInterfaces();
-        configureAllRoutingTables();
-    }
-}
diff --git a/inet/src/networklayer/autorouting/ipv4/IPv4NetworkConfigurator.h b/inet/src/networklayer/autorouting/ipv4/IPv4NetworkConfigurator.h
@@ -232,10 +232,6 @@ class INET_API IPv4NetworkConfigurator : public cSimpleModule, public IPvXAddres
          */
         virtual void configureRoutingTable(IRoutingTable *routingTable);
 
-        virtual void updateTopology();
-
-        virtual void removeNodeFromTopology(cModule* module);
-
     protected:
         virtual int numInitStages() const  { return 4; }
         virtual void handleMessage(cMessage *msg) { throw cRuntimeError("this module doesn't handle messages, it runs only in initialize()"); }